[Do Not Merge] 2 2 stable head upgrade

.editorconfig

@@ -0,0 +1,22 @@
+# http://EditorConfig.org
+# https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+tab_width = 2
+
+[**.rb]
+max_line_length = 80
+
+[**.js, **.coffee]
+max_line_length = 120
+
+[*.md]
+trim_trailing_whitespace = false

.gitignore

@@ -55,3 +55,4 @@ test_app
 **/coverage
 */.sass-cache
 .localeapp
+guides

.travis.yml

@@ -19,6 +19,4 @@ script:
   - bundle exec rake test_app
   - bundle exec rake spec
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.1.5

README.md

@@ -34,9 +34,9 @@ The fastest way to get started is by using the spree command line tool
 available in the spree gem which will add Spree to an existing Rails application.
 
 ```shell
-gem install rails -v 4.0.4
+gem install rails -v 4.0.12
 gem install spree
-rails _4.0.4_ new my_store
+rails _4.0.12_ new my_store
 spree install my_store
 ```
 
@@ -293,7 +293,7 @@ bash build.sh
 
 Further Documentation
 ------------
-Spree has a number of really useful guides online at [http://guides.spreecommerce.com](http://guides.spreecommerce.com). 
+Spree has a number of really useful guides online at [http://guides.spreecommerce.com](http://guides.spreecommerce.com).
 
 Contributing
 ------------

Rakefile

@@ -13,10 +13,22 @@ Gem::PackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
+task :default => :test
+
+desc "Runs all tests in all Spree engines"
+task :test do
+  Rake::Task['test_app'].invoke
+  %w(api backend core frontend).each do |gem_name|
+    Dir.chdir("#{File.dirname(__FILE__)}/#{gem_name}") do
+      system("rspec --fail-fast") or exit!(1)
+    end
+  end
+end
+
 desc "Generates a dummy app for testing for every Spree engine"
 task :test_app do
   require File.expand_path('../core/lib/generators/spree/install/install_generator', __FILE__)
-  %w(api backend core frontend).each do |engine|
+  %w(api backend core frontend sample).each do |engine|
     ENV['LIB_NAME'] = File.join('spree', engine)
     ENV['DUMMY_PATH'] = File.expand_path("../#{engine}/spec/dummy", __FILE__)
     Rake::Task['common:test_app'].execute

SPREE_VERSION

@@ -1 +1 @@
-2.2.2
+2.2.10.beta

api/CHANGELOG.md

@@ -1,9 +1 @@
-## Spree 2.2.2 (unreleased) ##
-
-* refactor the api to use a general importer in core gem.
-
-  * Peter Berkenbosch
-
-* Allow for linking of users to orders by admins
-
-  * Ryan Bigg
+## Spree 2.2.5 (unreleased) ##

api/app/controllers/spree/api/base_controller.rb

@@ -123,22 +123,27 @@ def find_product(id)
       end
 
       def product_scope
-        variants_associations = [{ option_values: :option_type }, :default_price, :prices, :images]
         if current_api_user.has_spree_role?("admin")
-          scope = Product.with_deleted.accessible_by(current_ability, :read)
-            .includes(:properties, :option_types, variants: variants_associations, master: variants_associations)
+          scope = Product.with_deleted.accessible_by(current_ability, :read).includes(*product_includes)
 
           unless params[:show_deleted]
             scope = scope.not_deleted
           end
         else
-          scope = Product.accessible_by(current_ability, :read).active
-            .includes(:properties, :option_types, variants: variants_associations, master: variants_associations)
+          scope = Product.accessible_by(current_ability, :read).active.includes(*product_includes)
         end
 
         scope
       end
 
+      def variants_associations
+        [{ option_values: :option_type }, :default_price, :images]
+      end
+
+      def product_includes
+        [ :option_types, variants: variants_associations, master: variants_associations ]
+      end
+
       def order_id
         params[:order_id] || params[:checkout_id] || params[:order_number]
       end

api/app/controllers/spree/api/checkouts_controller.rb

@@ -42,6 +42,51 @@ def load_order
           raise_insufficient_quantity and return if @order.insufficient_stock_lines.present?
         end
 
+        def object_params
+          modify_payment_attributes params[:order] || {}
+
+          protected_params = if params[:order]
+                               params.require(:order).permit(permitted_checkout_attributes)
+                             else
+                               {}
+                             end
+
+          map_nested_attributes_keys Order, protected_params
+        end
+
+        def user_id
+          params[:order][:user_id] if params[:order]
+        end
+
+        # For payment step, filter order parameters to produce the expected
+        # nested attributes for a single payment and its source, discarding
+        # attributes for payment methods other than the one selected
+        #
+        # respond_to check is necessary due to issue described in #2910
+        def modify_payment_attributes(object_params)
+          if @order.has_checkout_step?('payment') && @order.payment?
+            if object_params[:payments_attributes].is_a?(Hash)
+              object_params[:payments_attributes] = [object_params[:payments_attributes]]
+            end
+            if object_params[:payment_source].present? && source_params = object_params.delete(:payment_source)[object_params[:payments_attributes].first[:payment_method_id].to_s]
+              object_params[:payments_attributes].first[:source_attributes] = source_params
+            end
+            if object_params[:payments_attributes]
+              object_params[:payments_attributes].first[:amount] = @order.total.to_s
+            end
+          end
+        end
+
+        def nested_params
+          map_nested_attributes_keys Order, params[:order] || {}
+        end
+
+        # Should be overriden if you have areas of your checkout that don't match
+        # up to a step within checkout_steps, such as a registration step
+        def skip_state_validation?
+          false
+        end
+
         def update_order_state
           @order.state = params[:state] if params[:state]
           state_callback(:before)
@@ -58,6 +103,7 @@ def state_callback(before_or_after = :before)
           send(method_name) if respond_to?(method_name, true)
         end
 
+        # This is used in cancan
         def order_id
           super || params[:id]
         end

api/app/controllers/spree/api/inventory_units_controller.rb

@@ -5,6 +5,7 @@ class InventoryUnitsController < Spree::Api::BaseController
 
       def show
         @inventory_unit = inventory_unit
+        respond_with(@inventory_unit)
       end
 
       def update

api/app/controllers/spree/api/option_types_controller.rb

@@ -3,9 +3,9 @@ module Api
     class OptionTypesController < Spree::Api::BaseController
       def index
         if params[:ids]
-          @option_types = Spree::OptionType.accessible_by(current_ability, :read).where(:id => params[:ids].split(','))
+          @option_types = Spree::OptionType.includes(:option_values).accessible_by(current_ability, :read).where(id: params[:ids].split(','))
         else
-          @option_types = Spree::OptionType.accessible_by(current_ability, :read).load.ransack(params[:q]).result
+          @option_types = Spree::OptionType.includes(:option_values).accessible_by(current_ability, :read).load.ransack(params[:q]).result
         end
         respond_with(@option_types)
       end

api/app/controllers/spree/api/option_values_controller.rb

@@ -51,7 +51,7 @@ def scope
         end
 
         def option_value_params
-          params.require(:option_value).permit(permitted_option_type_attributes)
+          params.require(:option_value).permit(permitted_option_value_attributes)
         end
     end
   end

api/app/controllers/spree/api/orders_controller.rb

@@ -7,6 +7,8 @@ class OrdersController < Spree::Api::BaseController
       class_attribute :admin_order_attributes
       self.admin_order_attributes = [:import, :number, :completed_at, :locked_at, :channel]
 
+      wrap_parameters false
+
       skip_before_filter :check_for_user_or_api_key, only: :apply_coupon_code
       skip_before_filter :authenticate_user, only: :apply_coupon_code
 

api/app/controllers/spree/api/payments_controller.rb

@@ -12,7 +12,7 @@ def index
       end
 
       def new
-        @payment_methods = Spree::PaymentMethod.where(environment: Rails.env)
+        @payment_methods = Spree::PaymentMethod.available
         respond_with(@payment_method)
       end
 

api/app/controllers/spree/api/products_controller.rb

@@ -12,13 +12,15 @@ def index
         @products = @products.distinct.page(params[:page]).per(params[:per_page])
         expires_in 15.minutes, :public => true
         headers['Surrogate-Control'] = "max-age=#{15.minutes}"
+        respond_with(@products)
       end
 
       def show
         @product = find_product(params[:id])
         expires_in 15.minutes, :public => true
         headers['Surrogate-Control'] = "max-age=#{15.minutes}"
         headers['Surrogate-Key'] = "product_id=1"
+        respond_with(@product)
       end
 
       # Takes besides the products attributes either an array of variants or

api/app/controllers/spree/api/shipments_controller.rb

@@ -29,27 +29,14 @@ def create
         @shipment = @order.shipments.create(stock_location_id: params[:stock_location_id])
         @order.contents.add(variant, quantity, nil, @shipment)
 
-        @shipment.refresh_rates
         @shipment.save!
 
         respond_with(@shipment.reload, default_template: :show)
       end
 
       def update
-        unlock = params[:shipment].delete(:unlock)
-
-        if unlock == 'yes'
-          @shipment.adjustment.open
-        end
-
-        @shipment.update_attributes(shipment_params)
-
-        if unlock == 'yes'
-          @shipment.adjustment.close
-        end
-
-        @shipment.reload
-        respond_with(@shipment, default_template: :show)
+        @shipment.update_attributes_and_order(shipment_params)
+        respond_with(@shipment.reload, default_template: :show)
       end
 
       def ready

api/app/controllers/spree/api/taxons_controller.rb

@@ -65,7 +65,7 @@ def products
         # Products#index does not do the sorting.
         taxon = Spree::Taxon.find(params[:id])
         @products = taxon.products.ransack(params[:q]).result
-        @products = @products.page(params[:page]).per(500 || params[:per_page])
+        @products = @products.page(params[:page]).per(params[:per_page] || 500)
         render "spree/api/products/index"
       end
 

api/app/views/spree/api/addresses/show.v1.rabl

@@ -1,5 +1,5 @@
 object @address
-cache @address
+cache [I18n.locale, root_object]
 attributes *address_attributes
 
 child(:country) do |address|

api/app/views/spree/api/adjustments/show.v1.rabl

@@ -1,4 +1,4 @@
 object @adjustment
-cache @adjustment
+cache [I18n.locale, root_object]
 attributes *adjustment_attributes
-node(:display_amount) { |a| a.display_amount.to_s }
+node(:display_amount) { |a| a.display_amount.to_s }

api/app/views/spree/api/credit_cards/show.v1.rabl

@@ -1,3 +1,3 @@
 object @credit_card
-cache @credit_card
-attributes *creditcard_attributes
+cache [I18n.locale, root_object]
+attributes *creditcard_attributes

api/app/views/spree/api/line_items/show.v1.rabl

@@ -1,5 +1,5 @@
 object @line_item
-cache @line_item
+cache [I18n.locale, root_object]
 attributes *line_item_attributes
 node(:single_display_amount) { |li| li.single_display_amount.to_s }
 node(:display_amount) { |li| li.display_amount.to_s }

api/app/views/spree/api/orders/order.v1.rabl

@@ -1,4 +1,4 @@
-cache @order
+cache [I18n.locale, root_object]
 attributes *order_attributes
 node(:display_item_total) { |o| o.display_item_total.to_s }
 node(:total_quantity) { |o| o.line_items.sum(:quantity) }

api/app/views/spree/api/products/show.v1.rabl

@@ -1,5 +1,5 @@
 object @product
-cache [current_currency, root_object]
+cache [I18n.locale, current_currency, root_object]
 attributes *product_attributes
 node(:display_price) { |p| p.display_price.to_s }
 node(:has_variants) { |p| p.has_variants? }

api/app/views/spree/api/shipments/show.v1.rabl

@@ -1,5 +1,5 @@
 object @shipment
-cache @shipment
+cache [I18n.locale, root_object]
 attributes *shipment_attributes
 node(:order_id) { |shipment| shipment.order.number }
 node(:stock_location_name) { |shipment| shipment.stock_location.name }

api/app/views/spree/api/variants/big.v1.rabl

@@ -1,7 +1,7 @@
 object @variant
 attributes *variant_attributes
 
-cache ['big_variant', root_object]
+cache [I18n.locale, 'big_variant', root_object]
 
 extends "spree/api/variants/small"
 

api/app/views/spree/api/variants/show.v1.rabl

@@ -1,3 +1,3 @@
 object @variant
-cache ['show', root_object]
+cache [I18n.locale, 'show', root_object]
 extends "spree/api/variants/big"

api/app/views/spree/api/variants/small.v1.rabl

@@ -1,5 +1,5 @@
 attributes *variant_attributes
-cache ['small_variant', root_object]
+cache [I18n.locale, 'small_variant', root_object]
 
 node(:display_price) { |p| p.display_price.to_s }
 node(:options_text) { |v| v.options_text }

api/spec/controllers/spree/api/base_controller_spec.rb

@@ -101,4 +101,7 @@ def index
     end
   end
 
+  it "lets a subclass override the product associations that are eager-loaded" do
+    controller.respond_to?(:product_includes, true).should be
+  end
 end

api/spec/controllers/spree/api/option_values_controller_spec.rb

@@ -111,6 +111,13 @@ def check_option_values(option_values)
           option_value.name.should == "Option Value"
         end
 
+        it "permits the correct attributes" do
+          controller.should_receive(:permitted_option_value_attributes)
+          api_put :update, :id => option_value.id, :option_value => {
+                            :name => ""
+                           }
+        end
+
         it "cannot update an option value with invalid attributes" do
           api_put :update, :id => option_value.id, :option_value => {
                             :name => ""