spree_api 2.1.12 → 2.2.0

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

@@ -10,12 +10,15 @@ module Spree
         end
 
         @products = @products.distinct.page(params[:page]).per(params[:per_page])
+        expires_in 15.minutes, :public => true
+        headers['Surrogate-Control'] = "max-age=#{15.minutes}"
       end
 
       def show
         @product = find_product(params[:id])
-        expires_in 3.minutes
-        respond_with(@product)
+        expires_in 15.minutes, :public => true
+        headers['Surrogate-Control'] = "max-age=#{15.minutes}"
+        headers['Surrogate-Key'] = "product_id=1"
       end
 
       # Takes besides the products attributes either an array of variants or
@@ -56,30 +59,25 @@ module Spree
         params[:product][:available_on] ||= Time.now
         set_up_shipping_category
 
-        begin
-          @product = Product.new(product_params)
-          if @product.save
-            variants_params.each do |variant_attribute|
-              # make sure the product is assigned before the options=
-              @product.variants.create({ product: @product }.merge(variant_attribute))
-            end
-
-            option_types_params.each do |name|
-              option_type = OptionType.where(name: name).first_or_initialize do |option_type|
-                option_type.presentation = name
-                option_type.save!
-              end
+        @product = Product.new(product_params)
+        if @product.save
+          variants_params.each do |variant_attribute|
+            # make sure the product is assigned before the options=
+            @product.variants.create({ product: @product }.merge(variant_attribute))
+          end
 
-              @product.option_types << option_type unless @product.option_types.include?(option_type)
+          option_types_params.each do |name|
+            option_type = OptionType.where(name: name).first_or_initialize do |option_type|
+              option_type.presentation = name
+              option_type.save!
             end
 
-            respond_with(@product, :status => 201, :default_template => :show)
-          else
-            invalid_resource!(@product)
+            @product.option_types << option_type unless @product.option_types.include?(option_type)
           end
-        rescue ActiveRecord::RecordNotUnique
-          @product.permalink = nil
-          retry
+
+          respond_with(@product, :status => 201, :default_template => :show)
+        else
+          invalid_resource!(@product)
         end
       end
 
@@ -116,7 +114,8 @@ module Spree
       def destroy
         @product = find_product(params[:id])
         authorize! :destroy, @product
-        @product.destroy
+        @product.update_attribute(:deleted_at, Time.now)
+        @product.variants_including_master.update_all(:deleted_at => Time.now)
         respond_with(@product, :status => 204)
       end
 

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

@@ -60,6 +60,15 @@ module Spree
         respond_with(taxon, status: 204)
       end
 
+      def products
+        # Returns the products sorted by their position with the classification
+        # 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])
+        render "spree/api/products/index"
+      end
+
       private
 
         def taxonomy

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

@@ -46,7 +46,7 @@ module Spree
       private
 
         def product
-          @product ||= Spree::Product.accessible_by(current_ability, :read).find_by(permalink: params[:product_id]) if params[:product_id]
+          @product ||= Spree::Product.accessible_by(current_ability, :read).friendly.find(params[:product_id]) if params[:product_id]
         end
 
         def scope

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

@@ -40,12 +40,14 @@ module Spree
         # Permalinks presence is validated, but are really automatically generated
         # Therefore we shouldn't tell API clients that they MUST send one through
         required_fields.map!(&:to_s).delete("permalink")
+        # Do not require slugs, either
+        required_fields.delete("slug")
         required_fields
       end
 
       @@product_attributes = [
         :id, :name, :description, :price, :display_price, :available_on,
-        :permalink, :meta_description, :meta_keywords, :shipping_category_id,
+        :slug, :meta_description, :meta_keywords, :shipping_category_id,
         :taxon_ids
       ]
 
@@ -55,7 +57,7 @@ module Spree
 
       @@variant_attributes = [
         :id, :name, :sku, :price, :weight, :height, :width, :depth, :is_master,
-        :cost_price, :permalink, :description, :track_inventory
+        :cost_price, :slug, :description, :track_inventory
       ]
 
       @@image_attributes = [
@@ -73,7 +75,7 @@ module Spree
         :user_id, :created_at, :updated_at, :completed_at, :payment_total,
         :shipment_state, :payment_state, :email, :special_instructions, :channel,
         :included_tax_total, :additional_tax_total, :display_included_tax_total,
-        :display_additional_tax_total, :tax_total, :currency
+        :display_additional_tax_total
       ]
 
       @@line_item_attributes = [:id, :quantity, :price, :variant_id]

data/app/models/spree/order_decorator.rb

@@ -15,9 +15,7 @@ Spree::Order.class_eval do
       order.create_payments_from_api params.delete(:payments_attributes) || []
       order.complete_from_api params.delete(:completed_at)
 
-      destroy_automatic_taxes_on_import(order, params)
       order.update_attributes!(params)
-
       order.reload
     rescue Exception => e
       order.destroy if order && order.persisted?
@@ -25,12 +23,6 @@ Spree::Order.class_eval do
     end
   end
 
-  def self.destroy_automatic_taxes_on_import(order, params)
-    if params.delete :import
-      order.adjustments.tax.destroy_all
-    end
-  end
-
   def complete_from_api(completed_at)
     if completed_at
       self.completed_at = completed_at
@@ -85,7 +77,7 @@ 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, :sku)
+        extra_params = line_item.except(:variant_id, :quantity)
         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
@@ -97,11 +89,10 @@ Spree::Order.class_eval do
   def create_adjustments_from_api(adjustments)
     adjustments.each do |a|
       begin
-        a.symbolize_keys! # For backwards compatibility sake (before it acccessed string keys)
         adjustment = self.adjustments.build(:amount => a[:amount].to_f,
                                             :label => a[:label])
         adjustment.save!
-        adjustment.finalize!
+        adjustment.close!
       rescue Exception => e
         raise "Order import adjustments: #{e.message} #{a}"
       end

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

@@ -9,3 +9,7 @@ child :variant do
   attributes :product_id
   child(:images => :images) { extends "spree/api/images/show" }
 end
+
+child :adjustments => :adjustments do
+  extends "spree/api/adjustments/show"
+end

data/app/views/spree/api/orders/order.v1.rabl

@@ -2,7 +2,6 @@ cache @order
 attributes *order_attributes
 node(:display_item_total) { |o| o.display_item_total.to_s }
 node(:total_quantity) { |o| o.line_items.sum(:quantity) }
-node(:display_tax_total) { |o| o.display_tax_total }
 node(:display_total) { |o| o.display_total.to_s }
 node(:display_ship_total) { |o| o.display_ship_total }
 node(:token) { |o| o.token }

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

@@ -1,17 +1,14 @@
 object @product
-cache [current_currency, root_object]
+cache [current_currency, @product]
 attributes *product_attributes
 node(:display_price) { |p| p.display_price.to_s }
-child :variants_including_master => :variants do
-  attributes *variant_attributes
+node(:has_variants) { |p| p.has_variants? }
+child :master => :master do
+  extends "spree/api/variants/show"
+end
 
-  child :option_values => :option_values do
-    extends "spree/api/option_values/show"
-  end
-  
-  child :images => :images do
-    extends "spree/api/images/show"
-  end
+child :variants => :variants do
+  extends "spree/api/variants/show"
 end
 
 child :option_types => :option_types do

data/app/views/spree/api/promotions/handler.v1.rabl

@@ -0,0 +1,4 @@
+object false
+node(:success) { @handler.success }
+node(:error) { @handler.error }
+node(:successful) { @handler.successful? }

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

@@ -5,5 +5,5 @@ node(:current_page) { params[:page] ? params[:page].to_i : 1 }
 node(:pages) { @variants.num_pages }
 
 child(@variants => :variants) do
-  extends "spree/api/variants/big_variant"
+  extends "spree/api/variants/variant_full"
 end

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

@@ -1,5 +1,4 @@
 object @variant
 cache @variant
-extends "spree/api/variants/variant"
-child(:option_values => :option_values) { attributes *option_value_attributes }
-child(:images => :images) { extends "spree/api/images/show" }
+extends "spree/api/variants/variant_full"
+child(:images => :images) { extends "spree/api/images/show" }

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

@@ -1,5 +1,7 @@
 attributes *variant_attributes
+node(:display_price) { |p| p.display_price.to_s }
 node(:options_text) { |v| v.options_text }
+node(:in_stock) { |v| v.in_stock? }
 child :option_values => :option_values do
   attributes *option_value_attributes
 end

data/config/routes.rb

@@ -31,10 +31,6 @@ Spree::Core::Engine.add_routes do
     get '/orders/mine', :to => 'orders#mine', :as => 'my_orders'
 
     resources :orders do
-      member do
-        put :apply_coupon_code
-      end
-
       resources :addresses, :only => [:show, :update]
 
       resources :return_authorizations do
@@ -47,6 +43,7 @@ Spree::Core::Engine.add_routes do
       member do
         put :cancel
         put :empty
+        put :apply_coupon_code
       end
 
       resources :line_items
@@ -84,7 +81,9 @@ Spree::Core::Engine.add_routes do
         end
       end
     end
+
     resources :taxons, :only => [:index]
+
     resources :inventory_units, :only => [:show, :update]
     resources :users
     resources :properties
@@ -95,5 +94,8 @@ Spree::Core::Engine.add_routes do
 
     get '/config/money', :to => 'config#money'
     get '/config', :to => 'config#show'
+
+    put '/classifications', :to => 'classifications#update', :as => :classifications
+    get '/taxons/products', :to => 'taxons#products', :as => :taxon_products
   end
 end

data/lib/spree/api/controller_setup.rb

@@ -5,7 +5,6 @@ module Spree
     module ControllerSetup
       def self.included(klass)
         klass.class_eval do
-          include AbstractController::Rendering
           include AbstractController::ViewPaths
           include AbstractController::Callbacks
           include AbstractController::Helpers

data/lib/spree/api/testing_support/helpers.rb

@@ -17,6 +17,7 @@ module Spree
         end
 
         def stub_authentication!
+          controller.stub :check_for_user_or_api_key
           Spree::LegacyUser.stub(:find_by).with(hash_including(:spree_api_key)) { current_api_user }
         end
 

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

@@ -7,50 +7,76 @@ module Spree
     before do
       stub_authentication!
       @address = create(:address)
-      @order = create(:order, :bill_address => @address)
     end
-
-    context "with their own address" do
+    
+    context "with order" do
       before do
-        Order.any_instance.stub :user => current_api_user
+        @order = create(:order, :bill_address => @address)
       end
+      
+      context "with their own address" do
+        before do
+          Order.any_instance.stub :user => current_api_user
+        end
 
-      it "gets an address" do
-        api_get :show, :id => @address.id, :order_id => @order.number
-        json_response['address1'].should eq @address.address1
-      end
+        it "gets an address" do
+          api_get :show, :id => @address.id, :order_id => @order.number
+          json_response['address1'].should eq @address.address1
+        end
 
-      it "updates an address" do
-        api_put :update, :id => @address.id, :order_id => @order.number,
-                         :address => { :address1 => "123 Test Lane" }
-        json_response['address1'].should eq '123 Test Lane'
-      end
+        it "updates an address" do
+          api_put :update, :id => @address.id, :order_id => @order.number,
+                           :address => { :address1 => "123 Test Lane" }
+          json_response['address1'].should eq '123 Test Lane'
+        end
 
-      it "receives the errors object if address is invalid" do
-        api_put :update, :id => @address.id, :order_id => @order.number,
-                         :address => { :address1 => "" }
+        it "receives the errors object if address is invalid" do
+          api_put :update, :id => @address.id, :order_id => @order.number,
+                           :address => { :address1 => "" }
 
-        json_response['error'].should_not be_nil
-        json_response['errors'].should_not be_nil
-        json_response['errors']['address1'].first.should eq "can't be blank"
+          json_response['error'].should_not be_nil
+          json_response['errors'].should_not be_nil
+          json_response['errors']['address1'].first.should eq "can't be blank"
+        end
       end
-    end
 
-    context "on an address that does not belong to this order" do
-      before do
-        @order.bill_address_id = nil
-        @order.ship_address = nil
+      context "on an address that does not belong to this order" do
+        before do
+          @order.bill_address_id = nil
+          @order.ship_address = nil
+        end
+
+        it "cannot retreive address information" do
+          api_get :show, :id => @address.id, :order_id => @order.number
+          assert_unauthorized!
+        end
+
+        it "cannot update address information" do
+          api_get :update, :id => @address.id, :order_id => @order.number
+          assert_unauthorized!
+        end
       end
+    end
+    
+    context "without order" do
+      context "with their own address" do
+        before do
+          Address.any_instance.stub :user => current_api_user
+        end
 
-      it "cannot retreive address information" do
-        api_get :show, :id => @address.id, :order_id => @order.number
-        assert_unauthorized!
+        it "gets an address" do
+          api_get :show, :id => @address.id
+          json_response['address1'].should eq @address.address1
+        end
       end
 
-      it "cannot update address information" do
-        api_get :update, :id => @address.id, :order_id => @order.number
-        assert_unauthorized!
+      context "on an address that does not belong to this user" do
+        it "cannot update address information" do
+          api_put :update, :id => @address.id, :address => { :address1 => "123 Test Lane" }
+          json_response['address1'].should be_nil
+          assert_unauthorized!
+        end
       end
     end
   end
-end
+end

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

@@ -21,42 +21,6 @@ describe Spree::Api::BaseController do
     end
   end
 
-  context "when validating based on an order token" do
-    let!(:order) { create :order }
-
-    context "with a correct order token" do
-      it "succeeds" do
-        api_get :index, order_token: order.token, order_id: order.number
-        response.status.should == 200
-      end
-    end
-
-    context "with an incorrect order token" do
-      it "returns unauthorized" do
-        api_get :index, order_token: "NOT_A_TOKEN", order_id: order.number
-        response.status.should == 401
-      end
-    end
-  end
-
-  context "when validating based on an order token" do
-    let!(:order) { create :order }
-
-    context "with a correct order token" do
-      it "succeeds" do
-        api_get :index, order_token: order.token, order_id: order.number
-        response.status.should == 200
-      end
-    end
-
-    context "with an incorrect order token" do
-      it "returns unauthorized" do
-        api_get :index, order_token: "NOT_A_TOKEN", order_id: order.number
-        response.status.should == 401
-      end
-    end
-  end
-
   context "cannot make a request to the API" do
     it "without an API key" do
       api_get :index