spree_api 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6416ddb13bbe8f04930a3af747fecd032eb9bfa
-  data.tar.gz: fda21f8c9d73dc334d9826e01d6e362da9dc3526
+  metadata.gz: b4f74781ea0934c3fecc2b6bfabf934360efce72
+  data.tar.gz: fa04ae4fd788014ba5a0f23abf4ab5120fb04e68
 SHA512:
-  metadata.gz: a17ad20ff0392f2ae1ce3cf51baf5b7d224d6890e0d279d9dc77b46070b415ba71f40d04ec55352069c616c270eb2b99787685cc32cfea5f0e2d51f12e5b31e5
-  data.tar.gz: 132136db66a648b0457fe9c2063586c126f28654327441457da85b800cac154b2a694a622a15cb892450a7efb244534172f55d3aab85521c625bef696bebc1bf
+  metadata.gz: 016441c31d86a96ebc8a362c8c254bcf682aa164a1fb418d961884ad7e92351ae863deca84299ba88b52c5c78f08aad9bfdb66d8b92bb58da82168ad1296c6c3
+  data.tar.gz: 0f3762b3c07a6089b7055a68d2114234724ab2c0ab450702e40d0a77d66e953ac1596143b02e8d3bd7cd0c5619815df4d8c4b7f7e43af7140dc1ee7deda40a08

data/CHANGELOG.md

@@ -1,14 +1 @@
-## Spree 2.0.8 (unreleased) ##
-
-* When line items are added after the delivery state, the shipments are now recreated. #3914
-
-    Washington Luiz
-
-* State names are now persisted on addresses when using `ensure_state_from_api`, even if the state does not exist as a `Spree::State`. e976a3bbd603ea981499f440fa69f2e6d0d930d7
-
-    Washington Luiz
-
-* Times are now returned with millisecond precision. (Note: this patch is not in the 2-1-stable or master branches because Rails 4 does this by default.)
-
-    Washington Luiz
-    
+## Spree 2.0.9 (unreleased) ##

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

@@ -28,7 +28,7 @@ module Spree
 
       def set_jsonp_format
         if params[:callback] && request.get?
-          self.response_body = "#{params[:callback]}(#{self.response_body})"
+          self.response_body = "#{params[:callback]}(#{response.body})"
           headers["Content-Type"] = 'application/javascript'
         end
       end

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

@@ -1,8 +1,6 @@
 module Spree
   module Api
     class CheckoutsController < Spree::Api::BaseController
-
-      before_filter :load_order,     only: [:show, :update, :next, :advance]
       before_filter :associate_user, only: :update
 
       include Spree::Core::ControllerHelpers::Auth
@@ -18,6 +16,7 @@ module Spree
       end
 
       def next
+        load_order(true)
         authorize! :update, @order, params[:order_token]
         @order.next!
         respond_with(@order, default_template: 'spree/api/orders/show', status: 200)
@@ -26,16 +25,19 @@ module Spree
       end
 
       def advance
+        load_order(true)
         authorize! :update, @order, params[:order_token]
         while @order.next; end
         respond_with(@order, default_template: 'spree/api/orders/show', status: 200)
       end
 
       def show
+        load_order
         respond_with(@order, default_template: 'spree/api/orders/show', status: 200)
       end
 
       def update
+        load_order(true)
         authorize! :update, @order, params[:order_token]
         order_params = object_params
         user_id = order_params.delete(:user_id)
@@ -53,14 +55,6 @@ module Spree
         end
       end
 
-      def next
-        @order.next!
-        authorize! :update, @order, params[:order_token]
-        respond_with(@order, :default_template => 'spree/api/orders/show', :status => 200)
-        rescue StateMachine::InvalidTransition
-          respond_with(@order, :default_template => 'spree/api/orders/could_not_transition', :status => 422)
-      end
-
       private
 
         def object_params
@@ -88,9 +82,8 @@ module Spree
           false
         end
 
-        def load_order
-          @order = Spree::Order.find_by_number!(params[:id])
-          authorize! :read, @order, params[:order_token]
+        def load_order(lock = false)
+          @order = Spree::Order.lock(lock).find_by_number!(params[:id])
           raise_insufficient_quantity and return if @order.insufficient_stock_lines.present?
           @order.state = params[:state] if params[:state]
           state_callback(:before)

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

@@ -3,7 +3,7 @@ module Spree
     class OrdersController < Spree::Api::BaseController
       respond_to :json
 
-      before_filter :authorize_read!, :except => [:index, :search, :create]
+      before_filter :find_and_authorize!, :except => [:index, :search, :create]
 
       def index
         # should probably look at turning this into a CanCan step
@@ -19,33 +19,32 @@ module Spree
       def create
         nested_params[:line_items_attributes] = sanitize_line_items(nested_params[:line_items_attributes])
         @order = Order.build_from_api(current_api_user, nested_params)
-        respond_with(order, :default_template => :show, :status => 201)
+        respond_with(@order, :default_template => :show, :status => 201)
       end
 
       def update
-        authorize! :update, Order
         # Parsing line items through as an update_attributes call in the API will result in
         # many line items for the same variant_id being created. We must be smarter about this,
         # hence the use of the update_line_items method, defined within order_decorator.rb.
         line_items_params = sanitize_line_items(nested_params.delete("line_items_attributes"))
-        if order.update_attributes(nested_params)
-          order.update_line_items(line_items_params)
-          order.line_items.reload
-          order.update!
-          respond_with(order, :default_template => :show)
+        if @order.update_attributes(nested_params)
+          @order.update_line_items(line_items_params)
+          @order.line_items.reload
+          @order.update!
+          respond_with(@order, :default_template => :show)
         else
-          invalid_resource!(order)
+          invalid_resource!(@order)
         end
       end
 
       def cancel
-        order.cancel!
+        @order.cancel!
         render :show
       end
 
       def empty
-        order.empty!
-        order.update!
+        @order.empty!
+        @order.update!
         render :text => nil, :status => 200
       end
 
@@ -70,8 +69,9 @@ module Spree
         line_item_attributes = Hash[line_item_attributes].delete_if { |k,v| v.empty? }
       end
 
-      def order
-        @order ||= Order.find_by_number!(params[:id])
+      def find_order(lock = false)
+        @order = Spree::Order.lock(lock).find_by_number!(params[:id])
+        authorize! :update, @order, params[:order_token]
       end
 
       def next!(options={})
@@ -82,8 +82,9 @@ module Spree
         end
       end
 
-      def authorize_read!
-        authorize! :read, order
+      def find_and_authorize!
+        find_order(true)
+        authorize! :read, @order
       end
     end
   end

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

@@ -60,8 +60,32 @@ module Spree
 
       def update
         authorize! :update, Product
+
+        variants_attributes = params[:product].delete(:variants_attributes) || []
+        option_type_attributes = params[:product].delete(:option_types) || []
+        set_up_shipping_category
+
         @product = find_product(params[:id])
         if @product.update_attributes(params[:product])
+          variants_attributes.each do |variant_attribute|
+            # update the variant if the id is present in the payload
+            if variant_attribute['id'].present?
+              @product.variants.find(variant_attribute['id'].to_i).update_attributes(variant_attribute)
+            else
+              variant = @product.variants.new
+              variant.update_attributes(variant_attribute)
+            end
+          end
+
+          option_type_attributes.each do |name|
+            option_type = OptionType.where(name: name).first_or_initialize do |option_type|
+              option_type.presentation = name
+              option_type.save!
+            end
+
+            @product.option_types << option_type unless @product.option_types.include?(option_type)
+          end
+
           respond_with(@product, :status => 200, :default_template => :show)
         else
           invalid_resource!(@product)

data/app/models/spree/order_decorator.rb

@@ -67,7 +67,7 @@ Spree::Order.class_eval do
         shipment.shipping_rates.create!(:shipping_method => shipping_method,
                                         :cost => s[:cost])
       rescue Exception => e
-        raise "#{e.message} #{s}"
+        raise "Order import shipments: #{e.message} #{s}"
       end
     end
   end
@@ -81,7 +81,7 @@ Spree::Order.class_eval do
         payment.payment_method = Spree::PaymentMethod.find_by_name!(p[:payment_method])
         payment.save!
       rescue Exception => e
-        raise "#{e.message} #{p}"
+        raise "Order import payments: #{e.message} #{p}"
       end
     end
   end
@@ -96,7 +96,7 @@ Spree::Order.class_eval do
         line_item = self.contents.add(Spree::Variant.find(line_item[:variant_id]), line_item[:quantity])
         line_item.update_attributes(extra_params, as: :api) unless extra_params.empty?
       rescue Exception => e
-        raise "#{e.message} #{line_item}"
+        raise "Order import line items: #{e.message} #{line_item}"
       end
     end
   end
@@ -109,7 +109,7 @@ Spree::Order.class_eval do
         adjustment.save!
         adjustment.finalize!
       rescue Exception => e
-        raise "#{e.message} #{a}"
+        raise "Order import adjustments: #{e.message} #{a}"
       end
     end
   end
@@ -121,7 +121,7 @@ Spree::Order.class_eval do
         hash.delete(:sku)
       end
     rescue Exception => e
-      raise "#{e.message} #{hash}"
+      raise "Ensure order import variant: #{e.message} #{hash}"
     end
   end
 
@@ -144,7 +144,7 @@ Spree::Order.class_eval do
       address[:country_id] = Spree::Country.where(search).first!.id
 
     rescue Exception => e
-      raise "#{e.message} #{search}"
+      raise "Ensure order import address country: #{e.message} #{search}"
     end
   end
 
@@ -168,7 +168,7 @@ Spree::Order.class_eval do
         address[:state_name] = search[:name] || search[:abbr]
       end
     rescue Exception => e
-      raise "#{e.message} #{search}"
+      raise "Ensure order import address state: #{e.message} #{search}"
     end
   end
 

data/app/views/spree/api/images/show.v1.rabl

@@ -2,3 +2,6 @@ object @image
 attributes *image_attributes
 attributes :viewable_type, :viewable_id
 node(:attachment_url) { |i| i.attachment.to_s }
+Spree::Image.attachment_definitions[:attachment][:styles].each do |k,v|
+  node("#{k}_url") { |i| i.attachment.url(k) }
+end

data/app/views/spree/api/products/index.v1.rabl

@@ -4,6 +4,6 @@ node(:total_count) { @products.total_count }
 node(:current_page) { params[:page] ? params[:page].to_i : 1 }
 node(:pages) { @products.num_pages }
 node(:per_page) { params[:per_page] || Kaminari.config.default_per_page }
-child(@products) do
+child(@products => :products) do
   extends "spree/api/products/show"
 end

data/app/views/spree/api/variants/index.v1.rabl

@@ -14,7 +14,7 @@ child(@variants => :variants) do
     end
   end
 
-  child(:stock_items) do
+  child(:stock_items => :stock_items) do
     attributes :id, :count_on_hand, :stock_location_id, :backorderable
     attribute :available? => :available
 

data/config/routes.rb

@@ -22,7 +22,7 @@ Spree::Core::Engine.routes.draw do
       end
     end
 
-    resources :variants, :only => [:index]
+    resources :variants, :only => [:index, :show]
 
     resources :option_types do
       resources :option_values

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

@@ -296,10 +296,13 @@ module Spree
       end
 
       it "responds with orders updated_at with miliseconds precision" do
+        if ActiveRecord::Base.connection.adapter_name == "Mysql2"
+          pending "MySQL does not support millisecond timestamps."
+        end
+
         api_get :index
         milisecond = order.updated_at.strftime("%L")
         updated_at = json_response["orders"].first["updated_at"]
-
         expect(updated_at.split("T").last).to have_content(milisecond)
       end
 

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

@@ -13,6 +13,16 @@ module Spree
         :price => 19.99,
         :shipping_category_id => create(:shipping_category).id }
     end
+    let(:attributes_for_variant) do
+      h = attributes_for(:variant).except(:is_master, :product)
+      h.delete(:option_values)
+      h.merge({
+        options: [
+          { name: "size", value: "small" },
+          { name: "color", value: "black" }
+        ]
+      })
+    end
 
     before do
       stub_authentication!
@@ -82,6 +92,13 @@ module Spree
           response.body.should =~ /^callback\(.*\)$/
           response.header['Content-Type'].should include('application/javascript')
         end
+
+        # Regression test for #4332
+        it "does not escape quotes" do
+          api_get :index, {:callback => 'callback'}
+          response.body.should =~ /^callback\({"count":1,"total_count":1/
+          response.header['Content-Type'].should include('application/javascript')
+        end
       end
 
       it "can search for products" do
@@ -192,97 +209,6 @@ module Spree
 
       describe "creating products with" do
         it "embedded variants" do
-          def attributes_for_variant
-            h = attributes_for(:variant).except(:is_master, :product)
-            h.delete(:option_values)
-            h.merge({
-              options: [
-                { name: "size", value: "small" },
-                { name: "color", value: "black" }
-              ]
-            })
-          end
-
-          attributes = product_hash
-
-          attributes.merge!({
-            shipping_category_id: 1,
-
-            option_types: ['size', 'color'],
-
-            variants_attributes: [
-              attributes_for_variant,
-              attributes_for_variant
-            ]
-          })
-
-          api_post :create, :product => attributes
-
-          expect(json_response['variants'].count).to eq(3) # 1 master + 2 variants
-          expect(json_response['variants'][1]['option_values'][0]['name']).to eq('small')
-          expect(json_response['variants'][1]['option_values'][0]['option_type_name']).to eq('size')
-
-          expect(json_response['option_types'].count).to eq(2) # size, color
-        end
-
-        it "embedded product_properties" do
-          attributes = product_hash
-
-          attributes.merge!({
-            shipping_category_id: 1,
-
-            product_properties_attributes: [{
-              property_name: "fabric",
-              value: "cotton"
-            }]
-          })
-
-          api_post :create, :product => attributes
-
-          expect(json_response['product_properties'][0]['property_name']).to eq('fabric')
-          expect(json_response['product_properties'][0]['value']).to eq('cotton')
-        end
-
-        it "option_types even if without variants" do
-          attributes = product_hash
-
-          attributes.merge!({
-            shipping_category_id: 1,
-
-            option_types: ['size', 'color']
-          })
-
-          api_post :create, :product => attributes
-
-          expect(json_response['option_types'].count).to eq(2)
-        end
-
-        it "creates with shipping categories" do
-          hash = { :name => "The Other Product",
-                   :price => 19.99,
-                   :shipping_category => "Free Ships" }
-
-          api_post :create, :product => hash
-          expect(response.status).to eq 201
-
-          shipping_id = ShippingCategory.find_by_name("Free Ships").id
-          expect(json_response['shipping_category_id']).to eq shipping_id
-        end
-      end
-
-      describe "creating products with" do
-        it "embedded variants" do
-          def attributes_for_variant
-            h = attributes_for(:variant).except(:is_master, :product)
-            h.delete(:option_values)
-            h.merge({
-              options: [
-                { name: "size", value: "small" },
-                { name: "color", value: "black" }
-              ]
-            })
-          end
-
           product_hash.merge!({
             variants_attributes: [
               attributes_for_variant,
@@ -292,7 +218,6 @@ module Spree
 
           api_post :create, :product => product_hash
           expect(response.status).to eq 201
-          expect(json_response['variants'].count).to eq(3) # 1 master + 2 variants
 
           variants = json_response['variants'].select { |v| !v['is_master'] }
           expect(variants.first['option_values'][0]['name']).to eq('small')
@@ -376,6 +301,13 @@ module Spree
         response.status.should == 200
       end
 
+      it "updates shipping category properly if provided" do
+        api_put :update, :id => product.to_param, :product => { :shipping_category => "New Ships" }
+        expect(response.status).to eq 200
+        shipping_id = ShippingCategory.find_by_name("New Ships").id
+        expect(json_response['shipping_category_id']).to eq shipping_id
+      end
+
       it "cannot update a product with an invalid attribute" do
         api_put :update, :id => product.to_param, :product => { :name => "" }
         response.status.should == 422
@@ -389,6 +321,41 @@ module Spree
         response.status.should == 204
         product.reload.deleted_at.should_not be_nil
       end
+
+      describe "updating products with" do
+        it "embedded option types" do
+          api_put :update, :id => product.to_param, :product => { :option_types => ['shape', 'color'] }
+          json_response['option_types'].count.should eq(2)
+        end
+
+        it "new variants" do
+          api_put :update, :id => product.to_param, :product => { :variants_attributes => [attributes_for_variant, attributes_for_variant] }
+          response.status.should == 200
+          json_response['variants'].count.should == 3 # 1 master + 2 variants
+
+          variants = json_response['variants'].select { |v| !v['is_master'] }
+          variants.last['option_values'][0]['name'].should == 'small'
+          variants.last['option_values'][0]['option_type_name'].should == 'size'
+
+          json_response['option_types'].count.should == 2 # size, color
+        end
+
+        it "updating an existing variant" do
+          variant_hash = {
+            :sku => '123', :price => 19.99, :options => [{:name => "size", :value => "small"}]
+          }
+          variant = product.variants.new
+          variant.update_attributes(variant_hash)
+
+          api_put :update, :id => product.to_param, :product => { :variants_attributes => [variant_hash.merge(:id => variant.id.to_s, :sku => '456', :options => [{:name => "size", :value => "large" }])] }
+
+          json_response['variants'].count.should == 2 # 1 master + 2 variants
+          variants = json_response['variants'].select { |v| !v['is_master'] }
+          variants.last['option_values'][0]['name'].should == 'large'
+          variants.last['sku'].should == '456'
+          variants.count.should == 1
+        end
+      end
     end
   end
 end

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

@@ -133,7 +133,7 @@ module Spree
       end
 
       it "can mark a return authorization as received on the order with an inventory unit" do
-        FactoryGirl.create(:new_return_authorization, :order => order)
+        FactoryGirl.create(:new_return_authorization, :order => order, :stock_location_id => order.shipments.first.stock_location.id)
         return_authorization = order.return_authorizations.first
         return_authorization.state.should == "authorized"
 

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

@@ -87,27 +87,42 @@ module Spree
       end
     end
 
-    it "can see a single variant" do
-      api_get :show, :id => variant.to_param
-      json_response.should have_attributes(attributes)
-      option_values = json_response["option_values"]
-      option_values.first.should have_attributes([:name,
-                                                 :presentation,
-                                                 :option_type_name,
-                                                 :option_type_id])
-    end
+    context "single variant" do
 
-    it "can see a single variant with images" do
-      variant.images.create!(:attachment => image("thinking-cat.jpg"))
+      it "can see a single variant" do
+        api_get :show, :id => variant.to_param
+        json_response.should have_attributes(attributes)
+        option_values = json_response["option_values"]
+        option_values.first.should have_attributes([:name,
+                                                    :presentation,
+                                                    :option_type_name,
+                                                    :option_type_id])
+      end
 
-      api_get :show, :id => variant.to_param
+      it "can see a single variant with images" do
+        variant.images.create!(:attachment => image("thinking-cat.jpg"))
+
+        api_get :show, :id => variant.to_param
+
+        json_response.should have_attributes(attributes + [:images])
+        option_values = json_response["option_values"]
+        option_values.first.should have_attributes([:name,
+                                                    :presentation,
+                                                    :option_type_name,
+                                                    :option_type_id])
+      end
+
+      it 'shows variant image urls' do
+        variant.images.create!(:attachment => image("thinking-cat.jpg"))
+
+        api_get :show, :id => variant.to_param
+
+        images = json_response["images"]
+        image = images.first
+
+        expect(image).to have_attributes [:mini_url, :small_url, :product_url, :large_url]
+      end
 
-      json_response.should have_attributes(attributes + [:images])
-      option_values = json_response["option_values"]
-      option_values.first.should have_attributes([:name,
-                                                 :presentation,
-                                                 :option_type_name,
-                                                 :option_type_id])
     end
 
     it "can learn how to create a new variant" do

data/spree_api.gemspec

@@ -16,6 +16,6 @@ Gem::Specification.new do |gem|
   gem.version       = version
 
   gem.add_dependency 'spree_core', version
-  gem.add_dependency 'rabl', '0.8.4'
-  gem.add_dependency 'versioncake', '1.0.0'
+  gem.add_dependency 'rabl', '0.9.3'
+  gem.add_dependency 'versioncake', '~> 1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.0.9
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: versioncake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
 description: Spree's API
 email:
 - ryan@spreecommerce.com