spree 0.0.7 → 0.0.8

data/History.txt

@@ -1,3 +1,8 @@
+== 0.0.8 2008-03-27
+
+* Fixed a few new bugs introduced by the variant refactoring
+* Replaced some instances of the old Railscart logo
+
 == 0.0.7 2008-03-26
 
 * Fixed an error with improperly named helper in one of the mailers (this was preventing checkout)

data/Manifest.txt

@@ -50,7 +50,7 @@ starter-app/db/sample/taggings.yml
 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
@@ -108,6 +108,7 @@ starter-app/lib/tasks/sample/products/0000/0012/ror_stein_back_mini.jpeg
 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
@@ -116,6 +117,7 @@ starter-app/public/dispatch.fcgi
 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
@@ -139,6 +141,17 @@ starter-app/script/process/reaper
 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
@@ -273,6 +286,144 @@ starter-app/vendor/plugins/paginating_find/test_app/test/unit/abstract_test.rb
 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
@@ -289,7 +440,6 @@ starter-app/vendor/plugins/spree/app/controllers/admin/overview_controller.rb
 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
@@ -302,7 +452,6 @@ starter-app/vendor/plugins/spree/app/helpers/admin/orders_helper.rb
 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
@@ -329,7 +478,7 @@ starter-app/vendor/plugins/spree/app/models/sku.rb
 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
@@ -345,16 +494,15 @@ starter-app/vendor/plugins/spree/app/views/admin/option_types/edit.rhtml
 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
@@ -366,10 +514,6 @@ starter-app/vendor/plugins/spree/app/views/admin/users/edit.rhtml
 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
@@ -418,8 +562,7 @@ starter-app/vendor/plugins/spree/assets/images/rails.png
 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
@@ -446,14 +589,14 @@ starter-app/vendor/plugins/spree/db/migrate/007_create_option_values.rb
 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
@@ -501,20 +644,15 @@ starter-app/vendor/plugins/spree/test/functional/admin/orders_controller_test.rb
 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
@@ -524,7 +662,6 @@ starter-app/vendor/plugins/spree/test/unit/sku_test.rb
 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/config/hoe.rb

@@ -65,7 +65,8 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
       ['activemerchant', '>= 1.2.1'], 
       ['mocha', '>= 0.5.6'], 
       ['has_many_polymorphs', '>= 2.12'],
-      ['mini_magick', ">=1.2.3"]
+      ['mini_magick', ">=1.2.3"],
+      ['rspec', '=1.1.3'] #rspec version needs to exactly match what is required by the rspec plugin
   ]
   #p.extra_deps = []     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
   

data/lib/spree/version.rb

@@ -2,7 +2,7 @@ module Spree #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 7
+    TINY  = 8
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/starter-app/app/views/layouts/application.rhtml

@@ -13,11 +13,13 @@
 					<td colspan="2">
 						<table width="100%">
 							<tr>
-								<td>
-                  <h1>Welcome to Our Store</h1>									
+								<td width="140px">
+                  <%= image_tag 'spree.jpg' %>									
 								</td>
-								<td>&nbsp;</td>
-								<td align="right">
+								<td valign="top">
+								  <h1>Welcome To The Sample Store</h1>
+							  </td>
+								<td align="right" valign="top">
 									<%= render :partial => 'shared/store_menu' %>
 								</td>
 							</tr>

data/starter-app/db/sample/line_items.yml

@@ -1,7 +1,7 @@
 <% for i in 1..30 do%>
 li_<%= i %>:
   order_id: <%= i %>
-  product: ror_tote
+  variant: ror_tote_v
   quantity: 1
   price: 8.99
 <% end %>
@@ -9,7 +9,7 @@ li_<%= i %>:
 <% for i in 1..30 do%>
 li_<%= i + 30 %>:
   order_id: <%= i %>
-  product: ror_bag
+  variant: ror_bag_v
   quantity: 1
   price: 8.99
 <% end %>
@@ -17,7 +17,9 @@ li_<%= i + 30 %>:
 <% for i in 1..30 do%>
 li_<%= i + 60 %>:
   order_id: <%= i %>
-  product: ror_baseball_jersey
+  variant: large-blue-baseball
   quantity: 1
   price: 19.99
-<% end %>
+<% end %>
+
+  

data/starter-app/db/sample/{variations.yml → variants.yml}

@@ -28,4 +28,20 @@ large-green-baseball:
 xlarge-green-baseball:
   product: ror_baseball_jersey
   option_values: xl, red
