spree_api 3.3.6 → 3.4.0.rc1

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

@@ -2,7 +2,6 @@ module Spree
   module Api
     module V1
       class PaymentsController < Spree::Api::BaseController
-
         before_action :find_order
         before_action :find_payment, only: [:update, :show, :authorize, :purchase, :capture, :void]
 
@@ -17,7 +16,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)
@@ -59,24 +57,24 @@ module Spree
 
         private
 
-          def find_order
-            @order = Spree::Order.find_by!(number: order_id)
-            authorize! :read, @order, order_token
-          end
+        def find_order
+          @order = Spree::Order.find_by!(number: order_id)
+          authorize! :read, @order, order_token
+        end
 
-          def find_payment
-            @payment = @order.payments.find_by!(number: params[:id])
-          end
+        def find_payment
+          @payment = @order.payments.find_by!(number: params[:id])
+        end
 
-          def perform_payment_action(action, *args)
-            authorize! action, Payment
-            @payment.send("#{action}!", *args)
-            respond_with(@payment, default_template: :show)
-          end
+        def perform_payment_action(action, *args)
+          authorize! action, Payment
+          @payment.send("#{action}!", *args)
+          respond_with(@payment, default_template: :show)
+        end
 
-          def payment_params
-            params.require(:payment).permit(permitted_payment_attributes)
-          end
+        def payment_params
+          params.require(:payment).permit(permitted_payment_attributes)
+        end
       end
     end
   end

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

@@ -16,8 +16,7 @@ module Spree
           respond_with(@product_property)
         end
 
-        def new
-        end
+        def new; end
 
         def create
           authorize! :create, ProductProperty
@@ -56,7 +55,7 @@ module Spree
           if @product
             @product_property ||= @product.product_properties.find_by(id: params[:id])
             @product_property ||= @product.product_properties.includes(:property).where(spree_properties: { name: params[:id] }).first
-            fail ActiveRecord::RecordNotFound unless @product_property
+            raise ActiveRecord::RecordNotFound unless @product_property
             authorize! :read, @product_property
           end
         end

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

@@ -2,10 +2,9 @@ module Spree
   module Api
     module V1
       class ProductsController < Spree::Api::BaseController
-
         def index
           if params[:ids]
-            @products = product_scope.where(id: params[:ids].split(",").flatten)
+            @products = product_scope.where(id: params[:ids].split(',').flatten)
           else
             @products = product_scope.ransack(params[:q]).result
           end
@@ -20,7 +19,7 @@ module Spree
           @product = find_product(params[:id])
           expires_in 15.minutes, public: true
           headers['Surrogate-Control'] = "max-age=#{15.minutes}"
-          headers['Surrogate-Key'] = "product_id=1"
+          headers['Surrogate-Key'] = 'product_id=1'
           respond_with(@product)
         end
 
@@ -57,8 +56,7 @@ module Spree
         #     shipping_category: "Free Shipping Items"
         #   }
         #
-        def new
-        end
+        def new; end
 
         def create
           authorize! :create, Product
@@ -97,32 +95,33 @@ module Spree
         end
 
         private
-          def product_params
-            params.require(:product).permit(permitted_product_attributes)
-          end
 
-          def variants_params
-            variants_key = if params[:product].has_key? :variants
-              :variants
-            else
-              :variants_attributes
-            end
+        def product_params
+          params.require(:product).permit(permitted_product_attributes)
+        end
 
-            params.require(:product).permit(
-              variants_key => [permitted_variant_attributes, :id],
-            ).delete(variants_key) || []
+        def variants_params
+          variants_key = if params[:product].key? :variants
+                           :variants
+                         else
+                           :variants_attributes
           end
 
-          def option_types_params
-            params[:product].fetch(:option_types, [])
-          end
+          params.require(:product).permit(
+            variants_key => [permitted_variant_attributes, :id]
+          ).delete(variants_key) || []
+        end
+
+        def option_types_params
+          params[:product].fetch(:option_types, [])
+        end
 
-          def set_up_shipping_category
-            if shipping_category = params[:product].delete(:shipping_category)
-              id = ShippingCategory.find_or_create_by(name: shipping_category).id
-              params[:product][:shipping_category_id] = id
-            end
+        def set_up_shipping_category
+          if shipping_category = params[:product].delete(:shipping_category)
+            id = ShippingCategory.find_or_create_by(name: shipping_category).id
+            params[:product][:shipping_category_id] = id
           end
+        end
       end
     end
   end

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

@@ -13,15 +13,16 @@ module Spree
           end
         end
 
-        private 
-          def requires_admin
-            return if @current_user_roles.include?("admin")
-            unauthorized and return
-          end
+        private
 
