spree_api 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3736aa7fa433082c6e7771f2e1850ff8f7e14a76
-  data.tar.gz: 51e229c7ed5a6d30f00ad17aa48ec58d8dc8a5b8
+  metadata.gz: d9c508f1db57c6d3162093a618db8ae73f80889e
+  data.tar.gz: c2d8de75c3961ac03fbc5bb4804d62890bdff4ca
 SHA512:
-  metadata.gz: e9d188802236b8f7c836f98df8183b028dc4de465080f0382b5119f1017bf11dd1735b43b9048773f10aea96bb95f3474ce86c93f12a736ccbb0068e597d47e2
-  data.tar.gz: a2e7952731ee46c9896bc562d74926abeb370a80adb8f58f446a8ebfdd7d5d4dd9300e60eda4e536c22db35f844126c0921f716a5b83e0d76594c0b97d1ce165
+  metadata.gz: 0f2cf6539f49c45718e4af844d1f75bb92303ede18c9c829a99f87888d0cdc52993209a7cd86e624211dbffa2dc54fb4f76edd93b3d90aca42cf79882d3b9d6f
+  data.tar.gz: 1ba85f77edc9a122e4fdeef402ef96f9de6d936d3e58b8ebbba9b65cf755c68588cb59aea55946010480a25bdcf726adc942cc942e135b2ec57ef769045c4335

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

@@ -48,7 +48,7 @@ module Spree
       # users should be able to set price when importing orders via api
       def permitted_line_item_attributes
         if @current_user_roles.include?("admin")
-          super << [:price, :variant_id, :sku]
+          super + [:price, :variant_id, :sku]
         else
           super
         end

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

@@ -1,9 +1,17 @@
 module Spree
   module Api
     class LineItemsController < Spree::Api::BaseController
+      class_attribute :line_item_options
+
+      self.line_item_options = []
+
       def create
         variant = Spree::Variant.find(params[:line_item][:variant_id])
-        @line_item = order.contents.add(variant, params[:line_item][:quantity] || 1)
+        @line_item = order.contents.add(
+            variant,
+            params[:line_item][:quantity] || 1,
+            line_item_params[:options] || {}
+        )
 
         if @line_item.errors.empty?
           respond_with(@line_item, status: 201, default_template: :show)
@@ -44,12 +52,17 @@ module Spree
         def line_items_attributes
           {line_items_attributes: {
               id: params[:id],
-              quantity: params[:line_item][:quantity]
+              quantity: params[:line_item][:quantity],
+              options: line_item_params[:options] || {}
           }}
         end
 
         def line_item_params
-          params.require(:line_item).permit(:quantity, :variant_id)
+          params.require(:line_item).permit(
+              :quantity,
+              :variant_id,
+              options: line_item_options
+          )
         end
     end
   end

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

@@ -1,6 +1,17 @@
 require 'spec_helper'
 
 module Spree
+  PermittedAttributes.module_eval do
+    mattr_writer :line_item_attributes
+  end
+
+  unless PermittedAttributes.line_item_attributes.include? :some_option
+    PermittedAttributes.line_item_attributes += [:some_option]
+  end
+
+  # This should go in an initializer
+  Spree::Api::LineItemsController.line_item_options += [:some_option]
+
   describe Api::LineItemsController, :type => :controller do
     render_views
 
@@ -48,6 +59,17 @@ module Spree
         expect(json_response["variant"]["name"]).not_to be_blank
       end
 
+      it "can add a new line item to an existing order with options" do
+        expect_any_instance_of(LineItem).to receive(:some_option=).with(4)
+        api_post :create,
+                 line_item: {
+                   variant_id: product.master.to_param,
+                   quantity: 1,
+                   options: { some_option: 4 }
+                 }
+        expect(response.status).to eq(201)
+      end
+
       it "default quantity to 1 if none is given" do
         api_post :create, :line_item => { :variant_id => product.master.to_param }
         expect(response.status).to eq(201)
@@ -75,6 +97,15 @@ module Spree
         expect(json_response["quantity"]).to eq(101)
       end
 
+      it "can update a line item's options on the order" do
+        expect_any_instance_of(LineItem).to receive(:some_option=).with(12)
+        line_item = order.line_items.first
+        api_put :update,
+                id: line_item.id,
+                line_item: { quantity: 1, options: { some_option: 12 } }
+        expect(response.status).to eq(200)
+      end
+
       it "can delete a line item on the order" do
         line_item = order.line_items.first
         api_delete :destroy, :id => line_item.id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-22 00:00:00.000000000 Z
+date: 2014-12-05 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.1
+        version: 2.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 2.4.2
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement