spree_api 0.30.0.beta1 → 0.30.0

data/app/controllers/admin/users_controller_decorator.rb

@@ -0,0 +1,19 @@
+Admin::UsersController.class_eval do
+  
+  before_filter :load_roles, :only => [:edit, :new, :update, :create, :generate_api_key, :clear_api_key]
+
+  def generate_api_key
+    if object.generate_api_key!
+      flash.notice = t('api.key_generated')
+    end
+    redirect_to edit_object_path
+  end
+
+  def clear_api_key
+    if object.clear_api_key!
+      flash.notice = t('api.key_cleared')
+    end
+    redirect_to edit_object_path
+  end
+
+end

data/app/controllers/api/base_controller.rb

@@ -24,17 +24,16 @@ class Api::BaseController < Spree::BaseController
 
     define_method :admin_token_passed_in_headers do
       token = request.headers['X-SpreeAPIKey']
-      return false unless token
+      return access_denied unless token
       @current_user = User.find_by_api_key(token)
-      @current_user.has_role? 'admin'
     end
 
     define_method :end_of_association_chain do
-      (parent? ? parent_association : model).scoped(:include  => eager_load_associations)
+      parent? ? parent_association.scoped : model.scoped(:include  => eager_load_associations)
     end
 
     define_method :collection do
-      @collection ||= search.all(:limit => 100)
+      @collection ||= search.do_search.all(:limit => 100)
     end
   end
 

data/app/controllers/api/shipments_controller.rb

@@ -29,7 +29,7 @@ class Api::ShipmentsController < Api::BaseController
     end
 
     def eager_load_associations
-      [:shipping_method, {:shipping_charge => :order}, :address, {:inventory_units => [:variant]}]
+      [:shipping_method, :address, {:inventory_units => [:variant]}]
     end
 
 end

data/app/models/line_item_decorator.rb

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

data/app/models/user_decorator.rb

@@ -0,0 +1,17 @@
+User.class_eval do
+
+  def clear_api_key!
+    self.update_attribute(:api_key, "")
+  end
+
+  def generate_api_key!
+    self.update_attribute(:api_key, secure_digest(Time.now, (1..10).map{ rand.to_s }))
+  end
+
+  private
+
+  def secure_digest(*args)
+    Digest::SHA1.hexdigest(args.flatten.join('--'))
+  end
+
+end

data/config/locales/en.yml

@@ -1,3 +1,4 @@
+---
 en:
   api: "API"
   api:
@@ -12,5 +13,4 @@ en:
     regenerate_key: "Regenerate API key"
     no_key: "No key defined"
     key_generated: "API key generated"
-    key_cleared: "API key cleared"
-
+    key_cleared: "API key cleared"

data/lib/spree_api.rb

@@ -4,43 +4,27 @@ require 'spree_api_hooks'
 module SpreeApi
   class Engine < Rails::Engine
     def self.activate
-      lambda{
 
-        Admin::UsersController.class_eval do
+      # RAILS3 TODO: Get the API stuff working with Devise
+      # Spree::BaseController.class_eval do
+      #   private
+      #   def current_user
+      #     return @current_user if defined?(@current_user)
+      #     if current_user_session && current_user_session.user
+      #       return @current_user = current_user_session.user
+      #     end
+      #     if token = request.headers['X-SpreeAPIKey']
+      #       @current_user = User.find_by_api_key(token)
+      #     end
+      #   end
+      # end
+      
+      Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
+        Rails.env.production? ? require(c) : load(c)
+      end
 
-          def generate_api_key
-            if object.generate_api_key!
-              flash.notice = t('api.key_generated')
-            end
-            redirect_to edit_object_path
-          end
-
-        end
-
-        # RAILS3 TODO: Get the API stuff working with Devise
-        # Spree::BaseController.class_eval do
-        #   private
-        #   def current_user
-        #     return @current_user if defined?(@current_user)
-        #     if current_user_session && current_user_session.user
-        #       return @current_user = current_user_session.user
-        #     end
-        #     if token = request.headers['X-SpreeAPIKey']
-        #       @current_user = User.find_by_api_key(token)
-        #     end
-        #   end
-        # end
-
-        LineItem.class_eval do
-          def description
-            d = variant.product.name.clone
-            d << " (#{variant.options_text})" unless variant.option_values.empty?
-            d
-          end
-        end
-      }
     end
     config.autoload_paths += %W(#{config.root}/lib)
-    config.to_prepare &self.activate
+    config.to_prepare &method(:activate).to_proc
   end
-end
+end

data/lib/tasks/install.rake

@@ -0,0 +1,24 @@
+namespace :spree_api do
+  desc "Copies all migrations and assets (NOTE: This will be obsolete with Rails 3.1)"
+  task :install do
+    Rake::Task['spree_api:install:migrations'].invoke
+    Rake::Task['spree_api:install:assets'].invoke
+  end
+
+  namespace :install do
+
+    desc "Copies all migrations (NOTE: This will be obsolete with Rails 3.1)"
+    task :migrations do
+      source = File.join(File.dirname(__FILE__), '..', '..', 'db')
+      destination = File.join(Rails.root, 'db')
+      puts "INFO: Mirroring assets from #{source} to #{destination}"
+      Spree::FileUtilz.mirror_files(source, destination)
+    end
+
+    desc "Copies all assets (NOTE: This will be obsolete with Rails 3.1)"
+    task :assets do
+      # No assets
+    end
+
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_api
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  hash: 103
+  prerelease: false
   segments: 
   - 0
   - 30
   - 0
-  - beta1
-  version: 0.30.0.beta1
+  version: 0.30.0
 platform: ruby
 authors: 
 - David North
@@ -15,22 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-03 00:00:00 -04:00
+date: 2010-11-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 103
         segments: 
         - 0
         - 30
         - 0
-        - beta1
-        version: 0.30.0.beta1
+        version: 0.30.0
   type: :runtime
   version_requirements: *id001
 description: Required dependancy for Spree
@@ -44,6 +45,7 @@ extra_rdoc_files: []
 files: 
 - LICENSE
 - README.md
+- 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
@@ -53,15 +55,15 @@ files:
 - app/controllers/api/shipments_controller.rb
 - app/controllers/api/states_controller.rb
 - app/helpers/api/shipments_helper.rb
+- app/models/line_item_decorator.rb
+- app/models/user_decorator.rb
 - app/views/admin/users/_api_fields.html.erb
 - config/locales/en.yml
-- config/locales/ru-RU.yml
 - config/routes.rb
-- lib/generators/spree_api/install_generator.rb
-- lib/generators/templates/db/migrate/20100107141738_add_api_key_to_users.rb
 - lib/spree_api.rb
 - lib/spree_api_hooks.rb
-- lib/tasks/api.rake
+- lib/tasks/install.rake
+- db/migrate/20100107141738_add_api_key_to_users.rb
 has_rdoc: true
 homepage: http://spreecommerce.com
 licenses: []
@@ -72,27 +74,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: 
 - none
 rubyforge_project: spree_api
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Provides RESTful access for Spree.

data/config/locales/ru-RU.yml

@@ -1,16 +0,0 @@
-ru-RU:
-  api: "API"
-  api:
-    access: "API доступ"
-    clear_key: "Удалить ключ API"
-    errors:
-      invalid_event: "Недопустимое действие, допустимые действия: %{events}"
-      invalid_event_for_object: "Допустимое действие, но не разрешённое для заданного объекта, разрешённые действия: %{events}"
-      missing_event: "Действие не указано"
-    generate_key: "Сгенирировать ключ API"
-    key: "Ключ API"
-    regenerate_key: "Перегенерировать ключ API"
-    no_key: "Ключ не определён"
-    key_generated: "Ключ API сгенерирован"
-    key_cleared: "Ключ API удалён"
-      

data/lib/generators/spree_api/install_generator.rb

@@ -1,14 +0,0 @@
-module SpreeApi
-  module Generators
-    class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path("../../templates", __FILE__)
-
-      desc "Configures an existing Rails application to use spree_api"
-
-      def copy_migrations
-        directory "db"
-      end
-
-    end
-  end
-end

data/lib/tasks/api.rake

@@ -1,8 +0,0 @@
-namespace :spree do
-  desc "Synchronize public assets, migrations, seed and sample data from the Spree gems"
-  task :sync do
-    migration_dir = File.join(File.dirname(__FILE__), '..', '..', 'db', 'migrate')
-    puts "Mirror: #{migration_dir}"
-    Spree::FileUtilz.mirror_with_backup(migration_dir, File.join(Rails.root, 'db', 'migrate'))
-  end
-end