spree_api 3.5.0 → 3.6.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ad7977c5fc8db087d199524fd7e2ddcd343948c3
-  data.tar.gz: 90afabd6528ab75270f043b7aecf8de3d14f1ad3
+SHA256:
+  metadata.gz: 54d154d602caca737bf94054121558eb868f816567c860b85685e3a5c5b03e24
+  data.tar.gz: 8caef55d4f67cb4584e82fd1c2f4c537acff4aa96e5f357f70d3ae8b110d78e1
 SHA512:
-  metadata.gz: 11c274497f804c80f069cce49f3d731dfe194f0eb665ffdf94534769e7ff88d73d005ad0cf9877daf7fd012c185a20428407aa04d68431a5f3a9e08f841124c9
-  data.tar.gz: 254b5d13da34466de3dcab3fd7445eb626f2ee9e5f03d5e58c3255377f6e492cd4256b46609842bd092aefc233e36259a10ac3df0237d21d989f64696aa8fbd9
+  metadata.gz: ecbcc45b451ad5c9bd1a3d29199bfe2e43300ff759d5ac6a98cb9fd8b1fc6e34e305978432de98054c79bf37e2af3acb6f7b46dac645c4cf3075bcba10881752
+  data.tar.gz: fa4bbe45a751642c17abfdf9cb046af7c080938dfc6f5a752491713d9900903fed3e49f842c7ad07733700eea6fa6be85e889da75cc5c1afe5b1ef9e17319eb6

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

@@ -4,7 +4,7 @@ module Spree
       class OrdersController < Spree::Api::BaseController
         skip_before_action :authenticate_user, only: :apply_coupon_code
 
-        before_action :find_order, except: [:create, :mine, :current, :index, :update]
+        before_action :find_order, except: [:create, :mine, :current, :index, :update, :remove_coupon_code]
 
         # Dynamically defines our stores checkout steps to ensure we check authorization on each step.
         Order.checkout_steps.keys.each do |step|
@@ -112,6 +112,14 @@ module Spree
           render 'spree/api/v1/promotions/handler', status: status
         end
 
+        def remove_coupon_code
+          find_order(true)
+          authorize! :update, @order, order_token
+          @handler = Spree::PromotionHandler::Coupon.new(@order).remove(params[:coupon_code])
+          status = @handler.successful? ? 200 : 404
+          render 'spree/api/v1/promotions/handler', status: status
+        end
+
         private
 
         def order_params

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

@@ -141,31 +141,31 @@ module Spree
             order: {
               bill_address: {
                 state: {},
-                country: {},
+                country: {}
               },
               ship_address: {
                 state: {},
-                country: {},
+                country: {}
               },
               adjustments: {},
               payments: {
                 order: {},
-                payment_method: {},
-              },
+                payment_method: {}
+              }
             },
             inventory_units: {
               line_item: {
                 product: {},
-                variant: {},
+                variant: {}
               },
               variant: {
                 product: {},
                 default_price: {},
                 option_values: {
-                  option_type: {},
-                },
-              },
-            },
+                  option_type: {}
+                }
+              }
+            }
           }
         end
       end

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

@@ -1,6 +1,6 @@
 object @image
 attributes *image_attributes
 attributes :viewable_type, :viewable_id
-Spree::Image.attachment_definitions[:attachment][:styles].each do |k, _v|
-  node("#{k}_url") { |i| i.attachment.url(k) }
+Spree::Image.styles.each do |k, _v|
+  node("#{k}_url") { |i| main_app.url_for(i.url(k)) }
 end

data/config/routes.rb

@@ -63,7 +63,9 @@ Spree::Core::Engine.add_routes do
       get '/orders/mine', to: 'orders#mine', as: 'my_orders'
       get '/orders/current', to: 'orders#current', as: 'current_order'
 
-      resources :orders, concerns: :order_routes
+      resources :orders, concerns: :order_routes do
+        put :remove_coupon_code, on: :member
+      end
 
       resources :zones
       resources :countries, only: [:index, :show] do

data/spree_api.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'spree_core', s.version
   s.add_dependency 'rabl', '~> 0.13.1'
-  s.add_dependency 'versioncake', '~> 3.3.0'
+  s.add_dependency 'versioncake', '~> 3.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0.rc1
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2018-05-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.5.0
+        version: 3.6.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.6.0.rc1
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
 description: Spree's API
 email:
 - ryan@spreecommerce.com
@@ -231,12 +231,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.7.6
 signing_key: 
 specification_version: 4
 summary: Spree's API