spree 0.0.7 → 0.0.8

data/starter-app/vendor/plugins/spree/assets/stylesheets/store/_controller.css

@@ -18,6 +18,6 @@ li.preview a {
 	text-decoration: none;
 }
 
-#variations li {
+#variants li {
   list-style-type: none;
 }

data/starter-app/vendor/plugins/spree/db/migrate/002_create_cart_items.rb

@@ -2,8 +2,7 @@ class CreateCartItems < ActiveRecord::Migration
   def self.up
 	  create_table "cart_items", :force => true do |t|
 	    t.column "cart_id",      :integer, :null => false
-	    t.column "product_id",   :integer, :null => false
-      t.column "variation_id", :integer
+      t.column "variant_id",   :integer, :null => false
 	    t.column "quantity",     :integer, :null => false
 	  end
   end

data/starter-app/vendor/plugins/spree/db/migrate/006_create_line_items.rb

@@ -1,13 +1,11 @@
 class CreateLineItems < ActiveRecord::Migration
   def self.up
 	  create_table "line_items", :force => true do |t|
-	    t.column "order_id",     :integer
-	    t.column "product_id",   :integer
-      t.column "variation_id", :integer
-	    t.column "quantity",     :integer, :null => false
-	    t.column "price",        :decimal, :precision => 8, :scale => 2, :null => false
-	    t.column "created_at",   :datetime
-	    t.column "updated_at",   :datetime
+	    t.integer :order_id
+	    t.integer :variant_id
+	    t.integer :quantity, :null => false
+	    t.decimal :price, :precision => 8, :scale => 2, :null => false
+	    t.timestamps
 	  end
   end
 

data/starter-app/vendor/plugins/spree/db/migrate/011_create_variants.rb

@@ -0,0 +1,11 @@
+class CreateVariants < ActiveRecord::Migration
+  def self.up
+    create_table :variants do |t| 
+      t.integer :product_id
+    end
+  end
+
+  def self.down
+    drop_table :variants
+  end
+end

data/starter-app/vendor/plugins/spree/db/migrate/018_create_option_values_variants.rb

@@ -0,0 +1,12 @@
+class CreateOptionValuesVariants < ActiveRecord::Migration
+  def self.up
+    create_table :option_values_variants, :id=>false do |t| 
+      t.integer :variant_id
+      t.integer :option_value_id
+    end
+  end
+
+  def self.down
+    drop_table :option_values_variants
+  end
+end

data/starter-app/vendor/plugins/spree/test/unit/product_test.rb

@@ -40,39 +40,6 @@ class ProductTest < Test::Unit::TestCase
     p.stubs(:tax_treatments).returns []
     assert !(p.apply_tax_treatment? @tt.id)
   end
-  
-  def test_variations_no_category
-    assert (@p.variations.empty?)
-    assert (not @p.variations.frozen?)
-  end
-  
-  def test_variations_empty_category
-    @p.category = @c
-    assert (@p.variations.empty?)
-    assert !(@p.variations.frozen?)
-    v = Variation.new
-    @p.variations << v
-    assert (@p.variations == [v])
-    assert !(@p.variations.frozen?)
-  end
-  
-  def test_variations_category
-    v = ["mock variation"]
-    @c.stubs(:variations).returns v
-    @p.category = @c
-    assert (@p.variations == v)
-    assert (@p.variations.frozen?)
-  end
-  
-  def test_variations_parent_category
-    pc = Category.new
-    v = ["mock variation"]
-    pc.stubs(:variations).returns v
-    @c.parent = pc
-    @p.category = @c
-    assert @p.variations == v
-    assert @p.variations.frozen?
-  end
 
   def test_tax_no_category
     assert @p.tax_treatments.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spree
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Sean Schofield
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-24 00:00:00 -04:00
+date: 2008-03-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,6 +57,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.3
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.1.3
+    version: 
 description: Complete commerce solution for Ruby on Rails
 email: sean.schofield@gmail.com
 executables: 
@@ -70,6 +79,7 @@ extra_rdoc_files:
 - README.txt
 - starter-app/public/robots.txt
 - starter-app/vendor/plugins/attachment_fu/test/fixtures/files/foo.txt
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec/templates/previous_failures.txt
 - starter-app/vendor/plugins/spree/assets/robots.txt
 files: 
 - History.txt
@@ -124,7 +134,7 @@ files:
 - starter-app/db/sample/tags.yml
 - starter-app/db/sample/txns.yml
 - starter-app/db/sample/users.yml
-- starter-app/db/sample/variations.yml
+- starter-app/db/sample/variants.yml
 - starter-app/doc/README_FOR_APP
 - starter-app/lib/authenticated_system.rb
 - starter-app/lib/authenticated_test_helper.rb
@@ -182,6 +192,7 @@ files:
 - starter-app/lib/tasks/sample/products/0000/0012/ror_stein_back_product.jpeg
 - starter-app/lib/tasks/sample/products/0000/0012/ror_stein_back_small.jpeg
 - starter-app/lib/tasks/spree_sample_data.rake
+- starter-app/log/README
 - starter-app/public/.htaccess
 - starter-app/public/404.html
 - starter-app/public/500.html
@@ -190,6 +201,7 @@ files:
 - starter-app/public/dispatch.rb
 - starter-app/public/favicon.ico
 - starter-app/public/images/rails.png
+- starter-app/public/images/spree.jpg
 - starter-app/public/index.html
 - starter-app/public/javascripts/application.js
 - starter-app/public/javascripts/controls.js
@@ -213,6 +225,17 @@ files:
 - starter-app/script/process/spawner
 - starter-app/script/runner
 - starter-app/script/server
+- starter-app/script/spec
+- starter-app/script/spec_server
+- starter-app/spec/models/cart_item_spec.rb
+- starter-app/spec/models/cart_spec.rb
+- starter-app/spec/models/line_item_spec.rb
+- starter-app/spec/models/product_spec.rb
+- starter-app/spec/rcov.opts
+- starter-app/spec/spec.opts
+- starter-app/spec/spec_helper.rb
+- starter-app/stories/all.rb
+- starter-app/stories/helper.rb
 - starter-app/test/fixtures/users.yml
 - starter-app/test/test_helper.rb
 - starter-app/test/unit/user_test.rb
@@ -347,6 +370,144 @@ files:
 - starter-app/vendor/plugins/paginating_find/test_app/test/unit/group_test.rb
 - starter-app/vendor/plugins/paginating_find/test_app/test/unit/paginating_find_test.rb
 - starter-app/vendor/plugins/paginating_find/test_app/test/unit/paging_enumerator_test.rb
+- starter-app/vendor/plugins/rspec_on_rails/MIT-LICENSE
+- starter-app/vendor/plugins/rspec_on_rails/README
+- starter-app/vendor/plugins/rspec_on_rails/Rakefile
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec/CHANGES
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec/rspec_generator.rb
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec/templates/all_stories.rb
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec/templates/previous_failures.txt
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec/templates/rcov.opts
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec/templates/script/spec
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec/templates/script/spec_server
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec/templates/spec.opts
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec/templates/spec_helper.rb
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec/templates/stories_helper.rb
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec_controller/USAGE
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec_controller/rspec_controller_generator.rb
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec_controller/templates/controller_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec_controller/templates/helper_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec_controller/templates/view_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec_model/USAGE
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec_model/rspec_model_generator.rb
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec_model/templates/model_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/rspec_scaffold_generator.rb
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/controller_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/edit_erb_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/helper_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/index_erb_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/new_erb_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/routing_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/show_erb_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/init.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/autotest/discover.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/autotest/rails_rspec.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/example.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/example/assigns_hash_proxy.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/example/controller_example_group.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/example/functional_example_group.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/example/helper_example_group.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/example/ivar_proxy.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/example/model_example_group.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/example/rails_example_group.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/example/render_observer.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/example/view_example_group.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/action_controller/base.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/action_controller/rescue.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/action_controller/test_response.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/action_view/base.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/active_record/base.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/object.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/spec/example/configuration.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/spec/matchers/have.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/assert_select.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/have_text.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/redirect_to.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/render_template.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/story_adapter.rb
+- starter-app/vendor/plugins/rspec_on_rails/lib/spec/rails/version.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/autotest/mappings_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/autotest/rails_rspec_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/example/assigns_hash_proxy_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/example/configuration_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/example/controller_isolation_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/example/controller_spec_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/example/example_group_factory_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/example/helper_spec_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/example/ivar_proxy_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/example/model_spec_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/example/shared_behaviour_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/example/test_unit_assertion_accessibility_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/example/view_spec_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/extensions/action_controller_rescue_action_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/extensions/action_view_base_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/extensions/active_record_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/matchers/assert_select_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/matchers/description_generation_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/matchers/errors_on_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/matchers/have_text_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/matchers/redirect_to_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/matchers/render_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/mocks/mock_model_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/sample_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/spec_server_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails/spec_spec.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/rails_suite.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec/spec_helper.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/controllers/action_view_base_spec_controller.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/controllers/controller_spec_controller.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/controllers/redirect_spec_controller.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/controllers/render_spec_controller.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/controllers/rjs_spec_controller.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/helpers/explicit_helper.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/helpers/more_explicit_helper.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/helpers/plugin_application_helper.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/helpers/view_spec_helper.rb
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/_partial.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_setting_the_assigns_hash.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_with_errors_in_template.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_with_template.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/render_spec/_a_partial.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/render_spec/some_action.js.rjs
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/render_spec/some_action.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/render_spec/some_action.rjs
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/_replacement_partial.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/hide_div.rjs
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/hide_page_element.rjs
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/insert_html.rjs
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/replace.rjs
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/replace_html.rjs
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/replace_html_with_partial.rjs
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/visual_effect.rjs
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/visual_toggle_effect.rjs
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/tag_spec/no_tags.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/tag_spec/single_div_with_no_attributes.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/tag_spec/single_div_with_one_attribute.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_partial.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_partial_used_twice.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_partial_with_local_variable.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_partial_with_sub_partial.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_spacer.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/accessor.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/entry_form.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/explicit_helper.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/foo/show.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/implicit_helper.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/multiple_helpers.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/template_with_partial.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/template_with_partial_using_collection.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/template_with_partial_with_array.rhtml
+- starter-app/vendor/plugins/rspec_on_rails/stories/all.rb
+- starter-app/vendor/plugins/rspec_on_rails/stories/helper.rb
+- starter-app/vendor/plugins/rspec_on_rails/stories/steps/people.rb
+- starter-app/vendor/plugins/rspec_on_rails/stories/transactions_should_rollback
+- starter-app/vendor/plugins/rspec_on_rails/stories/transactions_should_rollback.rb
+- starter-app/vendor/plugins/rspec_on_rails/tasks/rspec.rake
 - starter-app/vendor/plugins/spree/.rakeTasks
 - starter-app/vendor/plugins/spree/CHANGELOG
 - starter-app/vendor/plugins/spree/LICENSE
@@ -363,7 +524,6 @@ files:
 - starter-app/vendor/plugins/spree/app/controllers/admin/products_controller.rb
 - starter-app/vendor/plugins/spree/app/controllers/admin/reports_controller.rb
 - starter-app/vendor/plugins/spree/app/controllers/admin/users_controller.rb
-- starter-app/vendor/plugins/spree/app/controllers/admin/variations_controller.rb
 - starter-app/vendor/plugins/spree/app/controllers/cart_controller.rb
 - starter-app/vendor/plugins/spree/app/controllers/checkout_controller.rb
 - starter-app/vendor/plugins/spree/app/controllers/spree/base_controller.rb
@@ -376,7 +536,6 @@ files:
 - starter-app/vendor/plugins/spree/app/helpers/admin/overview_helper.rb
 - starter-app/vendor/plugins/spree/app/helpers/admin/products_helper.rb
 - starter-app/vendor/plugins/spree/app/helpers/admin/users_helper.rb
-- starter-app/vendor/plugins/spree/app/helpers/admin/variations_helper.rb
 - starter-app/vendor/plugins/spree/app/helpers/cart_helper.rb
 - starter-app/vendor/plugins/spree/app/helpers/checkout_helper.rb
 - starter-app/vendor/plugins/spree/app/helpers/search_helper.rb
@@ -403,7 +562,7 @@ files:
 - starter-app/vendor/plugins/spree/app/models/state.rb
 - starter-app/vendor/plugins/spree/app/models/tax_treatment.rb
 - starter-app/vendor/plugins/spree/app/models/txn.rb
-- starter-app/vendor/plugins/spree/app/models/variation.rb
+- starter-app/vendor/plugins/spree/app/models/variant.rb
 - starter-app/vendor/plugins/spree/app/views/account/index.rhtml
 - starter-app/vendor/plugins/spree/app/views/account/login.rhtml
 - starter-app/vendor/plugins/spree/app/views/account/signup.rhtml
@@ -419,16 +578,15 @@ files:
 - starter-app/vendor/plugins/spree/app/views/admin/option_types/index.rhtml
 - starter-app/vendor/plugins/spree/app/views/admin/option_types/new.rhtml
 - starter-app/vendor/plugins/spree/app/views/admin/option_types/select.rhtml
-- starter-app/vendor/plugins/spree/app/views/admin/option_types/test.rhtml
 - starter-app/vendor/plugins/spree/app/views/admin/orders/_address.rhtml
 - starter-app/vendor/plugins/spree/app/views/admin/orders/index.rhtml
 - starter-app/vendor/plugins/spree/app/views/admin/orders/show.rhtml
 - starter-app/vendor/plugins/spree/app/views/admin/overview/index.rhtml
 - starter-app/vendor/plugins/spree/app/views/admin/products/_form.rhtml
 - starter-app/vendor/plugins/spree/app/views/admin/products/_menu.rhtml
-- starter-app/vendor/plugins/spree/app/views/admin/products/_new_variation.rhtml
+- starter-app/vendor/plugins/spree/app/views/admin/products/_new_variant.rhtml
 - starter-app/vendor/plugins/spree/app/views/admin/products/_option_types.rhtml
-- starter-app/vendor/plugins/spree/app/views/admin/products/_variations.rhtml
+- starter-app/vendor/plugins/spree/app/views/admin/products/_variants.rhtml
 - starter-app/vendor/plugins/spree/app/views/admin/products/edit.rhtml
 - starter-app/vendor/plugins/spree/app/views/admin/products/index.rhtml
 - starter-app/vendor/plugins/spree/app/views/admin/products/new.rhtml
@@ -440,10 +598,6 @@ files:
 - starter-app/vendor/plugins/spree/app/views/admin/users/index.rhtml
 - starter-app/vendor/plugins/spree/app/views/admin/users/new.rhtml
 - starter-app/vendor/plugins/spree/app/views/admin/users/show.rhtml
-- starter-app/vendor/plugins/spree/app/views/admin/variations/_form.rhtml
-- starter-app/vendor/plugins/spree/app/views/admin/variations/_option_values.rhtml
-- starter-app/vendor/plugins/spree/app/views/admin/variations/list.rhtml
-- starter-app/vendor/plugins/spree/app/views/admin/variations/new.rhtml
 - starter-app/vendor/plugins/spree/app/views/cart/index.rhtml
 - starter-app/vendor/plugins/spree/app/views/checkout/_address.rhtml
 - starter-app/vendor/plugins/spree/app/views/checkout/_address_ro.rhtml
@@ -492,8 +646,7 @@ files:
 - starter-app/vendor/plugins/spree/assets/images/spinner.gif
 - starter-app/vendor/plugins/spree/assets/images/spree/progress.gif
 - starter-app/vendor/plugins/spree/assets/images/spree/spinner.gif
-- starter-app/vendor/plugins/spree/assets/images/spree/spree_logo142x65.gif
-- starter-app/vendor/plugins/spree/assets/images/spree/spree_logo245x112.gif
+- starter-app/vendor/plugins/spree/assets/images/spree/spree.jpg
 - starter-app/vendor/plugins/spree/assets/images/visa_cid.gif
 - starter-app/vendor/plugins/spree/assets/javascripts/application.js
 - starter-app/vendor/plugins/spree/assets/javascripts/controls.js
@@ -520,14 +673,14 @@ files:
 - starter-app/vendor/plugins/spree/db/migrate/008_create_orders.rb
 - starter-app/vendor/plugins/spree/db/migrate/009_create_products.rb
 - starter-app/vendor/plugins/spree/db/migrate/010_create_txns.rb
-- starter-app/vendor/plugins/spree/db/migrate/011_create_variations.rb
+- starter-app/vendor/plugins/spree/db/migrate/011_create_variants.rb
 - starter-app/vendor/plugins/spree/db/migrate/012_create_tax_treatments.rb
 - starter-app/vendor/plugins/spree/db/migrate/013_create_skus.rb
 - starter-app/vendor/plugins/spree/db/migrate/014_create_countries.rb
 - starter-app/vendor/plugins/spree/db/migrate/015_create_states.rb
 - starter-app/vendor/plugins/spree/db/migrate/016_create_option_types.rb
 - starter-app/vendor/plugins/spree/db/migrate/017_create_product_option_types.rb
-- starter-app/vendor/plugins/spree/db/migrate/018_create_option_values_variations.rb
+- starter-app/vendor/plugins/spree/db/migrate/018_create_option_values_variants.rb
 - starter-app/vendor/plugins/spree/db/migrate/019_create_images.rb
 - starter-app/vendor/plugins/spree/db/migrate/020_create_credit_cards.rb
 - starter-app/vendor/plugins/spree/db/migrate/021_create_order_operations.rb
@@ -575,20 +728,15 @@ files:
 - starter-app/vendor/plugins/spree/test/functional/admin/overview_controller_test.rb
 - starter-app/vendor/plugins/spree/test/functional/admin/products_controller_test.rb
 - starter-app/vendor/plugins/spree/test/functional/admin/users_controller_test.rb
