spree_api 3.3.6 → 3.4.0.rc1

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

@@ -2,7 +2,6 @@ module Spree
   module Api
     module V1
       class UsersController < Spree::Api::BaseController
-
         rescue_from Spree::Core::DestroyWithOrdersError, with: :error_during_processing
 
         def index
@@ -24,8 +23,7 @@ module Spree
           respond_with(user)
         end
 
-        def new
-        end
+        def new; end
 
         def create
           authorize! :create, Spree.user_class
@@ -63,7 +61,6 @@ module Spree
                                          [bill_address_attributes: permitted_address_attributes,
                                           ship_address_attributes: permitted_address_attributes])
         end
-
       end
     end
   end

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

@@ -24,17 +24,16 @@ module Spree
         # we render on the view so we better update it any time a node is included
         # or removed from the views.
         def index
-          @variants = scope.includes({ option_values: :option_type }, :product, :default_price, :images, { stock_items: :stock_location })
-            .ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
+          @variants = scope.includes({ option_values: :option_type }, :product, :default_price, :images, stock_items: :stock_location).
+                      ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
           respond_with(@variants)
         end
 
-        def new
-        end
+        def new; end
 
         def show
-          @variant = scope.includes({ option_values: :option_type }, :option_values, :product, :default_price, :images, { stock_items: :stock_location })
-            .find(params[:id])
+          @variant = scope.includes({ option_values: :option_type }, :option_values, :product, :default_price, :images, stock_items: :stock_location).
+                     find(params[:id])
           respond_with(@variant)
         end
 
@@ -48,27 +47,28 @@ 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
+        def product
+          @product ||= Spree::Product.accessible_by(current_ability, :read).friendly.find(params[:product_id]) if params[:product_id]
+        end
 
-            if current_ability.can?(:manage, Variant) && params[:show_deleted]
-              variants = variants.with_deleted
-            end
+        def scope
+          variants = if @product
+                       @product.variants_including_master
+                     else
+                       Variant
+                     end
 
-            variants.accessible_by(current_ability, :read)
+          if current_ability.can?(:manage, Variant) && params[:show_deleted]
+            variants = variants.with_deleted
           end
 
-          def variant_params
-            params.require(:variant).permit(permitted_variant_attributes)
-          end
+          variants.accessible_by(current_ability, :read)
+        end
+
+        def variant_params
+          params.require(:variant).permit(permitted_variant_attributes)
+        end
       end
     end
   end

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

@@ -2,7 +2,6 @@ module Spree
   module Api
     module V1
       class ZonesController < Spree::Api::BaseController
-
         def create
           authorize! :create, Zone
           @zone = Spree::Zone.new(zone_params)

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

@@ -38,14 +38,14 @@ module Spree
       mattr_reader *ATTRIBUTES
 
       def required_fields_for(model)
-        required_fields = model._validators.select do |field, validations|
+        required_fields = model._validators.select do |_field, validations|
           validations.any? { |v| v.is_a?(ActiveModel::Validations::PresenceValidator) }
         end.map(&:first) # get fields that are invalid
         # 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")
+        required_fields.map!(&:to_s).delete('permalink')
         # Do not require slugs, either
-        required_fields.delete("slug")
+        required_fields.delete('slug')
         required_fields
       end
 
@@ -126,7 +126,7 @@ module Spree
       @@adjustment_attributes = [
         :id, :source_type, :source_id, :adjustable_type, :adjustable_id,
         :originator_type, :originator_id, :amount, :label, :mandatory,
-        :locked, :eligible,  :created_at, :updated_at
+        :locked, :eligible, :created_at, :updated_at
       ]
 
       @@creditcard_attributes = [
@@ -177,7 +177,7 @@ module Spree
       ]
 
       def variant_attributes
-        if @current_user_roles && @current_user_roles.include?("admin")
+        if @current_user_roles && @current_user_roles.include?('admin')
           @@variant_attributes + [:cost_price]
         else
           @@variant_attributes

data/app/views/spree/api/errors/gateway_error.v1.rabl

@@ -1,2 +1,2 @@
 object false
-node(:error) { I18n.t(:gateway_error, scope: "spree.api", text: @error) }
+node(:error) { I18n.t(:gateway_error, scope: 'spree.api', text: @error) }

data/app/views/spree/api/errors/invalid_api_key.v1.rabl

@@ -1,2 +1,2 @@
 object false
-node(:error) { I18n.t(:invalid_api_key, key: api_key, scope: "spree.api") }
+node(:error) { I18n.t(:invalid_api_key, key: api_key, scope: 'spree.api') }

data/app/views/spree/api/errors/invalid_resource.v1.rabl

@@ -1,3 +1,3 @@
 object false
-node(:error) { I18n.t(:invalid_resource, scope: "spree.api") }
+node(:error) { I18n.t(:invalid_resource, scope: 'spree.api') }
 node(:errors) { @resource.errors.to_hash }

data/app/views/spree/api/errors/must_specify_api_key.v1.rabl

@@ -1,2 +1,2 @@
 object false
-node(:error) { I18n.t(:must_specify_api_key, scope: "spree.api") }
+node(:error) { I18n.t(:must_specify_api_key, scope: 'spree.api') }

