spree_variant_options 0.2.0 → 0.3.0

data/.travis.yml

@@ -0,0 +1,12 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - rbx
+  - ree
+
+before_script:
+  - "sh -e /etc/init.d/xvfb start"
+  - "bundle exec dummier"
+
+script: "DISPLAY=:99.0 bundle exec rake"

data/README.md

@@ -1,5 +1,5 @@
-Spree Variant Options
-=====================
+# Spree Variant Options [![Build Status](https://secure.travis-ci.org/citrus/spree_variant_options.png)](http://travis-ci.org/citrus/spree_variant_options)
+
 
 Spree Variant Options is a very simple spree extension that replaces the radio-button variant selection with groups of option types and values. To get a better idea let's let a few images do the explaining.
 
@@ -24,7 +24,7 @@ If you don't already have an existing Spree site, [click here](https://gist.gith
 
 To install Spree Variant Options, just add the following to your Gemfile:
 
-    gem 'spree_variant_options', '0.2.0'
+    gem 'spree_variant_options', '0.3.0'
   
 
 Now, bundle up with:
@@ -36,23 +36,13 @@ Next, run the install generator to copy the necessary migration to your project
 
     rails g spree_variant_options:install
     rake db:migrate
-    
-    
-Finally, you'll need include `app/views/products/_variant_options.html.erb` in your `products#show` view...
-
-If you don't have a custom version of `_cart_form.html.erb` in your application, then don't worry about a thing, spree_variant_options will include the partial for you. Otherwise, just replace the entire `<% if @product.has_variants? %>` block with:
-
-    <%= render 'variant_options' %>
-
-
-To tie spree_variant_options in with your product photos just delete your local copy of `product.js` or copy spree_variant_options' `product.js` to your local `public/javascripts` directory.
 
 
 
 Versions
 --------
 
-Spree Variant Options works on Spree 0.30.x through 0.60.x. 0.70.x compatibility is just around the corner... Please let me know if you run into any issues.
+Spree Variant Options is compatible with Spree 0.30.x through 0.70.x. Please reference `Versionfile` for more details.
 
 
 Testing
