spree_api 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 898408b377a8e9d880bf8eb6ba24b5e732df26fc
-  data.tar.gz: 24fbb8abc05caf4c6a2f7a07c309690d44d0e3a2
+  metadata.gz: 023d49b32c382f815538ecd352d5aa66023229b1
+  data.tar.gz: ecab512bc91356f7caa6f885330b2d1f6bb15989
 SHA512:
-  metadata.gz: 348fa6f5b63439eeaacda5659931402eefe300c0eac4d9922d0b2800ada8baf81a40c6015c757cb331c47c8aaac8b2c5d84ffba38a0a26aee87ccb8e5a4444e6
-  data.tar.gz: cdaf932f2f3a76ab20e43d6b99bd49a9c2d41b58b525a72732187c7250296aa5f9835b78f1a49f665d33a903d4aa4f7d1ac4b8462dcceff39de2c4e243dd7895
+  metadata.gz: 55274ba4edc914b51eb726c77315569083b6cfa33d1a0758dba5002bc6a3d643a0f883179e42b3f3c19aa364696ec6590da2815cbb9bc75214ce07a79da5afbc
+  data.tar.gz: cdab9a3906f0919a652e3de59ab59d100da401170a8cbbe3ae5441b2880fc43b8caad2905e53a42155bbf1b04ffc7a0bcc55eb6c7eebfa8297c1883e870871e5

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

@@ -106,10 +106,6 @@ module Spree
           send(method_name) if respond_to?(method_name, true)
         end
 
-        def before_payment
-          @order.payments.destroy_all if request.put?
-        end
-
         def next!(options={})
           if @order.valid? && @order.next
             render 'spree/api/orders/show', status: options[:status] || 200

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

@@ -51,7 +51,7 @@ module Spree
         end
 
         def option_value_params
-          params.require(:option_value).permit(permitted_option_type_attributes)
+          params.require(:option_value).permit(permitted_option_value_attributes)
         end
     end
   end

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

@@ -30,18 +30,8 @@ module Spree
           @shipment = Spree::Shipment.accessible_by(current_ability, :update).readonly(false).find_by!(number: params[:id])
         end
 
-        unlock = params[:shipment].delete(:unlock)
-
-        if unlock == 'yes'
-          @shipment.adjustment.open
-        end
-
         @shipment.update_attributes(shipment_params)
 
-        if unlock == 'yes'
-          @shipment.adjustment.close
-        end
-
         @shipment.reload
         respond_with(@shipment, default_template: :show)
       end

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

@@ -1,5 +1,5 @@
 object @address
-cache @address
+cache [I18n.locale, root_object]
 attributes *address_attributes
 
 child(:country) do |address|

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

@@ -1,4 +1,4 @@
 object @adjustment
-cache @adjustment
+cache [I18n.locale, root_object]
 attributes *adjustment_attributes
-node(:display_amount) { |a| a.display_amount.to_s }
+node(:display_amount) { |a| a.display_amount.to_s }

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

@@ -1,3 +1,3 @@
 object @credit_card
-cache @credit_card
-attributes *creditcard_attributes
+cache [I18n.locale, root_object]
+attributes *creditcard_attributes

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

@@ -1,5 +1,5 @@
 object @line_item
-cache @line_item
+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 }

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

@@ -1,4 +1,4 @@
-cache @order
+cache [I18n.locale, root_object]
 attributes *order_attributes
 node(:display_item_total) { |o| o.display_item_total.to_s }
 node(:total_quantity) { |o| o.line_items.sum(:quantity) }

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

@@ -1,5 +1,5 @@
 object @product
-cache [current_currency, root_object]
+cache [I18n.locale, current_currency, root_object]
 attributes *product_attributes
 node(:display_price) { |p| p.display_price.to_s }
 node(:has_variants) { |p| p.has_variants? }

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

@@ -1,5 +1,5 @@
 object @shipment
-cache @shipment
+cache [I18n.locale, root_object]
 attributes *shipment_attributes
 node(:order_id) { |shipment| shipment.order.number }
 node(:stock_location_name) { |shipment| shipment.stock_location.name }

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

@@ -1,7 +1,7 @@
 object @variant
 attributes *variant_attributes
 
-cache ['big_variant', root_object]
+cache [I18n.locale, 'big_variant', root_object]
 
 extends "spree/api/variants/small"
 

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

@@ -1,3 +1,3 @@
 object @variant
-cache ['show', root_object]
+cache [I18n.locale, 'show', root_object]
 extends "spree/api/variants/big"

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

@@ -1,5 +1,5 @@
 attributes *variant_attributes
-cache ['small_variant', root_object]
+cache [I18n.locale, 'small_variant', root_object]
 
 node(:display_price) { |p| p.display_price.to_s }
 node(:options_text) { |v| v.options_text }

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

@@ -111,6 +111,13 @@ module Spree
           option_value.name.should == "Option Value"
         end
 
+        it "permits the correct attributes" do
+          controller.should_receive(:permitted_option_value_attributes)
+          api_put :update, :id => option_value.id, :option_value => {
+                            :name => ""
+                           }
+        end
+
         it "cannot update an option value with invalid attributes" do
           api_put :update, :id => option_value.id, :option_value => {
                             :name => ""

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

@@ -475,6 +475,23 @@ module Spree
         expect(updated_at.split("T").last).to have_content(milisecond)
       end
 
+      context "caching enabled" do
+        before do
+          ActionController::Base.perform_caching = true
+          3.times { Order.create }
+        end
+
+        it "returns unique orders" do
+          api_get :index
+
+          orders = json_response["orders"]
+          expect(orders.count).to be >= 3
+          expect(orders.map { |o| o["id"] }.sort).to eq(Order.order(:id).pluck(:id))
+        end
+
+        after { ActionController::Base.perform_caching = false }
+      end
+
       context "with two orders" do
         before { create(:order) }
 
@@ -549,4 +566,3 @@ module Spree
     end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-07-01 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.2.2
+        version: 2.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -254,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Spree's API