spree_api 2.4.5 → 2.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df85069fa27344d037168635f2c4ec87e02b9011
-  data.tar.gz: 8fbc76a068f2684e7bafd00bcf3e06ac8f5add06
+  metadata.gz: a1355738b99bc466e3299757f7f4d293a08ad45c
+  data.tar.gz: 9a81176332680c7c6802b11c395cd6c944a335c9
 SHA512:
-  metadata.gz: 144367eaf50a16d2d40d1ed194265f471f2d8098b918306b9ba96cbd1e0822cb9cd4434c579026585a133621f79d32ee6c37b48166b24f9b285fcfd12d003d46
-  data.tar.gz: 2acc72fc6fad8788ef7b42b9a007ede5afb66cc6c7bb2794144fbe18ce3ef0d47509aa21e442b8dd1bf2710aa17ddb26b2043ee7f38aaafdd474e556a7584b6d
+  metadata.gz: 576d4ca00833617cf383fa6c2c9ef25f5d0f82a1f3c20cbf53e2270c980dbb23aa390fa38b2945acb1aa109e9da1a1599b847fd5a39e417a746f4f8a2869276d
+  data.tar.gz: ede324c67a8f201a77f43a12b5321fae1a8a8bd72342564ef9e3cd37313c2f74bff53b6a1be2c437c50bc2c86f1d4942ed6334224bddd02054f9b1f2efccb2e9

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

@@ -18,8 +18,6 @@ module Spree
       before_action :authenticate_user
       before_action :load_user_roles
 
-      after_filter  :set_jsonp_format
-
       rescue_from Exception, with: :error_during_processing
       rescue_from ActiveRecord::RecordNotFound, with: :not_found
       rescue_from CanCan::AccessDenied, with: :unauthorized
@@ -29,13 +27,6 @@ module Spree
 
       ssl_allowed
 
-      def set_jsonp_format
-        if params[:callback] && request.get?
-          self.response_body = "#{params[:callback]}(#{response.body})"
-          headers["Content-Type"] = 'application/javascript'
-        end
-      end
-
       def map_nested_attributes_keys(klass, attributes)
         nested_keys = klass.nested_attributes_options.keys
         attributes.inject({}) do |h, (k,v)|

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

@@ -4,6 +4,7 @@ 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(:total_on_hand) { |v| v.total_on_hand }

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

@@ -145,21 +145,6 @@ module Spree
         end
       end
 
-      context "jsonp" do
-        it "retrieves a list of products of jsonp" do
-          api_get :index, {:callback => 'callback'}
-          expect(response.body).to match(/^callback\(.*\)$/)
-          expect(response.header['Content-Type']).to include('application/javascript')
-        end
-
-        # Regression test for #4332
-        it "does not escape quotes" do
-          api_get :index, {:callback => 'callback'}
-          expect(response.body).to match(/^callback\({"count":1,"total_count":1/)
-          expect(response.header['Content-Type']).to include('application/javascript')
-        end
-      end
-
       it "can search for products" do
         create(:product, :name => "The best product in the world")
         api_get :index, :q => { :name_cont => "best" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 2.4.6
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.5
+        version: 2.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.5
+        version: 2.4.6
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement