spree_auth 0.60.6 → 0.70.RC1

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

@@ -0,0 +1 @@
+//= require admin/spree_core

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

@@ -0,0 +1 @@
+//= require store/spree_core

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

@@ -0,0 +1,3 @@
+/*
+ *= require admin/spree_core
+*/

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

@@ -0,0 +1,3 @@
+/*
+ *= require store/spree_core
+*/

data/app/controllers/admin_controller_decorator.rb

@@ -2,6 +2,12 @@ Admin::BaseController.class_eval do
   before_filter :authorize_admin
 
   def authorize_admin
-    authorize! :admin, Object
+    begin
+      model = controller_name.classify.constantize
+    rescue
+      model = Object
+    end
+    authorize! :admin, model
+    authorize! params[:action].to_sym, model
   end
 end

data/app/controllers/orders_controller_decorator.rb

@@ -5,7 +5,7 @@ OrdersController.class_eval do
 
   def check_authorization
     session[:access_token] ||= params[:token]
-    order = Order.find_by_number(params[:id]) || current_order
+    order = current_order || Order.find_by_number(params[:id])
 
     if order
       authorize! :edit, order, session[:access_token]

data/app/controllers/spree/base_controller_decorator.rb

@@ -19,7 +19,6 @@ Spree::BaseController.class_eval do
           flash.now[:error] = I18n.t(:authorization_failure)
           render 'shared/unauthorized', :layout => 'spree_application'
         else
-          flash[:error] = I18n.t(:authorization_failure)
           store_location
           redirect_to login_path and return
         end

data/app/controllers/user_passwords_controller.rb

@@ -6,8 +6,23 @@ class UserPasswordsController < Devise::PasswordsController
     super
   end
 
+  # Temporary Override until next Devise release (i.e after v1.3.4)
+  # line:
+  #   respond_with resource, :location => new_session_path(resource_name)
+  # is generating bad url /session/new.user
+  #
+  # overridden to:
+  #   respond_with resource, :location => login_path
+  #
   def create
-    super
+    self.resource = resource_class.send_reset_password_instructions(params[resource_name])
+
+    if resource.errors.empty?
+      set_flash_message(:notice, :send_instructions) if is_navigational_format?
+      respond_with resource, :location => login_path 
+    else
+      respond_with_navigational(resource){ render_with_scope :new }
+    end
   end
 
   def edit

data/app/controllers/user_registrations_controller.rb

@@ -18,6 +18,7 @@ class UserRegistrationsController < Devise::RegistrationsController
     logger.debug(@user)
     if resource.save
       set_flash_message(:notice, :signed_up)
+      fire_event('spree.user.signup', :user => @user)
       sign_in_and_redirect(:user, @user)
     else
       clean_up_passwords(resource)

data/app/models/spree_auth_configuration.rb

@@ -1,4 +1,4 @@
 class SpreeAuthConfiguration < Configuration
   preference :registration_step, :boolean, :default => true
   preference :signout_after_password_change, :boolean, :default => true
-end
+end

data/app/models/user.rb

@@ -38,9 +38,9 @@ class User < ActiveRecord::Base
     email =~ /@example.net$/
   end
 
-  def deliver_password_reset_instructions!
+  def send_reset_password_instructions
     reset_perishable_token!
-    UserMailer.password_reset_instructions(self).deliver
+    UserMailer.reset_password_instructions(self).deliver
   end
 
   protected
@@ -63,7 +63,7 @@ class User < ActiveRecord::Base
 
   # Generate a friendly string randomically to be used as token.
   def self.friendly_token
-    ActiveSupport::SecureRandom.base64(15).tr('+/=', '-_ ').strip.delete("\n")
+    SecureRandom.base64(15).tr('+/=', '-_ ').strip.delete("\n")
   end
 
   # Generate a token by looping and ensuring does not already exist.

data/app/overrides/auth_admin_login_navigation_bar.rb

@@ -0,0 +1,4 @@
+Deface::Override.new(:virtual_path => "layouts/admin",
+                     :name => "auth_admin_login_navigation_bar",
+                     :replace => "[data-hook='admin_login_navigation_bar'], #admin_login_navigation_bar[data-hook]",
+                     :partial => "layouts/admin/login_nav")

data/app/overrides/auth_shared_login_bar.rb

@@ -0,0 +1,6 @@
+Deface::Override.new(:virtual_path => "shared/_nav_bar",
+                     :name => "auth_shared_login_bar",
+                     :insert_after => "li#search-bar",
+                     :partial => "shared/login_bar",
+                     :disabled => false)
+

data/app/views/shared/_user_form.html.erb

@@ -14,4 +14,4 @@
   </p>
 </div>
 
-<%= hook :signup_below_password_fields %>
+<div data-hook="signup_below_password_fields"></div>

data/app/views/user_registrations/new.html.erb

@@ -5,19 +5,20 @@
 <div id="new-customer">
   <h2><%= t("new_customer") %></h2>
 
-  <%= hook :signup do %>
+  <div data-hook="signup">
 
     <%= form_for(:user, :url => registration_path(@user)) do |f| %>
 
-      <%= hook :signup_inside_form do %>
+      <div data-hook="signup_inside_form"%>
         <%= render 'shared/user_form', :f => f %>
         <p><%= submit_tag t("create"), :class => 'button primary' %></p>
-      <% end %>
+      </div>
 
     <% end %>
     <%= t("or") %> <%= link_to t("login_as_existing"), login_path %>
-  <% end %>
+
+  </div>
 
 </div>
 
-<%= hook :login_extras %>
+<div data-hook="login_extras"></div>

data/app/views/user_sessions/new.html.erb

@@ -5,9 +5,9 @@
 <% @body_id = 'login' %>
 <div id="existing-customer">
   <h2><%= t("login_as_existing") %></h2>
-  <%= hook :login do %>
+  <div data-hook="login">
     <%= render :partial => 'shared/login' %>
     <%= t("or") %> <%= link_to t("create_a_new_account"), signup_path %> | <%= link_to t("forgot_password"), new_user_password_path %>
-  <% end %>
+  </div>
 </div>
-<%= hook :login_extras %>
+<div data-hook="login_extras"></div>

data/app/views/users/show.html.erb

@@ -1,50 +1,44 @@
 <h1><%= t("my_account") %></h1>
 
-<%= hook :account_summary do %>
+<div data-hook="account_summary">
+  <dl id="user-info">
+    <dt><%= t("email") %></dt>
+    <dd><%= @user.email %></dd>
+  </dl>
+  <p><%= link_to t('edit'), edit_account_path %></p>
+</div>
 
-<table>
-  <tr>
-    <td><%= t("email") %>:</td>
-    <td>
-      <%= @user.email %>
-    </td>
-  </tr>
-</table>
-<p><%= link_to t('edit'), edit_account_path %></p>
+<div data-hook="account_my_orders">
 
-<% end %>
+  <h2><%= t("my_orders") %></h2>
+  <% if @orders.present? %>
+    <table class="order-summary" width="545">
+      <thead>
+        <tr>
+          <th><%= t("order_number") %></th>
+          <th><%= t("order_date") %></th>
+          <th><%= t("status") %></th>
+          <th><%= t("payment_state") %></th>
+          <th><%= t("shipment_state") %></th>
+          <th><%= t("total") %></th>
+        </tr>
+      </thead>
+      <tbody>
+      <% @orders.each do |order| %>
+        <tr class="<%= cycle('even', 'odd') %>">
+          <td><%= link_to order.number, order_url(order) %></td>
+          <td><%= l order.created_at.to_date %></td>
+          <td><%= t(order.state).titleize %></td>
+          <td><%= t("payment_states.#{order.payment_state}") if order.payment_state %></td>
+          <td><%= t("shipment_states.#{order.shipment_state}") if order.shipment_state %></td>
+          <td><%= number_to_currency order.total %></td>
+        </tr>
+      <% end %>
+      </tbody>
+    </table>
+  <% else %>
+    <p><%= t(:you_have_no_orders_yet) %></p>
+  <% end %>
+  <br />
 
-<%= hook :account_my_orders do %>
-
-<h2><%= t("my_orders") %></h2>
-<% if @orders.present? %>
-  <table class="order-summary" width="545">
-    <thead>
-      <tr>
-        <th><%= t("order_number") %></th>
-        <th><%= t("order_date") %></th>
-        <th><%= t("status") %></th>
-        <th><%= t("payment_state") %></th>
-        <th><%= t("shipment_state") %></th>
-        <th><%= t("total") %></th>
-      </tr>
-    </thead>
-    <tbody>
-    <% @orders.each do |order| %>
-      <tr class="<%= cycle('even', 'odd') %>">
-        <td><%= link_to order.number, order_url(order) %></td>
-        <td><%=order.created_at.to_date%></td>
-        <td><%= t(order.state).titleize %></td>
-        <td><%= t("payment_states.#{order.payment_state}") if order.payment_state %></td>
-        <td><%= t("shipment_states.#{order.shipment_state}") if order.shipment_state %></td>
-        <td><%= number_to_currency order.total %></td>
-      </tr>
-    <% end %>
-    </tbody>
-  </table>
-<% else %>
-  <p><%= t(:you_have_no_orders_yet) %></p>
-<% end %>
-<br />
-
-<% end %>
+</div>

data/db/{sample → default}/users.rb

@@ -50,4 +50,6 @@ def create_admin_user
   end
 end
 
-create_admin_user if User.where("roles.name" => 'admin').includes(:roles).empty?
+if Rails.env.development?
+  create_admin_user if User.where("roles.name" => 'admin').includes(:roles).empty?
+end

data/db/migrate/20101026184950_rename_columns_for_devise.rb

@@ -14,7 +14,7 @@ class RenameColumnsForDevise < ActiveRecord::Migration
     add_column :users, :authentication_token, :string
     add_column :users, :unlock_token, :string
     add_column :users, :locked_at, :datetime
-    remove_column :users, :api_key rescue Exception
+    remove_column :users, :api_key if column_exists?(:users, :api_key)
     remove_column :users, :openid_identifier
   end
 

data/db/seeds.rb

@@ -0,0 +1,5 @@
+# Loads seed data out of default dir
+default_path = File.join(File.dirname(__FILE__), 'default')
+
+Rake::Task['db:load_dir'].reenable
+Rake::Task["db:load_dir"].invoke( default_path )

data/lib/spree/token_resource.rb

@@ -10,7 +10,7 @@ module Spree::TokenResource
 
   module InstanceMethods
     def create_token
-      create_tokenized_permission(:token => ActiveSupport::SecureRandom::hex(8))
+      create_tokenized_permission(:token => ::SecureRandom::hex(8))
       token
     end
   end
@@ -20,4 +20,4 @@ module Spree::TokenResource
     receiver.send :include, InstanceMethods
   end
 
-end
+end

data/lib/spree_auth.rb

@@ -4,22 +4,17 @@ require 'cancan'
 
 require 'spree/auth/config'
 require 'spree/token_resource'
-require 'spree_auth_hooks'
 
 module SpreeAuth
   class Engine < Rails::Engine
+    engine_name 'spree_auth'
+
     def self.activate
       Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
-        Rails.env.production? ? require(c) : load(c)
+        Rails.application.config.cache_classes ? require(c) : load(c)
       end
-
-      # monkey patch until new version of devise comes out
-      # https://github.com/plataformatec/devise/commit/ec5bfe9119d0e1e633629793b0de1f58f89622dc
-      Devise::IndifferentHash.class_eval do
-        def [](key)
-          super(convert_key(key))
-        end
-        def to_hash; Hash.new.update(self) end
+      Dir.glob(File.join(File.dirname(__FILE__), "../app/overrides/*.rb")) do |c|
+        Rails.application.config.cache_classes ? require(c) : load(c)
       end
     end
 

data/lib/tasks/auth.rake

@@ -2,7 +2,7 @@ namespace :db do
   namespace :admin do
     desc "Create admin username and password"
     task :create => :environment do
-      require File.join(Rails.root, 'db', 'sample', 'users.rb')
+      require File.join(File.dirname(__FILE__), '..', '..', 'db', 'default', 'users.rb')
     end
   end
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: spree_auth
 version: !ruby/object:Gem::Version 
-  hash: 227
-  prerelease: 
+  hash: 11094103
+  prerelease: 5
   segments: 
   - 0
-  - 60
-  - 6
-  version: 0.60.6
+  - 70
+  - RC
+  - 1
+  version: 0.70.RC1
 platform: ruby
 authors: 
 - Sean Schofield
@@ -15,57 +16,58 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-12 00:00:00 Z
+date: 2011-09-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 227
+        hash: 11094103
         segments: 
         - 0
-        - 60
-        - 6
-        version: 0.60.6
-  version_requirements: *id001
+        - 70
+        - RC
+        - 1
+        version: 0.70.RC1
   name: spree_core
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 15
         segments: 
         - 1
-        - 3
-        - 3
-        version: 1.3.3
-  version_requirements: *id002
+        - 4
+        - 4
+        version: 1.4.4
   name: devise
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 1
         - 6
-        - 4
-        version: 1.6.4
-  version_requirements: *id003
+        - 5
+        version: 1.6.5
   name: cancan
-description: Required dependancy for Spree
+  type: :runtime
+  prerelease: false
+  requirement: *id003
+description: Required dependency for Spree
 email: sean@railsdog.com
 executables: []
 
@@ -76,6 +78,10 @@ extra_rdoc_files: []
 files: 
 - LICENSE
 - README.md
+- app/assets/javascripts/admin/spree_auth.js
+- app/assets/javascripts/store/spree_auth.js
+- app/assets/stylesheets/admin/spree_auth.css
+- app/assets/stylesheets/store/spree_auth.css
 - app/controllers/admin_controller_decorator.rb
 - app/controllers/admin_orders_controller_decorator.rb
 - app/controllers/admin_resource_controller_decorator.rb
@@ -95,6 +101,8 @@ files:
 - app/models/tokenized_permission.rb
 - app/models/user.rb
 - app/models/user_mailer.rb
+- app/overrides/auth_admin_login_navigation_bar.rb
+- app/overrides/auth_shared_login_bar.rb
 - app/views/checkout/registration.html.erb
 - app/views/layouts/admin/_login_nav.html.erb
 - app/views/shared/_flashes.html.erb
@@ -117,14 +125,13 @@ files:
 - lib/spree/auth/config.rb
 - lib/spree/token_resource.rb
 - lib/spree_auth.rb
-- lib/spree_auth_hooks.rb
 - lib/tasks/auth.rake
-- lib/tasks/install.rake
+- db/default/users.rb
 - db/migrate/20101026184950_rename_columns_for_devise.rb
 - db/migrate/20101214150824_convert_user_remember_field.rb
 - db/migrate/20101217012656_create_tokenized_permissions.rb
 - db/migrate/20101219201531_tokens_for_legacy_orders.rb
-- db/sample/users.rb
+- db/seeds.rb
 homepage: http://spreecommerce.com
 licenses: []
 
@@ -147,16 +154,18 @@ 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_auth
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Provides authentication and authorization services for use with Spree.

data/lib/spree_auth_hooks.rb

@@ -1,6 +0,0 @@
-class SpreeAuthHooks < Spree::ThemeSupport::HookListener
-
-  replace :admin_login_navigation_bar, :partial => "layouts/admin/login_nav"
-  replace :shared_login_bar, :partial => "shared/login_bar"
-
-end

data/lib/tasks/install.rake

@@ -1,23 +0,0 @@
-namespace :spree_auth do
-  desc "Copies all migrations and assets (NOTE: This will be obsolete with Rails 3.1)"
-  task :install do
-    Rake::Task['spree_auth:install:migrations'].invoke
-    Rake::Task['spree_auth: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')
-      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