spree_api 3.3.6 → 3.4.0.rc1

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

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

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

@@ -5,5 +5,5 @@ node(:current_page) { params[:page].try(:to_i) || 1 }
 node(:pages) { @shipments.total_pages }
 
 child(@shipments => :shipments) do
-  extends "spree/api/v1/shipments/big"
+  extends 'spree/api/v1/shipments/big'
 end

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

@@ -5,11 +5,11 @@ node(:order_id) { |shipment| shipment.order.number }
 node(:stock_location_name) { |shipment| shipment.stock_location.name }
 
 child shipping_rates: :shipping_rates do
-  extends "spree/api/v1/shipping_rates/show"
+  extends 'spree/api/v1/shipping_rates/show'
 end
 
 child selected_shipping_rate: :selected_shipping_rate do
-  extends "spree/api/v1/shipping_rates/show"
+  extends 'spree/api/v1/shipping_rates/show'
 end
 
 child shipping_methods: :shipping_methods do
@@ -25,8 +25,8 @@ end
 
 child manifest: :manifest do
   child variant: :variant do
-    extends "spree/api/v1/variants/small"
+    extends 'spree/api/v1/variants/small'
   end
-  node(:quantity) { |m| m.quantity }
-  node(:states) { |m| m.states }
+  node(:quantity, &:quantity)
+  node(:states, &:states)
 end

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

@@ -6,11 +6,11 @@ node(:order_id) { |shipment| shipment.order.number }
 node(:stock_location_name) { |shipment| shipment.stock_location.name }
 
 child shipping_rates: :shipping_rates do
-  extends "spree/api/v1/shipping_rates/show"
+  extends 'spree/api/v1/shipping_rates/show'
 end
 
 child selected_shipping_rate: :selected_shipping_rate do
-  extends "spree/api/v1/shipping_rates/show"
+  extends 'spree/api/v1/shipping_rates/show'
 end
 
 child shipping_methods: :shipping_methods do
@@ -28,10 +28,10 @@ child manifest: :manifest do
   glue(:variant) do
     attribute id: :variant_id
   end
-  node(:quantity) { |m| m.quantity }
-  node(:states) { |m| m.states }
+  node(:quantity, &:quantity)
+  node(:states, &:states)
 end
 
 child adjustments: :adjustments do
-  extends "spree/api/v1/adjustments/show"
+  extends 'spree/api/v1/adjustments/show'
 end

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

@@ -1,2 +1,2 @@
-attributes  :id, :name, :cost, :selected, :shipping_method_id, :shipping_method_code
+attributes :id, :name, :cost, :selected, :shipping_method_id, :shipping_method_code
 node(:display_cost) { |sr| sr.display_cost.to_s }

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

@@ -1,7 +1,5 @@
 object false
-if @country
-  node(:states_required) { @country.states_required }
-end
+node(:states_required) { @country.states_required } if @country
 
 child(@states => :states) do
   attributes *state_attributes

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

@@ -1,5 +1,5 @@
 object @stock_item
 attributes *stock_item_attributes
 child(:variant) do
-  extends "spree/api/v1/variants/small"
+  extends 'spree/api/v1/variants/small'
 end

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

@@ -1,8 +1,8 @@
 object @stock_location
 attributes *stock_location_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/stock_movements/show.v1.rabl

@@ -1,5 +1,5 @@
 object @stock_movement
 attributes *stock_movement_attributes
 child :stock_item do
-  extends "spree/api/v1/stock_items/show"
+  extends 'spree/api/v1/stock_items/show'
 end

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

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

data/app/views/spree/api/v1/taxonomies/jstree.rabl

@@ -2,7 +2,6 @@ object false
 node(:data) { @taxonomy.root.name }
 node(:attr) do
   { id: @taxonomy.root.id,
-    name: @taxonomy.root.name
-  }
+    name: @taxonomy.root.name }
 end
-node(:state) { "closed" }
+node(:state) { 'closed' }

data/app/views/spree/api/v1/taxonomies/nested.v1.rabl

@@ -6,6 +6,6 @@ child root: :root do
   child children: :taxons do
     attributes *taxon_attributes
 
-    extends "spree/api/v1/taxons/taxons"
+    extends 'spree/api/v1/taxons/taxons'
   end
 end

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

@@ -1,7 +1,7 @@
 object @taxonomy
 
 if params[:set] == 'nested'
-  extends "spree/api/v1/taxonomies/nested"
+  extends 'spree/api/v1/taxonomies/nested'
 else
   attributes *taxonomy_attributes
 

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

@@ -6,7 +6,5 @@ node(:per_page) { params[:per_page].try(:to_i) || Kaminari.config.default_per_pa
 node(:pages) { @taxons.total_pages }
 child @taxons => :taxons do
   attributes *taxon_attributes
-  unless params[:without_children]
-    extends "spree/api/v1/taxons/taxons"
-  end
+  extends 'spree/api/v1/taxons/taxons' unless params[:without_children]
 end

data/app/views/spree/api/v1/taxons/jstree.rabl

@@ -1,8 +1,7 @@
 collection @taxon.children, object_root: false
-node(:data) { |taxon| taxon.name }
+node(:data, &:name)
 node(:attr) do |taxon|
   { id: taxon.id,
-    name: taxon.name
-  }
+    name: taxon.name }
 end
-node(:state) { "closed" }
+node(:state) { 'closed' }

data/app/views/spree/api/v1/taxons/taxons.v1.rabl

@@ -1,5 +1,5 @@
 attributes *taxon_attributes
 
 node :taxons do |t|
-  t.children.map { |c| partial("spree/api/v1/taxons/taxons", object: c) }
+  t.children.map { |c| partial('spree/api/v1/taxons/taxons', object: c) }
 end

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

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

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

@@ -3,9 +3,9 @@ cache [I18n.locale, root_object]
 
 attributes *user_attributes
 child(bill_address: :bill_address) do
-  extends "spree/api/v1/addresses/show"
+  extends 'spree/api/v1/addresses/show'
 end
 
 child(ship_address: :ship_address) do
-  extends "spree/api/v1/addresses/show"
-end
+  extends 'spree/api/v1/addresses/show'
+end

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

@@ -2,7 +2,7 @@ object @variant
 
 cache [I18n.locale, @current_user_roles.include?('admin'), 'big_variant', root_object]
 
-extends "spree/api/v1/variants/small"
+extends 'spree/api/v1/variants/small'
 
 child(stock_items: :stock_items) do
   attributes :id, :count_on_hand, :stock_location_id, :backorderable

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

@@ -5,5 +5,5 @@ node(:current_page) { params[:page] ? params[:page].to_i : 1 }
 node(:pages) { @variants.total_pages }
 
 child(@variants => :variants) do
-  extends "spree/api/v1/variants/big"
+  extends 'spree/api/v1/variants/big'
 end

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

@@ -1,3 +1,3 @@
 object @variant
 cache [I18n.locale, @current_user_roles.include?('admin'), 'show', root_object]
-extends "spree/api/v1/variants/big"
+extends 'spree/api/v1/variants/big'

data/app/views/spree/api/v1/variants/small.v1.rabl

@@ -3,16 +3,16 @@ cache [I18n.locale, @current_user_roles.include?('admin'), 'small_variant', root
 attributes *variant_attributes
 
 node(:display_price) { |p| p.display_price.to_s }
-node(:options_text) { |v| v.options_text }
-node(:track_inventory) { |v| v.should_track_inventory? }
-node(:in_stock) { |v| v.in_stock? }
-node(:is_backorderable) { |v| v.is_backorderable? }
+node(:options_text, &:options_text)
+node(:track_inventory, &:should_track_inventory?)
+node(:in_stock, &:in_stock?)
+node(:is_backorderable, &:is_backorderable?)
 node(:is_orderable) { |v| v.is_backorderable? || v.in_stock? }
-node(:total_on_hand) { |v| v.total_on_hand }
-node(:is_destroyed) { |v| v.destroyed? }
+node(:total_on_hand, &:total_on_hand)
+node(:is_destroyed, &:destroyed?)
 
 child option_values: :option_values do
   attributes *option_value_attributes
 end
 
-child(images: :images) { extends "spree/api/v1/images/show" }
+child(images: :images) { extends 'spree/api/v1/images/show' }

data/config/routes.rb

@@ -61,7 +61,7 @@ Spree::Core::Engine.add_routes do
       resources :option_values, only: :index
 
       get '/orders/mine', to: 'orders#mine', as: 'my_orders'
-      get "/orders/current", to: "orders#current", as: "current_order"
+      get '/orders/current', to: 'orders#current', as: 'current_order'
 
       resources :orders, concerns: :order_routes
 
@@ -122,14 +122,14 @@ Spree::Core::Engine.add_routes do
 
     spree_path = Rails.application.routes.url_helpers.try(:spree_path, trailing_slash: true) || '/'
 
-    match 'v:api/*path', to: redirect{ |params, request|
+    match 'v:api/*path', to: redirect { |params, request|
       format = ".#{params[:format]}" unless params[:format].blank?
       query  = "?#{request.query_string}" unless request.query_string.blank?
 
       "#{spree_path}api/v1/#{params[:path]}#{format}#{query}"
     }, via: [:get, :post, :put, :patch, :delete]
 
-    match '*path', to: redirect{ |params, request|
+    match '*path', to: redirect { |params, request|
       format = ".#{params[:format]}" unless params[:format].blank?
       query  = "?#{request.query_string}" unless request.query_string.blank?
 

data/lib/spree/api/controller_setup.rb

@@ -8,8 +8,8 @@ module Spree
           include CanCan::ControllerAdditions
           include Spree::Core::ControllerHelpers::Auth
 
-          prepend_view_path Rails.root + "app/views"
-          append_view_path File.expand_path("../../../app/views", File.dirname(__FILE__))
+          prepend_view_path Rails.root + 'app/views'
+          append_view_path File.expand_path('../../../app/views', File.dirname(__FILE__))
 
           self.responder = Spree::Api::Responders::AppResponder
           respond_to :json

data/lib/spree/api/engine.rb

@@ -17,7 +17,7 @@ module Spree
         config.json_engine = ActiveSupport::JSON
       end
 
-      initializer "spree.api.versioncake" do |_app|
+      initializer 'spree.api.versioncake' do |_app|
         VersionCake.setup do |config|
           config.resources do |r|
             r.resource %r{.*}, [], [], [1]
@@ -28,12 +28,12 @@ module Spree
         end
       end
 
-      initializer "spree.api.environment", before: :load_config_initializers do |app|
+      initializer 'spree.api.environment', before: :load_config_initializers do |_app|
         Spree::Api::Config = Spree::ApiConfiguration.new
       end
 
       def self.activate
-        Dir.glob(File.join(File.dirname(__FILE__), "../../../app/**/*_decorator*.rb")) do |c|
+        Dir.glob(File.join(File.dirname(__FILE__), '../../../app/**/*_decorator*.rb')) do |c|
           Rails.configuration.cache_classes ? require(c) : load(c)
         end
       end

data/lib/spree/api/responders/rabl_template.rb

@@ -17,11 +17,9 @@ module Spree
         end
 
         def api_behavior
-          if controller.params[:action] == "destroy"
+          if controller.params[:action] == 'destroy'
             # Render a blank template
             super
-          else
-            # Do nothing and fallback to the default template
           end
         end
       end

data/lib/spree/api/testing_support/caching.rb

@@ -1,10 +1,10 @@
 RSpec.configure do |config|
-  config.before(:each, caching: true) do 
+  config.before(:each, caching: true) do
     ActionController::Base.perform_caching = true
   end
-  
+
   config.after(:each, caching: true) do
     ActionController::Base.perform_caching = false
     Rails.cache.clear
   end
-end
+end

data/lib/spree/api/testing_support/helpers.rb

@@ -12,12 +12,12 @@ module Spree
         end
 
         def assert_not_found!
-          expect(json_response).to eq({ "error" => "The resource you were looking for could not be found." })
+          expect(json_response).to eq('error' => 'The resource you were looking for could not be found.')
           expect(response.status).to eq 404
         end
 
         def assert_unauthorized!
-          expect(json_response).to eq({ "error" => "You are not authorized to perform that action." })
+          expect(json_response).to eq('error' => 'You are not authorized to perform that action.')
           expect(response.status).to eq 401
         end
 
@@ -28,11 +28,11 @@ module Spree
         # This method can be overriden (with a let block) inside a context
         # For instance, if you wanted to have an admin user instead.
         def current_api_user
-          @current_api_user ||= stub_model(Spree.user_class, email: "spree@example.com")
+          @current_api_user ||= stub_model(Spree.user_class, email: 'spree@example.com')
         end
 
         def image(filename)
-          File.open(Spree::Api::Engine.root + "spec/fixtures" + filename)
+          File.open(Spree::Api::Engine.root + 'spec/fixtures' + filename)
         end
 
         def upload_image(filename)

data/lib/spree/api/testing_support/setup.rb

@@ -5,8 +5,8 @@ module Spree
         def sign_in_as_admin!
           let!(:current_api_user) do
             user = stub_model(Spree.user_class)
-            allow(user).to receive_message_chain(:spree_roles, :pluck).and_return(["admin"])
-            allow(user).to receive(:has_spree_role?).with("admin").and_return(true)
+            allow(user).to receive_message_chain(:spree_roles, :pluck).and_return(['admin'])
+            allow(user).to receive(:has_spree_role?).with('admin').and_return(true)
             user
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 3.3.6
+  version: 3.4.0.rc1
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.6
+        version: 3.4.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.6
+        version: 3.4.0.rc1
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -230,12 +230,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Spree's API