@@ -65,42 +55,6 @@ Clone this repo to where you develop, bundle up, then run `dummier' to get the s
     bundle install
     bundle exec dummier
 
-
-This will generate a fresh rails app in test/dummy, install spree & spree_variant_options, then migrate the test database. Sweet.
-
-
-### Spork + Cucumber
-
-To run the cucumber features, boot spork like this:
-
-    bundle exec spork
-
-Then, in another window, run:
-
-    cucumber --drb
-
-
-### Spork + Test::Unit
-    
-If you want to run shoulda tests, start spork with:
-
-    bundle exec spork TestUnit
-    #or 
-    bundle exec spork t
-        
-In another window, run all tests:
-
-    testdrb test/**/*_test.rb
-    
-Or just a specific test:
-
-    testdrb test/unit/supplier_test.rb
-  
-
-### No Spork
-
-If you don't want to spork, just use rake:
-
     # cucumber/capybara
     rake cucumber
     

data/Versionfile

@@ -1,4 +1,4 @@
-"0.70.x" => { :branch  => "0.70.x" }
+"0.70.x" => { :version => "0.3.0" }
 "0.60.x" => { :version => "0.2.0" }
 "0.50.x" => { :version => "0.1.1" }
 "0.40.x" => { :version => "0.1.1" }

data/{public/javascripts → app/assets/javascripts/store}/variant_options.js

@@ -150,9 +150,9 @@ function VariantOptions(options, allow_backorders) {
         return to_f(a) < to_f(b) ? -1 : 1;
       });
       if (prices.length == 1) {
-        $('.prices .price').html('<span class="price assumed">' + prices[0] + '</span>');  
+        $('#product-price .price').html('<span class="price assumed">' + prices[0] + '</span>');  
       } else { 
-        $('.prices .price').html('<span class="price from">' + prices[0] + '</span> - <span class="price to">' + prices[prices.length - 1] + '</span>');
+        $('#product-price .price').html('<span class="price from">' + prices[0] + '</span> - <span class="price to">' + prices[prices.length - 1] + '</span>');
       }
       return false;
     }
@@ -161,7 +161,7 @@ function VariantOptions(options, allow_backorders) {
   function toggle() {
     if (variant) {
       $('#variant_id').val(variant.id);
-      $('.prices .price').removeClass('unselected').text(variant.price);      
+      $('#product-price .price').removeClass('unselected').text(variant.price);      
       $('button[type=submit]').attr('disabled', false).fadeTo(100, 1);
       try {
         select_variant(variant.id, $.map($('a.selected'), function(i) { return $(i).text() }).join(" "));
@@ -171,7 +171,7 @@ function VariantOptions(options, allow_backorders) {
     } else {
       $('#variant_id').val('');
       $('button[type=submit]').attr('disabled', true).fadeTo(0, 0.5);
-      $('.prices .price').addClass('unselected').text('(select)');
+      $('#product-price .price').addClass('unselected').text('(select)');
     }    
   }
   

data/app/models/option_value_decorator.rb

@@ -2,20 +2,9 @@ OptionValue.class_eval do
 
   default_scope order(:position)
     
-  if defined?(SpreeHeroku)
-    has_attached_file :image, 
-      :styles => { :small => '40x30#', :large => '140x110#' },
-      :default_style => :small,
-      :path => "assets/option_values/:id/:style/:basename.:extension",
-      :storage => "s3",
-      :s3_credentials => "#{Rails.root}/config/s3.yml"
-  else
-    has_attached_file :image, 
-      :styles => { :small => '40x30#', :large => '140x110#' },
-      :default_style => :small,
-      :url => "/assets/option_values/:id/:style/:basename.:extension",
-      :path => ":rails_root/public/assets/option_values/:id/:style/:basename.:extension"
-  end
+  has_attached_file :image, 
+    :styles => { :small => '40x30#', :large => '140x110#' },
+    :default_style => :small
   
   def has_image?
     image_file_name && !image_file_name.empty?

data/app/overrides/spree_variant_options.rb

@@ -0,0 +1,5 @@
+Deface::Override.new(:virtual_path => "products/_cart_form",
+                     :name         => "spree_variant_options",
+                     :replace      => "#product-variants",
+                     :partial      => "products/variant_options",
+                     :disabled     => false)

data/app/views/products/_variant_options.html.erb

@@ -35,9 +35,10 @@
     </script>
     
   </div>
-<% end%>
+  
+  <% content_for :head do %>
+    <%= stylesheet_link_tag 'store/variant_options' %>
+    <%= javascript_include_tag 'store/variant_options' %>
+  <% end %>
 
-<% content_for :head do %>
-  <%= stylesheet_link_tag 'variant_options' %>
-  <%= javascript_include_tag 'variant_options' %>
-<% end %>
+<% end%>

data/features/admin_option_types.feature

@@ -18,14 +18,14 @@ Feature: Admin option type values
       And I fill in the option value fields for the new option value
     When I press "Update"
     Then I should see option values for small, medium, large, x-large and xxx-large
-      And I should see image "spree.jpg"
+      And I should see image "1.jpg"
 
   Scenario: Update an existing option value
     Given I'm on the edit admin option type page for option type "Size"
     When I fill in the option value fields for option value "Medium"
       And I press "Update"
     Then I should see option values for small, large, x-large and xxx-large
-      And I should see image "spree.jpg"
+      And I should see image "1.jpg"
 
   Scenario: Delete an existing option value
     Given I'm on the edit admin option type page for option type "Size"

data/features/step_definitions/option_values.rb

@@ -19,8 +19,8 @@ Then /^I fill in the option value fields for (.*)$/ do |parent|
     %w(name presentation).each do |name|
       find(:xpath, ".//input[contains(@name, '[#{name}]')]").set('xxx-large')
     end
-    find(:xpath, ".//input[contains(@name, '[image]')]").set(Rails.root.join("public/images/spree.jpg"))
-  end  
+    find(:xpath, ".//input[contains(@name, '[image]')]").set(File.expand_path("../../../test/support/images/1.jpg", __FILE__))
+  end
 end
 
 

data/features/step_definitions/variant_options.rb

@@ -10,7 +10,7 @@ end
 
 def random_image
   unless @sample_images
-    dir = File.expand_path("../../../test/dummy/db/sample/assets/*", __FILE__)
+    dir = File.expand_path("../../../test/support/images/*", __FILE__)
     @sample_images = Dir[dir]
   end
   image = @sample_images.shuffle.first
@@ -22,6 +22,7 @@ end
 
 Given /^I( don't)? allow backorders$/ do |dont|
   Spree::Config.set(:allow_backorders => dont.nil?)
+  assert_equal dont.nil?, Spree::Config[:allow_backorders]
 end
 
 Given /^I have a product( with variants)?( and images)?$/ do |has_variants, has_images|
@@ -38,14 +39,14 @@ end
 
 Given /^the first option type has an option value with image "([^"]*)"$/ do |source|
   flunk unless @product
-  @product.option_types.first.option_values.first.update_attributes(:image => File.open(Rails.root.join("public/images/#{source}")))
+  @product.option_types.first.option_values.first.update_attributes(:image => File.open(Rails.root.join("../support/images/#{source}")))
 end
 
 Then /^I should see image "([^"]*)" within the first option value$/ do |source|
   ot = @product.option_types.first
   ov = ot.option_values.first
   within ".variant-options a[rel='#{ot.id}-#{ov.id}']" do
-    assert_match "/assets/option_values/#{ov.id}/small/#{source}", find("img").native.attribute("src")
+    assert_match "/system/images/#{ov.id}/small/#{source}", find("img").native.attribute("src")
   end
 end
 

data/features/step_definitions/web_steps.rb

@@ -8,8 +8,8 @@ def get_parent(parent)
     when "flash notice";  ".flash"
     when "first set of options";  "#option_type_#{@product.option_types.first.id}"
     when "second set of options"; "#option_type_#{@product.option_types[1].id}"
-    when "variant images label";  "#variant-images"
-    when "price"; ".prices .price"    
+    when "variant images label";  "#product-thumbnails"
+    when "price"; "#product-price .price"    
     else "[set-your-parent] #{parent}"
   end
 end

data/features/support/env.rb

@@ -1,31 +1,26 @@
 ENV["RAILS_ENV"] = "test"
 ENV["RAILS_ROOT"] = File.expand_path("../../../test/dummy", __FILE__)
 
-require 'spork'
- 
-Spork.prefork do
-  require 'cucumber/rails'
-  require 'selenium/webdriver'
-  require 'factory_girl'
-  
-  
-  I18n.reload!
-  
-  ActionController::Base.allow_rescue = false
-  
-  Capybara.default_driver   = :selenium
-  Capybara.default_selector = :css
+require "cucumber/rails"
+require "selenium/webdriver"
+require "factory_girl"
+
+#  I18n.reload!
   
-  Cucumber::Rails::World.use_transactional_fixtures
-  DatabaseCleaner.strategy  = :transaction
+ActionController::Base.allow_rescue = false
+
+Capybara.default_driver   = :selenium
+Capybara.default_selector = :css
+
+Cucumber::Rails::World.use_transactional_fixtures
+DatabaseCleaner.strategy  = :transaction
   
-  Spree::Config.set(:random => rand(1000))
-    
-end
- 
-Spork.each_run do
+Dir["#{File.expand_path("../../../", __FILE__)}/test/support/**/*.rb"].each { |f| require f }
 
-  Dir["#{File.expand_path("../../../", __FILE__)}/test/support/**/*.rb"].each { |f| require f }
-  World(HelperMethods)
+World(HelperMethods)
 
+# ensures spree preferencs are initialized before each test
+Before do
+  Spree::Config.instance_variable_set("@configuration", nil)
+  Spree::Config.set(:random => rand(1000))
 end

data/features/variant_options.feature

@@ -16,9 +16,9 @@ Feature: Products should have variant options
   
   Scenario: Display option images when visiting a product
     Given I have a product with variants
-      And the first option type has an option value with image "spree.jpg"
+      And the first option type has an option value with image "1.jpg"
       And I'm on the product page for the first product
-    Then I should see image "spree.jpg" within the first option value
+    Then I should see image "1.jpg" within the first option value
   
   Scenario: Interact with options for a product
     Given I have a product with variants
@@ -117,13 +117,13 @@ Feature: Products should have variant options
     Then I should see "$24.99" in the price
       And the add to cart button should be enabled
    
-  Scenario: Should show variant images when a selection is made
-    Given I have a product with variants and images
-      And I'm on the product page for the first product
-    When I follow "Small" within the first set of options
-      And I follow "Green" within the second set of options
-    Then the add to cart button should be enabled
-      And I should see "Small Green" in the variant images label 
-    When I follow "Red" within the second set of options
-    Then I should see "Small Red" in the variant images label   
+  #Scenario: Should show variant images when a selection is made
+  #  Given I have a product with variants and images
+  #    And I'm on the product page for the first product
+  #  When I follow "Small" within the first set of options
+  #    And I follow "Green" within the second set of options
+  #  Then the add to cart button should be enabled
+  #    And I should see "Small Green" in the variant images label 
+  #  When I follow "Red" within the second set of options
+  #  Then I should see "Small Red" in the variant images label   
     

data/lib/generators/spree_variant_options/install_generator.rb

@@ -4,15 +4,24 @@ module SpreeVariantOptions
       
       include Rails::Generators::Migration      
 
-      def self.count!
+      def self.count
         @count ||= 0
         (@count += 1) * 3
       end
+      
+      def self.new_migration_number
+        (Time.new.utc + self.count).strftime("%Y%m%d%H%M%S")
+      end
 
       def self.next_migration_number(path)
         @time ||= Time.new.utc
         if ActiveRecord::Base.timestamped_migrations
-          (@time + self.count!).strftime("%Y%m%d%H%M%S")
+          files = Dir.entries(Rails.root.join("db/migrate"))
+          migration = new_migration_number
+          while files.join.include?(migration)
+            migration = new_migration_number
+          end
+          migration
         else
           "%.3d" % (current_migration_number(dirname) + 1)
         end

data/lib/spree_variant_options.rb

@@ -7,19 +7,17 @@ module SpreeVariantOptions
 
     config.autoload_paths += %W(#{config.root}/lib)
 
-    initializer "static assets" do |app|
-      app.middleware.insert_before ::Rack::Lock, ::ActionDispatch::Static, "#{config.root}/public"
-    end
-        
-    def self.activate
-      
-      Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator.rb")) do |c|
-        Rails.env.production? ? require(c) : load(c)
+    config.to_prepare do
+      #loads application's model / class decorators
+      Dir.glob File.expand_path("../../app/**/*_decorator.rb", __FILE__) do |c|
+        Rails.configuration.cache_classes ? require(c) : load(c)
       end
-      
-    end
 
-    config.to_prepare &method(:activate).to_proc
+      #loads application's deface view overrides
+      Dir.glob File.expand_path("../../app/overrides/*.rb", __FILE__) do |c|
+        Rails.application.config.cache_classes ? require(c) : load(c)
+      end
+    end
     
   end
   

data/lib/spree_variant_options/version.rb

@@ -1,3 +1,3 @@
 module SpreeVariantOptions
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spree_variant_options.gemspec

@@ -20,18 +20,15 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   # Runtime
-  s.add_dependency('spree_core', '>= 0.30.1')
+  s.add_dependency('spree_core', '>= 0.70.0')
   
   # Development
-  s.add_development_dependency('spree_sample',     '>= 0.30.1')
-  s.add_development_dependency('dummier',          '>= 0.2.0')
-  s.add_development_dependency('shoulda',          '>= 2.11.3')
-  s.add_development_dependency('factory_girl',     '>= 2.0.4')
-  s.add_development_dependency('cucumber-rails',   '>= 1.0.2')
+  s.add_development_dependency('spree_sample',     '>= 0.70.0')
+  s.add_development_dependency('dummier',          '>= 0.2.4')
+  s.add_development_dependency('shoulda',          '>= 3.0.0.beta2')
+  s.add_development_dependency('factory_girl',     '>= 2.3.2')
+  s.add_development_dependency('cucumber-rails',   '>= 1.2.1')
   s.add_development_dependency('database_cleaner', '>= 0.6.7')
   s.add_development_dependency('sqlite3',          '>= 1.3.4')
-  s.add_development_dependency('spork',            '>= 0.9.0.rc9')
-  s.add_development_dependency('spork-testunit',   '>= 0.0.5')
-  s.add_development_dependency('turn',             '>= 0.8.2')
 
 end

data/test/dummy_hooks/before_migrate.rb

@@ -1,11 +1,13 @@
-# install spree & spree_sample
-rake "spree_core:install spree_sample:install"
+# install spree & spree_variant_options
+run "rails g spree:site"
+run "rails g spree_variant_options:install"
 
-# install spree_variant_options
-run  "rails g spree_variant_options:install"
-
-# since spree auth isn't installed
-create_file "app/views/shared/_login_bar.html.erb", ""
-
-# remove the default product.js
-remove_file "public/javascripts/product.js"
+# remove all stylesheets except core  
+%w(admin store).each do |ns|
+  js  = "app/assets/javascripts/#{ns}/all.js"
+  css = "app/assets/stylesheets/#{ns}/all.css"
+  remove_file js
+  remove_file css
+  template "#{ns}/all.js", js
+  template "#{ns}/all.css", css
+end

data/test/dummy_hooks/templates/admin/all.css

@@ -0,0 +1,3 @@
+/*
+*= require admin/spree_core
+*/

data/test/dummy_hooks/templates/admin/all.js

@@ -0,0 +1 @@
+//= require admin/spree_core

data/test/dummy_hooks/templates/store/all.css

@@ -0,0 +1,3 @@
+/*
+*= require store/spree_core
+*/  

data/test/dummy_hooks/templates/store/all.js

@@ -0,0 +1 @@
+//= require store/spree_core

data/test/test_helper.rb

@@ -1,23 +1,12 @@
 # Configure Rails Envinronment
 ENV["RAILS_ENV"] = "test"
-require 'spork'
-
-Spork.prefork do
   
-  require File.expand_path("../dummy/config/environment.rb",  __FILE__)
-  require "rails/test_help"
-  require "shoulda"
-  require "factory_girl"
-  require "sqlite3"
-  require "faker"
-  require "turn"
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require "rails/test_help"
+require "shoulda"
+require "factory_girl"
+require "sqlite3"
+require "faker"
+begin; require "turn"; rescue LoadError; end
   
-  # Run any available migration if needed
-  ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
-end
-
-Spork.each_run do
-
-  Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
-end
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/test/unit/option_value_test.rb

@@ -1,9 +1,9 @@
-require_relative '../test_helper'
+require 'test_helper'
 
 class OptionValueTest < ActiveSupport::TestCase
 
   setup do
-    @images = Dir[File.expand_path("../../dummy/db/sample/assets/*", __FILE__)]
+    @images = Dir[File.expand_path("../../support/images/*", __FILE__)]
   end
 
   should_have_attached_file :image
@@ -44,13 +44,13 @@ class OptionValueTest < ActiveSupport::TestCase
       end
       
       should "have small large and original images" do
-        dir = File.expand_path("../../dummy/public/assets/option_values/#{@option_value.id}", __FILE__)
+        dir = File.expand_path("../../dummy/public/system/images/#{@option_value.id}", __FILE__)
         %w(small large original).each do |size|
           assert File.exists?(File.join(dir, size, File.basename(@path)))
         end        
       end
       
-    end  
+    end
   
   end
   

data/test/unit/product_test.rb

@@ -1,4 +1,4 @@
-require_relative '../test_helper'
+require 'test_helper'
 
 class ProductTest < ActiveSupport::TestCase
 

metadata

@@ -1,160 +1,130 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spree_variant_options
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Spencer Steffen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-30 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70264012210960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.30.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.70.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70264012210960
+- !ruby/object:Gem::Dependency
   name: spree_sample
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70264012210180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.30.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.70.0
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70264012210180
+- !ruby/object:Gem::Dependency
   name: dummier
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70264012209520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.2.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.4
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70264012209520
+- !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70264012208880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.11.3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0.beta2
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70264012208880
+- !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70264012208400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.2
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70264012208400
+- !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70264012207760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.1
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70264012207760
+- !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70264012207300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.7
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70264012207300
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &70264012206820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: spork
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.0.rc9
-  type: :development
-  prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: spork-testunit
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.0.5
-  type: :development
-  prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: turn
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.8.2
-  type: :development
-  prerelease: false
-  version_requirements: *id011
-description: Spree Variant Options is a simple spree extension that replaces the radio-button variant selection with groups of option types and values. Please see the documentation for more details.
-email: 
+  version_requirements: *70264012206820
+description: Spree Variant Options is a simple spree extension that replaces the radio-button
+  variant selection with groups of option types and values. Please see the documentation
+  for more details.
+email:
 - spencer@citrusme.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - Versionfile
+- app/assets/images/store/out-of-stock.png
+- app/assets/javascripts/store/product.js
+- app/assets/javascripts/store/variant_options.js
+- app/assets/stylesheets/store/variant_options.css
 - app/controllers/admin/option_values_controller.rb
 - app/models/option_value_decorator.rb
 - app/models/product_decorator.rb
+- app/overrides/spree_variant_options.rb
 - app/views/admin/option_types/_option_value_fields.html.erb
 - app/views/admin/option_types/edit.html.erb
-- app/views/products/_cart_form.html.erb
 - app/views/products/_variant_options.html.erb
 - config/cucumber.yml
 - config/routes.rb
@@ -170,53 +140,60 @@ files:
 - lib/generators/templates/db/migrate/add_image_to_option_values.rb
 - lib/spree_variant_options.rb
 - lib/spree_variant_options/version.rb
-- public/images/out-of-stock.png
-- public/javascripts/product.js
-- public/javascripts/variant_options.js
-- public/stylesheets/variant_options.css
 - spree_variant_options.gemspec
 - test/dummy_hooks/after_migrate.rb.sample
 - test/dummy_hooks/before_migrate.rb
+- test/dummy_hooks/templates/admin/all.css
+- test/dummy_hooks/templates/admin/all.js
+- test/dummy_hooks/templates/store/all.css
+- test/dummy_hooks/templates/store/all.js
 - test/support/factories.rb
 - test/support/helper_methods.rb
+- test/support/images/1.gif
+- test/support/images/1.jpg
+- test/support/images/1.png
+- test/support/images/2.gif
+- test/support/images/2.jpg
+- test/support/images/2.png
+- test/support/images/3.gif
+- test/support/images/3.jpg
+- test/support/images/3.png
 - test/support/paperclip.rb
 - test/test_helper.rb
 - test/unit/option_value_test.rb
 - test/unit/product_test.rb
 homepage: https://github.com/citrus/spree_variant_options
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 2340832333583009512
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3966294049605257627
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 2340832333583009512
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -3966294049605257627
 requirements: []
-
 rubyforge_project: spree_variant_options
-rubygems_version: 1.8.8
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Spree Variant Options is a simple spree extension that replaces the radio-button variant selection with groups of option types and values.
-test_files: 
+summary: Spree Variant Options is a simple spree extension that replaces the radio-button
+  variant selection with groups of option types and values.
+test_files:
 - features/admin_option_types.feature
 - features/step_definitions/option_values.rb
 - features/step_definitions/variant_options.rb
@@ -227,8 +204,21 @@ test_files:
 - features/variant_options.feature
 - test/dummy_hooks/after_migrate.rb.sample
 - test/dummy_hooks/before_migrate.rb
+- test/dummy_hooks/templates/admin/all.css
+- test/dummy_hooks/templates/admin/all.js
+- test/dummy_hooks/templates/store/all.css
+- test/dummy_hooks/templates/store/all.js
 - test/support/factories.rb
 - test/support/helper_methods.rb
+- test/support/images/1.gif
+- test/support/images/1.jpg
+- test/support/images/1.png
+- test/support/images/2.gif
+- test/support/images/2.jpg
+- test/support/images/2.png
+- test/support/images/3.gif
+- test/support/images/3.jpg
+- test/support/images/3.png
 - test/support/paperclip.rb
 - test/test_helper.rb
 - test/unit/option_value_test.rb

data/app/views/products/_cart_form.html.erb

@@ -1,32 +0,0 @@
-<%= form_for :order, :url => populate_orders_url do |f| %>
-<%= hook :inside_product_cart_form do %>
-
-  <% if product_price(@product) %>
-    <%= hook :product_price do %>
-      <p class="prices">
-        <%= t("price") %>
-        <br />
-        <span class="price selling"><%= product_price(@product) %></span>
-      </p>
-    <% end %>
-  <% end %>
-
-  <%= render 'variant_options' %>
-    
-  <% if @product.has_stock? || Spree::Config[:allow_backorders] %>
-    <%= text_field_tag (@product.has_variants? ? :quantity : "variants[#{@product.master.id}]"),
-      1, :class => "title", :size => 3 %>
-    &nbsp;
-    <button type='submit' class='large primary'>
-      <%= image_tag('/images/add-to-cart.png') + t('add_to_cart') %>
-    </button>
-  <% else %>
-    <%= content_tag('strong', t('out_of_stock')) %>
-  <% end %>
-
-<% end %>
-<% end %>
-
-<% content_for :head do %>
-  <%= javascript_include_tag 'product' %>
-<% end %>