spree_core 1.0.7 → 1.1.0.rc1

metadata

@@ -1,99 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 1.0.7
-  prerelease: 
+  version: 1.1.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2012-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70111187015640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.4
+  version_requirements: *70111187015640
 - !ruby/object:Gem::Dependency
   name: nested_set
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70111187015020 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.8
+  version_requirements: *70111187015020
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70111187014120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
+  version_requirements: *70111187014120
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70111187013620 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: 1.6.11
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.8
+  version_requirements: *70111187013620
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70111187013080 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.1
+  version_requirements: *70111187013080
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70111187012380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,79 +76,68 @@ dependencies:
         version: 1.12.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.12.0
+  version_requirements: *70111187012380
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70111187011780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *70111187011780
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: &70111187010620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 1.3.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *70111187010620
 - !ruby/object:Gem::Dependency
-  name: meta_search
-  requirement: !ruby/object:Gem::Requirement
+  name: ransack
+  requirement: &70111187009560 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.1
+  version_requirements: *70111187009560
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70111187008720 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.20.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.20.1
+  version_requirements: *70111187008720
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70111187027200 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.10
+        version: 3.2.2
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.10
+  version_requirements: *70111187027200
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70111187026120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -181,31 +145,21 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.13.0
+  version_requirements: *70111187026120
 - !ruby/object:Gem::Dependency
   name: deface
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70111187025480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
+  version_requirements: *70111187025480
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70111187024680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -213,12 +167,7 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.2
+  version_requirements: *70111187024680
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -333,7 +282,6 @@ files:
 - app/assets/images/icons/checkout.png
 - app/assets/images/icons/delete.png
 - app/assets/images/icons/update.png
-- app/assets/images/noimage/large.png
 - app/assets/images/noimage/mini.png
 - app/assets/images/noimage/product.png
 - app/assets/images/noimage/small.png
@@ -345,6 +293,7 @@ files:
 - app/assets/javascripts/admin/calculator.js
 - app/assets/javascripts/admin/checkouts/edit.js
 - app/assets/javascripts/admin/gateway.js
+- app/assets/javascripts/admin/image_settings.js
 - app/assets/javascripts/admin/images/index.js
 - app/assets/javascripts/admin/images/new.js
 - app/assets/javascripts/admin/nested-attribute.js
@@ -375,6 +324,7 @@ files:
 - app/controllers/spree/admin/base_controller.rb
 - app/controllers/spree/admin/configurations_controller.rb
 - app/controllers/spree/admin/general_settings_controller.rb
+- app/controllers/spree/admin/image_settings_controller.rb
 - app/controllers/spree/admin/images_controller.rb
 - app/controllers/spree/admin/inventory_settings_controller.rb
 - app/controllers/spree/admin/inventory_units_controller.rb
@@ -387,9 +337,7 @@ files:
 - app/controllers/spree/admin/overview_controller.rb
 - app/controllers/spree/admin/payment_methods_controller.rb
 - app/controllers/spree/admin/payments_controller.rb
-- app/controllers/spree/admin/product_groups_controller.rb
 - app/controllers/spree/admin/product_properties_controller.rb
-- app/controllers/spree/admin/product_scopes_controller.rb
 - app/controllers/spree/admin/products_controller.rb
 - app/controllers/spree/admin/properties_controller.rb
 - app/controllers/spree/admin/prototypes_controller.rb
@@ -425,8 +373,6 @@ files:
 - app/helpers/spree/admin/orders_helper.rb
 - app/helpers/spree/admin/overview_helper.rb
 - app/helpers/spree/admin/payments_helper.rb
-- app/helpers/spree/admin/product_groups_helper.rb
-- app/helpers/spree/admin/product_properties_helper.rb
 - app/helpers/spree/admin/products_helper.rb
 - app/helpers/spree/admin/taxons_helper.rb
 - app/helpers/spree/admin/users_helper.rb
@@ -480,11 +426,9 @@ files:
 - app/models/spree/preferences/store.rb
 - app/models/spree/product/scopes.rb
 - app/models/spree/product.rb
-- app/models/spree/product_group.rb
 - app/models/spree/product_option_type.rb
 - app/models/spree/product_property.rb
 - app/models/spree/product_scope/scopes.rb
-- app/models/spree/product_scope.rb
 - app/models/spree/property.rb
 - app/models/spree/prototype.rb
 - app/models/spree/return_authorization.rb
@@ -492,8 +436,9 @@ files:
 - app/models/spree/shipment.rb
 - app/models/spree/shipping_category.rb
 - app/models/spree/shipping_method.rb
+- app/models/spree/shipping_rate.rb
 - app/models/spree/state.rb
-- app/models/spree/state_event.rb
+- app/models/spree/state_change.rb
 - app/models/spree/tax_category.rb
 - app/models/spree/tax_rate.rb
 - app/models/spree/taxon.rb
@@ -510,10 +455,11 @@ files:
 - app/views/spree/admin/adjustments/edit.html.erb
 - app/views/spree/admin/adjustments/index.html.erb
 - app/views/spree/admin/adjustments/new.html.erb
-- app/views/spree/admin/banners/_gateway.html.erb
 - app/views/spree/admin/configurations/index.html.erb
 - app/views/spree/admin/general_settings/edit.html.erb
 - app/views/spree/admin/general_settings/show.html.erb
+- app/views/spree/admin/image_settings/edit.html.erb
+- app/views/spree/admin/image_settings/show.html.erb
 - app/views/spree/admin/images/_form.html.erb
 - app/views/spree/admin/images/edit.html.erb
 - app/views/spree/admin/images/index.html.erb
@@ -563,17 +509,8 @@ files:
 - app/views/spree/admin/payments/source_forms/_gateway.html.erb
 - app/views/spree/admin/payments/source_views/_check.html.erb
 - app/views/spree/admin/payments/source_views/_gateway.html.erb
-- app/views/spree/admin/product_groups/_preview.html.erb
-- app/views/spree/admin/product_groups/_product_scope.html.erb
-- app/views/spree/admin/product_groups/edit.html.erb
-- app/views/spree/admin/product_groups/index.html.erb
-- app/views/spree/admin/product_groups/new.html.erb
-- app/views/spree/admin/product_groups/show.html.erb
 - app/views/spree/admin/product_properties/_product_property_fields.html.erb
 - app/views/spree/admin/product_properties/index.html.erb
-- app/views/spree/admin/product_scopes/create.js.erb
-- app/views/spree/admin/product_scopes/destroy.js.erb
-- app/views/spree/admin/product_scopes/new.html.erb
 - app/views/spree/admin/products/_form.html.erb
 - app/views/spree/admin/products/_option_types.html.erb
 - app/views/spree/admin/products/_properties_form.erb
@@ -595,6 +532,7 @@ files:
 - app/views/spree/admin/prototypes/new.html.erb
 - app/views/spree/admin/prototypes/new.js.erb
 - app/views/spree/admin/prototypes/select.js.erb
+- app/views/spree/admin/prototypes/show.html.erb
 - app/views/spree/admin/reports/index.html.erb
 - app/views/spree/admin/reports/sales_total.html.erb
 - app/views/spree/admin/return_authorizations/_form.html.erb
@@ -609,7 +547,6 @@ files:
 - app/views/spree/admin/shared/_configuration_menu.html.erb
 - app/views/spree/admin/shared/_destroy.js.erb
 - app/views/spree/admin/shared/_edit_resource_links.html.erb
-- app/views/spree/admin/shared/_group_from_products_form.html.erb
 - app/views/spree/admin/shared/_head.html.erb
 - app/views/spree/admin/shared/_new_adjustment_button.html.erb
 - app/views/spree/admin/shared/_new_resource_links.html.erb
@@ -797,10 +734,8 @@ files:
 - lib/spree/core/testing_support/factories/payment_factory.rb
 - lib/spree/core/testing_support/factories/payment_method_factory.rb
 - lib/spree/core/testing_support/factories/product_factory.rb
-- lib/spree/core/testing_support/factories/product_group_factory.rb
 - lib/spree/core/testing_support/factories/product_option_type_factory.rb
 - lib/spree/core/testing_support/factories/product_property_factory.rb
-- lib/spree/core/testing_support/factories/product_scope_factory.rb
 - lib/spree/core/testing_support/factories/property_factory.rb
 - lib/spree/core/testing_support/factories/prototype_factory.rb
 - lib/spree/core/testing_support/factories/return_authorization_factory.rb
@@ -819,10 +754,9 @@ files:
 - lib/spree/core/testing_support/factories/zone_factory.rb
 - lib/spree/core/testing_support/factories.rb
 - lib/spree/core/testing_support/fixtures.rb
-- lib/spree/core/theme_support/hook_listener.rb
-- lib/spree/core/theme_support.rb
 - lib/spree/core/url_helpers.rb
 - lib/spree/core/user_banners.rb
+- lib/spree/core/validators/email.rb
 - lib/spree/core/version.rb
 - lib/spree/core.rb
 - lib/spree/product_filters.rb
@@ -843,7 +777,6 @@ files:
 - db/migrate/20090923100315_add_count_on_hand_to_variants_and_products.rb
 - db/migrate/20091007134354_change_taxons_to_nested_set.rb
 - db/migrate/20091008091614_move_to_configurable_gateways.rb
-- db/migrate/20091012120519_product_groups_and_scopes.rb
 - db/migrate/20091015110842_add_open_id_authentication_tables.rb
 - db/migrate/20091015153048_add_openid_field_to_users.rb
 - db/migrate/20091016174634_change_preference_value_type.rb
@@ -866,7 +799,6 @@ files:
 - db/migrate/20100121160010_creditcard_id_for_creditcard_txns.rb
 - db/migrate/20100121183934_original_creditcard_txn_id_for_creditcard_txns.rb
 - db/migrate/20100125145351_add_test_mode_to_billing_integration.rb
-- db/migrate/20100126103714_create_products_product_groups.rb
 - db/migrate/20100209025806_create_payment_methods.rb
 - db/migrate/20100209144531_polymorphic_payments.rb
 - db/migrate/20100213103131_change_payments_payment_method_to_belongs_to.rb
@@ -875,7 +807,6 @@ files:
 - db/migrate/20100223183812_drop_billing_integrations.rb
 - db/migrate/20100224153127_deleted_at_for_payment_methods.rb
 - db/migrate/20100301163454_add_adjustments_index.rb
-- db/migrate/20100306153445_fix_by_popularity.rb
 - db/migrate/20100317120946_add_alt_text_to_images.rb
 - db/migrate/20100419194457_fix_existing_coupon_credits.rb
 - db/migrate/20100427121301_add_display_to_payment_methods.rb
@@ -932,8 +863,9 @@ files:
 - db/migrate/20120105193911_associate_shipping_methods_and_shipping_categories.rb
 - db/migrate/20120105195817_add_match_rules_to_shipping_methods.rb
 - db/migrate/20120119024710_new_preferences.rb
+- db/migrate/20120203001428_rename_state_events_to_state_changes.rb
 - db/migrate/20120203153759_add_deleted_at_to_tax_category.rb
-- db/migrate/20120523061241_convert_sales_tax_to_default_tax.rb
+- db/migrate/20120315064358_migrate_images_from_products_to_variants.rb
 - db/sample/users.rb
 - db/seeds.rb
 - vendor/assets/images/datepicker/cal.gif
@@ -956,7 +888,6 @@ files:
 - vendor/assets/javascripts/jquery.alerts/images/important.gif
 - vendor/assets/javascripts/jquery.alerts/images/info.gif
 - vendor/assets/javascripts/jquery.alerts/images/title.gif
-- vendor/assets/javascripts/jquery.alerts/jquery.alerts.css
 - vendor/assets/javascripts/jquery.alerts/jquery.alerts.css.erb
 - vendor/assets/javascripts/jquery.alerts/jquery.alerts.js
 - vendor/assets/javascripts/jquery.alerts/jquery.alerts.spree.css
@@ -1030,16 +961,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 1804394564669674040
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: spree_core
-rubygems_version: 1.8.23
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Core e-commerce functionality for the Spree project.

data/app/controllers/spree/admin/product_groups_controller.rb

@@ -1,49 +0,0 @@
-module Spree
-  module Admin
-    class ProductGroupsController < ResourceController
-      before_filter :patch_params, :only => [:update]
-  
-      def preview
-        @product_group = ProductGroup.new(params[:product_group])
-        @product_group.name = "for_preview"
-        respond_with(@product_group) { |format| format.html { render :partial => 'preview', :layout => false } }
-      end
-
-      protected
-
-        def find_resource
-          ProductGroup.find_by_permalink!(params[:id])
-        end
-     
-        def location_after_save
-          edit_admin_product_group_path(@product_group)
-        end
-
-        def collection
-          params[:search] ||= {}
-          params[:search][:meta_sort] ||= "name.asc"
-          @search = super.metasearch(params[:search])
-          @collection = @search.relation.page(params[:page]).per(Spree::Config[:admin_pgroup_per_page])
-        end
-    
-      private
-
-        # Consolidate argument arrays for nested product_scope attributes
-        # Necessary for product scopes with multiple arguments
-        def patch_params
-          if params["product_group"] and params["product_group"]["product_scopes_attributes"].is_a?(Array)
-            params["product_group"]["product_scopes_attributes"] = params["product_group"]["product_scopes_attributes"].group_by {|a| a["id"]}.map do |scope_id, attrs|
-              a = { "id" => scope_id, "arguments" => attrs.map{|a| a["arguments"] }.flatten }
-              if name = attrs.first["name"]
-                a["name"] = name
-              end
-              a
-            end
-          end
-        end
-
-
-
-    end
-  end
-end

data/app/controllers/spree/admin/product_scopes_controller.rb

@@ -1,39 +0,0 @@
-module Spree
-  module Admin
-    class ProductScopesController < BaseController
-      helper 'spree/admin/product_groups'
-
-      respond_to :html, :js
-
-      def create
-        @product_group = ProductGroup.find_by_permalink(params[:product_group_id])
-        @product_scope = @product_group.product_scopes.build(params[:product_scope])
-        if @product_scope.save
-          respond_with(@product_scope) do |format|
-            format.html { redirect_to edit_admin_product_group_path(@product_group) }
-            format.js   { render :layout => false }
-          end
-        else
-          respond_with(@product_scope)
-        end
-      end
-
-      def destroy
-        @product_scope = ProductScope.find(params[:id])
-        if @product_scope.destroy
-          @product_group = @product_scope.product_group
-          @product_group.update_memberships
-          respond_with(@product_scope) do |format|
-            format.html { redirect_to edit_admin_product_group_path(@product_group) }
-            format.js   { render :layout => false }
-          end
-        else
-          respond_with(@product_scope) do |format|
-            format.html { redirect_to edit_admin_product_group_path(@product_scope.product_group) }
-          end
-        end
-      end
-
-    end
-  end
-end

data/app/helpers/spree/admin/product_groups_helper.rb

@@ -1,14 +0,0 @@
-module Spree
-  module Admin
-    module ProductGroupsHelper
-      # Allow certain scope attributes to have a custom field type
-      def product_scope_field(product_scope, i)
-        value = (product_scope.arguments || [])[i]
-        name = 'product_group[product_scopes_attributes][][arguments][]'
-        helper_method_for_scope = :product_picker_field if product_scope.name.to_sym == :with_ids
-        helper_method_for_scope ||= :text_field_tag
-        send(helper_method_for_scope, name, value)
-      end
-    end
-  end
-end

data/app/helpers/spree/admin/product_properties_helper.rb

@@ -1,24 +0,0 @@
-module Spree
-  module Admin
-    module ProductPropertiesHelper
-      # Generates the appropriate field name for attribute_fu.  Normally attribute_fu handles this but we've got a
-      # special case where we need text_field_with_autocomplete and we have to recreate attribute_fu's naming
-      # scheme manually.
-      def property_fu_name(product_property, number)
-        if product_property.new_record?
-          "product[product_property_attributes][new][#{number}][property_name]"
-        else
-          "product[product_property_attributes][#{product_property.id}][property_name]"
-        end
-      end
-
-      def property_fu_value(product_property, number)
-        if product_property.new_record?
-          "product[product_property_attributes][new][#{number}][value]"
-        else
-          "product[product_property_attributes][#{product_property.id}][value]"
-        end
-      end
-    end
-  end
-end