-          def load_promotion
-            @promotion = Spree::Promotion.find_by(id: params[:id]) || Spree::Promotion.with_coupon_code(params[:id])
-          end
+        def requires_admin
+          return if @current_user_roles.include?('admin')
+          unauthorized and return
+        end
+
+        def load_promotion
+          @promotion = Spree::Promotion.find_by(id: params[:id]) || Spree::Promotion.with_coupon_code(params[:id])
+        end
       end
     end
   end

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

@@ -2,17 +2,16 @@ module Spree
   module Api
     module V1
       class PropertiesController < Spree::Api::BaseController
-
         before_action :find_property, only: [:show, :update, :destroy]
 
         def index
           @properties = Spree::Property.accessible_by(current_ability, :read)
 
-          if params[:ids]
-            @properties = @properties.where(id: params[:ids].split(",").flatten)
-          else
-            @properties = @properties.ransack(params[:q]).result
-          end
+          @properties = if params[:ids]
+                          @properties.where(id: params[:ids].split(',').flatten)
+                        else
+                          @properties.ransack(params[:q]).result
+                        end
 
           @properties = @properties.page(params[:page]).per(params[:per_page])
           respond_with(@properties)
@@ -22,8 +21,7 @@ module Spree
           respond_with(@property)
         end
 
-        def new
-        end
+        def new; end
 
         def create
           authorize! :create, Property
@@ -57,15 +55,15 @@ module Spree
 
         private
 
-          def find_property
-            @property = Spree::Property.accessible_by(current_ability, :read).find(params[:id])
-          rescue ActiveRecord::RecordNotFound
-            @property = Spree::Property.accessible_by(current_ability, :read).find_by!(name: params[:id])
-          end
+        def find_property
+          @property = Spree::Property.accessible_by(current_ability, :read).find(params[:id])
+        rescue ActiveRecord::RecordNotFound
+          @property = Spree::Property.accessible_by(current_ability, :read).find_by!(name: params[:id])
+        end
 
-          def property_params
-            params.require(:property).permit(permitted_property_attributes)
-          end
+        def property_params
+          params.require(:property).permit(permitted_property_attributes)
+        end
       end
     end
   end

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

@@ -2,7 +2,6 @@ module Spree
   module Api
     module V1
       class ReturnAuthorizationsController < Spree::Api::BaseController
-
         def create
           authorize! :create, ReturnAuthorization
           @return_authorization = order.return_authorizations.build(return_authorization_params)

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

@@ -2,20 +2,19 @@ module Spree
   module Api
     module V1
       class ShipmentsController < Spree::Api::BaseController
-
         before_action :find_and_update_shipment, only: [:ship, :ready, :add, :remove]
         before_action :load_transfer_params, only: [:transfer_to_location, :transfer_to_shipment]
 
         def mine
           if current_api_user.persisted?
-            @shipments = Spree::Shipment
-              .reverse_chronological
-              .joins(:order)
-              .where(spree_orders: {user_id: current_api_user.id})
-              .includes(mine_includes)
-              .ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
+            @shipments = Spree::Shipment.
+                         reverse_chronological.
+                         joins(:order).
+                         where(spree_orders: { user_id: current_api_user.id }).
+                         includes(mine_includes).
+                         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
 
@@ -25,7 +24,9 @@ module Spree
           authorize! :create, Shipment
           quantity = params[:quantity].to_i
           @shipment = @order.shipments.create(stock_location_id: params.fetch(:stock_location_id))
-          @order.contents.add(variant, quantity, {shipment: @shipment})
+          @order.contents.add(variant, quantity, shipment: @shipment)
+
+          @shipment.save!
 
           respond_with(@shipment.reload, default_template: :show)
         end
@@ -49,9 +50,7 @@ module Spree
         end
 
         def ship
-          unless @shipment.shipped?
-            @shipment.ship!
-          end
+          @shipment.ship! unless @shipment.shipped?
           respond_with(@shipment, default_template: :show)
         end
 
@@ -59,23 +58,15 @@ module Spree
           quantity = params[:quantity].to_i
 
           @shipment.order.contents.add(variant, quantity, shipment: @shipment)
+
           respond_with(@shipment, default_template: :show)
         end
 
         def remove
-          quantity = if params.key?(:quantity)
-                       params[:quantity].to_i
-                     else
-                       @shipment.inventory_units_for(variant).sum(:quantity)
-                     end
-          @shipment.order.contents.remove(variant, quantity, shipment: @shipment)
-
-          if @shipment.inventory_units.any?
-            @shipment.reload
-          else
-            @shipment.destroy!
-          end
+          quantity = params[:quantity].to_i
 
+          @shipment.order.contents.remove(variant, quantity, shipment: @shipment)
+          @shipment.reload if @shipment.persisted?
           respond_with(@shipment, default_template: :show)
         end
 
