spree_api 3.0.0.rc4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 289fb29c93471320f7597347942a3e5977c44376
-  data.tar.gz: f7286dcb7c91f8a12a0ea037629c87ed10acc163
+  metadata.gz: ab9505bfe7982709e648940a6685e64804a59525
+  data.tar.gz: 33f82a1d56bca7c62d7992b90f7db61f37c1a853
 SHA512:
-  metadata.gz: f51b957333c99f66c04f1552caaae42ab3c07dd130c915e592fec07b758f60a47d52eb033898dfb8812b2de6ec3ed92be28987b76f5f489da7bb0105b4d1038a
-  data.tar.gz: e86dd63722a692e1271acb5bd198ec1b694e792811d3abb13d7786358dbd01724b7cc2e1d8ea03e162ea9779cc834a59e36f08932bb35bc3162fea8737f61ec3
+  metadata.gz: 078ed12604797d085834aebea70d5934c8af84c54aa61c05a1989c21f25d65520b37c331a4dd313dec0a121785aa9528b42fbab8ec9f55935319c689e68fe1e3
+  data.tar.gz: b1a7ee95d0bc92cbbe1626a3732f074504f1589e1ea1d4bb1eda07b73d5417618ff4195b47ea55157ba248598d2bb7bd4afc63a18ecb7dd207b4d967a99fc7d3

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

@@ -17,8 +17,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
@@ -26,13 +24,6 @@ module Spree
 
       helper Spree::Api::ApiHelpers
 
-      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)|
@@ -119,11 +110,6 @@ module Spree
         Spree::Ability.new(current_api_user)
       end
 
-      def current_currency
-        Spree::Config[:currency]
-      end
-      helper_method :current_currency
-
       def invalid_resource!(resource)
         @resource = resource
         render "spree/api/errors/invalid_resource", :status => 422

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

@@ -694,8 +694,6 @@ module Spree
 
       context "can cancel an order" do
         before do
-          Spree::Config[:mails_from] = "spree@example.com"
-
           order.completed_at = Time.now
           order.state = 'complete'
           order.shipment_state = 'ready'

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

@@ -156,21 +156,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" }

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

@@ -122,9 +122,6 @@ describe Spree::Api::ShipmentsController, :type => :controller do
     context "can transition a shipment from ready to ship" do
       before do
         allow_any_instance_of(Spree::Order).to receive_messages(:paid? => true, :complete? => true)
-        # For the shipment notification email
-        Spree::Config[:mails_from] = "spree@example.com"
-
         shipment.update!(shipment.order)
         expect(shipment.state).to eq("ready")
         allow_any_instance_of(Spree::ShippingRate).to receive_messages(:cost => 5)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc4
+  version: 3.0.0
 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: 3.0.0.rc4
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc4
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -260,9 +260,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5