spree_api 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b88f0bb66f6241fa750c60df09e559515380ff9
-  data.tar.gz: c8c8111f3b16f720c3219105faf7d5a912dc5c45
+  metadata.gz: 40032b519232965869e9496c081b35073f3befff
+  data.tar.gz: 27e40bed61616ece0b4b48f569296a878d855549
 SHA512:
-  metadata.gz: 1c330a76aaf9c02fdfc52aa1c5da7cec9e1d20bd4eb607ae622dd7b9c3898a389b9f6955c8b0d0f52fda7ae02c3e052e100863fcd5535a80d98897b2cd9753e9
-  data.tar.gz: 9676ad30355100421c95579e8089ef471f0bd267327887ab9582f081ea5731ca0c7034cb68d37139528e5325bb03419b02f3eb8fbf1b14153de34935a4cd72ff
+  metadata.gz: 328477374d05ceee8eaa930ffe6cce7cf379c61cf7398a1655c3e2c82d8647a40984862e7f436ad3456742cdbca0f43cd5f02b9dadb52a197e602b9f1d30748f
+  data.tar.gz: e82687169737c1f7c6de712fc5bd9076bc894caa961d474972021b1748e5d07e9dcfb5c2d476abbfed69f9ec73a082dd9fd7c93194e92d57b0f1ada388ed2a73

data/CHANGELOG.md

@@ -1,117 +1,18 @@
-## Spree 2.1.2 ##
+## Spree 2.1.3 ##
 
-* States and countries endpoints now do not require authentication, even if it is forced with the `requires_authentication` setting. This is so the frontend's checkout address page can still work.
+*   ApiHelpers attributes can now be extended without overriding instance
+    methods. By using the same approach in PermittedAttributes. e.g.
 
-    *Ryan Bigg*
+        Spree::Api::ApiHelpers.order_attributes.push :locked_at
+    
+    Washington Luiz
 
-* You can now assign a location to a shipment when creating it through the orders API. f3ef2e1d46bc972442acbbcaae928e6ef2dc0eb5
+*   Admin users can set the order channel when importing orders. By sing the
+    channel attribute on Order model
 
-    *Washington Luiz*
+    Washington Luiz
 
-* Stock Items, Stock Movements and Stock Locations are now invisible to non-admin users.
+*   An order's shipments are now destroyed (to be recreated) when an order is assigned a new line item through the API. #3914
 
-    *Ryan Bigg*
+    Washington Luiz
 
