diff --git a/.ruby-version b/.ruby-version index e5fea6c..3e3c2f1 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-1.9.3-p374 +2.1.1 diff --git a/Gemfile b/Gemfile index 9bb8108..4d7db12 100644 --- a/Gemfile +++ b/Gemfile @@ -1,51 +1,50 @@ source 'https://rubygems.org' -gem 'rails', '3.2.13' +gem 'rails', '3.2.19' gem 'netzke-cancan' -gem 'netzke-core', '~>0.8.0' -gem 'netzke-basepack', '~>0.8.0' +gem 'netzke-core' +gem 'netzke-basepack' gem 'acts_as_loggable', :git => 'https://github.com/spacemunkay/acts_as_loggable.git' -gem 'bootstrap-will_paginate', '~> 0.0.6' +gem 'bootstrap-will_paginate' gem 'cancan' gem 'decent_exposure', '~> 1.0.1' gem 'devise', '~> 2.0.4' -gem 'haml-rails', '~> 0.3.4' -gem 'jquery-rails', '~> 2.0' +gem 'haml-rails' +gem 'jquery-rails' gem 'pg', '~> 0.17.1' -gem 'will_paginate', '~> 3.0.3' -gem 'jbuilder', '~> 2.0.3' +gem 'will_paginate' +gem 'jbuilder' # Gems used only for assets and not required # in production environments by default. group :assets do - gem 'coffee-rails', '~> 3.2.1' - gem "twitter-bootstrap-rails", "~> 2.0.3" - - # See https://github.com/sstephenson/execjs#readme for more supported runtimes - # gem 'therubyracer' - - gem 'uglifier', '>= 1.0.3' + gem 'coffee-rails' + # Use SCSS for stylesheets + gem 'sass-rails' + # Use bootstrap-sass for stylesheets + gem 'bootstrap-sass' + gem 'uglifier' end group :development, :test do - gem 'rspec-rails', '~> 2.14.0' - gem 'factory_girl_rails', '~> 1.2' - gem 'pry', '~> 0.9.8' - gem 'faker', '~> 1.2.0' + gem 'rspec-rails' + gem 'factory_girl_rails' + gem 'pry' + gem 'faker' end group :test do - gem 'shoulda-matchers', '~> 1.0.0' +# gem 'shoulda-matchers', '~> 1.0.0' gem 'capybara', '~> 2.2.1' gem 'poltergeist', '~> 1.5.0' gem 'database_cleaner', '~> 1.2.0' gem 'launchy', '~> 2.4.2' - gem 'spork', '~> 0.9.2' + gem 'spork' #guard dependency for Mac OS 10 gem 'rb-fsevent', :require => false if RUBY_PLATFORM =~ /darwin/i - gem 'guard-spork', '~> 1.5.1' - gem 'guard-rspec', '~> 4.2.6' + gem 'guard-spork' + gem 'guard-rspec' end diff --git a/Gemfile.lock b/Gemfile.lock index e9971ae..a4a6a58 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,12 +9,12 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.13) - actionpack (= 3.2.13) - mail (~> 2.5.3) - actionpack (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) + actionmailer (3.2.19) + actionpack (= 3.2.19) + mail (~> 2.5.4) + actionpack (3.2.19) + activemodel (= 3.2.19) + activesupport (= 3.2.19) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -22,23 +22,27 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.13) - activesupport (= 3.2.13) + activemodel (3.2.19) + activesupport (= 3.2.19) builder (~> 3.0.0) - activerecord (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) + activerecord (3.2.19) + activemodel (= 3.2.19) + activesupport (= 3.2.19) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - activesupport (3.2.13) - i18n (= 0.6.1) + activeresource (3.2.19) + activemodel (= 3.2.19) + activesupport (= 3.2.19) + activesupport (3.2.19) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - addressable (2.3.5) + addressable (2.3.6) arel (3.0.3) - bcrypt-ruby (3.1.2) + bcrypt (3.1.7) + bcrypt-ruby (3.1.5) + bcrypt (>= 3.1.3) + bootstrap-sass (3.2.0.0) + sass (~> 3.2) bootstrap-will_paginate (0.0.10) will_paginate builder (3.0.4) @@ -51,18 +55,17 @@ GEM xpath (~> 2.0) celluloid (0.15.2) timers (~> 1.1.0) - childprocess (0.4.0) + childprocess (0.5.3) ffi (~> 1.0, >= 1.0.11) cliver (0.3.2) coderay (1.1.0) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) - coffee-script (2.2.0) + coffee-script (2.3.0) coffee-script-source execjs - coffee-script-source (1.7.0) - commonjs (0.2.7) + coffee-script-source (1.7.1) database_cleaner (1.2.0) decent_exposure (1.0.2) devise (2.0.6) @@ -72,160 +75,156 @@ GEM warden (~> 1.1.1) diff-lcs (1.2.5) erubis (2.7.0) - execjs (2.0.2) - factory_girl (2.6.4) - activesupport (>= 2.3.9) - factory_girl_rails (1.7.0) - factory_girl (~> 2.6.0) + execjs (2.2.1) + factory_girl (4.4.0) + activesupport (>= 3.0.0) + factory_girl_rails (4.4.1) + factory_girl (~> 4.4.0) railties (>= 3.0.0) - faker (1.2.0) + faker (1.4.2) i18n (~> 0.5) ffi (1.9.3) - formatador (0.2.4) - guard (2.4.0) + formatador (0.2.5) + guard (2.6.1) formatador (>= 0.2.4) - listen (~> 2.1) + listen (~> 2.7) lumberjack (~> 1.0) pry (>= 0.9.12) thor (>= 0.18.1) - guard-rspec (4.2.6) + guard-rspec (4.3.1) guard (~> 2.1) rspec (>= 2.14, < 4.0) guard-spork (1.5.1) childprocess (>= 0.2.3) guard (>= 1.1) spork (>= 0.8.4) - haml (3.1.8) - haml-rails (0.3.5) + haml (4.0.5) + tilt + haml-rails (0.4) actionpack (>= 3.1, < 4.1) activesupport (>= 3.1, < 4.1) - haml (~> 3.1) + haml (>= 3.1, < 4.1) railties (>= 3.1, < 4.1) hike (1.2.3) - i18n (0.6.1) - jbuilder (2.0.3) - activesupport (>= 3.0.0) - multi_json (>= 1.2.0) + i18n (0.6.11) + jbuilder (2.1.3) + activesupport (>= 3.0.0, < 5) + multi_json (~> 1.2) journey (1.0.4) - jquery-rails (2.3.0) + jquery-rails (3.1.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) launchy (2.4.2) addressable (~> 2.3) - less (2.2.2) - commonjs (~> 0.2.6) - less-rails (2.2.6) - actionpack (>= 3.1) - less (~> 2.2.0) - libv8 (3.3.10.4) - listen (2.4.1) + listen (2.7.9) celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - lumberjack (1.0.4) + lumberjack (1.0.9) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) method_source (0.8.2) mime-types (1.25.1) - mini_portile (0.5.2) - multi_json (1.8.4) - netzke-basepack (0.8.4) - netzke-core (~> 0.8.2) + mini_portile (0.6.0) + multi_json (1.10.1) + netzke-basepack (0.10.1) + netzke-core (~> 0.10.0) netzke-cancan (0.8.2) cancan netzke-core - netzke-core (0.8.4) + netzke-core (0.10.1) execjs uglifier - nokogiri (1.6.1) - mini_portile (~> 0.5.0) + nokogiri (1.6.3.1) + mini_portile (= 0.6.0) orm_adapter (0.0.7) pg (0.17.1) - poltergeist (1.5.0) + poltergeist (1.5.1) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) - polyglot (0.3.3) - pry (0.9.12.6) - coderay (~> 1.0) - method_source (~> 0.8) + polyglot (0.3.5) + pry (0.10.0) + coderay (~> 1.1.0) + method_source (~> 0.8.1) slop (~> 3.4) rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-ssl (1.3.3) + rack-ssl (1.3.4) rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.13) - actionmailer (= 3.2.13) - actionpack (= 3.2.13) - activerecord (= 3.2.13) - activeresource (= 3.2.13) - activesupport (= 3.2.13) + rails (3.2.19) + actionmailer (= 3.2.19) + actionpack (= 3.2.19) + activerecord (= 3.2.19) + activeresource (= 3.2.19) + activesupport (= 3.2.19) bundler (~> 1.0) - railties (= 3.2.13) - railties (3.2.13) - actionpack (= 3.2.13) - activesupport (= 3.2.13) + railties (= 3.2.19) + railties (3.2.19) + actionpack (= 3.2.19) + activesupport (= 3.2.19) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.1.1) + rake (10.3.2) rb-fsevent (0.9.4) - rb-inotify (0.9.3) + rb-inotify (0.9.5) ffi (>= 0.5.0) rdoc (3.12.2) json (~> 1.4) - rspec (2.14.1) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - rspec-core (2.14.7) - rspec-expectations (2.14.5) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.5) - rspec-rails (2.14.1) + rspec (3.0.0) + rspec-core (~> 3.0.0) + rspec-expectations (~> 3.0.0) + rspec-mocks (~> 3.0.0) + rspec-core (3.0.3) + rspec-support (~> 3.0.0) + rspec-expectations (3.0.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.0.0) + rspec-mocks (3.0.3) + rspec-support (~> 3.0.0) + rspec-rails (3.0.2) actionpack (>= 3.0) - activemodel (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - shoulda-matchers (1.0.0) - slop (3.4.7) + rspec-core (~> 3.0.0) + rspec-expectations (~> 3.0.0) + rspec-mocks (~> 3.0.0) + rspec-support (~> 3.0.0) + rspec-support (3.0.3) + sass (3.3.10) + sass-rails (3.2.6) + railties (~> 3.2.0) + sass (>= 3.1.10) + tilt (~> 1.3) + slop (3.6.0) spork (0.9.2) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - therubyracer (0.10.2) - libv8 (~> 3.3.10) - thor (0.18.1) + thor (0.19.1) tilt (1.4.1) timers (1.1.0) treetop (1.4.15) polyglot polyglot (>= 0.3.1) - twitter-bootstrap-rails (2.0.9) - actionpack (>= 3.1) - less-rails (~> 2.2.2) - railties (>= 3.1) - therubyracer (~> 0.10.1) - tzinfo (0.3.38) - uglifier (2.4.0) + tzinfo (0.3.40) + uglifier (2.5.3) execjs (>= 0.3.0) json (>= 1.8.0) warden (1.1.1) rack (>= 1.0) - websocket-driver (0.3.2) - will_paginate (3.0.5) + websocket-driver (0.3.4) + will_paginate (3.0.7) xpath (2.0.0) nokogiri (~> 1.3) @@ -234,32 +233,32 @@ PLATFORMS DEPENDENCIES acts_as_loggable! - bootstrap-will_paginate (~> 0.0.6) + bootstrap-sass + bootstrap-will_paginate cancan capybara (~> 2.2.1) - coffee-rails (~> 3.2.1) + coffee-rails database_cleaner (~> 1.2.0) decent_exposure (~> 1.0.1) devise (~> 2.0.4) - factory_girl_rails (~> 1.2) - faker (~> 1.2.0) - guard-rspec (~> 4.2.6) - guard-spork (~> 1.5.1) - haml-rails (~> 0.3.4) - jbuilder (~> 2.0.3) - jquery-rails (~> 2.0) + factory_girl_rails + faker + guard-rspec + guard-spork + haml-rails + jbuilder + jquery-rails launchy (~> 2.4.2) - netzke-basepack (~> 0.8.0) + netzke-basepack netzke-cancan - netzke-core (~> 0.8.0) + netzke-core pg (~> 0.17.1) poltergeist (~> 1.5.0) - pry (~> 0.9.8) - rails (= 3.2.13) + pry + rails (= 3.2.19) rb-fsevent - rspec-rails (~> 2.14.0) - shoulda-matchers (~> 1.0.0) - spork (~> 0.9.2) - twitter-bootstrap-rails (~> 2.0.3) - uglifier (>= 1.0.3) - will_paginate (~> 3.0.3) + rspec-rails + sass-rails + spork + uglifier + will_paginate diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less deleted file mode 100644 index 1d0efba..0000000 --- a/app/assets/stylesheets/bootstrap_and_overrides.css.less +++ /dev/null @@ -1,47 +0,0 @@ -@import "twitter/bootstrap/bootstrap"; -body { - padding-top: 60px; - padding-left: 20px; -} - -@import "twitter/bootstrap/responsive"; - -// Set the correct sprite paths -@iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png'); -@iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png'); - -// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines) -// Note: If you use asset_path() here, your compiled boostrap_and_overrides.css will not -// have the proper paths. So for now we use the absolute path. -@fontAwesomeEotPath: '/assets/fontawesome-webfont.eot'; -@fontAwesomeWoffPath: '/assets/fontawesome-webfont.woff'; -@fontAwesomeTtfPath: '/assets/fontawesome-webfont.ttf'; -@fontAwesomeSvgPath: '/assets/fontawesome-webfont.svg'; - -// Font Awesome -@import "fontawesome"; - -// Your custom LESS stylesheets goes here -// -// Since bootstrap was imported above you have access to its mixins which -// you may use and inherit here -// -// If you'd like to override bootstrap's own variables, you can do so here as well -// See http://twitter.github.com/bootstrap/less.html for their names and documentation -// -// Example: -// @linkColor: #ff0000; - -[data-toggle="buttons-radio"] > .btn > input[type="radio"], -[data-toggle="buttons"] > .btn > input[type="checkbox"] { - display: none; -} - -.inline-block { - display: inline-block; -} - -.control-group.error .btn-group > .btn { - color: #b94a48; - border-color: #b94a48; -} diff --git a/config/application.rb b/config/application.rb index 7d74bda..c7a4b4c 100644 --- a/config/application.rb +++ b/config/application.rb @@ -3,10 +3,7 @@ require File.expand_path('../boot', __FILE__) require 'rails/all' if defined?(Bundler) - # If you precompile assets before deploying to production, use this line - Bundler.require(*Rails.groups(:assets => %w(development test))) - # If you want your assets lazily compiled in production, use this line - # Bundler.require(:default, :assets, Rails.env) + Bundler.require(*Rails.groups) end module Velocipede diff --git a/spec/factories/bikes.rb b/spec/factories/bikes.rb index 18ea59f..a7ff188 100644 --- a/spec/factories/bikes.rb +++ b/spec/factories/bikes.rb @@ -16,22 +16,21 @@ FactoryGirl.define do value 200 bike_condition { FactoryGirl.create(:bike_condition) } bike_purpose { FactoryGirl.create(:bike_purpose) } - end - - factory :seed_bike do - sequence(:shop_id) {|n| n} - sequence :serial_number do |n| - "#{Faker::Code.isbn}-#{n}" + factory :seed_bike do + sequence(:shop_id) {|n| n} + sequence :serial_number do |n| + "#{Faker::Code.isbn}-#{n}" + end + bike_brand_id { BikeBrand.all.sample.id } + model { Faker::Commerce.product_name } + color { sprintf("%06X", Random.rand(16777215) ) } + bike_style_id { BikeStyle.all.sample.id } + seat_tube_height { Random.rand(25) } + top_tube_length { Random.rand(25) } + bike_wheel_size_id { BikeWheelSize.all.sample.id } + value { Random.rand(200) } + bike_condition_id { BikeCondition.all.sample.id } + bike_purpose_id { BikePurpose.all.sample.id } end - bike_brand_id { BikeBrand.all.sample.id } - model { Faker::Commerce.product_name } - color { sprintf("%06X", Random.rand(16777215) ) } - bike_style_id { BikeStyle.all.sample.id } - seat_tube_height { Random.rand(25) } - top_tube_length { Random.rand(25) } - bike_wheel_size_id { BikeWheelSize.all.sample.id } - value { Random.rand(200) } - bike_condition_id { BikeCondition.all.sample.id } - bike_purpose_id { BikePurpose.all.sample.id } end end diff --git a/spec/factories/users.rb b/spec/factories/users.rb index b75147c..5d1e769 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -8,14 +8,14 @@ FactoryGirl.define do first_name 'Michael' last_name 'Scott' sequence(:bike_id) { |n| n } - after_build do |r| + after(:build) do |r| r.roles << (Role.find_by_role("user") || FactoryGirl.create(:role_user)) end factory :staff do username "staff" first_name 'Staff' - after_build do |r| + after(:build) do |r| r.roles << (Role.find_by_role("staff") || FactoryGirl.create(:role_staff)) end end @@ -23,7 +23,7 @@ FactoryGirl.define do factory :admin do username "admin" first_name 'Admin' - after_build do |r| + after(:build) do |r| r.roles << (Role.find_by_role("admin") || FactoryGirl.create(:role_admin)) end end @@ -31,7 +31,7 @@ FactoryGirl.define do factory :bike_admin do username "bike_admin" first_name 'BikeAdmin' - after_build do |r| + after(:build) do |r| r.roles << (Role.find_by_role("bike_admin") || FactoryGirl.create(:role_bike_admin)) end end