spree_api 0.70.7 → 1.0.0.rc1

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2011, Rails Dog LLC and other contributors
+Copyright (c) 2007-2011, Spree Commerce, Inc. and other contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -23,4 +23,4 @@ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/app/assets/javascripts/admin/spree.js

@@ -1,5 +1,4 @@
 //= require admin/spree_core
 //= require admin/spree_auth
 //= require admin/spree_api
-//= require admin/spree_dash
 //= require admin/spree_promo

data/app/assets/javascripts/store/spree.js

@@ -1,5 +1,4 @@
 //= require store/spree_core
 //= require store/spree_auth
 //= require store/spree_api
-//= require store/spree_dash
 //= require store/spree_promo

data/app/assets/stylesheets/admin/spree.css

@@ -3,5 +3,4 @@
  *= require admin/spree_auth
  *= require admin/spree_api
  *= require admin/spree_promo
- *= require admin/spree_dash
 */

data/app/assets/stylesheets/store/spree.css

@@ -3,5 +3,4 @@
  *= require store/spree_auth
  *= require store/spree_api
  *= require store/spree_promo
- *= require store/spree_dash
 */

data/app/controllers/{admin → spree/admin}/users_controller_decorator.rb

@@ -1,5 +1,4 @@
-Admin::UsersController.class_eval do
-
+Spree::Admin::UsersController.class_eval do
   before_filter :load_roles, :only => [:edit, :new, :update, :create, :generate_api_key, :clear_api_key]
 
   def generate_api_key
@@ -15,5 +14,4 @@ Admin::UsersController.class_eval do
     end
     redirect_to edit_admin_user_path(@user)
   end
-
 end

data/app/controllers/{api → spree/api}/base_controller.rb

@@ -1,9 +1,8 @@
-class Api::BaseController < Spree::BaseController
+class Spree::Api::BaseController < Spree::BaseController
   before_filter :check_http_authorization
   before_filter :load_resource
   skip_before_filter :verify_authenticity_token, :if => lambda { admin_token_passed_in_headers }
-  authorize_resource
-  
+
   respond_to :json
 
   def index
@@ -71,13 +70,13 @@ class Api::BaseController < Spree::BaseController
 
   protected
     def model_class
-      controller_name.classify.constantize
+      "Spree::#{controller_name.classify}".constantize
     end
-    
+
     def object_name
       controller_name.singularize
     end
-    
+
     def load_resource
       if member_action?
         @object ||= load_resource_instance
@@ -87,7 +86,7 @@ class Api::BaseController < Spree::BaseController
         instance_variable_set("@#{controller_name}", @collection)
       end
     end
-    
+
     def load_resource_instance
       if new_actions.include?(params[:action].to_sym)
         build_resource
@@ -95,7 +94,7 @@ class Api::BaseController < Spree::BaseController
         find_resource
       end
     end
-    
+
     def parent
       nil
     end
@@ -107,7 +106,7 @@ class Api::BaseController < Spree::BaseController
         model_class.includes(eager_load_associations).find(params[:id])
       end
     end
-    
+
     def build_resource
       if parent.present?
         parent.send(controller_name).build(params[object_name])
@@ -115,14 +114,14 @@ class Api::BaseController < Spree::BaseController
         model_class.new(params[object_name])
       end
     end
-    
+
     def collection
-      return @search unless @search.nil?      
+      return @search unless @search.nil?
       params[:search] = {} if params[:search].blank?
       params[:search][:meta_sort] = 'created_at.desc' if params[:search][:meta_sort].blank?
-      
+
       scope = parent.present? ? parent.send(controller_name) : model_class.scoped
-     
+
       @search = scope.metasearch(params[:search]).relation.limit(100)
       @search
     end
@@ -151,7 +150,7 @@ class Api::BaseController < Spree::BaseController
         send "admin_#{object_name}_url", target, options
       end
     end
-    
+
     def collection_actions
       [:index]
     end