-- starter-app/vendor/plugins/spree/test/functional/admin/variations_controller_test.rb
 - starter-app/vendor/plugins/spree/test/functional/application_controller_test.rb
 - starter-app/vendor/plugins/spree/test/functional/cart_controller_test.rb
 - starter-app/vendor/plugins/spree/test/functional/checkout_controller_test.rb
 - starter-app/vendor/plugins/spree/test/integration/authentication_test.rb
 - starter-app/vendor/plugins/spree/test/integration/product_admin_test.rb
 - starter-app/vendor/plugins/spree/test/integration/user_stories_test.rb
-- starter-app/vendor/plugins/spree/test/integration/variations_test.rb
 - starter-app/vendor/plugins/spree/test/test_helper.rb
 - starter-app/vendor/plugins/spree/test/unit/address_test.rb
-- starter-app/vendor/plugins/spree/test/unit/cart_item_test.rb
-- starter-app/vendor/plugins/spree/test/unit/cart_test.rb
 - starter-app/vendor/plugins/spree/test/unit/category_test.rb
-- starter-app/vendor/plugins/spree/test/unit/line_item_test.rb
 - starter-app/vendor/plugins/spree/test/unit/option_group_test.rb
 - starter-app/vendor/plugins/spree/test/unit/order_test.rb
 - starter-app/vendor/plugins/spree/test/unit/product_test.rb
@@ -598,7 +746,6 @@ files:
 - starter-app/vendor/plugins/spree/test/unit/tag_test.rb
 - starter-app/vendor/plugins/spree/test/unit/tax_treatment_test.rb
 - starter-app/vendor/plugins/spree/test/unit/txn_test.rb
-- starter-app/vendor/plugins/spree/test/unit/variation_test.rb
 - starter-app/vendor/plugins/spree/uninstall.rb
 - tasks/deployment.rake
 - tasks/environment.rake

data/starter-app/vendor/plugins/spree/app/controllers/admin/variations_controller.rb

@@ -1,73 +0,0 @@
-class Admin::VariationsController < Admin::BaseController
-
-  def new
-    @variation = Variation.new
-    render :layout => false
-  end
-
-  def create
-    @product = Product.find(params[:id])
-    variation = Variation.new
-    variation.option = Option.find(params[:option_id])
-    variation.option_value = OptionValue.find(params[:option_value_id])
-    variation.product = @product
-    logger.debug("product: " + variation.product.inspect)
-    logger.debug("option_value: " + variation.option_value.inspect)
-    
-    variation.save!
-    flash[:notice] = 'Variation was successfully created.'
-    redirect_to :controller => 'products', :action => 'edit', :id => @product    
-  rescue Exception => e
-    logger.error("unable to create variation")
-    logger.error("message: " + e.message)
-    flash[:error] = ' Problem saving variation'
-    redirect_to :controller => 'products', :action => 'edit', :id => @product
-  end
-
-  # delete the variation (ajax call from either product or category edit screen)
-  def delete
-    v = Variation.find(params[:id])
-    if v.variable_type == "Product"
-      @product = Product.find v.variable_id  
-      @variations = @product.variations
-    else
-      @category = Category.find v.variable_id
-      @variations = @category.variations
-    end
-    v.destroy
-    render :update do |page|
-      #page.replace_html 'variations', :partial => 'updated_template'
-      page.replace_html 'variations', :partial => 'shared/variations', :locals => {:variations => @variations, :product => @product, :category => @category}
-      #render :partial => 'shared/variations', :locals => {:variations => @product.variations, :product => @product, :category => @category}
-    end
-  end
-
-  # AJAX method to show variations based on change in parent category (during category edit)
-  def category_variations
-    category = Category.find_or_create_by_id(params[:category_id])
-    if (params[:parent_id].blank?)
-      category.parent = Category.find(:first)
-    else
-      category.parent = Category.find(params[:parent_id])      
-    end
-    
-    render  :partial => 'shared/variations',
-            :locals => {:variations => category.variations, :category => category},
-            :layout => false
-  end
-
-  # AJAX method to show variations based on change in category (during product edit)
-  def product_variations
-    product = Product.find_or_create_by_id(params[:product_id])
-    if (params[:category_id].blank?)
-      product.category = Category.find(:first)
-    else
-      product.category = Category.find(params[:category_id])      
-    end
-    
-    render  :partial => 'shared/variations',
-            :locals => {:variations => product.variations, :product => product},
-            :layout => false
-  end
-  
-end