@@ -88,7 +79,7 @@ module Spree
           end
 
           @original_shipment.transfer_to_location(@variant, @quantity, @stock_location)
-          render json: {success: true, message: Spree.t(:shipment_transfer_success)}, status: 201
+          render json: { success: true, message: Spree.t(:shipment_transfer_success) }, status: 201
         end
 
         def transfer_to_shipment
@@ -100,7 +91,7 @@ module Spree
           end
 
           @original_shipment.transfer_to_shipment(@variant, @quantity, @target_shipment)
-          render json: {success: true, message: Spree.t(:shipment_transfer_success)}, status: 201
+          render json: { success: true, message: Spree.t(:shipment_transfer_success) }, status: 201
         end
 
         private

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

@@ -12,9 +12,7 @@ module Spree
           end
 
           state = @states.last
-          if stale?(state)
-            respond_with(@states)
-          end
+          respond_with(@states) if stale?(state)
         end
 
         def show
@@ -23,14 +21,15 @@ module Spree
         end
 
         private
-          def scope
-            if params[:country_id]
-              @country = Country.accessible_by(current_ability, :read).find(params[:country_id])
-              return @country.states.accessible_by(current_ability, :read).order('name ASC')
-            else
-              return State.accessible_by(current_ability, :read).order('name ASC')
-            end
+
+        def scope
+          if params[:country_id]
+            @country = Country.accessible_by(current_ability, :read).find(params[:country_id])
+            @country.states.accessible_by(current_ability, :read).order('name ASC')
+          else
+            State.accessible_by(current_ability, :read).order('name ASC')
           end
+        end
       end
     end
   end

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

@@ -18,7 +18,7 @@ module Spree
           authorize! :create, StockItem
 
           count_on_hand = 0
-          if params[:stock_item].has_key?(:count_on_hand)
+          if params[:stock_item].key?(:count_on_hand)
             count_on_hand = params[:stock_item][:count_on_hand].to_i
           end
 
@@ -35,7 +35,7 @@ module Spree
           @stock_item = StockItem.accessible_by(current_ability, :update).find(params[:id])
 
           count_on_hand = 0
-          if params[:stock_item].has_key?(:count_on_hand)
+          if params[:stock_item].key?(:count_on_hand)
             count_on_hand = params[:stock_item][:count_on_hand].to_i
             params[:stock_item].delete(:count_on_hand)
           end

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

@@ -2,7 +2,6 @@ module Spree
   module Api
     module V1
       class StoresController < Spree::Api::BaseController
-
         before_action :get_store, except: [:index, :create]
 
         def index

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

@@ -5,7 +5,7 @@ module Spree
         def index
           @tags =
             if params[:ids]
-              Tag.where(id: params[:ids].split(",").flatten)
+              Tag.where(id: params[:ids].split(',').flatten)
             else
               Tag.ransack(params[:q]).result
             end

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

@@ -2,7 +2,6 @@ module Spree
   module Api
     module V1
       class TaxonomiesController < Spree::Api::BaseController
-
         def index
           respond_with(taxonomies)
         end
@@ -16,8 +15,7 @@ module Spree
           show
         end
 
-        def new
-        end
+        def new; end
 
         def create
           authorize! :create, Taxonomy

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

@@ -26,8 +26,7 @@ module Spree
           show
         end
 
-        def new
-        end
+        def new; end
 
         def create
           authorize! :create, Taxon
@@ -70,28 +69,28 @@ module Spree
           taxon = Spree::Taxon.find(params[:id])
           @products = taxon.products.ransack(params[:q]).result
           @products = @products.page(params[:page]).per(params[:per_page] || 500)
-          render "spree/api/v1/products/index"
+          render 'spree/api/v1/products/index'
         end
 
         private
 
-          def taxonomy
-            if params[:taxonomy_id].present?
-              @taxonomy ||= Spree::Taxonomy.accessible_by(current_ability, :read).find(params[:taxonomy_id])
-            end
+        def taxonomy
+          if params[:taxonomy_id].present?
+            @taxonomy ||= Spree::Taxonomy.accessible_by(current_ability, :read).find(params[:taxonomy_id])
           end
+        end
 
-          def taxon
-            @taxon ||= taxonomy.taxons.accessible_by(current_ability, :read).find(params[:id])
-          end
+        def taxon
+          @taxon ||= taxonomy.taxons.accessible_by(current_ability, :read).find(params[:id])
+        end
 
-          def taxon_params
-            if params[:taxon] && !params[:taxon].empty?
-              params.require(:taxon).permit(permitted_taxon_attributes)
-            else
-              {}
-            end
+        def taxon_params
+          if params[:taxon] && !params[:taxon].empty?
+            params.require(:taxon).permit(permitted_taxon_attributes)
+          else
+            {}
           end
+        end
       end
     end
   end