spree_api 0.30.2 → 0.40.0

data/app/controllers/api/base_controller.rb

@@ -2,30 +2,30 @@ class Api::BaseController < Spree::BaseController
 
   def self.resource_controller_for_api
     resource_controller
+    before_filter :check_http_authorization
     skip_before_filter :verify_authenticity_token, :if => lambda { admin_token_passed_in_headers }
 
-    index.response do |wants|
+    index do
       wants.json { render :json => collection.to_json(collection_serialization_options) }
     end
 
-    show.response do |wants|
+    show do
       wants.json { render :json => object.to_json(object_serialization_options) }
+      failure.wants.json { render :text => "Failure\n", :status => 500 }
     end
 
     create do
-      wants.json { redirect_to object_url, :status => 201 }
-      failure.wants.json { render :json => object_errors.to_json, :status => 422 }
+      wants.json { render :text => "Resource created\n", :status => 201, :location => object_url }
+      failure.wants.json { render :text => "Failure\n", :status => 500 }
     end
 
     update do
       wants.json { render :nothing => true }
-      failure.wants.json { render :json => object_errors.to_json, :status => 422 }
+      failure.wants.json { render :text => "Failure\n", :status => 500 }
     end
 
     define_method :admin_token_passed_in_headers do
-      token = request.headers['X-SpreeAPIKey']
-      return access_denied unless token
-      @current_user = User.find_by_api_key(token)
+      request.headers['HTTP_AUTHORIZATION'].present?
     end
 
     define_method :end_of_association_chain do
@@ -33,7 +33,7 @@ class Api::BaseController < Spree::BaseController
     end
 
     define_method :collection do
-      @collection ||= search.do_search.all(:limit => 100)
+      @collection ||= search.do_search.limit(100)
     end
   end
 
@@ -93,4 +93,9 @@ class Api::BaseController < Spree::BaseController
       {:errors => object.errors.full_messages}
     end
 
+  private
+  def check_http_authorization
+    render :text => "Access Denied\n", :status => 401 unless request.headers['HTTP_AUTHORIZATION'].present?
+  end
+
 end

data/app/models/user_decorator.rb

@@ -1,13 +1,18 @@
 User.class_eval do
 
   def clear_api_key!
-    self.update_attribute(:api_key, "")
+    self.update_attribute(:authentication_token, "")
   end
 
   def generate_api_key!
-    self.update_attribute(:api_key, secure_digest(Time.now, (1..10).map{ rand.to_s }))
+    self.reset_authentication_token!
   end
 
+  #def self.authenticate_with_http(username, password)
+  #  logger.debug(username)
+  #  self.authenticate_with_token(:auth_token => username)
+  #end
+
   private
 
   def secure_digest(*args)

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

@@ -1,7 +1,7 @@
 <h2><%= t('api.access') %></h2>
 
-<% if @user.api_key.present? %>
-  <p><strong><%= t('api.key') %></strong> <%= @user.api_key %></p>
+<% 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 %>

data/config/cucumber.yml

@@ -0,0 +1,8 @@
+<%
+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"
+%>
+default: <%= std_opts %> features
+wip: --tags @wip:3 --wip features
+rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip

data/lib/spree_api.rb

@@ -5,20 +5,6 @@ module SpreeApi
   class Engine < Rails::Engine
     def self.activate
 
-      # 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

data/lib/tasks/install.rake

@@ -11,7 +11,6 @@ namespace :spree_api do
     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
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_api
 version: !ruby/object:Gem::Version 
-  hash: 99
-  prerelease: 
+  hash: 191
+  prerelease: false
   segments: 
   - 0
-  - 30
-  - 2
-  version: 0.30.2
+  - 40
+  - 0
+  version: 0.40.0
 platform: ruby
 authors: 
 - David North
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-23 00:00:00 Z
+date: 2010-12-22 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core
@@ -25,12 +26,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 99
+        hash: 191
         segments: 
         - 0
-        - 30
-        - 2
-        version: 0.30.2
+        - 40
+        - 0
+        version: 0.40.0
   type: :runtime
   version_requirements: *id001
 description: Required dependancy for Spree
@@ -57,12 +58,14 @@ files:
 - app/models/line_item_decorator.rb
 - app/models/user_decorator.rb
 - app/views/admin/users/_api_fields.html.erb
+- config/cucumber.yml
 - config/locales/en.yml
 - config/routes.rb
 - lib/spree_api.rb
 - lib/spree_api_hooks.rb
 - lib/tasks/install.rake
 - db/migrate/20100107141738_add_api_key_to_users.rb
+has_rdoc: true
 homepage: http://spreecommerce.com
 licenses: []
 
@@ -94,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: spree_api
-rubygems_version: 1.8.10
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Provides RESTful access for Spree.