spree_api 2.2.6 → 2.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deb1a6d97cb271dd9cc4a2d1fd18b06e1a9436ab
-  data.tar.gz: e9f35894fba49ecb7ab11db26ddb751db7faccbc
+  metadata.gz: 552423ad87e0055689731580be5866f71756286f
+  data.tar.gz: 2158c845b83c58ce9d2d1109296b2e590d61b506
 SHA512:
-  metadata.gz: cf795c05d74934c7df5d03a7075fc231959d80f1127041cfc8ae8d44fcf647844aedc6a2aac364fa37f355990336adcf0d3a7215a2df7919973eef1802d8b42b
-  data.tar.gz: d159dd97e4c2ac33940f0760ba119a832db3006888e5c86c75a431ab7ad74d6fa3d7ee45a1bd639b7ccac479eca96780ec9688e9cbea6841212e156ca513e9d8
+  metadata.gz: f4dc598439b0c5efb7dee15afc5ceaba4ba0cd34459834bf725e892540a8d76689532265f65c57ab2a603636f60802ec94b78c7e125bbb17c0b56eb18129ce49
+  data.tar.gz: 979ccee54a8e8906d76cda45c7d4b6424905fbc8ce3df112cddf9b911058ed850d9cdf747e11d72115ec55d35b37ac55dafd0fe4dfcbe17e162dd2d989abb99e

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

@@ -3,9 +3,9 @@ module Spree
     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

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

@@ -67,7 +67,7 @@ module Spree
 
         def find_order
           @order = Spree::Order.find_by(number: order_id)
-          authorize! :read, @order
+          authorize! :read, @order, order_token
         end
 
         def find_payment

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

@@ -65,7 +65,7 @@ module Spree
         # 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
 

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

@@ -174,7 +174,7 @@ module Spree
       Order.should_receive(:create!).and_return(order = Spree::Order.new)
       order.stub(:associate_user!)
       order.stub_chain(:contents, :add).and_return(line_item = double('LineItem'))
-      line_item.should_receive(:update_attributes).with("special" => true)
+      line_item.should_receive(:update_attributes!).with("special" => true)
 
       controller.stub(permitted_line_item_attributes: [:id, :variant_id, :quantity, :special])
       api_post :create, :order => {

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

@@ -64,6 +64,11 @@ module Spree
           api_get :index, :order_id => order.to_param
           assert_unauthorized!
         end
+
+        it "can view the payments for an order given the order token" do
+          api_get :index, :order_id => order.to_param, :order_token => order.token
+          json_response["payments"].first.should have_attributes(attributes)
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.2.7
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-11-20 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.6
+        version: 2.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.6
+        version: 2.2.7
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement