spree_api 3.3.6 → 3.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 949e3374b130bd1cd8c1de9fe328915bfe17d519
-  data.tar.gz: 1c70da25fc3f172998d608a92418c9b8cad46716
+  metadata.gz: caba802b7afa26a82233bfc0febb57c3c17e40b2
+  data.tar.gz: 440f5f7989eec445403422c946090c78eb67acc6
 SHA512:
-  metadata.gz: 55ef6ad5ed1daf562ca67b8df0b071c89cb823dc4332de337b19f03c8262703e473874c3924fd2d2b76d2153f0b6cce536ac1db47049d20a1109f2e4ba959d69
-  data.tar.gz: afc35989746989dc55cf0ff84b6d86a46f439875c2e2a08232650fbc0b85ffe507a0d9f8955ac7384f3747ef37c8d833baf4d272d8e7dfadbaa00a6fe75002bf
+  metadata.gz: 38cda01b2989356cc970658c54f3317459482d56ce16aa10832b8b4e7a74e5b04dda0a88bb3300bee29dc95b0ddf0d8a2e56dd52f79bacd32b12ed3aeeac2a76
+  data.tar.gz: 9ff1e6162ebbc664277e98fe26c15347e39e0e7bd22990b877221e5bd24e6a709c41ff0a49e2c44c753f0e2417ab426d70aa1aaa1fbd8f1c833cc9e4d814f2c9

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

@@ -11,7 +11,7 @@ module Spree
 
       before_action :set_content_type
       before_action :load_user
-      before_action :authorize_for_order, if: Proc.new { order_token.present? }
+      before_action :authorize_for_order, if: proc { order_token.present? }
       before_action :authenticate_user
       before_action :load_user_roles
 
@@ -25,7 +25,7 @@ module Spree
 
       # users should be able to set price when importing orders via api
       def permitted_line_item_attributes
-        if @current_user_roles.include?("admin")
+        if @current_user_roles.include?('admin')
           super + [:price, :variant_id, :sku]
         else
           super
@@ -34,17 +34,17 @@ module Spree
 
       def content_type
         case params[:format]
-        when "json"
-          "application/json; charset=utf-8"
-        when "xml"
-          "text/xml; charset=utf-8"
+        when 'json'
+          'application/json; charset=utf-8'
+        when 'xml'
+          'text/xml; charset=utf-8'
         end
       end
 
       private
 
       def set_content_type
-        headers["Content-Type"] = content_type
+        headers['Content-Type'] = content_type
       end
 
       def load_user
@@ -65,11 +65,11 @@ module Spree
       end
 
       def invalid_api_key
-        render "spree/api/errors/invalid_api_key", status: 401
+        render 'spree/api/errors/invalid_api_key', status: 401
       end
 
       def must_specify_api_key
-        render "spree/api/errors/must_specify_api_key", status: 401
+        render 'spree/api/errors/must_specify_api_key', status: 401
       end
 
       def load_user_roles
@@ -77,7 +77,7 @@ module Spree
       end
 
       def unauthorized
-        render "spree/api/errors/unauthorized", status: 401 and return
+        render 'spree/api/errors/unauthorized', status: 401 and return
       end
 
       def error_during_processing(exception)
@@ -101,7 +101,7 @@ module Spree
       end
 
       def not_found
-        render "spree/api/errors/not_found", status: 404 and return
+        render 'spree/api/errors/not_found', status: 404 and return
       end
 
       def current_ability
@@ -110,16 +110,16 @@ module Spree
 
       def invalid_resource!(resource)
         @resource = resource
-        render "spree/api/errors/invalid_resource", status: 422
+        render 'spree/api/errors/invalid_resource', status: 422
       end
 
       def api_key
-        request.headers["X-Spree-Token"] || params[:token]
+        request.headers['X-Spree-Token'] || params[:token]
       end
       helper_method :api_key
 
       def order_token
-        request.headers["X-Spree-Order-Token"] || params[:order_token]
+        request.headers['X-Spree-Order-Token'] || params[:order_token]
       end
 
       def find_product(id)
@@ -129,15 +129,11 @@ module Spree
       end
 
       def product_scope
-        if @current_user_roles.include?("admin")
+        if @current_user_roles.include?('admin')
           scope = Product.with_deleted.accessible_by(current_ability, :read).includes(*product_includes)
 
-          unless params[:show_deleted]
-            scope = scope.not_deleted
-          end
-          unless params[:show_discontinued]
-            scope = scope.not_discontinued
-          end
+          scope = scope.not_deleted unless params[:show_deleted]
+          scope = scope.not_discontinued unless params[:show_discontinued]
         else
           scope = Product.accessible_by(current_ability, :read).active.includes(*product_includes)
         end

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

@@ -8,10 +8,8 @@ module Spree
           @countries = Country.accessible_by(current_ability, :read).ransack(params[:q]).result.
                        order('name ASC').
                        page(params[:page]).per(params[:per_page])
-          country = Country.order("updated_at ASC").last
-          if stale?(country)
-            respond_with(@countries)
-          end
+          country = Country.order('updated_at ASC').last
+          respond_with(@countries) if stale?(country)
         end
 
         def show

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

@@ -5,22 +5,21 @@ module Spree
         before_action :user
 
         def index
-          @credit_cards = user
-            .credit_cards
-            .accessible_by(current_ability, :read)
-            .with_payment_profile
-            .ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
+          @credit_cards = user.
+                          credit_cards.
+                          accessible_by(current_ability, :read).
+                          with_payment_profile.
+                          ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
           respond_with(@credit_cards)
         end
 
         private
 
-          def user
-            if params[:user_id].present?
-              @user ||= Spree::user_class.accessible_by(current_ability, :read).find(params[:user_id])
-            end
+        def user
+          if params[:user_id].present?
+            @user ||= Spree.user_class.accessible_by(current_ability, :read).find(params[:user_id])
           end
-
+        end
       end
     end
   end

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

@@ -12,8 +12,7 @@ module Spree
           respond_with(@image)
         end
 
-        def new
-        end
+        def new; end
 
         def create
           authorize! :create, Image

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

@@ -34,7 +34,7 @@ module Spree
           can_event = "can_#{@event}?"
 
           unless inventory_unit.respond_to?(can_event) &&
-                 inventory_unit.send(can_event)
+              inventory_unit.send(can_event)
             render plain: { exception: "cannot transition to #{@event}" }.to_json,
                    status: 200
             false
@@ -44,7 +44,7 @@ module Spree
         def fire
           inventory_unit.send("#{@event}!") if @event
         end
-        
+
         def inventory_unit_params
           params.require(:inventory_unit).permit(permitted_inventory_unit_attributes)
         end

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

@@ -6,15 +6,14 @@ module Spree
 
         self.line_item_options = []
 
-        def new
-        end
+        def new; end
 
         def create
           variant = Spree::Variant.find(params[:line_item][:variant_id])
           @line_item = order.contents.add(
-              variant,
-              params[:line_item][:quantity] || 1,
-              line_item_params[:options] || {}
+            variant,
+            params[:line_item][:quantity] || 1,
+            line_item_params[:options] || {}
           )
 
           if @line_item.errors.empty?
@@ -41,32 +40,29 @@ module Spree
         end
 
         private
-          def order
-            @order ||= Spree::Order.includes(:line_items).find_by!(number: order_id)
-            authorize! :update, @order, order_token
-          end
 
-          def find_line_item
-            id = params[:id].to_i
-            order.line_items.detect { |line_item| line_item.id == id } or
-                raise ActiveRecord::RecordNotFound
-          end
+        def order
+          @order ||= Spree::Order.includes(:line_items).find_by!(number: order_id)
+          authorize! :update, @order, order_token
+        end
 
-          def line_items_attributes
-            {line_items_attributes: {
-                id: params[:id],
-                quantity: params[:line_item][:quantity],
-                options: line_item_params[:options] || {}
-            }}
-          end
+        def find_line_item
+          id = params[:id].to_i
+          order.line_items.detect { |line_item| line_item.id == id } or
+            raise ActiveRecord::RecordNotFound
+        end
 
-          def line_item_params
-            params.require(:line_item).permit(
-                :quantity,
-                :variant_id,
-                options: line_item_options
-            )
-          end
+        def line_items_attributes
+          { line_items_attributes: {
+              id: params[:id],
+              quantity: params[:line_item][:quantity],
+              options: line_item_params[:options] || {}
+          } }
+        end
+
+        def line_item_params
+          params.require(:line_item).permit(:quantity, :variant_id, options: line_item_options)
+        end
       end
     end
   end

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

@@ -22,8 +22,7 @@ module Spree
           respond_with(@option_type)
         end
 
-        def new
-        end
+        def new; end
 
         def create
           authorize! :create, Spree::OptionType
@@ -51,9 +50,10 @@ module Spree
         end
 
         private
-          def option_type_params
-            params.require(:option_type).permit(permitted_option_type_attributes)
-          end
+
+        def option_type_params
+          params.require(:option_type).permit(permitted_option_type_attributes)
+        end
       end
     end
   end

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

@@ -3,11 +3,11 @@ module Spree
     module V1
       class OptionValuesController < Spree::Api::BaseController
         def index
-          if params[:ids]
-            @option_values = scope.where(id: params[:ids])
-          else
-            @option_values = scope.ransack(params[:q]).result.distinct
-          end
+          @option_values = if params[:ids]
+                             scope.where(id: params[:ids])
+                           else
+                             scope.ransack(params[:q]).result.distinct
+                           end
           respond_with(@option_values)
         end
 
@@ -16,8 +16,7 @@ module Spree
           respond_with(@option_value)
         end
 
-        def new
-        end
+        def new; end
 
         def create
           authorize! :create, Spree::OptionValue
@@ -46,17 +45,17 @@ module Spree
 
         private
 
-          def scope
-            if params[:option_type_id]
-              @scope ||= Spree::OptionType.find(params[:option_type_id]).option_values.accessible_by(current_ability, :read)
-            else
-              @scope ||= Spree::OptionValue.accessible_by(current_ability, :read).load
-            end
-          end
+        def scope
+          @scope ||= if params[:option_type_id]
+                       Spree::OptionType.find(params[:option_type_id]).option_values.accessible_by(current_ability, :read)
+                     else
+                       Spree::OptionValue.accessible_by(current_ability, :read).load
+                     end
+        end
 
-          def option_value_params
-            params.require(:option_value).permit(permitted_option_value_attributes)
-          end
+        def option_value_params
+          params.require(:option_value).permit(permitted_option_value_attributes)
+        end
       end
     end
   end

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

@@ -27,32 +27,21 @@ 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)
-          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
+          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)
+          respond_with(@order, default_template: :show, status: 201)
         end
 
         def empty
@@ -100,7 +89,7 @@ module Spree
           if current_api_user.persisted?
             @orders = current_api_user.orders.reverse_chronological.ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
           else
-            render "spree/api/errors/unauthorized", status: :unauthorized
+            render 'spree/api/errors/unauthorized', status: :unauthorized
           end
         end
 
@@ -110,38 +99,39 @@ module Spree
           @order.coupon_code = params[:coupon_code]
           @handler = PromotionHandler::Coupon.new(@order).apply
           status = @handler.successful? ? 200 : 422
-          render "spree/api/v1/promotions/handler", status: status
+          render 'spree/api/v1/promotions/handler', status: status
         end
 
         private
-          def order_params
-            if params[:order]
-              normalize_params
-              params.require(:order).permit(permitted_order_attributes)
-            else
-              {}
-            end
-          end
 
-          def normalize_params
-            params[:order][:payments_attributes] = params[:order].delete(:payments) if params[:order][:payments]
-            params[:order][:shipments_attributes] = params[:order].delete(:shipments) if params[:order][:shipments]
-            params[:order][:line_items_attributes] = params[:order].delete(:line_items) if params[:order][:line_items]
-            params[:order][:ship_address_attributes] = params[:order].delete(:ship_address) if params[:order][:ship_address]
-            params[:order][:bill_address_attributes] = params[:order].delete(:bill_address) if params[:order][:bill_address]
+        def order_params
+          if params[:order]
+            normalize_params
+            params.require(:order).permit(permitted_order_attributes)
+          else
+            {}
           end
+        end
 
-          def find_order(lock = false)
-            @order = Spree::Order.lock(lock).find_by!(number: params[:id])
-          end
+        def normalize_params
+          params[:order][:payments_attributes] = params[:order].delete(:payments) if params[:order][:payments]
+          params[:order][:shipments_attributes] = params[:order].delete(:shipments) if params[:order][:shipments]
+          params[:order][:line_items_attributes] = params[:order].delete(:line_items) if params[:order][:line_items]
+          params[:order][:ship_address_attributes] = params[:order].delete(:ship_address) if params[:order][:ship_address]
+          params[:order][:bill_address_attributes] = params[:order].delete(:bill_address) if params[:order][:bill_address]
+        end
 
-          def find_current_order
-            current_api_user ? current_api_user.orders.incomplete.order(:created_at).last : nil
-          end
+        def find_order(lock = false)
+          @order = Spree::Order.lock(lock).find_by!(number: params[:id])
+        end
 
-          def order_id
-            super || params[:id]
-          end
+        def find_current_order
+          current_api_user ? current_api_user.orders.incomplete.order(:created_at).last : nil
+        end
+
+        def order_id
+          super || params[:id]
+        end
       end
     end
   end