solidus_api 1.2.3 → 1.3.0.beta1

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

@@ -1,7 +1,6 @@
 module Spree
   module Api
     class PaymentsController < Spree::Api::BaseController
-
       before_filter :find_order
       around_filter :lock_order, only: [:create, :update, :destroy, :authorize, :capture, :purchase, :void, :credit]
       before_filter :find_payment, only: [:update, :show, :authorize, :purchase, :capture, :void, :credit]
@@ -17,7 +16,6 @@ module Spree
       end
 
       def create
-        @order.validate_payments_attributes(payment_params)
         @payment = PaymentCreate.new(@order, payment_params).build
         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(params[:id])
-        end
+      def find_payment
+        @payment = @order.payments.find(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/product_properties_controller.rb

@@ -1,7 +1,6 @@
 module Spree
   module Api
     class ProductPropertiesController < Spree::Api::BaseController
-
       before_action :find_product
       before_action :product_property, only: [:show, :update, :destroy]
 
@@ -51,22 +50,22 @@ module Spree
 
       private
 
-        def find_product
-          @product = super(params[:product_id])
-          authorize! :read, @product
-        end
+      def find_product
+        @product = super(params[:product_id])
+        authorize! :read, @product
+      end
 
-        def product_property
-          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
-            authorize! :read, @product_property
-          end
+      def product_property
+        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
+          authorize! :read, @product_property
         end
+      end
 
-        def product_property_params
-          params.require(:product_property).permit(permitted_product_properties_attributes)
-        end
+      def product_property_params
+        params.require(:product_property).permit(permitted_product_properties_attributes)
+      end
     end
   end
 end

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

@@ -1,7 +1,6 @@
 module Spree
   module Api
     class ProductsController < Spree::Api::BaseController
-
       def index
         if params[:ids]
           ids = params[:ids].split(",").flatten
@@ -11,14 +10,17 @@ 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 new
+      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)
@@ -90,40 +92,41 @@ module Spree
         @product = find_product(params[:id])
         authorize! :destroy, @product
         @product.destroy
-        respond_with(@product, :status => 204)
+        respond_with(@product, status: 204)
       end
 
       private
-        def product_params
-          product_params = params.require(:product).permit(permitted_product_attributes)
-          if product_params[:taxon_ids].present?
-            product_params[:taxon_ids] = product_params[:taxon_ids].split(',')
-          end
-          product_params
-        end
-
-        def variants_params
-          variants_key = if params[:product].has_key? :variants
-            :variants
-          else
-            :variants_attributes
-          end
 
-          params.require(:product).permit(
-            variants_key => [permitted_variant_attributes, :id],
-          ).delete(variants_key) || []
+      def product_params
+        product_params = params.require(:product).permit(permitted_product_attributes)
+        if product_params[:taxon_ids].present?
+          product_params[:taxon_ids] = product_params[:taxon_ids].split(',')
         end
+        product_params
+      end
 
-        def option_types_params
-          params[:product].fetch(:option_types, [])
+      def variants_params
+        variants_key = if params[:product].key? :variants
+          :variants
+        else
+          :variants_attributes
         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
+        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
+      end
     end
   end
 end

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

@@ -12,15 +12,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 && 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/properties_controller.rb

@@ -1,7 +1,6 @@
 module Spree
   module Api
     class PropertiesController < Spree::Api::BaseController
-
       before_action :find_property, only: [:show, :update, :destroy]
 
       def index
@@ -9,7 +8,7 @@ module Spree
 
         if params[:ids]
           ids = params[:ids].split(",").flatten
-          @properties = @properties.where(:id => ids)
+          @properties = @properties.where(id: ids)
         else
           @properties = @properties.ransack(params[:q]).result
         end
@@ -57,15 +56,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/resource_controller.rb

@@ -2,7 +2,15 @@ class Spree::Api::ResourceController < Spree::Api::BaseController
   before_action :load_resource, only: [:show, :update, :destroy]
 
   def index
-    @collection = model_class.accessible_by(current_ability, :read).ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
+    collection_scope = model_class.accessible_by(current_ability, :read)
+    if params[:ids]
+      ids = params[:ids].split(",").flatten
+      collection_scope = collection_scope.where(id: ids)
+    else
+      collection_scope = collection_scope.ransack(params[:q]).result
+    end
+
+    @collection = collection_scope.page(params[:page]).per(params[:per_page])
     instance_variable_set("@#{controller_name}", @collection)
 
     respond_with(@collection)

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

@@ -12,7 +12,7 @@ module Spree
           @shipments = Spree::Shipment
             .reverse_chronological
             .joins(:order)
-            .where(spree_orders: {user_id: current_api_user.id})
+            .where(spree_orders: { user_id: current_api_user.id })
             .includes(mine_includes)
             .ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
         else
@@ -21,7 +21,7 @@ module Spree
       end
 
       def create
-        # TODO Can remove conditional here once deprecated #find_order is removed.
+        # TODO: Can remove conditional here once deprecated #find_order is removed.
         unless @order.present?
           @order = Spree::Order.find_by!(number: params[:shipment][:order_id])
           authorize! :read, @order
@@ -29,7 +29,7 @@ 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!
 
@@ -48,7 +48,7 @@ module Spree
             @shipment.ready!
           else
             logger.error("cannot_ready_shipment shipment_state=#{@shipment.state}")
-            render 'spree/api/shipments/cannot_ready_shipment', status: 422 and return
+            render('spree/api/shipments/cannot_ready_shipment', status: 422) && return
           end
         end
         respond_with(@shipment, default_template: :show)
@@ -66,7 +66,7 @@ module Spree
       def add
         quantity = params[:quantity].to_i
 
-        @shipment.order.contents.add(variant, quantity, {shipment: @shipment})
+        @shipment.order.contents.add(variant, quantity, { shipment: @shipment })
         respond_with(@shipment, default_template: :show)
       end
 
@@ -74,7 +74,7 @@ module Spree
         quantity = params[:quantity].to_i
 
         if @shipment.pending?
-          @shipment.order.contents.remove(variant, quantity, {shipment: @shipment})
+          @shipment.order.contents.remove(variant, quantity, { shipment: @shipment })
           @shipment.reload if @shipment.persisted?
           respond_with(@shipment, default_template: :show)
         else
@@ -86,13 +86,13 @@ module Spree
       def transfer_to_location
         @stock_location = Spree::StockLocation.find(params[:stock_location_id])
         @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
         @target_shipment = Spree::Shipment.find_by!(number: params[:target_shipment_number])
         @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
@@ -107,7 +107,7 @@ module Spree
       end
 
       def find_order_on_create
-        # TODO Can remove conditional here once deprecated #find_order is removed.
+        # TODO: Can remove conditional here once deprecated #find_order is removed.
         unless @order.present?
           @order = Spree::Order.find_by!(number: params[:shipment][:order_id])
           authorize! :read, @order
@@ -146,31 +146,31 @@ module Spree
           order: {
             bill_address: {
               state: {},
-              country: {},
+              country: {}
             },
             ship_address: {
               state: {},
-              country: {},
+              country: {}
             },
             adjustments: {},
             payments: {
               order: {},
-              payment_method: {},
-            },
+              payment_method: {}
+            }
           },
           inventory_units: {
             line_item: {
               product: {},
-              variant: {},
+              variant: {}
             },
             variant: {
               product: {},
               default_price: {},
               option_values: {
-                option_type: {},
-              },
-            },
-          },
+                option_type: {}
+              }
+            }
+          }
         }
       end
     end

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

@@ -20,14 +20,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)
-          else
-            return State.accessible_by(current_ability, :read)
-          end
+
+      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)
+        else
+          return State.accessible_by(current_ability, :read)
         end
+      end
     end
   end
 end

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

@@ -58,11 +58,12 @@ 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
 
       def stock_item_params
+        params.require(:stock_item).delete(:force)
         params.require(:stock_item).permit(permitted_stock_item_attributes)
       end
 

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

@@ -33,7 +33,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/stores_controller.rb

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

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

@@ -1,11 +1,13 @@
 module Spree
   module Api
     class TaxonomiesController < Spree::Api::BaseController
-
       def index
         respond_with(taxonomies)
       end
 
+      def new
+      end
+
       def show
         respond_with(taxonomy)
       end
@@ -19,7 +21,7 @@ module Spree
         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
@@ -28,7 +30,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
@@ -37,13 +39,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/taxons_controller.rb

@@ -4,18 +4,19 @@ module Spree
       def index
         if taxonomy
           @taxons = taxonomy.root.children
+        elsif params[:ids]
+          @taxons = Spree::Taxon.accessible_by(current_ability, :read).where(id: params[:ids].split(','))
         else
-          if params[:ids]
-            @taxons = Spree::Taxon.accessible_by(current_ability, :read).where(id: params[:ids].split(','))
-          else
-            @taxons = Spree::Taxon.accessible_by(current_ability, :read).order(:taxonomy_id, :lft).ransack(params[:q]).result
-          end
+          @taxons = Spree::Taxon.accessible_by(current_ability, :read).order(:taxonomy_id, :lft).ransack(params[:q]).result
         end
 
         @taxons = @taxons.page(params[:page]).per(params[:per_page])
         respond_with(@taxons)
       end
 
+      def new
+      end
+
       def show
         @taxon = taxon
         respond_with(@taxon)
@@ -33,7 +34,7 @@ module Spree
 
         if taxonomy.nil?
           @taxon.errors[:taxonomy_id] = I18n.t(:invalid_taxonomy_id, scope: 'spree.api')
-          invalid_resource!(@taxon) and return
+          invalid_resource!(@taxon) && return
         end
 
         @taxon.parent_id = taxonomy.root.id unless params[:taxon][:parent_id]
@@ -71,23 +72,23 @@ module Spree
 
       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

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

@@ -1,10 +1,7 @@
 class Spree::Api::UsersController < Spree::Api::ResourceController
-
   private
 
-  def user
-    @user
-  end
+  attr_reader :user
 
   def model_class
     Spree.user_class

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

@@ -47,29 +47,30 @@ module Spree
       end
 
       private
-        def product
-          @product ||= Spree::Product.accessible_by(current_ability, :read).friendly.find(params[:product_id]) if params[:product_id]
-        end
-
-        def scope
-          if @product
-            variants = @product.variants_including_master
-          else
-            variants = Variant
-          end
 
-          if current_ability.can?(:manage, Variant) && params[:show_deleted]
-            variants = variants.with_deleted
-          end
+      def product
+        @product ||= Spree::Product.accessible_by(current_ability, :read).friendly.find(params[:product_id]) if params[:product_id]
+      end
 
-          variants = variants.accessible_by(current_ability, :read)
-          variants = variants.in_stock if params[:in_stock_only] || cannot?(:view_out_of_stock, Spree::Variant)
-          variants
+      def scope
+        if @product
+          variants = @product.variants_including_master
+        else
+          variants = Variant
         end
 
-        def variant_params
-          params.require(:variant).permit(permitted_variant_attributes)
+        if current_ability.can?(:manage, Variant) && params[:show_deleted]
+          variants = variants.with_deleted
         end
+
+        variants = variants.accessible_by(current_ability, :read)
+        variants = variants.in_stock if params[:in_stock_only] || cannot?(:view_out_of_stock, Spree::Variant)
+        variants
+      end
+
+      def variant_params
+        params.require(:variant).permit(permitted_variant_attributes)
+      end
     end
   end
 end

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

@@ -1,12 +1,11 @@
 module Spree
   module Api
     class ZonesController < Spree::Api::BaseController
-
       def create
         authorize! :create, Zone
         @zone = Zone.new(zone_params)
         if @zone.save
-          respond_with(@zone, :status => 201, :default_template => :show)
+          respond_with(@zone, status: 201, default_template: :show)
         else
           invalid_resource!(@zone)
         end
@@ -15,7 +14,7 @@ module Spree
       def destroy
         authorize! :destroy, zone
         zone.destroy
-        respond_with(zone, :status => 204)
+        respond_with(zone, status: 204)
       end
 
       def index
@@ -30,7 +29,7 @@ module Spree
       def update
         authorize! :update, zone
         if zone.update_attributes(zone_params)
-          respond_with(zone, :status => 200, :default_template => :show)
+          respond_with(zone, status: 200, default_template: :show)
         else
           invalid_resource!(zone)
         end