-* Fixed issue where X-Spree-Token header was being ignored. #3798
-
-    *Washington Luiz*
-
-## Spree 2.1.0 ##
-
-* The Products API endpoint now returns an additional key called `shipping_category_id`, and also requires `shipping_category_id` on create.
-
-    *Jeff Dutil*
-
-* The Products API endpoint now returns an additional key called `display_price`, which is the proper rendering of the price of a product.
-
-    *Ryan Bigg*
-
-* The Images API's `attachment_url` key has been removed in favour of keys that reflect the current image styles available in the application, such as `mini_url` and `product_url`. Use these now to references images.
-
-    *Ryan Bigg*
-
-* Fix issue where calling OrdersController#update with line item parameters would *always* create new line items, rather than updating existing ones.
-
-    *Ryan Bigg*
-
-* The Orders API endpoint now returns an additional key called `display_item_total`, which is the proper rendering of the total line item price of an order.
-
-    *Ryan Bigg*
-
-* Include a `per_page` key in Products API end response so that libraries like jQuery.simplePagination can use this to display a pagination element on the page.
-
-    *Ryan Bigg*
-
-* Line item responses now contain `single_display_amount` and `display_amount` for "pretty" versions of the single and total amount for a line item, as well as a `total` node which is an "ugly" version of the total amount of a line item.
-
-    *Ryan Bigg*
-
-* /api/orders endpoints now accept a `?order_token` parameter which should be the order's token. This can be used to authorize actions on an order without having to pass in an API key.
-
-    *Ryan Bigg*
-
-* Requests to POST /api/line_items will now update existing line items. For example if you have a line item with a variant ID=2 and quantity=10 and you attempt to create a new line item for the same variant with a quantity of 5, the existing line item's quantity will be updated to 15. Previously, a new line item would erroneously be created.
-
-    *Ryan Bigg*
-
-* /api/countries now will a 304 response if no country has been changed since the last request.
-
-    *Ryan Bigg*
-
-* The Shipments API no longer returns inventory units. Instead, it will return manifest objects. This is necessary due to the split shipments changes brought in by Spree 2.
-
-    *Ryan Bigg*
-
-* Checkouts API's update action will now correctly process line item attributes (either `line_items` or `line_item_attributes`)
-
-    *Ryan Bigg*
-
-* The structure of shipments data in the API has changed. Shipments can now have many shipping methods, shipping rates (which in turn have many zones and shipping categories), as well as a new key called "manifest" which returns the list of items contained within just this shipment for the order.
-
-    *Ryan Bigg*
-
-* Address responses now contain a `full_name` attribute.
-
-    *Ryan Bigg*
-
-* Shipments responses now contain a `selected_shipping_rate` key, so that you don't have to sort through the list of `shipping_rates` to get the selected one.
-
-    *Ryan Bigg*
-
-* Checkouts API now correctly processes incoming payment data during the payment step.
-
-    *Ryan Bigg*
-
-* Fix issue where `set_current_order` before filter would be called when CheckoutsController actions were run, causing the order object to be deleted. #3306
-
-    *Ryan Bigg*
-
-* An order can no longer transition past the "cart" state without first having a line item. #3312
-
-    *Ryan Bigg*
-
-* Attributes other than "quantity" and "variant_id" will be added to a line item when creating along with an order. #3404
-
-    *Alex Marles & Ryan Bigg*
-
-* Requests to POST /api/line_items will now update existing line items. For example if you have a line item with a variant ID=2 and quantity=10 and you attempt to create a new line item for the same variant with a quantity of 5, the existing line item's quantity will be updated to 15. Previously, a new line item would erroneously be created.
-
-    * Ryan Bigg
-
-* Checkouts API's update action will now correctly process line item attributes (either `line_items` or `line_item_attributes`)
-
-    * Ryan Bigg
-
-* Taxon attributes from `/api/taxons` are now returned within `taxons` subkey. Before:
-
-```json
-[{ name: 'Ruby' ... }]
-```
-
-Now:
-
-```json
-{ taxons: [{ name: 'Ruby' }]}
-```
-
-    * Ryan Bigg

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

@@ -48,7 +48,7 @@ module Spree
       # users should be able to set price when importing orders via api
       def permitted_line_item_attributes
         if current_api_user.has_spree_role?("admin")
-          super << [:price]
+          super << [:price, :variant_id, :sku]
         else
           super
         end

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

@@ -37,7 +37,7 @@ module Spree
         authorize! :update, @order, params[:order_token]
         order_params = object_params
         line_items = order_params.delete('line_items_attributes')
-        if @order.update_attributes(object_params)
+        if @order.update_attributes(order_params)
           @order.update_line_items(line_items)
           if current_api_user.has_spree_role?('admin') && user_id.present?
             @order.associate_user!(Spree.user_class.find(user_id))
@@ -67,12 +67,7 @@ module Spree
               object_params[:payments_attributes].first[:amount] = @order.total.to_s
             end
           end
-
-          if params[:order]
-            params.require(:order).permit(permitted_checkout_attributes)
-          else
-            {}
-          end
+          object_params
         end
 
         def user_id

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

@@ -6,6 +6,7 @@ module Spree
         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
           respond_with(@line_item, status: 201, default_template: :show)
         else
           invalid_resource!(@line_item)
@@ -15,6 +16,7 @@ module Spree
       def update
         @line_item = order.line_items.find(params[:id])
         if @line_item.update_attributes(line_item_params)
+          @order.ensure_updated_shipments
           respond_with(@line_item, default_template: :show)
         else
           invalid_resource!(@line_item)

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

@@ -50,11 +50,9 @@ module Spree
         # hence the use of the update_line_items method, defined within order_decorator.rb.
         order_params.delete("line_items_attributes")
         if @order.update_attributes(order_params)
-          line_item_attributes = params[:order][:line_items].map do |id, attributes|
-            [id, attributes.slice(*permitted_line_item_attributes)]
-          end
-          line_item_attributes = Hash[line_item_attributes].delete_if { |k,v| v.empty? }
-          @order.update_line_items(line_item_attributes)
+
+          deal_with_line_items if params[:order][:line_items]
+
           @order.line_items.reload
           @order.update!
           respond_with(@order, default_template: :show)
@@ -64,12 +62,22 @@ module Spree
       end
 
       private
+        def deal_with_line_items
+          line_item_attributes = params[:order][:line_items].map do |id, attributes|
+            [id, attributes.slice(*permitted_line_item_attributes)]
+          end
+          line_item_attributes = Hash[line_item_attributes].delete_if { |k,v| v.empty? }
+          @order.update_line_items(line_item_attributes)
+        end
 
         def order_params
           if params[:order]
-            params[:order][:line_items_attributes] = params[:order][:line_items]
+            params[:order][:payments_attributes] = params[:order][:payments] if params[:order][:payments]
+            params[:order][:shipments_attributes] = params[:order][:shipments] if params[:order][:shipments]
+            params[:order][:line_items_attributes] = params[:order][:line_items] if params[:order][:line_items]
             params[:order][:ship_address_attributes] = params[:order][:ship_address] if params[:order][:ship_address]
             params[:order][:bill_address_attributes] = params[:order][:bill_address] if params[:order][:bill_address]
+
             params.require(:order).permit(permitted_order_attributes)
           else
             {}
@@ -77,7 +85,27 @@ module Spree
         end
 
         def permitted_order_attributes
-          super << [:import]
+          if current_api_user.has_spree_role? "admin"
+            super << admin_order_attributes
+          else
+            super
+          end
+        end
+
+        def permitted_shipment_attributes
+          if current_api_user.has_spree_role? "admin"
+            super << admin_shipment_attributes
+          else
+            super
+          end
+        end
+
+        def admin_shipment_attributes
+          [:shipping_method, :stock_location, :inventory_units => [:variant_id, :sku]]
+        end
+
+        def admin_order_attributes
+          [:import, :number, :completed_at, :locked_at, :channel]
         end
 
         def next!(options={})

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

@@ -4,7 +4,7 @@ module Spree
 
       def index
         if params[:ids]
-          @products = product_scope.where(:id => params[:ids])
+          @products = product_scope.where(:id => params[:ids].split(","))
         else
           @products = product_scope.ransack(params[:q]).result
         end
@@ -35,7 +35,7 @@ module Spree
           @product.permalink = nil
           retry
         end
-      end 
+      end
 
       def update
         @product = find_product(params[:id])

data/app/helpers/spree/api/api_helpers.rb

@@ -1,6 +1,40 @@
 module Spree
   module Api
     module ApiHelpers
+      ATTRIBUTES = [
+        :product_attributes,
+        :product_property_attributes,
+        :variant_attributes,
+        :image_attributes,
+        :option_value_attributes,
+        :order_attributes,
+        :line_item_attributes,
+        :option_type_attributes,
+        :payment_attributes,
+        :payment_method_attributes,
+        :shipment_attributes,
+        :taxonomy_attributes,
+        :taxon_attributes,
+        :inventory_unit_attributes,
+        :return_authorization_attributes,
+        :address_attributes,
+        :country_attributes,
+        :state_attributes,
+        :adjustment_attributes,
+        :taxon_attributes,
+        :inventory_unit_attributes,
+        :return_authorization_attributes,
+        :adjustment_attributes,
+        :creditcard_attributes,
+        :user_attributes,
+        :property_attributes,
+        :stock_location_attributes,
+        :stock_movement_attributes,
+        :stock_item_attributes
+      ]
+
+      mattr_reader *ATTRIBUTES
+
       def required_fields_for(model)
         required_fields = model._validators.select do |field, validations|
           validations.any? { |v| v.is_a?(ActiveModel::Validations::PresenceValidator) }
@@ -11,105 +45,104 @@ module Spree
         required_fields
       end
 
-      def product_attributes
-        [:id, :name, :description, :price, :display_price, :available_on, :permalink, :meta_description, :meta_keywords, :shipping_category_id, :taxon_ids]
-      end
+      @@product_attributes = [
+        :id, :name, :description, :price, :display_price, :available_on,
+        :permalink, :meta_description, :meta_keywords, :shipping_category_id,
+        :taxon_ids
+      ]
 
-      def product_property_attributes
-        [:id, :product_id, :property_id, :value, :property_name]
-      end
+      @@product_property_attributes = [
+        :id, :product_id, :property_id, :value, :property_name
+      ]
 
-      def variant_attributes
-        [:id, :name, :sku, :price, :weight, :height, :width, :depth, :is_master, :cost_price, :permalink, :description]
-      end
+      @@variant_attributes = [
+        :id, :name, :sku, :price, :weight, :height, :width, :depth, :is_master,
+        :cost_price, :permalink, :description
+      ]
 
-      def image_attributes
-        [:id, :position, :attachment_content_type, :attachment_file_name, :type, :attachment_updated_at, :attachment_width, :attachment_height, :alt]
-      end
+      @@image_attributes = [
+        :id, :position, :attachment_content_type, :attachment_file_name, :type,
+        :attachment_updated_at, :attachment_width, :attachment_height, :alt
+      ]
 
-      def option_value_attributes
-        [:id, :name, :presentation, :option_type_name, :option_type_id, :option_type_presentation]
-      end
+      @@option_value_attributes = [
+        :id, :name, :presentation, :option_type_name, :option_type_id,
+        :option_type_presentation
+      ]
 
-      def order_attributes
-        [:id, :number, :item_total, :total, :state, :adjustment_total, :user_id, :created_at, :updated_at, :completed_at, :payment_total, :shipment_state, :payment_state, :email, :special_instructions]
-      end
+      @@order_attributes = [
+        :id, :number, :item_total, :total, :ship_total, :state, :adjustment_total,
+        :user_id, :created_at, :updated_at, :completed_at, :payment_total,
+        :shipment_state, :payment_state, :email, :special_instructions, :channel
+      ]
 
-      def line_item_attributes
-        [:id, :quantity, :price, :variant_id]
-      end
+      @@line_item_attributes = [:id, :quantity, :price, :variant_id]
 
-      def option_type_attributes
-        [:id, :name, :presentation, :position]
-      end
+      @@option_type_attributes = [:id, :name, :presentation, :position]
 
-      def payment_attributes
-        [:id, :source_type, :source_id, :amount, :display_amount, :payment_method_id, :response_code, :state, :avs_response, :created_at, :updated_at]
-      end
+      @@payment_attributes = [
+        :id, :source_type, :source_id, :amount, :display_amount,
+        :payment_method_id, :response_code, :state, :avs_response, :created_at,
+        :updated_at
+      ]
 
-      def payment_method_attributes
-        [:id, :name, :description]
-      end
+      @@payment_method_attributes = [:id, :name, :description]
 
-      def shipment_attributes
-        [:id, :tracking, :number, :cost, :shipped_at, :state]
-      end
+      @@shipment_attributes = [:id, :tracking, :number, :cost, :shipped_at, :state]
 
-      def taxonomy_attributes
-        [:id, :name]
-      end
+      @@taxonomy_attributes = [:id, :name]
 
-      def taxon_attributes
-        [:id, :name, :pretty_name, :permalink, :position, :parent_id, :taxonomy_id]
-      end
+      @@taxon_attributes = [
+        :id, :name, :pretty_name, :permalink, :position, :parent_id,
+        :taxonomy_id
+      ]
 
-      def inventory_unit_attributes
-        [:id, :lock_version, :state, :variant_id, :shipment_id, :return_authorization_id]
-      end
+      @@inventory_unit_attributes = [
+        :id, :lock_version, :state, :variant_id, :shipment_id,
+        :return_authorization_id
+      ]
 
-      def return_authorization_attributes
-        [:id, :number, :state, :amount, :order_id, :reason, :created_at, :updated_at]
-      end
+      @@return_authorization_attributes = [
+        :id, :number, :state, :amount, :order_id, :reason, :created_at,
+        :updated_at
+      ]
 
-      def address_attributes
-        [:id, :firstname, :lastname, :full_name, :address1, :address2, :city, :zipcode, :phone, :company, :alternative_phone, :country_id, :state_id, :state_name]
-      end
+      @@address_attributes = [
+        :id, :firstname, :lastname, :full_name, :address1, :address2, :city,
+        :zipcode, :phone, :company, :alternative_phone, :country_id, :state_id,
+        :state_name
+      ]
 
-      def country_attributes
-        [:id, :iso_name, :iso, :iso3, :name, :numcode]
-      end
+      @@country_attributes = [:id, :iso_name, :iso, :iso3, :name, :numcode]
 
-      def state_attributes
-        [:id, :name, :abbr, :country_id]
-      end
+      @@state_attributes = [:id, :name, :abbr, :country_id]
 
-      def adjustment_attributes
-        [:id, :source_type, :source_id, :adjustable_type, :adjustable_id, :originator_type, :originator_id, :amount, :label, :mandatory, :locked, :eligible,  :created_at, :updated_at]
-      end
+      @@adjustment_attributes = [
+        :id, :source_type, :source_id, :adjustable_type, :adjustable_id,
+        :originator_type, :originator_id, :amount, :label, :mandatory,
+        :locked, :eligible,  :created_at, :updated_at
+      ]
 
-      def creditcard_attributes
-        [:id, :month, :year, :cc_type, :last_digits, :first_name, :last_name, :gateway_customer_profile_id, :gateway_payment_profile_id]
-      end
+      @@creditcard_attributes = [
+        :id, :month, :year, :cc_type, :last_digits, :first_name, :last_name,
+        :gateway_customer_profile_id, :gateway_payment_profile_id
+      ]
 
-      def user_attributes
-        [:id, :email, :created_at, :updated_at]
-      end
+      @@user_attributes = [:id, :email, :created_at, :updated_at]
 
-      def property_attributes
-        [:id, :name, :presentation]
-      end
+      @@property_attributes = [:id, :name, :presentation]
 
-      def stock_location_attributes
-        [:id, :name, :address1, :address2, :city, :state_id, :state_name, :country_id, :zipcode, :phone, :active]
-      end
+      @@stock_location_attributes = [
+        :id, :name, :address1, :address2, :city, :state_id, :state_name,
+        :country_id, :zipcode, :phone, :active
+      ]
 
-      def stock_movement_attributes
-        [:id, :quantity, :stock_item_id]
-      end
+      @@stock_movement_attributes = [:id, :quantity, :stock_item_id]
 
-      def stock_item_attributes
-        [:id, :count_on_hand, :backorderable, :lock_version, :stock_location_id, :variant_id]
-      end
+      @@stock_item_attributes = [
+        :id, :count_on_hand, :backorderable, :lock_version, :stock_location_id,
+        :variant_id
+      ]
     end
   end
 end

data/app/models/spree/order_decorator.rb

@@ -60,7 +60,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
@@ -74,7 +74,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
@@ -85,11 +85,11 @@ Spree::Order.class_eval do
         line_item = line_items_hash[k]
         self.class.ensure_variant_id_from_api(line_item)
 
-        extra_params = line_item.except(:variant_id, :quantity)
+        extra_params = line_item.except(:variant_id, :quantity, :sku)
         line_item = self.contents.add(Spree::Variant.find(line_item[:variant_id]), line_item[:quantity])
         line_item.update_attributes(extra_params) unless extra_params.empty?
       rescue Exception => e
-        raise "#{e.message} #{line_item}"
+        raise "Order import line items: #{e.message} #{line_item}"
       end
     end
   end
@@ -102,7 +102,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
@@ -114,7 +114,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
 
@@ -137,7 +137,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
 
@@ -153,9 +153,15 @@ Spree::Order.class_eval do
       end
 
       address.delete(:state)
-      address[:state_id] = Spree::State.where(search).first!.id
+      search[:country_id] = address[:country_id]
+
+      if state = Spree::State.where(search).first
+        address[:state_id] = state.id
+      else
+        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/db/migrate/20131017162334_add_index_to_user_spree_api_key.rb

