spree_api 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 413eb33e48024baa6bf0e9f9e774278b74ea977c
-  data.tar.gz: be1fad955d1c3d9cdca565d3e551560974b16d7d
+  metadata.gz: dc3a1a431b9b8d9c5d32ba386030f0d55ea3554d
+  data.tar.gz: 4264b2c93575c1336f335afeceb46d5f16b5a60a
 SHA512:
-  metadata.gz: 5f3dd086ec26934adb2b797afc20ff5b793dc3db8b0496a44bd721ce3525264854b32dbaa66353b04af087bc756e85c0cd2a745e83bea3110e25c47857ac2fda
-  data.tar.gz: a808bada61806c4d29a075da18eb8e58ae6c9faf6524501c20274da31216ca9930c78d7bbbe9faac67bbc97c4bfb4e2b512cc4ae0f4a5e5b24c1d00e2ce7f775
+  metadata.gz: 58a12d74ec252e62aee0b65f79e66584057f05b65ffb72f85beb3792b7262477fff435eaf767047f04fe496c255d9ecf0430adf2ef532be961311e234cb863f2
+  data.tar.gz: 579e9bca1dd148464a67e49c1fbd50ae53138170b31a9e948071390094289863d0701cf47bbea56387f49edcccb9453752294ba3427a79ed25ec4c7e667afd19

data/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) ##

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

@@ -129,22 +129,27 @@ module Spree
       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

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

@@ -62,7 +62,7 @@ module Spree
             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]]
+            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]

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

@@ -5,6 +5,7 @@ module Spree
 
       def show
         @inventory_unit = inventory_unit
+        respond_with(@inventory_unit)
       end
 
       def update

data/app/controllers/spree/api/line_items_controller.rb

@@ -4,9 +4,8 @@ module Spree
 
       def create
         variant = Spree::Variant.find(params[:line_item][:variant_id])
-        @line_item = order.contents.add(variant, params[:line_item][:quantity])
-        if @line_item.save
-          @order.ensure_updated_shipments
+        @line_item = order.contents.add(variant, params[:line_item][:quantity] || 1)
+        if @line_item.errors.empty?
           respond_with(@line_item, status: 201, default_template: :show)
         else
           invalid_resource!(@line_item)
@@ -28,7 +27,6 @@ module Spree
         @line_item = find_line_item
         variant = Spree::Variant.find(@line_item.variant_id)
         @order.contents.remove(variant, @line_item.quantity)
-        @order.ensure_updated_shipments
         respond_with(@line_item, status: 204)
       end
 

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

@@ -1,6 +1,7 @@
 module Spree
   module Api
     class OrdersController < Spree::Api::BaseController
+      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
@@ -17,7 +18,7 @@ module Spree
         find_order
         authorize! :update, @order, params[:token]
         @order.cancel!
-        render :show
+        respond_with(@order, :default_template => :show)
       end
 
       def create
@@ -69,7 +70,7 @@ module Spree
 
       def mine
         if current_api_user.persisted?
-          @orders = current_api_user.orders.ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
+          @orders = current_api_user.orders.reverse_chronological.ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
         else
           render "spree/api/errors/unauthorized", status: :unauthorized
         end

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

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

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

@@ -12,6 +12,7 @@ module Spree
         @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
@@ -19,6 +20,7 @@ module Spree
         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

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

@@ -17,7 +17,6 @@ module Spree
         @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)
@@ -30,10 +29,8 @@ module Spree
           @shipment = Spree::Shipment.accessible_by(current_ability, :update).readonly(false).find_by!(number: params[:id])
         end
 
-        @shipment.update_attributes(shipment_params)
-
-        @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

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

@@ -71,7 +71,7 @@ describe Spree::Api::BaseController do
     json_response.should == { "exception" => "no joy" }
   end
 
-  it "maps symantec keys to nested_attributes keys" do
+  it "maps semantic keys to nested_attributes keys" do
     klass = double(:nested_attributes_options => { :line_items => {},
                                                   :bill_address => {} })
     attributes = { 'line_items' => { :id => 1 },
@@ -82,4 +82,8 @@ describe Spree::Api::BaseController do
     mapped.has_key?('line_items_attributes').should be_true
     mapped.has_key?('name').should be_true
   end
+
+  it "lets a subclass override the product associations that are eager-loaded" do
+    controller.respond_to?(:product_includes, true).should be
+  end
 end

data/spec/controllers/spree/api/orders_controller_spec.rb

@@ -75,6 +75,18 @@ module Spree
         response.status.should == 200
         json_response["orders"].length.should == 0
       end
+
+      it "returns orders in reverse chronological order" do
+        order2 = create(:order, line_items: [line_item], user: order.user)
+        order2.created_at.should > order.created_at
+
+        api_get :mine
+        response.status.should == 200
+        json_response["pages"].should == 1
+        json_response["orders"].length.should == 2
+        json_response["orders"][0]["number"].should == order2.number
+        json_response["orders"][1]["number"].should == order.number
+      end
     end
 
     it "can view their own order" do

data/spec/controllers/spree/api/products_controller_spec.rb

@@ -67,6 +67,34 @@ module Spree
         json_response["per_page"].should == Kaminari.config.default_per_page
       end
 
+      context "specifying a rabl template for a custom action" do
+        before do
+          Spree::Api::ProductsController.class_eval do
+            def custom_show
+              @product = find_product(params[:id])
+              respond_with(@product)
+            end
+          end
+        end
+
+        it "uses the specified custom template through the request header" do
+          request.headers['X-Spree-Template'] = 'show'
+          api_get :custom_show, :id => product.id
+          response.should render_template('spree/api/products/show')
+        end
+
+        it "uses the specified custom template through the template URL parameter" do
+          api_get :custom_show, :id => product.id, :template => 'show'
+          response.should render_template('spree/api/products/show')
+        end
+
+        it "falls back to the default template if the specified template does not exist" do
+          request.headers['X-Spree-Template'] = 'invoice'
+          api_get :show, :id => product.id
+          response.should render_template('spree/api/products/show')
+        end
+      end
+
       context "product has more than one price" do
         before { product.master.prices.create currency: "EUR", amount: 22 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.2.5
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement