spree_api 3.0.10 → 3.1.0.rc1

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

@@ -0,0 +1,75 @@
+module Spree
+  module Api
+    module V1
+      class VariantsController < Spree::Api::BaseController
+        before_action :product
+
+        def create
+          authorize! :create, Variant
+          @variant = scope.new(variant_params)
+          if @variant.save
+            respond_with(@variant, status: 201, default_template: :show)
+          else
+            invalid_resource!(@variant)
+          end
+        end
+
+        def destroy
+          @variant = scope.accessible_by(current_ability, :destroy).find(params[:id])
+          @variant.destroy
+          respond_with(@variant, status: 204)
+        end
+
+        # The lazyloaded associations here are pretty much attached to which nodes
+        # we render on the view so we better update it any time a node is included
+        # or removed from the views.
+        def index
+          @variants = scope.includes({ option_values: :option_type }, :product, :default_price, :images, { stock_items: :stock_location })
+            .ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
+          respond_with(@variants)
+        end
+
+        def new
+        end
+
+        def show
+          @variant = scope.includes({ option_values: :option_type }, :option_values, :product, :default_price, :images, { stock_items: :stock_location })
+            .find(params[:id])
+          respond_with(@variant)
+        end
+
+        def update
+          @variant = scope.accessible_by(current_ability, :update).find(params[:id])
+          if @variant.update_attributes(variant_params)
+            respond_with(@variant, status: 200, default_template: :show)
+          else
+            invalid_resource!(@product)
+          end
+        end
+
+        private
+          def product
+            @product ||= Spree::Product.accessible_by(current_ability, :read).friendly.find(params[:product_id]) if params[:product_id]
+          end
+
+          def scope
+            if @product
+              variants = @product.variants_including_master
+            else
+              variants = Variant
+            end
+
+            if current_ability.can?(:manage, Variant) && params[:show_deleted]
+              variants = variants.with_deleted
+            end
+
+            variants.accessible_by(current_ability, :read)
+          end
+
+          def variant_params
+            params.require(:variant).permit(permitted_variant_attributes)
+          end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+module Spree
+  module Api
+    module V1
+      class ZonesController < Spree::Api::BaseController
+
+        def create
+          authorize! :create, Zone
+          @zone = Zone.new(map_nested_attributes_keys(Spree::Zone, zone_params))
+          if @zone.save
+            respond_with(@zone, :status => 201, :default_template => :show)
+          else
+            invalid_resource!(@zone)
+          end
+        end
+
+        def destroy
+          authorize! :destroy, zone
+          zone.destroy
+          respond_with(zone, :status => 204)
+        end
+
+        def index
+          @zones = Zone.accessible_by(current_ability, :read).order('name ASC').ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
+          respond_with(@zones)
+        end
+
+        def show
+          respond_with(zone)
+        end
+
+        def update
+          authorize! :update, zone
+          if zone.update_attributes(map_nested_attributes_keys(Spree::Zone, zone_params))
+            respond_with(zone, :status => 200, :default_template => :show)
+          else
+            invalid_resource!(zone)
+          end
+        end
+
+        private
+        def zone_params
+          params.require(:zone).permit!
+        end
+
+        def zone
+          @zone ||= Spree::Zone.accessible_by(current_ability, :read).find(params[:id])
+        end
+      end
+    end
+  end
+end

data/app/helpers/spree/api/api_helpers.rb

@@ -76,7 +76,8 @@ module Spree
         :user_id, :created_at, :updated_at, :completed_at, :payment_total,
         :shipment_state, :payment_state, :email, :special_instructions, :channel,
         :included_tax_total, :additional_tax_total, :display_included_tax_total,
-        :display_additional_tax_total, :tax_total, :currency
+        :display_additional_tax_total, :tax_total, :currency, :considered_risky,
+        :canceler_id
       ]
 
       @@line_item_attributes = [:id, :quantity, :price, :variant_id]
@@ -86,7 +87,7 @@ module Spree
       @@payment_attributes = [
         :id, :source_type, :source_id, :amount, :display_amount,
         :payment_method_id, :state, :avs_response, :created_at,
-        :updated_at
+        :updated_at, :number
       ]
 
       @@payment_method_attributes = [:id, :name, :description]

data/app/views/spree/api/{credit_cards → v1/credit_cards}/index.v1.rabl

@@ -1,6 +1,6 @@
 object false
 child(@credit_cards => :credit_cards) do
-  extends "spree/api/credit_cards/show"
+  extends "spree/api/v1/credit_cards/show"
 end
 node(:count) { @credit_cards.count }
 node(:current_page) { params[:page] || 1 }

data/app/views/spree/api/{images → v1/images}/index.v1.rabl

@@ -1,4 +1,4 @@
 object false
 child(@images => :images) do
-  extends "spree/api/images/show"
+  extends "spree/api/v1/images/show"
 end

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

@@ -0,0 +1,3 @@
+object false
+node(:attributes) { [*image_attributes] }
+node(:required_attributes) { required_fields_for(Spree::Image) }

data/app/views/spree/api/{line_items → v1/line_items}/show.v1.rabl

@@ -5,11 +5,11 @@ node(:single_display_amount) { |li| li.single_display_amount.to_s }
 node(:display_amount) { |li| li.display_amount.to_s }
 node(:total) { |li| li.total }
 child :variant do
-  extends "spree/api/variants/small"
+  extends "spree/api/v1/variants/small"
   attributes :product_id
-  child(:images => :images) { extends "spree/api/images/show" }
+  child(:images => :images) { extends "spree/api/v1/images/show" }
 end
 
 child :adjustments => :adjustments do
-  extends "spree/api/adjustments/show"
+  extends "spree/api/v1/adjustments/show"
 end

data/app/views/spree/api/v1/option_types/index.v1.rabl

@@ -0,0 +1,3 @@
+collection @option_types
+
+extends "spree/api/v1/option_types/show"

data/app/views/spree/api/v1/option_types/new.v1.rabl

@@ -0,0 +1,3 @@
+object false
+node(:attributes) { [*option_type_attributes] }
+node(:required_attributes) { required_fields_for(Spree::OptionType) }

data/app/views/spree/api/v1/option_values/index.v1.rabl

@@ -0,0 +1,3 @@
+collection @option_values
+
+extends "spree/api/v1/option_values/show"

data/app/views/spree/api/v1/option_values/new.v1.rabl

@@ -0,0 +1,3 @@
+object false
+node(:attributes) { [*option_value_attributes] }
+node(:required_attributes) { required_fields_for(Spree::OptionValue) }

data/app/views/spree/api/{orders → v1/orders}/index.v1.rabl

@@ -1,6 +1,6 @@
 object false
 child(@orders => :orders) do
-  extends "spree/api/orders/order"
+  extends "spree/api/v1/orders/order"
 end
 node(:count) { @orders.count }
 node(:current_page) { params[:page] || 1 }

data/app/views/spree/api/{orders → v1/orders}/mine.v1.rabl

@@ -1,7 +1,7 @@
 object false
 
 child(@orders => :orders) do
-  extends "spree/api/orders/show"
+  extends "spree/api/v1/orders/show"
 end
 
 node(:count) { @orders.count }

data/app/views/spree/api/{orders → v1/orders}/order.v1.rabl

@@ -5,5 +5,6 @@ node(:total_quantity) { |o| o.line_items.sum(:quantity) }
 node(:display_total) { |o| o.display_total.to_s }
 node(:display_ship_total) { |o| o.display_ship_total }
 node(:display_tax_total) { |o| o.display_tax_total }
+node(:display_adjustment_total) { |o| o.display_adjustment_total }
 node(:token) { |o| o.guest_token }
 node(:checkout_steps) { |o| o.checkout_steps }

data/app/views/spree/api/{orders → v1/orders}/show.v1.rabl

@@ -1,20 +1,20 @@
 object @order
-extends "spree/api/orders/order"
+extends "spree/api/v1/orders/order"
 
-if lookup_context.find_all("spree/api/orders/#{root_object.state}").present?
-  extends "spree/api/orders/#{root_object.state}"
+if lookup_context.find_all("spree/api/v1/orders/#{root_object.state}").present?
+  extends "spree/api/v1/orders/#{root_object.state}"
 end
 
 child :billing_address => :bill_address do
-  extends "spree/api/addresses/show"
+  extends "spree/api/v1/addresses/show"
 end
 
 child :shipping_address => :ship_address do
-  extends "spree/api/addresses/show"
+  extends "spree/api/v1/addresses/show"
 end
 
 child :line_items => :line_items do
-  extends "spree/api/line_items/show"
+  extends "spree/api/v1/line_items/show"
 end
 
 child :payments => :payments do
@@ -34,11 +34,11 @@ child :payments => :payments do
 end
 
 child :shipments => :shipments do
-  extends "spree/api/shipments/small"
+  extends "spree/api/v1/shipments/small"
 end
 
 child :adjustments => :adjustments do
-  extends "spree/api/adjustments/show"
+  extends "spree/api/v1/adjustments/show"
 end
 
 # Necessary for backend's order interface
@@ -47,5 +47,5 @@ node :permissions do
 end
 
 child :valid_credit_cards => :credit_cards do
-  extends "spree/api/credit_cards/show"
+  extends "spree/api/v1/credit_cards/show"
 end

data/app/views/spree/api/{products → v1/products}/index.v1.rabl

@@ -5,5 +5,5 @@ node(:current_page) { params[:page] ? params[:page].to_i : 1 }
 node(:per_page) { params[:per_page] || Kaminari.config.default_per_page }
 node(:pages) { @products.num_pages }
 child(@products => :products) do
-  extends "spree/api/products/show"
+  extends "spree/api/v1/products/show"
 end

data/app/views/spree/api/{products → v1/products}/show.v1.rabl

@@ -8,11 +8,11 @@ node(:has_variants) { |p| p.has_variants? }
 node(:taxon_ids) { |p| p.taxon_ids }
 
 child :master => :master do
-  extends "spree/api/variants/small"
+  extends "spree/api/v1/variants/small"
 end
 
 child :variants => :variants do
-  extends "spree/api/variants/small"
+  extends "spree/api/v1/variants/small"
 end
 
 child :option_types => :option_types do
@@ -27,6 +27,6 @@ child :classifications => :classifications do
   attributes :taxon_id, :position
 
   child(:taxon) do
-    extends "spree/api/taxons/show"
+    extends "spree/api/v1/taxons/show"
   end
 end

data/app/views/spree/api/{shipments → v1/shipments}/big.v1.rabl

@@ -3,7 +3,7 @@ cache @shipment
 attributes *shipment_attributes
 
 child selected_shipping_rate: :selected_shipping_rate do
-  extends "spree/api/shipping_rates/show"
+  extends "spree/api/v1/shipping_rates/show"
 end
 
 child inventory_units: :inventory_units do
@@ -11,9 +11,9 @@ child inventory_units: :inventory_units do
   attributes *inventory_unit_attributes
 
   child :variant do
-    extends "spree/api/variants/small"
+    extends "spree/api/v1/variants/small"
     attributes :product_id
-    child(images: :images) { extends "spree/api/images/show" }
+    child(images: :images) { extends "spree/api/v1/images/show" }
   end
 
   child :line_item do
@@ -25,18 +25,18 @@ child inventory_units: :inventory_units do
 end
 
 child order: :order do
-  extends "spree/api/orders/order"
+  extends "spree/api/v1/orders/order"
 
   child billing_address: :bill_address do
-    extends "spree/api/addresses/show"
+    extends "spree/api/v1/addresses/show"
   end
 
   child shipping_address: :ship_address do
-    extends "spree/api/addresses/show"
+    extends "spree/api/v1/addresses/show"
   end
 
   child adjustments: :adjustments do
-    extends "spree/api/adjustments/show"
+    extends "spree/api/v1/adjustments/show"
   end
 
   child payments: :payments do