data/app/views/spree/api/errors/not_found.v1.rabl

@@ -1,2 +1,2 @@
 object false
-node(:error) { I18n.t(:resource_not_found, scope: "spree.api") }
+node(:error) { I18n.t(:resource_not_found, scope: 'spree.api') }

data/app/views/spree/api/errors/unauthorized.v1.rabl

@@ -1,2 +1,2 @@
 object false
-node(:error) { I18n.t(:unauthorized, scope: "spree.api") }
+node(:error) { I18n.t(:unauthorized, scope: 'spree.api') }

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

@@ -2,9 +2,9 @@ object @address
 cache [I18n.locale, root_object]
 attributes *address_attributes
 
-child(:country) do |address|
+child(:country) do |_address|
   attributes *country_attributes
 end
-child(:state) do |address|
+child(:state) do |_address|
   attributes *state_attributes
 end

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

@@ -1,6 +1,6 @@
 object false
 child(@credit_cards => :credit_cards) do
-  extends "spree/api/v1/credit_cards/show"
+  extends 'spree/api/v1/credit_cards/show'
 end
 node(:count) { @credit_cards.count }
 node(:current_page) { params[:page].try(:to_i) || 1 }

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

@@ -1,4 +1,4 @@
 object false
 child(@images => :images) do
-  extends "spree/api/v1/images/show"
+  extends 'spree/api/v1/images/show'
 end

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

@@ -1,6 +1,6 @@
 object @image
 attributes *image_attributes
 attributes :viewable_type, :viewable_id
-Spree::Image.attachment_definitions[:attachment][:styles].each do |k,v|
+Spree::Image.attachment_definitions[:attachment][:styles].each do |k, _v|
   node("#{k}_url") { |i| i.attachment.url(k) }
 end

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

@@ -3,12 +3,12 @@ cache [I18n.locale, root_object]
 attributes *line_item_attributes
 node(:single_display_amount) { |li| li.single_display_amount.to_s }
 node(:display_amount) { |li| li.display_amount.to_s }
-node(:total) { |li| li.total }
+node(:total, &:total)
 child :variant do
-  extends "spree/api/v1/variants/small"
+  extends 'spree/api/v1/variants/small'
   attributes :product_id
 end
 
 child adjustments: :adjustments do
-  extends "spree/api/v1/adjustments/show"
+  extends 'spree/api/v1/adjustments/show'
 end

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

@@ -1,3 +1,3 @@
 collection @option_types
 
-extends "spree/api/v1/option_types/show"
+extends 'spree/api/v1/option_types/show'

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

@@ -2,4 +2,4 @@ object @option_type
 attributes *option_type_attributes
 child option_values: :option_values do
   attributes *option_value_attributes
-end
+end

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

@@ -1,3 +1,3 @@
 collection @option_values
 
-extends "spree/api/v1/option_values/show"
+extends 'spree/api/v1/option_values/show'

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

@@ -1,2 +1,2 @@
 object @option_value
-attributes *option_value_attributes
+attributes *option_value_attributes

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

@@ -1,3 +1,3 @@
 object false
-node(:error) { I18n.t(:could_not_transition, scope: "spree.api.order") }
+node(:error) { I18n.t(:could_not_transition, scope: 'spree.api.order') }
 node(:errors) { @order.errors.to_hash }

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

@@ -1,6 +1,6 @@
 object false
 child(@orders => :orders) do
-  extends "spree/api/v1/orders/order"
+  extends 'spree/api/v1/orders/order'
 end
 node(:count) { @orders.count }
 node(:current_page) { params[:page].try(:to_i) || 1 }

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

@@ -1,2 +1,2 @@
 object false
-node(:errors) { [I18n.t(:invalid_shipping_method, scope: "spree.api.order")] }
+node(:errors) { [I18n.t(:invalid_shipping_method, scope: 'spree.api.order')] }

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

@@ -1,7 +1,7 @@
 object false
 
 child(@orders => :orders) do
-  extends "spree/api/v1/orders/show"
+  extends 'spree/api/v1/orders/show'
 end
 
 node(:count) { @orders.count }

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

@@ -3,8 +3,8 @@ 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_total) { |o| o.display_total.to_s }
-node(:display_ship_total) { |o| o.display_ship_total }
-node(:display_tax_total) { |o| o.display_tax_total }
-node(:display_adjustment_total) { |o| o.display_adjustment_total }
-node(:token) { |o| o.guest_token }
-node(:checkout_steps) { |o| o.checkout_steps }
+node(:display_ship_total, &:display_ship_total)
+node(:display_tax_total, &:display_tax_total)
+node(:display_adjustment_total, &:display_adjustment_total)
+node(:token, &:guest_token)
+node(:checkout_steps, &:checkout_steps)

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

@@ -1,20 +1,20 @@
 object @order
-extends "spree/api/v1/orders/order"
+extends 'spree/api/v1/orders/order'
 
 if lookup_context.find_all("spree/api/v1/orders/#{root_object.state}").present?
   extends "spree/api/v1/orders/#{root_object.state}"
 end
 
 child billing_address: :bill_address do
-  extends "spree/api/v1/addresses/show"
+  extends 'spree/api/v1/addresses/show'
 end
 
 child shipping_address: :ship_address do
-  extends "spree/api/v1/addresses/show"
+  extends 'spree/api/v1/addresses/show'
 end
 
 child line_items: :line_items do
-  extends "spree/api/v1/line_items/show"
+  extends 'spree/api/v1/line_items/show'
 end
 
 child payments: :payments do
@@ -34,11 +34,11 @@ child payments: :payments do
 end
 
 child shipments: :shipments do
-  extends "spree/api/v1/shipments/small"
+  extends 'spree/api/v1/shipments/small'
 end
 
 child adjustments: :adjustments do
-  extends "spree/api/v1/adjustments/show"
+  extends 'spree/api/v1/adjustments/show'
 end
 
 # Necessary for backend's order interface
@@ -47,5 +47,5 @@ node :permissions do
 end
 
 child valid_credit_cards: :credit_cards do
-  extends "spree/api/v1/credit_cards/show"
+  extends 'spree/api/v1/credit_cards/show'
 end

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

@@ -1,6 +1,6 @@
 object false
 child(@product_properties => :product_properties) do
-  attributes *product_property_attributes 
+  attributes *product_property_attributes
 end
 node(:count) { @product_properties.count }
 node(:current_page) { params[:page].try(:to_i) || 1 }

data/app/views/spree/api/v1/product_properties/new.v1.rabl

@@ -1,2 +1,2 @@
 node(:attributes) { [*product_property_attributes] }
-node(:required_attributes) { [] }
+node(:required_attributes) { [] }

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

@@ -5,5 +5,5 @@ node(:current_page) { params[:page] ? params[:page].to_i : 1 }
 node(:per_page) { params[:per_page].try(:to_i) || Kaminari.config.default_per_page }
 node(:pages) { @products.total_pages }
 child(@products => :products) do
-  extends "spree/api/v1/products/show"
+  extends 'spree/api/v1/products/show'
 end

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

@@ -4,15 +4,15 @@ cache [I18n.locale, @current_user_roles.include?('admin'), current_currency, roo
 attributes *product_attributes
 
 node(:display_price) { |p| p.display_price.to_s }
-node(:has_variants) { |p| p.has_variants? }
-node(:taxon_ids) { |p| p.taxon_ids }
+node(:has_variants, &:has_variants?)
+node(:taxon_ids, &:taxon_ids)
 
 child master: :master do
-  extends "spree/api/v1/variants/small"
+  extends 'spree/api/v1/variants/small'
 end
 
 child variants: :variants do
-  extends "spree/api/v1/variants/small"
+  extends 'spree/api/v1/variants/small'
 end
 
 child option_types: :option_types do
@@ -27,6 +27,6 @@ child classifications: :classifications do
   attributes :taxon_id, :position
 
   child(:taxon) do
-    extends "spree/api/v1/taxons/show"
+    extends 'spree/api/v1/taxons/show'
   end
 end

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

@@ -1,2 +1,2 @@
 object @return_authorization
-attributes *return_authorization_attributes
+attributes *return_authorization_attributes

data/app/views/spree/api/v1/shared/stock_location_required.v1.rabl

@@ -1,2 +1,2 @@
 object false
-node(:error) { I18n.t(:stock_location_required, scope: "spree.api") }
+node(:error) { I18n.t(:stock_location_required, scope: 'spree.api') }

data/app/views/spree/api/v1/shipments/big.v1.rabl

@@ -3,7 +3,7 @@ cache @shipment
 attributes *shipment_attributes
 
 child selected_shipping_rate: :selected_shipping_rate do
-  extends "spree/api/v1/shipping_rates/show"
+  extends 'spree/api/v1/shipping_rates/show'
 end
 
 child inventory_units: :inventory_units do
@@ -11,32 +11,32 @@ child inventory_units: :inventory_units do
   attributes *inventory_unit_attributes
 
   child :variant do
-    extends "spree/api/v1/variants/small"
+    extends 'spree/api/v1/variants/small'
     attributes :product_id
-    child(images: :images) { extends "spree/api/v1/images/show" }
+    child(images: :images) { extends 'spree/api/v1/images/show' }
   end
 
   child :line_item do
     attributes *line_item_attributes
     node(:single_display_amount) { |li| li.single_display_amount.to_s }
     node(:display_amount) { |li| li.display_amount.to_s }
-    node(:total) { |li| li.total }
+    node(:total, &:total)
   end
 end
 
 child order: :order do
-  extends "spree/api/v1/orders/order"
+  extends 'spree/api/v1/orders/order'
 
   child billing_address: :bill_address do
-    extends "spree/api/v1/addresses/show"
+    extends 'spree/api/v1/addresses/show'
   end
 
   child shipping_address: :ship_address do
-    extends "spree/api/v1/addresses/show"
+    extends 'spree/api/v1/addresses/show'
   end
 
   child adjustments: :adjustments do
-    extends "spree/api/v1/adjustments/show"
+    extends 'spree/api/v1/adjustments/show'
   end
 
   child payments: :payments do