spree_api 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cb2106c19046c8db51461b87b224d461e21fec1
-  data.tar.gz: e6acefe01a95c4b55e83b2ea0d651d7c205cf30f
+  metadata.gz: 31009b464b6105afeae033af555ebf099230ff51
+  data.tar.gz: 9a6294c2ddcfa6044efede92b4821544acfbf82e
 SHA512:
-  metadata.gz: f93f7762a47e706f13da9958f4d3993c9a69662cace7a8f68e3b47ee066e3df5a054309265d9a11bd59db7a5bb0c6df1cce8c3e5562617921317cc618b616578
-  data.tar.gz: 5da0e8c9a2b8960985e22049190a677d7415bbedf3e03d29b47a66a68c7707152df13a5336fa2433628d10337078f6a647893ec19c28f260defa7c10387710ef
+  metadata.gz: e8bccb730f13c6867b1e46a175b52edfb128445f0c81aaa25580eb4d08781d0b63102cd179854d22c5017dc8ef4536a3f869aac7614e5048ff801d2688e759a8
+  data.tar.gz: 9b2e19265e60d63e04a3ff1380955cebd8c751eed12ce4ab4e34afafa62de307b17e8de50eb3c34942afd4321bad45f4eb78666974c8d7bd6bea0d87c527c5d0

data/CHANGELOG.md

@@ -1,49 +1,17 @@
-## Spree 2.0.6 ##
+## Spree 2.0.7 (unreleased) ##
 
-* Normal users can no longer read stock item, stock location or stock movements API endpoints.
+*For all commits, please see [the GitHub compare view](https://github.com/spree/spree/compare/v2.0.6...v2.0.7).*
 
-  *Ryan Bigg*
-  
-## Spree 2.0.x ##
+*   Admin users can set the order channel when importing orders. By sing the
+    channel attribute on Order model
 
-* PUT requests to Checkouts API endpoints now require authorization to alter an order.
+    Washington Luiz
 
-    *Ryan Bigg*
+*   Added missing per_page node to products/index
 
-* The Products API endpoint now returns an additional key called `shipping_category_id`, and also requires `shipping_category_id` on create.
+    Ryan Bigg
 
-    *Jeff Dutil*
+*   `ship_total` is now returned on order results.
 
-* Checkouts API's update action will now correctly process line item attributes (either `line_items` or `line_item_attributes`)
-
-    * 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* 
-
-* Taxon attributes from `/api/taxons` are now returned within `taxons` subkey. Before:
-
-```json
-[{ name: 'Ruby' ... }]
-```
-
-Now:
-
-```json
-{ taxons: [{ name: 'Ruby' }]}
-```
-
-    * Ryan Bigg
+    Washington Luiz
+    

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

@@ -7,6 +7,7 @@ module Spree
         authorize! :read, order
         @line_item = order.line_items.build(params[:line_item], :as => :api)
         if @line_item.save
+          @order.ensure_updated_shipments
           respond_with(@line_item, :status => 201, :default_template => :show)
         else
           invalid_resource!(@line_item)
@@ -17,6 +18,7 @@ module Spree
         authorize! :read, order
         @line_item = order.line_items.find(params[:id])
         if @line_item.update_attributes(params[:line_item], :as => :api)
+          @order.ensure_updated_shipments
           respond_with(@line_item, :default_template => :show)
         else
           invalid_resource!(@line_item)

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

@@ -58,6 +58,8 @@ module Spree
       def sanitize_line_items(line_item_attributes)
         return {} if line_item_attributes.blank?
         line_item_attributes = line_item_attributes.map do |id, attributes|
+          attributes ||= id
+
           # Faux Strong-Parameters code to strip price if user isn't an admin
           if current_api_user.has_spree_role?("admin")
             [id, attributes.slice(*Spree::LineItem.attr_accessible[:api])]

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

@@ -5,7 +5,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

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

@@ -32,7 +32,7 @@ module Spree
       end
 
       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, :token]
+        [: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, :token, :channel]
       end
 
       def line_item_attributes
@@ -60,7 +60,7 @@ module Spree
       end
 
       def taxon_attributes
-        [:id, :name, :pretty_name, :permalink, :position, :parent_id, :taxonomy_id]
+        [:id, :name, :pretty_name, :permalink, :parent_id, :taxonomy_id]
       end
 
       def inventory_unit_attributes

data/app/models/spree/line_item_decorator.rb

@@ -1,3 +1,3 @@
 Spree::LineItem.class_eval do
-  attr_accessible :quantity, :variant_id, :price, :as => :api
+  attr_accessible :quantity, :variant_id, :price, :sku, :as => :api
 end

data/app/models/spree/order_decorator.rb

@@ -1,4 +1,6 @@
 Spree::Order.class_eval do
+  attr_accessible :channel, :as => :api_admin
+
   def self.build_from_api(user, params)
     begin
       ensure_country_id_from_api params[:ship_address_attributes]
@@ -16,7 +18,12 @@ Spree::Order.class_eval do
       order.complete_from_api params.delete(:completed_at)
 
       destroy_automatic_taxes_on_import(order, params)
-      order.update_attributes!(params)
+
+      if user.has_spree_role? "admin"
+        order.update_attributes!(params, as: :api_admin)
+      else
+        order.update_attributes!(params)
+      end
 
       order.reload
     rescue Exception => e
@@ -153,7 +160,13 @@ 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}"
     end

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

@@ -3,6 +3,7 @@ node(:count) { @products.count }
 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
   extends "spree/api/products/show"
 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/line_items_controller_spec.rb

@@ -46,6 +46,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
@@ -68,6 +87,5 @@ module Spree
         lambda { line_item.reload }.should_not raise_error
       end
     end
-
   end
 end

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

@@ -11,10 +11,9 @@ module Spree
                         :completed_at, :payment_total, :shipment_state,
                         :payment_state, :email, :special_instructions, :token] }
 
+    let(:variant) { create(:variant) }
 
-    before do
-      stub_authentication!
-    end
+    before { stub_authentication! }
 
     it "cannot view all orders" do
       api_get :index
@@ -76,6 +75,50 @@ module Spree
         json_response["user_id"].should == current_api_user.id
       end
 
+      context "import" do
+        let(:tax_rate) { create(:tax_rate, amount: 0.05, calculator: Calculator::DefaultTax.create) }
+        let(:other_variant) { create(:variant) }
+
+        # line items come in as an array when importing orders or when
+        # creating both an order an a line item at once
+        let(:order_params) do
+          {
+            :line_items => [
+              { :variant_id => variant.to_param, :quantity => 5 },
+              { :variant_id => other_variant.to_param, :quantity => 5 }
+            ]
+          }
+        end
+
+        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 {
+            api_post :create, :order => order_params.merge(:import => true)
+          }.not_to change { Adjustment.count }
+          expect(response.status).to eq 201
+        end
+
+        context "provides sku rather than variant id" do
+          let(:order_params) do
+            { :line_items => [{ :sku => variant.sku, :quantity => 1 }] }
+          end
+
+          it "still finds the variant by sku and persist order" do
+            api_post :create, :order => order_params
+            expect(json_response['line_items'].count).to eq 1
+          end
+        end
+      end
+
       it "cannot create an order with an abitrary price for the line item" do
         variant = create(:variant)
         api_post :create, :order => {
@@ -104,8 +147,6 @@ module Spree
     end
 
     context "working with an order" do
-
-      let(:variant) { create(:variant) }
       let!(:line_item) { order.contents.add(variant, 1) }
       let!(:payment_method) { create(:payment_method) }
 
@@ -254,6 +295,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

@@ -30,6 +30,17 @@ module Spree
         json_response["pages"].should == 1
       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

@@ -130,7 +130,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 }
 
@@ -138,15 +138,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
@@ -184,19 +202,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.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-11-19 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.0.6
+        version: 2.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.0.7
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -181,6 +181,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