spree_api 3.1.5 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b8ad4edd7469cb2c67174d856ae8aa1284f183c
-  data.tar.gz: 2ab89546cef6d0e1a1ab7b89ae248030db2f4704
+  metadata.gz: eb6992b77897c73750856161f7dbc3dffb5c364e
+  data.tar.gz: '0964719f61957349955e4829a300d00797244ac5'
 SHA512:
-  metadata.gz: f2a3c1859e39e8040005fe536d1d26e53e8dc6179a318435d74c26cf7ec7ccff9207e1bb26a3f30776175eac0414788158030d391d814da48d84cf8910be4811
-  data.tar.gz: dec9414e9c0f82be84fcd5a6c8a019ed10964c92e053610ee6a0df383bd44db14176adaf4bc7b094f05f83d6a22f76a17e2369f4440c20b2feb36b80a3deb985
+  metadata.gz: 75cbb0627aca0fa825b74c296d394384f2db34023000b0560887c6d7ec71e73af880e4251d592c70246f7fe05f72e76f739498377eba8140b7eb8e8d5f27a168
+  data.tar.gz: ae601fbe2cc4e48de3a1c41fcdaa80f4b586a4af14375c0f82d133f6684feec55b78490ff6692101675b0ce23c93242b3af2d459b9286fe40f330c5830b0bd61

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

@@ -30,9 +30,9 @@ module Spree
         end
 
         def update
-          if @product_property
-            authorize! :update, @product_property
-            @product_property.update_attributes(product_property_params)
+          authorize! :update, @product_property
+
+          if @product_property.update_attributes(product_property_params)
             respond_with(@product_property, status: 200, default_template: :show)
           else
             invalid_resource!(@product_property)
@@ -40,13 +40,9 @@ module Spree
         end
 
         def destroy
-          if @product_property
-            authorize! :destroy, @product_property
-            @product_property.destroy
-            respond_with(@product_property, status: 204)
-          else
-            invalid_resource!(@product_property)
-          end
+          authorize! :destroy, @product_property
+          @product_property.destroy
+          respond_with(@product_property, status: 204)
         end
 
         private
@@ -60,6 +56,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
             authorize! :read, @product_property
           end
         end

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

@@ -3,5 +3,5 @@ child(@countries => :countries) do
   attributes *country_attributes
 end
 node(:count) { @countries.count }
-node(:current_page) { params[:page] || 1 }
+node(:current_page) { params[:page].try(:to_i) || 1 }
 node(:pages) { @countries.total_pages }

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

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

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

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

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

@@ -5,5 +5,5 @@ child(@orders => :orders) do
 end
 
 node(:count) { @orders.count }
-node(:current_page) { params[:page] || 1 }
+node(:current_page) { params[:page].try(:to_i) || 1 }
 node(:pages) { @orders.total_pages }

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

@@ -3,5 +3,5 @@ child(@payments => :payments) do
   attributes *payment_attributes
 end
 node(:count) { @payments.count }
-node(:current_page) { params[:page] || 1 }
+node(:current_page) { params[:page].try(:to_i) || 1 }
 node(:pages) { @payments.total_pages }

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

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

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

@@ -2,7 +2,7 @@ object false
 node(:count) { @products.count }
 node(:total_count) { @products.total_count }
 node(:current_page) { params[:page] ? params[:page].to_i : 1 }
-node(:per_page) { params[:per_page] || Kaminari.config.default_per_page }
+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"

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

@@ -3,5 +3,5 @@ child(@properties => :properties) do
   attributes *property_attributes
 end
 node(:count) { @properties.count }
-node(:current_page) { params[:page] || 1 }
+node(:current_page) { params[:page].try(:to_i) || 1 }
 node(:pages) { @properties.total_pages }

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

@@ -3,5 +3,5 @@ child(@return_authorizations => :return_authorizations) do
   attributes *return_authorization_attributes
 end
 node(:count) { @return_authorizations.count }
-node(:current_page) { params[:page] || 1 }
+node(:current_page) { params[:page].try(:to_i) || 1 }
 node(:pages) { @return_authorizations.total_pages }

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

@@ -1,7 +1,7 @@
 object false
 
 node(:count) { @shipments.count }
-node(:current_page) { params[:page] || 1 }
+node(:current_page) { params[:page].try(:to_i) || 1 }
 node(:pages) { @shipments.total_pages }
 
 child(@shipments => :shipments) do

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

@@ -9,6 +9,6 @@ end
 
 if @states.respond_to?(:total_pages)
   node(:count) { @states.count }
-  node(:current_page) { params[:page] || 1 }
+  node(:current_page) { params[:page].try(:to_i) || 1 }
   node(:pages) { @states.total_pages }
 end

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@ object false
 node(:count) { @taxons.count }
 node(:total_count) { @taxons.total_count }
 node(:current_page) { params[:page] ? params[:page].to_i : 1 }
-node(:per_page) { params[:per_page] || Kaminari.config.default_per_page }
+node(:per_page) { params[:per_page].try(:to_i) || Kaminari.config.default_per_page }
 node(:pages) { @taxons.total_pages }
 child @taxons => :taxons do
   attributes *taxon_attributes

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

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

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

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

data/spree_api.gemspec

@@ -9,9 +9,8 @@ Gem::Specification.new do |s|
   s.homepage      = 'https://spreecommerce.com'
   s.license       = 'BSD-3'
 
-  s.files         = `git ls-files`.split($\)
+  s.files         = `git ls-files`.split($\).reject { |f| f.match(/^spec/) }
   s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.name          = "spree_api"
   s.require_paths = ["lib"]
   s.version       = Spree.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.6
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-07-28 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.1.5
+        version: 3.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.5
+        version: 3.1.6
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -206,47 +206,6 @@ files:
 - lib/spree/api/testing_support/setup.rb
 - lib/spree_api.rb
 - script/rails
-- spec/controllers/spree/api/base_controller_spec.rb
-- spec/controllers/spree/api/v1/addresses_controller_spec.rb
-- spec/controllers/spree/api/v1/checkouts_controller_spec.rb
-- spec/controllers/spree/api/v1/classifications_controller_spec.rb
-- spec/controllers/spree/api/v1/countries_controller_spec.rb
-- spec/controllers/spree/api/v1/credit_cards_controller_spec.rb
-- spec/controllers/spree/api/v1/images_controller_spec.rb
-- spec/controllers/spree/api/v1/inventory_units_controller_spec.rb
-- spec/controllers/spree/api/v1/line_items_controller_spec.rb
-- spec/controllers/spree/api/v1/option_types_controller_spec.rb
-- spec/controllers/spree/api/v1/option_values_controller_spec.rb
-- spec/controllers/spree/api/v1/orders_controller_spec.rb
-- spec/controllers/spree/api/v1/payments_controller_spec.rb
-- spec/controllers/spree/api/v1/product_properties_controller_spec.rb
-- spec/controllers/spree/api/v1/products_controller_spec.rb
-- spec/controllers/spree/api/v1/promotion_application_spec.rb
-- spec/controllers/spree/api/v1/promotions_controller_spec.rb
-- spec/controllers/spree/api/v1/properties_controller_spec.rb
-- spec/controllers/spree/api/v1/return_authorizations_controller_spec.rb
-- spec/controllers/spree/api/v1/shipments_controller_spec.rb
-- spec/controllers/spree/api/v1/states_controller_spec.rb
-- spec/controllers/spree/api/v1/stock_items_controller_spec.rb
-- spec/controllers/spree/api/v1/stock_locations_controller_spec.rb
-- spec/controllers/spree/api/v1/stock_movements_controller_spec.rb
-- spec/controllers/spree/api/v1/stores_controller_spec.rb
-- spec/controllers/spree/api/v1/taxonomies_controller_spec.rb
-- spec/controllers/spree/api/v1/taxons_controller_spec.rb
-- spec/controllers/spree/api/v1/unauthenticated_products_controller_spec.rb
-- spec/controllers/spree/api/v1/users_controller_spec.rb
-- spec/controllers/spree/api/v1/variants_controller_spec.rb
-- spec/controllers/spree/api/v1/zones_controller_spec.rb
-- spec/fixtures/thinking-cat.jpg
-- spec/models/spree/legacy_user_spec.rb
-- spec/requests/rabl_cache_spec.rb
-- spec/requests/ransackable_attributes_spec.rb
-- spec/requests/version_spec.rb
-- spec/shared_examples/protect_product_actions.rb
-- spec/spec_helper.rb
-- spec/support/controller_hacks.rb
-- spec/support/database_cleaner.rb
-- spec/support/have_attributes_matcher.rb
 - spree_api.gemspec
 homepage: https://spreecommerce.com
 licenses:
@@ -268,49 +227,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Spree's API
-test_files:
-- spec/controllers/spree/api/base_controller_spec.rb
-- spec/controllers/spree/api/v1/addresses_controller_spec.rb
-- spec/controllers/spree/api/v1/checkouts_controller_spec.rb
-- spec/controllers/spree/api/v1/classifications_controller_spec.rb
-- spec/controllers/spree/api/v1/countries_controller_spec.rb
-- spec/controllers/spree/api/v1/credit_cards_controller_spec.rb
-- spec/controllers/spree/api/v1/images_controller_spec.rb
-- spec/controllers/spree/api/v1/inventory_units_controller_spec.rb
-- spec/controllers/spree/api/v1/line_items_controller_spec.rb
-- spec/controllers/spree/api/v1/option_types_controller_spec.rb
-- spec/controllers/spree/api/v1/option_values_controller_spec.rb
-- spec/controllers/spree/api/v1/orders_controller_spec.rb
-- spec/controllers/spree/api/v1/payments_controller_spec.rb
-- spec/controllers/spree/api/v1/product_properties_controller_spec.rb
-- spec/controllers/spree/api/v1/products_controller_spec.rb
-- spec/controllers/spree/api/v1/promotion_application_spec.rb
-- spec/controllers/spree/api/v1/promotions_controller_spec.rb
-- spec/controllers/spree/api/v1/properties_controller_spec.rb
-- spec/controllers/spree/api/v1/return_authorizations_controller_spec.rb
-- spec/controllers/spree/api/v1/shipments_controller_spec.rb
-- spec/controllers/spree/api/v1/states_controller_spec.rb
-- spec/controllers/spree/api/v1/stock_items_controller_spec.rb
-- spec/controllers/spree/api/v1/stock_locations_controller_spec.rb
-- spec/controllers/spree/api/v1/stock_movements_controller_spec.rb
-- spec/controllers/spree/api/v1/stores_controller_spec.rb
-- spec/controllers/spree/api/v1/taxonomies_controller_spec.rb
-- spec/controllers/spree/api/v1/taxons_controller_spec.rb
-- spec/controllers/spree/api/v1/unauthenticated_products_controller_spec.rb
-- spec/controllers/spree/api/v1/users_controller_spec.rb
-- spec/controllers/spree/api/v1/variants_controller_spec.rb
-- spec/controllers/spree/api/v1/zones_controller_spec.rb
-- spec/fixtures/thinking-cat.jpg
-- spec/models/spree/legacy_user_spec.rb
-- spec/requests/rabl_cache_spec.rb
-- spec/requests/ransackable_attributes_spec.rb
-- spec/requests/version_spec.rb
-- spec/shared_examples/protect_product_actions.rb
-- spec/spec_helper.rb
-- spec/support/controller_hacks.rb
-- spec/support/database_cleaner.rb
-- spec/support/have_attributes_matcher.rb
+test_files: []

data/spec/controllers/spree/api/base_controller_spec.rb

@@ -1,96 +0,0 @@
-require 'spec_helper'
-
-class FakesController < Spree::Api::BaseController
-end
-
-describe Spree::Api::BaseController, :type => :controller do
-  render_views
-  controller(Spree::Api::BaseController) do
-    def index
-      render :text => { "products" => [] }.to_json
-    end
-  end
-
-  before do
-    @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
-      r.draw { get 'index', to: 'spree/api/base#index' }
-    end
-  end
-
-  context "when validating based on an order token" do
-    let!(:order) { create :order }
-
-    context "with a correct order token" do
-      it "succeeds" do
-        api_get :index, order_token: order.guest_token, order_id: order.number
-        expect(response.status).to eq(200)
-      end
-
-      it "succeeds with an order_number parameter" do
-        api_get :index, order_token: order.guest_token, order_number: order.number
-        expect(response.status).to eq(200)
-      end
-    end
-
-    context "with an incorrect order token" do
-      it "returns unauthorized" do
-        api_get :index, order_token: "NOT_A_TOKEN", order_id: order.number
-        expect(response.status).to eq(401)
-      end
-    end
-  end
-
-  context "cannot make a request to the API" do
-    it "without an API key" do
-      api_get :index
-      expect(json_response).to eq({ "error" => "You must specify an API key." })
-      expect(response.status).to eq(401)
-    end
-
-    it "with an invalid API key" do
-      request.headers["X-Spree-Token"] = "fake_key"
-      get :index, {}
-      expect(json_response).to eq({ "error" => "Invalid API key (fake_key) specified." })
-      expect(response.status).to eq(401)
-    end
-
-    it "using an invalid token param" do
-      get :index, :token => "fake_key"
-      expect(json_response).to eq({ "error" => "Invalid API key (fake_key) specified." })
-    end
-  end
-
-  it 'handles parameter missing exceptions' do
-    expect(subject).to receive(:authenticate_user).and_return(true)
-    expect(subject).to receive(:load_user_roles).and_return(true)
-    expect(subject).to receive(:index).and_raise(ActionController::ParameterMissing.new('foo'))
-    get :index, token: 'exception-message'
-    expect(json_response).to eql('exception' => 'param is missing or the value is empty: foo')
-  end
-
-  it 'handles record invalid exceptions' do
-    expect(subject).to receive(:authenticate_user).and_return(true)
-    expect(subject).to receive(:load_user_roles).and_return(true)
-    resource = Spree::Product.new
-    resource.valid? # get some errors
-    expect(subject).to receive(:index).and_raise(ActiveRecord::RecordInvalid.new(resource))
-    get :index, token: 'exception-message'
-    expect(json_response).to eql('exception' => "Validation failed: Name can't be blank, Shipping Category can't be blank, Price can't be blank")
-  end
-
-  it "maps semantic keys to nested_attributes keys" do
-    klass = double(:nested_attributes_options => { :line_items => {},
-                                                  :bill_address => {} })
-    attributes = { 'line_items' => { :id => 1 },
-                   'bill_address' => { :id => 2 },
-                   'name' => 'test order' }
-
-    mapped = subject.map_nested_attributes_keys(klass, attributes)
-    expect(mapped.has_key?('line_items_attributes')).to be true
-    expect(mapped.has_key?('name')).to be true
-  end
-
-  it "lets a subclass override the product associations that are eager-loaded" do
-    expect(controller.respond_to?(:product_includes, true)).to be
-  end
-end