+ror_tote_v:
+  product: ror_tote
+ror_bag_v:
+  product: ror_bag
+ror_jr_spaghetti_v:
+  product: ror_jr_spaghetti
+ror_mug_v:
+  product: ror_mug  
+ror_ringer_v:
+  product: ror_ringer  
+ror_stein_v:
+  product: ror_stein  
+  
+
+ror_bag_v:
+    product: ror_bag  
 		

data/starter-app/log/README

@@ -0,0 +1 @@
+log files will go in here

data/starter-app/public/stylesheets/application.css

@@ -189,12 +189,12 @@ padding-right: 0;
 /* ================ end: product preview ================ */
 
 /* ================ begin: product-name ================ */
-.product-name, .product-price, .product-variations {
+.product-name, .product-price, .product-variants {
   font-weight: bold;
 }
 /* ================ end: product-name ================ */
 
-#variations ul {
+#variants ul {
 	list-style: none;
 	margin-left: 0px;
 	padding-left: 1em;

data/starter-app/script/spec

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/rspec/lib"))
+require 'spec'
+exit ::Spec::Runner::CommandLine.run(::Spec::Runner::OptionParser.parse(ARGV, STDERR, STDOUT))

data/starter-app/script/spec_server

@@ -0,0 +1,102 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../../rspec/lib' # For svn
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../vendor/plugins/rspec/lib' # For rspec installed as plugin
+require 'rubygems'
+require 'drb/drb'
+require 'rbconfig'
+require 'spec'
+require 'optparse'
+
+# This is based on Florian Weber's TDDMate
+module Spec
+  module Runner
+    class RailsSpecServer
+      def run(argv, stderr, stdout)
+        $stdout = stdout
+        $stderr = stderr
+
+        base = ActiveRecord::Base
+        def base.clear_reloadable_connections!
+          active_connections.each do |name, conn|
+            if conn.requires_reloading?
+              conn.disconnect!
+              active_connections.delete(name)
+            end
+          end
+        end        
+
+        if ActionController.const_defined?(:Dispatcher)
+          dispatcher = ::ActionController::Dispatcher.new($stdout)
+          dispatcher.cleanup_application(true)
+        elsif ::Dispatcher.respond_to?(:reset_application!)
+          ::Dispatcher.reset_application!
+        else
+          raise "Application reloading failed"
+        end
+        ::Dependencies.mechanism = :load
+        require_dependency('application.rb') unless Object.const_defined?(:ApplicationController)
+        load File.dirname(__FILE__) + '/../spec/spec_helper.rb'
+
+        ::Spec::Runner::CommandLine.run(
+          ::Spec::Runner::OptionParser.parse(
+            argv,
+            $stderr,
+            $stdout
+          )
+        )
+      end
+    end
+  end
+end
+puts "Loading Rails environment"
+
+ENV["RAILS_ENV"] = "test"
+require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
+require 'dispatcher'
+
+def restart_test_server
+  puts "restarting"
+  config       = ::Config::CONFIG
+  ruby         = File::join(config['bindir'], config['ruby_install_name']) + config['EXEEXT']
+  command_line = [ruby, $0, ARGV].flatten.join(' ')
+  exec(command_line)
+end
+
+def daemonize(pid_file = nil)
+  return yield if $DEBUG
+  pid = Process.fork{
+    Process.setsid
+    Dir.chdir(RAILS_ROOT)
+    trap("SIGINT"){ exit! 0 }
+    trap("SIGTERM"){ exit! 0 }
+    trap("SIGHUP"){ restart_test_server }
+    File.open("/dev/null"){|f|
+      STDERR.reopen f
+      STDIN.reopen  f
+      STDOUT.reopen f
+    }
+    yield
+  }
+  puts "spec_server launched. (PID: %d)" % pid
+  File.open(pid_file,"w"){|f| f.puts pid } if pid_file
+  exit! 0
+end
+
+options = Hash.new
+opts = OptionParser.new
+opts.on("-d", "--daemon"){|v| options[:daemon] = true }
+opts.on("-p", "--pid PIDFILE"){|v| options[:pid] = v }
+opts.parse!(ARGV)
+
+puts "Ready"
+exec_server = lambda {
+  trap("USR2") { restart_test_server } if Signal.list.has_key?("USR2")
+  DRb.start_service("druby://localhost:8989", Spec::Runner::RailsSpecServer.new)
+  DRb.thread.join
+}
+
+if options[:daemon]
+  daemonize(options[:pid], &exec_server)
+else
+  exec_server.call
+end