@@ -165,10 +164,9 @@ class Api::BaseController < Spree::BaseController
     end
 
   private
-  def check_http_authorization
-    if request.headers['HTTP_AUTHORIZATION'].blank?
-      render :text => "Access Denied\n", :status => 401
+    def check_http_authorization
+      if request.headers['HTTP_AUTHORIZATION'].blank?
+        render :text => "Access Denied\n", :status => 401
+      end
     end
-  end
-
 end

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

@@ -0,0 +1,3 @@
+class Spree::Api::CountriesController < Spree::Api::BaseController
+  before_filter :access_denied, :except => [:index, :show]
+end

data/app/controllers/{api → spree/api}/inventory_units_controller.rb

@@ -1,19 +1,18 @@
-class Api::InventoryUnitsController < Api::BaseController
+class Spree::Api::InventoryUnitsController < Spree::Api::BaseController
   private
     def parent
       if params[:order_id]
-        @parent = Order.find_by_param(params[:order_id])
+        @parent = Spree::Order.find_by_param(params[:order_id])
       elsif params[:shipment_id]
-        @parent = Shipment.find_by_param(params[:shipment_id])
+        @parent = Spree::Shipment.find_by_param(params[:shipment_id])
       end
     end
-  
+
     def parent_data
       [params[:order_id], params[:shipment_id]].compact
     end
-    
+
     def eager_load_associations
       [:variant]
     end
-
 end

data/app/controllers/{api → spree/api}/line_items_controller.rb

@@ -1,16 +1,15 @@
-class Api::LineItemsController < Api::BaseController
-
+class Spree::Api::LineItemsController < Spree::Api::BaseController
   private
     def parent
       if params[:order_id]
-        @parent ||= Order.find_by_param(params[:order_id])
+        @parent ||= Spree::Order.find_by_param(params[:order_id])
       end
     end
-  
+
     def parent_data
       params[:order_id]
     end
-    
+
     def collection_serialization_options
       { :include => [:variant], :methods => [:description] }
     end
@@ -18,5 +17,4 @@ class Api::LineItemsController < Api::BaseController
     def object_serialization_options
       collection_serialization_options
     end
-
 end

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

@@ -0,0 +1,19 @@
+class Spree::Api::OrdersController < Spree::Api::BaseController
+  before_filter :access_denied, :except => [:index, :show]
+  authorize_resource :class => Spree::Order
+
+  private
+    def find_resource
+      Spree::Order.find_by_param(params[:id])
+    end
+
+    def object_serialization_options
+      { :include => {
+          :bill_address => { :include => [:country, :state] },
+          :ship_address => { :include => [:country, :state] },
+          :shipments => { :include => [:shipping_method, :address] },
+          :line_items => { :include => [:variant] }
+          }
+      }
+    end
+end

data/app/controllers/{api → spree/api}/products_controller.rb

@@ -1,5 +1,5 @@
-class Api::ProductsController < Api::BaseController
-  include Spree::Search
+class Spree::Api::ProductsController < Spree::Api::BaseController
+  include Spree::Core::Search
 
   private
     def collection

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

@@ -0,0 +1,35 @@
+class Spree::Api::ShipmentsController < Spree::Api::BaseController
+  private
+    def parent
+      if params[:order_id]
+        @parent ||= Spree::Order.find_by_param(params[:order_id])
+      end
+    end
+
+    def collection_serialization_options
+      { :include => { :shipping_method => {}, :address => {}, :inventory_units => { :include => :variant } },
+        :except => [:shipping_method_id, :address_id] }
+    end
+
+    def object_serialization_options
+      { :include =>  {
+          :shipping_method => {},
+          :address => { :include => [:country, :state] },
+          :inventory_units => {
+            :include => {
+              :variant => {
+                :include => {
+                  :product => { :only => [:name] }
+                }
+              }
+            }
+          }
+        },
+        :except => [:shipping_method_id, :address_id]
+      }
+    end
+
+    def eager_load_associations
+      [:shipping_method, :address, { :inventory_units => [:variant] }]
+    end
+end

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

@@ -0,0 +1,8 @@
+class Spree::Api::StatesController < Spree::Api::BaseController
+  before_filter :access_denied, :except => [:index, :show]
+
+  private
+    def parent
+      @parent ||= Spree::Country.find(params[:country_id])
+    end
+end

data/app/models/line_item_decorator.rb

@@ -1,7 +1,7 @@
-LineItem.class_eval do
+Spree::LineItem.class_eval do
   def description
     d = variant.product.name.clone
     d << " (#{variant.options_text})" unless variant.option_values.empty?
     d
   end
-end
+end

data/app/models/order_decorator.rb

@@ -1,9 +1,9 @@
-Order.class_eval do
+Spree::Order.class_eval do
   def self.find_by_param(param)
     if param.to_i > 0
-      Order.find(param)
+      Spree::Order.find(param)
     else
-      Order.where(:number => param).first
+      Spree::Order.where(:number => param).first
     end
   end
 end

data/app/models/shipment_decorator.rb

@@ -1,9 +1,9 @@
-Shipment.class_eval do
+Spree::Shipment.class_eval do
   def self.find_by_param(param)
     if param.to_i > 0
-      Shipment.find(param)
+      Spree::Shipment.find(param)
     else
-      Shipment.where(:number => param).first
+      Spree::Shipment.where(:number => param).first
     end
   end
 end

data/app/models/user_decorator.rb

@@ -1,5 +1,4 @@
-User.class_eval do
-
+Spree::User.class_eval do
   def clear_api_key!
     self.update_attribute(:authentication_token, "")
   end
@@ -14,9 +13,7 @@ User.class_eval do
   #end
 
   private
-
-  def secure_digest(*args)
-    Digest::SHA1.hexdigest(args.flatten.join('--'))
-  end
-
-end
+    def secure_digest(*args)
+      Digest::SHA1.hexdigest(args.flatten.join('--'))
+    end
+end

data/app/overrides/api_admin_user_edit_form.rb

@@ -1,6 +1,6 @@
-Deface::Override.new(:virtual_path => "admin/users/edit",
+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]",
-                     :partial => "admin/users/api_fields",
+                     :partial => "spree/admin/users/api_fields",
                      :disabled => false)
 

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

@@ -0,0 +1,16 @@
+<h2><%= t('api.access') %></h2>
+
+<% if @user.authentication_token.present? %>
+  <p><strong><%= t('api.key') %></strong> <%= @user.authentication_token %></p>
+  <%= form_tag spree.clear_api_key_admin_user_path(@user), :method => :put do %>
+    <%= button t('api.clear_key') %>
+  <% end %>
+  <%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %>
+    <%= button t('api.regenerate_key') %>
+  <% end %>
+<% else %>
+  <p><%= t('api.no_key') %></p>
+  <%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %>
+    <%= button t('api.generate_key') %>
+  <% end %>
+<% end %>

data/config/routes.rb

@@ -1,4 +1,4 @@
-Rails.application.routes.draw do
+Spree::Core::Engine.routes.prepend do
   namespace :admin do
     resources :users do
       member do
@@ -33,4 +33,4 @@ Rails.application.routes.draw do
     resources :states, :except => [:new,:edit]
   end
 
-end
+end

data/db/migrate/20100107141738_add_api_key_to_users.rb

@@ -1,9 +1,5 @@
 class AddApiKeyToUsers < ActiveRecord::Migration
-  def self.up
-    add_column "users", "api_key", :string, :limit => 40
+  def change
+    add_column :spree_users, :api_key, :string, :limit => 40
   end
-
-  def self.down
-    remove_column "users", "api_key"
-  end
-end
+end

data/lib/spree/api/engine.rb

@@ -0,0 +1,21 @@
+module Spree
+  module Api
+    class Engine < Rails::Engine
+      isolate_namespace Spree
+      engine_name 'spree_api'
+
+      def self.activate
+        Dir.glob(File.join(File.dirname(__FILE__), "../../../app/**/*_decorator*.rb")) do |c|
+          Rails.configuration.cache_classes ? require(c) : load(c)
+        end
+
+        Dir.glob(File.join(File.dirname(__FILE__), "../../../app/overrides/*.rb")) do |c|
+          Rails.configuration.cache_classes ? require(c) : load(c)
+        end
+      end
+
+      config.autoload_paths += %W(#{config.root}/lib)
+      config.to_prepare &method(:activate).to_proc
+    end
+  end
+end

data/lib/spree/api.rb

@@ -0,0 +1,10 @@
+require 'spree_core'
+require 'spree_auth'
+
+module Spree
+  module Api
+
+  end
+end
+
+require 'spree/api/engine'

data/lib/spree_api.rb

@@ -1,20 +1,3 @@
-require 'spree_core'
+require 'spree/api'
+require 'spree/core'
 require 'spree_auth'
-
-module SpreeApi
-  class Engine < Rails::Engine
-    engine_name 'spree_api'
-
-    def self.activate
-      Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
-       Rails.application.config.cache_classes ? require(c) : load(c)
-      end
-      Dir.glob(File.join(File.dirname(__FILE__), "../app/overrides/*.rb")) do |c|
-        Rails.application.config.cache_classes ? require(c) : load(c)
-      end
-    end
-
-    config.autoload_paths += %W(#{config.root}/lib)
-    config.to_prepare &method(:activate).to_proc
-  end
-end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: spree_api
 version: !ruby/object:Gem::Version 
-  hash: 265
-  prerelease: 
+  hash: 15424055
+  prerelease: 6
   segments: 
+  - 1
   - 0
-  - 70
-  - 7
-  version: 0.70.7
+  - 0
+  - rc
+  - 1
+  version: 1.0.0.rc1
 platform: ruby
 authors: 
 - David North
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-08 00:00:00 Z
+date: 2011-12-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -23,12 +25,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 265
+        hash: 15424055
         segments: 
+        - 1
+        - 0
         - 0
-        - 70
-        - 7
-        version: 0.70.7
+        - rc
+        - 1
+        version: 1.0.0.rc1
   requirement: *id001
   type: :runtime
   prerelease: false
@@ -39,12 +43,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 265
+        hash: 15424055
         segments: 
+        - 1
+        - 0
         - 0
-        - 70
-        - 7
-        version: 0.70.7
+        - rc
+        - 1
+        version: 1.0.0.rc1
   requirement: *id002
   type: :runtime
   prerelease: false
@@ -72,24 +78,25 @@ files:
 - app/assets/stylesheets/store/all.css
 - app/assets/stylesheets/store/spree.css
 - app/assets/stylesheets/store/spree_api.css
-- app/controllers/admin/users_controller_decorator.rb
-- app/controllers/api/base_controller.rb
-- app/controllers/api/countries_controller.rb
-- app/controllers/api/inventory_units_controller.rb
-- app/controllers/api/line_items_controller.rb
-- app/controllers/api/orders_controller.rb
-- app/controllers/api/products_controller.rb
-- app/controllers/api/shipments_controller.rb
-- app/controllers/api/states_controller.rb
+- app/controllers/spree/admin/users_controller_decorator.rb
+- app/controllers/spree/api/base_controller.rb
+- app/controllers/spree/api/countries_controller.rb
+- app/controllers/spree/api/inventory_units_controller.rb
+- app/controllers/spree/api/line_items_controller.rb
+- app/controllers/spree/api/orders_controller.rb
+- app/controllers/spree/api/products_controller.rb
+- app/controllers/spree/api/shipments_controller.rb
+- app/controllers/spree/api/states_controller.rb
 - app/models/line_item_decorator.rb
 - app/models/order_decorator.rb
 - app/models/shipment_decorator.rb
 - app/models/user_decorator.rb
 - app/overrides/api_admin_user_edit_form.rb
-- app/views/admin/users/_api_fields.html.erb
-- config/cucumber.yml
+- app/views/spree/admin/users/_api_fields.html.erb
 - config/locales/en.yml
 - config/routes.rb
+- lib/spree/api/engine.rb
+- lib/spree/api.rb
 - lib/spree_api.rb
 - db/migrate/20100107141738_add_api_key_to_users.rb
 homepage: http://spreecommerce.com
@@ -114,15 +121,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: 
 - none
-rubyforge_project: spree_api
+rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3

data/app/controllers/api/countries_controller.rb

@@ -1,3 +0,0 @@
-class Api::CountriesController < Api::BaseController
-  before_filter :access_denied, :except => [:index, :show]
-end

data/app/controllers/api/orders_controller.rb

@@ -1,20 +0,0 @@
-class Api::OrdersController < Api::BaseController
-  before_filter :access_denied, :except => [:index, :show]
-
-  private
-
-    def find_resource
-      Order.find_by_param(params[:id])
-    end
-
-    def object_serialization_options
-      { :include => {
-          :bill_address => {:include => [:country, :state]},
-          :ship_address => {:include => [:country, :state]},
-          :shipments => {:include => [:shipping_method, :address]},
-          :line_items => {:include => [:variant]}
-          }
-      }
-    end
-
-end

data/app/controllers/api/shipments_controller.rb

@@ -1,37 +0,0 @@
-class Api::ShipmentsController < Api::BaseController
-
-  private
-    def parent
-      if params[:order_id]
-        @parent ||= Order.find_by_param(params[:order_id])
-      end
-    end
-    
-    def collection_serialization_options
-      { :include => {:shipping_method => {}, :address => {}, :inventory_units => {:include => :variant}},
-      :except => [:shipping_method_id, :address_id] }
-    end
-
-    def object_serialization_options
-      { :include =>  {
-        :shipping_method => {},
-        :address => {:include => [:country, :state]},
-        :inventory_units => {
-          :include => {
-            :variant => {
-              :include => {
-                :product => {:only => [:name]}
-                }
-              }
-            }
-          }
-        },
-        :except => [:shipping_method_id, :address_id]
-      }
-    end
-
-    def eager_load_associations
-      [:shipping_method, :address, {:inventory_units => [:variant]}]
-    end
-
-end

data/app/controllers/api/states_controller.rb

@@ -1,8 +0,0 @@
-class Api::StatesController < Api::BaseController
-  before_filter :access_denied, :except => [:index, :show]
-
-  private
-  def parent
-    @parent ||= Country.find(params[:country_id])
-  end
-end

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

@@ -1,16 +0,0 @@
-<h2><%= t('api.access') %></h2>
-
-<% if @user.authentication_token.present? %>
-  <p><strong><%= t('api.key') %></strong> <%= @user.authentication_token %></p>
-  <%= form_tag clear_api_key_admin_user_path(@user), :method => :put do %>
-    <%= button t("api.clear_key") %>
-  <% end %>
-  <%= form_tag generate_api_key_admin_user_path(@user), :method => :put do %>
-    <%= button t("api.regenerate_key") %>
-  <% end %>
-<% else %>
-  <p><%= t('api.no_key') %></p>
-  <%= form_tag generate_api_key_admin_user_path(@user), :method => :put do %>
-    <%= button t("api.generate_key") %>
-  <% end %>
-<% end %>

data/config/cucumber.yml

@@ -1,10 +0,0 @@
-<%
-rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
-rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
-std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} --strict --tags ~@wip"
-ci_opts = "--format progress --strict"
-%>
-default: <%= std_opts %> features
-wip: --tags @wip:3 --wip features
-ci: <%= ci_opts %> features CI=true
-rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip