spree_api 1.2.5 → 1.3.0.rc1

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

@@ -0,0 +1,50 @@
+module Spree
+  module Api
+    class ReturnAuthorizationsController < Spree::Api::BaseController
+      before_filter :authorize_admin!
+
+      def index
+        @return_authorizations = order.return_authorizations.ransack(params[:q]).result
+          .page(params[:page]).per(params[:per_page])
+      end
+
+      def show
+        @return_authorization = order.return_authorizations.find(params[:id])
+      end
+
+      def create
+        @return_authorization = order.return_authorizations.build(params[:return_authorization], :as => :api)
+        if @return_authorization.save
+          render :show, :status => 201
+        else
+          invalid_resource!(@return_authorization)
+        end
+      end
+
+      def update
+        @return_authorization = order.return_authorizations.find(params[:id])
+        if @return_authorization.update_attributes(params[:return_authorization])
+          render :show
+        else
+          invalid_resource!(@return_authorization)
+        end
+      end
+
+      def destroy
+        @return_authorization = order.return_authorizations.find(params[:id])
+        @return_authorization.destroy
+        render :text => nil, :status => 204
+      end
+
+      private
+
+      def order
+        @order ||= Order.find_by_number!(params[:order_id])
+      end
+
+      def authorize_admin!
+        authorize! :manage, Spree::ReturnAuthorization
+      end
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+module Spree
+  module Api
+    class ShipmentsController < Spree::Api::BaseController
+      before_filter :find_order
+      before_filter :find_and_update_shipment, :only => [:ship, :ready]
+
+      def ready
+        authorize! :read, Shipment
+        unless @shipment.ready?
+          if @shipment.can_ready?
+            @shipment.ready!
+          else
+            render "spree/api/shipments/cannot_ready_shipment", :status => 422 and return
+          end
+        end
+        render :show
+      end
+
+      def ship
+        authorize! :read, Shipment
+        unless @shipment.shipped?
+          @shipment.ship!
+        end
+        render :show
+      end
+
+      private
+
+      def find_order
+        @order = Spree::Order.find_by_number!(params[:order_id])
+        authorize! :read, @order
+      end
+
+      def find_and_update_shipment
+        @shipment = @order.shipments.find_by_number!(params[:id])
+        @shipment.update_attributes(params[:shipment])
+        @shipment.reload
+      end
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+module Spree
+  module Api
+    class TaxonomiesController < Spree::Api::BaseController
+      def index
+        @taxonomies = Taxonomy.order('name').includes(:root => :children).ransack(params[:q]).result
+          .page(params[:page]).per(params[:per_page])
+      end
+
+      def show
+        @taxonomy = Taxonomy.find(params[:id])
+      end
+
+      def create
+        authorize! :create, Taxonomy
+        @taxonomy = Taxonomy.new(params[:taxonomy])
+        if @taxonomy.save
+          render :show, :status => 201
+        else
+          invalid_resource!(@taxonomy)
+        end
+      end
+
+      def update
+        authorize! :update, Taxonomy
+        if taxonomy.update_attributes(params[:taxonomy])
+          render :show, :status => 200
+        else
+          invalid_resource!(taxonomy)
+        end
+      end
+
+      def destroy
+        authorize! :delete, Taxonomy
+        taxonomy.destroy
+        render :text => nil, :status => 204
+      end
+
+      private
+
+      def taxonomy
+        @taxonomy ||= Taxonomy.find(params[:id])
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+module Spree
+  module Api
+    class TaxonsController < Spree::Api::BaseController
+      def index
+        @taxons = taxonomy.root.children
+      end
+
+      def show
+        @taxon = taxon
+      end
+
+      def create
+        authorize! :create, Taxon
+        @taxon = Taxon.new(params[:taxon])
+        if @taxon.save
+          render :show, :status => 201
+        else
+          invalid_resource!(@taxon)
+        end
+      end
+
+      def update
+        authorize! :update, Taxon
+        if taxon.update_attributes(params[:taxon])
+          render :show, :status => 200
+        else
+          invalid_resource!(taxon)
+        end
+      end
+
+      def destroy
+        authorize! :delete, Taxon
+        taxon.destroy
+        render :text => nil, :status => 204
+      end
+
+      private
+
+      def taxonomy
+        @taxonomy ||= Taxonomy.find(params[:taxonomy_id])
+      end
+
+      def taxon
+        @taxon ||= taxonomy.taxons.find(params[:id])
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,71 @@
+module Spree
+  module Api
+    class VariantsController < Spree::Api::BaseController
+      before_filter :product
+
+      def index
+        @variants = scope.includes(:option_values).ransack(params[:q]).result.
+          page(params[:page]).per(params[:per_page])
+      end
+
+      def show
+        @variant = scope.includes(:option_values).find(params[:id])
+      end
+
+      def new
+      end
+
+      def create
+        authorize! :create, Variant
+        @variant = scope.new(params[:product])
+        if @variant.save
+          render :show, :status => 201
+        else
+          invalid_resource!(@variant)
+        end
+      end
+
+      def update
+        authorize! :update, Variant
+        @variant = scope.find(params[:id])
+        if @variant.update_attributes(params[:variant])
+          render :show, :status => 200
+        else
+          invalid_resource!(@product)
+        end
+      end
+
+      def destroy
+        authorize! :delete, Variant
+        @variant = scope.find(params[:id])
+        @variant.destroy
+        render :text => nil, :status => 204
+      end
+
+      private
+        def product
+          @product ||= Spree::Product.find_by_permalink(params[:product_id]) if params[:product_id]
+        end
+
+        def scope
+          if @product
+            unless current_api_user.has_spree_role?("admin") || params[:show_deleted]
+              variants = @product.variants_including_master
+            else
+              variants = @product.variants_including_master_and_deleted
+            end
+          else
+            variants = Variant.scoped
+            if current_api_user.has_spree_role?("admin")
+              unless params[:show_deleted]
+                variants = Variant.active
+              end
+            else
+              variants = variants.active
+            end
+          end
+          variants
+        end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+module Spree
+  module Api
+    class ZonesController < Spree::Api::BaseController
+      def index
+        @zones = Zone.order('name ASC').ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
+      end
+
+      def show
+        zone
+      end
+
+      def create
+        authorize! :create, Zone
+        @zone = Zone.new(map_nested_attributes_keys(Spree::Zone, params[:zone]))
+        if @zone.save
+          render :show, :status => 201
+        else
+          invalid_resource!(@zone)
+        end
+      end
+
+      def update
+        authorize! :update, Zone
+        if zone.update_attributes(map_nested_attributes_keys(Spree::Zone, params[:zone]))
+          render :show, :status => 200
+        else
+          invalid_resource!(@zone)
+        end
+      end
+
+      def destroy
+        authorize! :delete, Zone
+        zone.destroy
+        render :text => nil, :status => 204
+      end
+
+      private
+      def zone
+        @zone ||= Spree::Zone.find(params[:id])
+      end
+    end
+  end
+end

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

@@ -64,11 +64,6 @@ module Spree
         [:id, :name, :permalink, :position, :parent_id, :taxonomy_id]
       end
 
-      def inventory_unit_attributes
-        [:id, :lock_version, :state, :variant_id, :order_id,
-         :shipment_id, :return_authorization_id]
-      end
-
       def return_authorization_attributes
         [:id, :number, :state, :amount, :order_id, :reason, :created_at, :updated_at]
       end

data/app/overrides/api_admin_user_edit_form.rb

@@ -1,6 +1,6 @@
 Deface::Override.new(:virtual_path => "spree/admin/users/edit",
                      :name => "api_admin_user_edit_form",
-                     :insert_after => "[data-hook='admin_user_edit_form'], #admin_user_edit_form[data-hook]",
+                     :insert_after => "[data-hook='admin_user_edit_general_settings']",
                      :partial => "spree/admin/users/api_fields",
                      :disabled => false)
 

data/app/views/spree/admin/users/_api_fields.html.erb

@@ -1,20 +1,32 @@
-<h2><%= t('access', :scope => 'spree.api') %></h2>
+<fieldset data-hook="admin_user_api_key" class="omega six columns">
+  <legend><%= t('access', :scope => 'spree.api') %></legend>
 
-<% if @user.spree_api_key.present? %>
-  <p><strong><%= t('key', :scope => 'spree.api') %></strong> <%= @user.spree_api_key %></p>
+  <% if @user.spree_api_key.present? %>
+    <div class="field">
+      <%= label_tag t('key', :scope => 'spree.api') %>:
+      <%= @user.spree_api_key %>
+    </div>
+    <div class="filter-actions actions">
+      <%= form_tag spree.clear_api_key_admin_user_path(@user), :method => :put do %>
+        <%= button t('clear_key', :scope => 'spree.api'), 'icon-trash' %>
+      <% end %>
 
-  <%= form_tag spree.clear_api_key_admin_user_path(@user), :method => :put do %>
-    <%= button t('clear_key', :scope => 'spree.api') %>
-  <% end %>
+      <span class="or"><%= t(:or)%></span>
+    
+      <%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %>
+        <%= button t('regenerate_key', :scope => 'spree.api'), 'icon-refresh' %>
+      <% end %>      
+    </div>    
 
-  <%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %>
-    <%= button t('regenerate_key', :scope => 'spree.api') %>
-  <% end %>
+  <% else %>
 
-<% else %>
+    <div class="no-objects-found"><%= t('no_key', :scope => 'spree.api') %></div>
 
-  <p><%= t('no_key', :scope => 'spree.api') %></p>
-  <%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %>
-    <%= button t('generate_key', :scope => 'spree.api') %>
+    <div class="filter-actions actions">
+      <%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %>
+        <%= button t('generate_key', :scope => 'spree.api'), 'icon-key' %>
+      <% end %>
+    </div>    
   <% end %>
-<% end %>
+
+</fieldset>

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

@@ -1,5 +1,5 @@
 object @line_item
 attributes *line_item_attributes
 child :variant do
-  extends "spree/api/v1/variants/variant"
+  extends "spree/api/variants/variant"
 end

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

@@ -1,20 +1,20 @@
 object @order
 attributes *order_attributes
 
-if lookup_context.find_all("spree/api/v1/orders/#{@order.state}").present?
-  extends "spree/api/v1/orders/#{@order.state}"
+if lookup_context.find_all("spree/api/orders/#{@order.state}").present?
+  extends "spree/api/orders/#{@order.state}"
 end
 
 child :billing_address => :bill_address do
-  extends "spree/api/v1/addresses/show"
+  extends "spree/api/addresses/show"
 end
 
 child :shipping_address => :ship_address do
-  extends "spree/api/v1/addresses/show"
+  extends "spree/api/addresses/show"
 end
 
 child :line_items => :line_items do
-  extends "spree/api/v1/line_items/show"
+  extends "spree/api/line_items/show"
 end
 
 child :payments => :payments do
@@ -25,5 +25,5 @@ child :payments => :payments do
 end
 
 child :shipments => :shipments do
-  extends "spree/api/v1/shipments/show"
+  extends "spree/api/shipments/show"
 end