@@ -0,0 +1,7 @@
+class AddIndexToUserSpreeApiKey < ActiveRecord::Migration
+  def change
+    unless defined?(User)
+      add_index :spree_users, :spree_api_key
+    end
+  end
+end

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

@@ -38,7 +38,14 @@ module Spree
     end
 
     context "PUT 'update'" do
-      let(:order) { create(:order_with_line_items) }
+      let(:order) do 
+        order = create(:order_with_line_items)
+        # Order should be in a pristine state
+        # Without doing this, the order may transition from 'cart' straight to 'delivery'
+        order.shipments.delete_all
+        order
+      end
+
 
       before(:each) do
         Order.any_instance.stub(:confirmation_required? => true)

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

@@ -65,6 +65,25 @@ module Spree
         response.status.should == 204
         lambda { line_item.reload }.should raise_error(ActiveRecord::RecordNotFound)
       end
+
+      context "order contents changed after shipments were created" do
+        let!(:order) { Order.create }
+        let!(:line_item) { order.contents.add(product.master) }
+
+        before { order.create_proposed_shipments }
+
+        it "clear out shipments on create" do
+          expect(order.reload.shipments).not_to be_empty
+          api_post :create, :line_item => { :variant_id => product.master.to_param, :quantity => 1 }
+          expect(order.reload.shipments).to be_empty
+        end
+
+        it "clear out shipments on update" do
+          expect(order.reload.shipments).not_to be_empty
+          api_put :update, :id => line_item.id, :line_item => { :quantity => 1000 }
+          expect(order.reload.shipments).to be_empty
+        end
+      end
     end
 
     context "as just another user" do
@@ -87,6 +106,5 @@ module Spree
         lambda { line_item.reload }.should_not raise_error
       end
     end
-
   end
 end

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

@@ -145,7 +145,15 @@ module Spree
         }
       end
 
-      before { Zone.stub default_tax: tax_rate.zone }
+      before do
+        Zone.stub default_tax: tax_rate.zone
+        current_api_user.stub has_spree_role?: true
+      end
+
+      it "sets channel" do
+        api_post :create, :order => { channel: "amazon" }
+        expect(json_response['channel']).to eq "amazon"
+      end
 
       it "doesnt persist any automatic tax adjustment" do
         expect {
@@ -154,6 +162,15 @@ module Spree
 
         expect(response.status).to eq 201
       end
+
+      it "doesnt blow up when passing a sku into line items hash" do
+        order_params[:line_items]["0"][:sku] = variant.sku
+        order_params[:line_items]["0"][:variant_id] = nil
+        order_params[:line_items]["1"][:sku] = other_variant.sku
+
+        api_post :create, :order => order_params
+        expect(response.status).to eq 201
+      end
     end
 
     # Regression test for #3404
@@ -207,6 +224,16 @@ module Spree
         address
       end
 
+      context "line_items hash not present in request" do
+        it "responds successfully" do
+          api_put :update, :id => order.to_param, :order => {
+            :email => "hublock@spreecommerce.com"
+          }
+
+          expect(response).to be_success
+        end
+      end
+
       it "updates quantities of existing line items" do
         api_put :update, :id => order.to_param, :order => {
           :line_items => {
@@ -368,6 +395,14 @@ module Spree
         end
       end
 
+      it "responds with orders updated_at with miliseconds precision" do
+        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
+
       context "with two orders" do
         before { create(:order) }
 

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

@@ -32,6 +32,17 @@ module Spree
         json_response["per_page"].should == Kaminari.config.default_per_page
       end
 
+      it "retrieves a list of products by ids string" do
+        second_product = create(:product)
+        api_get :index, :ids => [product.id, second_product.id].join(",")
+        json_response["products"].first.should have_attributes(attributes)
+        json_response["products"][1].should have_attributes(attributes)
+        json_response["total_count"].should == 2
+        json_response["current_page"].should == 1
+        json_response["pages"].should == 1
+        json_response["per_page"].should == Kaminari.config.default_per_page
+      end
+
       it "does not return inactive products when queried by ids" do
         api_get :index, :ids => [inactive_product.id]
         json_response["count"].should == 0

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

@@ -7,7 +7,7 @@ module Spree
     let(:taxonomy) { create(:taxonomy) }
     let(:taxon) { create(:taxon, :name => "Ruby", :taxonomy => taxonomy) }
     let(:taxon2) { create(:taxon, :name => "Rails", :taxonomy => taxonomy) }
-    let(:attributes) { ["id", "name", "pretty_name", "permalink", "position", "parent_id", "taxonomy_id"] }
+    let(:attributes) { ["id", "name", "pretty_name", "permalink", "parent_id", "taxonomy_id"] }
 
     before do
       stub_authentication!
@@ -105,9 +105,10 @@ module Spree
         response.status.should == 201
 
         taxonomy.reload.root.children.count.should eq 2
+        taxon = Spree::Taxon.where(:name => 'Colors').first
 
-        Spree::Taxon.last.parent_id.should eq taxonomy.root.id
-        Spree::Taxon.last.taxonomy_id.should eq taxonomy.id
+        taxon.parent_id.should eq taxonomy.root.id
+        taxon.taxonomy_id.should eq taxonomy.id
       end
 
       it "cannot create a new taxon with invalid attributes" do

data/spec/models/spree/order_spec.rb

@@ -128,7 +128,7 @@ module Spree
 
     it 'can build an order from API with state attributes' do
       ship_address.delete(:state_id)
-      ship_address[:state] = { 'name' => 'Alabama' }
+      ship_address[:state] = { 'name' => state.name }
       params = { :ship_address_attributes => ship_address,
                  :line_items_attributes => line_items }
 
@@ -136,15 +136,33 @@ module Spree
       order.ship_address.state.name.should eq 'Alabama'
     end
 
-    it 'handles state lookup exceptions' do
+    context "state passed is not associated with country" do
+      let(:params) do
+        params = { :ship_address_attributes => ship_address,
+                   :line_items_attributes => line_items }
+      end
+
+      let(:other_state) { create(:state, name: "Uhuhuh", country: create(:country)) }
+
+      before do
+        ship_address.delete(:state_id)
+        ship_address[:state] = { 'name' => other_state.name }
+      end
+
+      it 'sets states name instead of state id' do
+        order = Order.build_from_api(user, params)
+        expect(order.ship_address.state_name).to eq other_state.name
+      end
+    end
+
+    it 'sets state name if state record not found' do
       ship_address.delete(:state_id)
       ship_address[:state] = { 'name' => 'XXX' }
       params = { :ship_address_attributes => ship_address,
                  :line_items_attributes => line_items }
 
-      expect {
-        order = Order.build_from_api(user, params)
-      }.to raise_error /XXX/
+      order = Order.build_from_api(user, params)
+      expect(order.ship_address.state_name).to eq 'XXX'
     end
 
     context 'variant not deleted' do
@@ -182,19 +200,12 @@ module Spree
 
     it 'ensures_state_id for state fields' do
       [:name, :abbr].each do |field|
-        address = { :state => { field => state.send(field) }}
+        address = { country_id: country.id, :state => { field => state.send(field) }}
         Order.ensure_state_id_from_api(address)
         address[:state_id].should eq state.id
       end
     end
 
-    it "raises with proper message when cant find state" do
-      address = { :state => { "name" => "NoNoState" } }
-      expect {
-        Order.ensure_state_id_from_api(address)
-      }.to raise_error /NoNoState/
-    end
-
     context "shippments" do
       let(:params) do
         { :shipments_attributes => [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-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.1.2
+        version: 2.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.1.3
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -185,6 +185,7 @@ files:
 - db/migrate/20100107141738_add_api_key_to_spree_users.rb
 - db/migrate/20120411123334_resize_api_key_field.rb
 - db/migrate/20120530054546_rename_api_key_to_spree_api_key.rb
+- db/migrate/20131017162334_add_index_to_user_spree_api_key.rb
 - lib/spree/api.rb
 - lib/spree/api/controller_setup.rb
 - lib/spree/api/engine.rb