spree_api 3.1.14 → 3.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d864b52fbae791097fb9bd2441f5ec2d4a7a40e
-  data.tar.gz: c6c1d1d487b976ccc067a876f504139db298f688
+  metadata.gz: 0263d4468e9dfa57da8fde935f0cb2b26fe8d7a0
+  data.tar.gz: 903c3bb494e975188c0ef6fa81440c15a8246096
 SHA512:
-  metadata.gz: 11e9f491d78600e424e449d7172fcb87d32a6cafa3a956a65713e55ef584d5c3039d58201ec24878aa0153608648e43a2b0baae5318a053fc26160a228bb71ae
-  data.tar.gz: 801957f1087425cf4b5d478f79beede0062253d2b165b71823eb5c99517e7ae78900a18539ab870e3ea168fd80d99006a35277889404dcbc345b8ce29ac5d8af
+  metadata.gz: 5b052fff311b035d3324120f57643106450c26020eb8dcb93afdabea084b9904f2b9f0a18a41f53eb87d4fee50aa980bdc4fce0cfb30015ce066768b089d4edd
+  data.tar.gz: 881171f4e20c1a08c6cce5fc8de20d571f8e896645e9d73053429625371b11991bc7fe3f6b3d3ad105160913457030b9e7625251c5ae96e58cf302c7b9d47e91

data/Gemfile

@@ -1,5 +1,7 @@
 eval(File.read(File.dirname(__FILE__) + '/../common_spree_dependencies.rb'))
 
-gem 'spree_core', :path => '../core'
+gem 'spree_core', path: '../core'
+
+gem 'rabl'
 
 gemspec

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

@@ -25,7 +25,7 @@ module Spree
 
       def map_nested_attributes_keys(klass, attributes)
         nested_keys = klass.nested_attributes_options.keys
-        attributes.inject({}) do |h, (k,v)|
+        attributes.to_h.inject({}) do |h, (k,v)|
           key = nested_keys.include?(k.to_sym) ? "#{k}_attributes" : k
           h[key] = v
           h
@@ -89,7 +89,7 @@ module Spree
       end
 
       def unprocessable_entity(message)
-        render text: { exception: message }.to_json, status: 422
+        render plain: { exception: message }.to_json, status: 422
       end
 
       def gateway_error(exception)

data/app/controllers/spree/api/v1/addresses_controller.rb

@@ -15,7 +15,7 @@ module Spree
           @address = find_address
 
           if @address.update_attributes(address_params)
-            respond_with(@address, :default_template => :show)
+            respond_with(@address, default_template: :show)
           else
             invalid_resource!(@address)
           end

data/app/controllers/spree/api/v1/classifications_controller.rb

@@ -12,7 +12,7 @@ module Spree
           # Because position we get back is 0-indexed.
           # acts_as_list is 1-indexed.
           classification.insert_at(params[:position].to_i + 1)
-          render nothing: true
+          head :ok
         end
       end
     end

data/app/controllers/spree/api/v1/images_controller.rb

@@ -12,6 +12,9 @@ module Spree
           respond_with(@image)
         end
 
+        def new
+        end
+
         def create
           authorize! :create, Image
           @image = scope.images.new(image_params)

data/app/controllers/spree/api/v1/inventory_units_controller.rb

@@ -15,7 +15,7 @@ module Spree
           inventory_unit.transaction do
             if inventory_unit.update_attributes(inventory_unit_params)
               fire
-              render :show, :status => 200
+              render :show, status: 200
             else
               invalid_resource!(inventory_unit)
             end
@@ -35,8 +35,8 @@ module Spree
 
           unless inventory_unit.respond_to?(can_event) &&
                  inventory_unit.send(can_event)
-            render :text => { :exception => "cannot transition to #{@event}" }.to_json,
-                   :status => 200
+            render plain: { exception: "cannot transition to #{@event}" }.to_json,
+                   status: 200
             false
           end
         end

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

@@ -6,6 +6,9 @@ module Spree
 
         self.line_item_options = []
 
+        def new
+        end
+
         def create
           variant = Spree::Variant.find(params[:line_item][:variant_id])
           @line_item = order.contents.add(

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

@@ -3,11 +3,17 @@ module Spree
     module V1
       class OptionTypesController < Spree::Api::BaseController
         def index
-          if params[:ids]
-            @option_types = Spree::OptionType.includes(:option_values).accessible_by(current_ability, :read).where(id: params[:ids].split(','))
-          else
-            @option_types = Spree::OptionType.includes(:option_values).accessible_by(current_ability, :read).load.ransack(params[:q]).result
-          end
+          @option_types =  if params[:ids]
+                             Spree::OptionType.
+                               includes(:option_values).
+                               accessible_by(current_ability, :read).
+                               where(id: params[:ids].split(','))
+                           else
+                             Spree::OptionType.
+                               includes(:option_values).
+                               accessible_by(current_ability, :read).
+                               load.ransack(params[:q]).result
+                           end
           respond_with(@option_types)
         end
 
@@ -16,11 +22,14 @@ module Spree
           respond_with(@option_type)
         end
 
+        def new
+        end
+
         def create
           authorize! :create, Spree::OptionType
           @option_type = Spree::OptionType.new(option_type_params)
           if @option_type.save
-            render :show, :status => 201
+            render :show, status: 201
           else
             invalid_resource!(@option_type)
           end
@@ -38,7 +47,7 @@ module Spree
         def destroy
           @option_type = Spree::OptionType.accessible_by(current_ability, :destroy).find(params[:id])
           @option_type.destroy
-          render :text => nil, :status => 204
+          render plain: nil, status: 204
         end
 
         private

data/app/controllers/spree/api/v1/option_values_controller.rb

@@ -4,7 +4,7 @@ module Spree
       class OptionValuesController < Spree::Api::BaseController
         def index
           if params[:ids]
-            @option_values = scope.where(:id => params[:ids])
+            @option_values = scope.where(id: params[:ids])
           else
             @option_values = scope.ransack(params[:q]).result.distinct
           end
@@ -16,11 +16,14 @@ module Spree
           respond_with(@option_value)
         end
 
+        def new
+        end
+
         def create
           authorize! :create, Spree::OptionValue
           @option_value = scope.new(option_value_params)
           if @option_value.save
-            render :show, :status => 201
+            render :show, status: 201
           else
             invalid_resource!(@option_value)
           end
@@ -38,7 +41,7 @@ module Spree
         def destroy
           @option_value = scope.accessible_by(current_ability, :destroy).find(params[:id])
           @option_value.destroy
-          render :text => nil, :status => 204
+          render plain: nil, status: 204
         end
 
         private

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

@@ -27,38 +27,27 @@ module Spree
         end
 
         def create
-          authorize! :create, Spree::Order
-          if can?(:admin, Spree::Order)
-
-            order_user = if @current_user_roles.include?('admin') && order_params[:user_id]
-              Spree.user_class.find(order_params[:user_id])
-            else
-              current_api_user
-            end
-
-            import_params = if @current_user_roles.include?("admin")
-              params[:order].present? ? params[:order].permit! : {}
-            else
-              order_params
-            end
-
-            @order = Spree::Core::Importer::Order.import(order_user, import_params)
+          authorize! :create, Order
+          order_user = if @current_user_roles.include?('admin') && order_params[:user_id]
+            Spree.user_class.find(order_params[:user_id])
+          else
+            current_api_user
+          end
 
-            respond_with(@order, default_template: :show, status: 201)
+          import_params = if @current_user_roles.include?("admin")
+            params[:order].present? ? params[:order].permit! : {}
           else
-            @order = Spree::Order.create!(user: current_api_user, store: current_store)
-            if @order.contents.update_cart(order_params)
-              respond_with(@order, default_template: :show, status: 201)
-            else
-              invalid_resource!(@order)
-            end
+            order_params
           end
+
+          @order = Spree::Core::Importer::Order.import(order_user, import_params)
+          respond_with(@order, default_template: :show, status: 201)
         end
 
         def empty
           authorize! :update, @order, order_token
           @order.empty!
-          render text: nil, status: 204
+          render plain: nil, status: 204
         end
 
         def index

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

@@ -17,7 +17,6 @@ module Spree
         end
 
         def create
-          @order.validate_payments_attributes([payment_params])
           @payment = @order.payments.build(payment_params)
           if @payment.save
             respond_with(@payment, status: 201, default_template: :show)

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

@@ -11,14 +11,14 @@ module Spree
           end
 
           @products = @products.distinct.page(params[:page]).per(params[:per_page])
-          expires_in 15.minutes, :public => true
+          expires_in 15.minutes, public: true
           headers['Surrogate-Control'] = "max-age=#{15.minutes}"
           respond_with(@products)
         end
 
         def show
           @product = find_product(params[:id])
-          expires_in 15.minutes, :public => true
+          expires_in 15.minutes, public: true
           headers['Surrogate-Control'] = "max-age=#{15.minutes}"
           headers['Surrogate-Key'] = "product_id=1"
           respond_with(@product)
@@ -57,6 +57,9 @@ module Spree
         #     shipping_category: "Free Shipping Items"
         #   }
         #
+        def new
+        end
+
         def create
           authorize! :create, Product
           params[:product][:available_on] ||= Time.current
@@ -66,7 +69,7 @@ module Spree
           @product = Core::Importer::Product.new(nil, product_params, options).create
 
           if @product.persisted?
-            respond_with(@product, :status => 201, :default_template => :show)
+            respond_with(@product, status: 201, default_template: :show)
           else
             invalid_resource!(@product)
           end
@@ -80,7 +83,7 @@ module Spree
           @product = Core::Importer::Product.new(@product, product_params, options).update
 
           if @product.errors.empty?
-            respond_with(@product.reload, :status => 200, :default_template => :show)
+            respond_with(@product.reload, status: 200, default_template: :show)
           else
             invalid_resource!(@product)
           end
@@ -90,7 +93,7 @@ module Spree
           @product = find_product(params[:id])
           authorize! :destroy, @product
           @product.destroy
-          respond_with(@product, :status => 204)
+          respond_with(@product, status: 204)
         end
 
         private

data/app/controllers/spree/api/v1/stock_items_controller.rb

@@ -64,7 +64,7 @@ module Spree
         end
 
         def scope
-          includes = {:variant => [{ :option_values => :option_type }, :product] }
+          includes = { variant: [{ option_values: :option_type }, :product] }
           @stock_location.stock_items.accessible_by(current_ability, :read).includes(includes)
         end
 

data/app/controllers/spree/api/v1/stock_locations_controller.rb

@@ -34,7 +34,7 @@ module Spree
         def destroy
           authorize! :destroy, stock_location
           stock_location.destroy
-          respond_with(stock_location, :status => 204)
+          respond_with(stock_location, status: 204)
         end
 
         private

data/app/controllers/spree/api/v1/tags_controller.rb

@@ -0,0 +1,28 @@
+module Spree
+  module Api
+    module V1
+      class TagsController < Spree::Api::BaseController
+        def index
+          @tags =
+            if params[:ids]
+              Tag.where(id: params[:ids].split(",").flatten)
+            else
+              Tag.ransack(params[:q]).result
+            end
+
+          @tags = @tags.page(params[:page]).per(params[:per_page])
+
+          expires_in 15.minutes, public: true
+          headers['Surrogate-Control'] = "max-age=#{15.minutes}"
+          respond_with(@tags)
+        end
+
+        private
+
+        def tags_params
+          params.require(:tag).permit(permitted_tags_attributes)
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v1/taxonomies_controller.rb

@@ -16,11 +16,14 @@ module Spree
           show
         end
 
+        def new
+        end
+
         def create
           authorize! :create, Taxonomy
           @taxonomy = Taxonomy.new(taxonomy_params)
           if @taxonomy.save
-            respond_with(@taxonomy, :status => 201, :default_template => :show)
+            respond_with(@taxonomy, status: 201, default_template: :show)
           else
             invalid_resource!(@taxonomy)
           end
@@ -29,7 +32,7 @@ module Spree
         def update
           authorize! :update, taxonomy
           if taxonomy.update_attributes(taxonomy_params)
-            respond_with(taxonomy, :status => 200, :default_template => :show)
+            respond_with(taxonomy, status: 200, default_template: :show)
           else
             invalid_resource!(taxonomy)
           end
@@ -38,13 +41,13 @@ module Spree
         def destroy
           authorize! :destroy, taxonomy
           taxonomy.destroy
-          respond_with(taxonomy, :status => 204)
+          respond_with(taxonomy, status: 204)
         end
 
         private
 
         def taxonomies
-          @taxonomies = Taxonomy.accessible_by(current_ability, :read).order('name').includes(:root => :children).
+          @taxonomies = Taxonomy.accessible_by(current_ability, :read).order('name').includes(root: :children).
                         ransack(params[:q]).result.
                         page(params[:page]).per(params[:per_page])
         end

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

@@ -26,6 +26,9 @@ module Spree
           show
         end
 
+        def new
+        end
+
         def create
           authorize! :create, Taxon
           @taxon = Spree::Taxon.new(taxon_params)
@@ -33,7 +36,7 @@ module Spree
           taxonomy = Spree::Taxonomy.find_by(id: params[:taxonomy_id])
 
           if taxonomy.nil?
-            @taxon.errors[:taxonomy_id] = I18n.t(:invalid_taxonomy_id, scope: 'spree.api')
+            @taxon.errors.add(:taxonomy_id, I18n.t('spree.api.invalid_taxonomy_id'))
             invalid_resource!(@taxon) and return
           end
 

data/app/controllers/spree/api/v1/users_controller.rb

@@ -7,6 +7,8 @@ module Spree
 
         def index
           @users = Spree.user_class.accessible_by(current_ability,:read).ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
+          expires_in 15.minutes, public: true
+          headers['Surrogate-Control'] = "max-age=#{15.minutes}"
           respond_with(@users)
         end
 
@@ -21,7 +23,7 @@ module Spree
           authorize! :create, Spree.user_class
           @user = Spree.user_class.new(user_params)
           if @user.save
-            respond_with(@user, :status => 201, :default_template => :show)
+            respond_with(@user, status: 201, default_template: :show)
           else
             invalid_resource!(@user)
           end
@@ -30,7 +32,7 @@ module Spree
         def update
           authorize! :update, user
           if user.update_attributes(user_params)
-            respond_with(user, :status => 200, :default_template => :show)
+            respond_with(user, status: 200, default_template: :show)
           else
             invalid_resource!(user)
           end
@@ -39,7 +41,7 @@ module Spree
         def destroy
           authorize! :destroy, user
           user.destroy
-          respond_with(user, :status => 204)
+          respond_with(user, status: 204)
         end
 
         private