spree_auth 1.0.0.rc2 → 1.0.0.rc3

data/app/controllers/spree/checkout_controller_decorator.rb

@@ -9,6 +9,7 @@ Spree::CheckoutController.class_eval do
   end
 
   def update_registration
+    fire_event("spree.user.signup", :order => current_order)
     # hack - temporarily change the state to something other than cart so we can validate the order email address
     current_order.state = 'address'
     if current_order.update_attributes(params[:order])

data/app/controllers/spree/user_registrations_controller.rb

@@ -15,9 +15,9 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
   # POST /resource/sign_up
   def create
     @user = build_resource(params[:user])
-    logger.debug(@user)
     if resource.save
       set_flash_message(:notice, :signed_up)
+      sign_in(:user, @user)
       fire_event('spree.user.signup', :user => @user)
       sign_in_and_redirect(:user, @user)
     else

data/app/overrides/auth_shared_login_bar.rb

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

data/app/views/spree/checkout/registration.html.erb

@@ -1,13 +1,13 @@
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
 <h2><%= t(:registration) %></h2>
 <div id="registration">
-  <div id="account">
+  <div id="account" class="columns alpha eight">
     <%= render :file => 'spree/user_sessions/new' %>
   </div>
   <% if Spree::Config[:allow_guest_checkout] %>
-    <div id="guest_checkout">
+    <div id="guest_checkout" class="columns omega eight">
       <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
-      <h2><%= t(:guest_user_account) %></h2>
+      <h6><%= t(:guest_user_account) %></h6>
       <%= form_for @order, :url => spree.update_checkout_registration_path, :method => :put, :html => { :id => 'checkout_form_registration' } do |f| %>
         <p>
           <%= f.label :email, t(:email) %><br />

data/app/views/spree/shared/_login_bar.html.erb

@@ -2,5 +2,5 @@
   <li><%= link_to t(:my_account), spree.account_path %></li>
   <li><%= link_to t(:logout), spree.destroy_user_session_path %></li>
 <% else %>
-  <li><%= link_to t(:login), spree.login_path %></li>
+  <li id="link-to-login"><%= link_to t(:login), spree.login_path %></li>
 <% end %>

data/app/views/spree/user_passwords/new.html.erb

@@ -1,13 +1,15 @@
-<h2><%= t(:forgot_password) %></h2>
+<div id="forgot-password">
+  <h6><%= t(:forgot_password) %></h6>
 
-<p><%= t(:instructions_to_reset_password) %></p>
+  <p><%= t(:instructions_to_reset_password) %></p>
 
-<%= form_for Spree::User.new, :as => :user, :url => spree.user_password_path do |f| %>
-  <p>
-    <%= f.label :email, t(:email) %><br />
-    <%= f.email_field :email %>
-  </p>
-  <p>
-    <%= f.submit t(:reset_password), :class => 'button primary' %>
-  </p>
-<% end %>
+  <%= form_for Spree::User.new, :as => :user, :url => spree.user_password_path do |f| %>
+    <p>
+      <%= f.label :email, t(:email) %><br />
+      <%= f.email_field :email %>
+    </p>
+    <p>
+      <%= f.submit t(:reset_password), :class => 'button primary' %>
+    </p>
+  <% end %>
+</div>

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

@@ -3,7 +3,7 @@
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
 
 <div id="new-customer">
-  <h2><%= t(:new_customer) %></h2>
+  <h6><%= t(:new_customer) %></h6>
 
   <div data-hook="signup">
 

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

@@ -4,7 +4,7 @@
 
 <% @body_id = 'login' %>
 <div id="existing-customer">
-  <h2><%= t(:login_as_existing) %></h2>
+  <h6><%= t(:login_as_existing) %></h6>
   <div data-hook="login">
     <%= render :partial => 'spree/shared/login' %>
     <%= t(:or) %> <%= link_to t(:create_a_new_account), spree.signup_path %> | <%= link_to t(:forgot_password), spree.new_user_password_path %>

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

@@ -1,18 +1,17 @@
-<h1><%= accurate_title %></h1>
+<h3><%= accurate_title %></h3>
 
 <div data-hook="account_summary">
   <dl id="user-info">
     <dt><%= t(:email) %></dt>
-    <dd><%= @user.email %></dd>
+    <dd><%= @user.email %> (<%= link_to t(:edit), spree.edit_account_path %>)</dd>
   </dl>
-  <p><%= link_to t(:edit), spree.edit_account_path %></p>
 </div>
 
 <div data-hook="account_my_orders">
 
-  <h2><%= t(:my_orders) %></h2>
+  <h3><%= t(:my_orders) %></h3>
   <% if @orders.present? %>
-    <table class="order-summary" style="width:545px;">
+    <table class="order-summary">
       <thead>
         <tr>
           <th><%= t(:order_number) %></th>

data/db/default/users.rb

@@ -2,22 +2,34 @@ require 'highline/import'
 
 # see last line where we create an admin if there is none, asking for email and password
 def prompt_for_admin_password
-  password = ask('Password [spree123]: ') do |q|
-    q.echo = false
-    q.validate = /^(|.{5,40})$/
-    q.responses[:not_valid] = 'Invalid password. Must be at least 5 characters long.'
-    q.whitespace = :strip
+  if ENV['ADMIN_PASSWORD']
+    password = ENV['ADMIN_PASSWORD'].dup
+    say "Admin Password #{password}"
+  else
+    password = ask('Password [spree123]: ') do |q|
+      q.echo = false
+      q.validate = /^(|.{5,40})$/
+      q.responses[:not_valid] = 'Invalid password. Must be at least 5 characters long.'
+      q.whitespace = :strip
+    end
+    password = 'spree123' if password.blank?
   end
-  password = 'spree123' if password.blank?
+
   password
 end
 
 def prompt_for_admin_email
-  email = ask('Email [spree@example.com]: ') do |q|
-    q.echo = true
-    q.whitespace = :strip
+  if ENV['ADMIN_EMAIL']
+    email = ENV['ADMIN_EMAIL'].dup
+    say "Admin User #{email}"
+  else
+    email = ask('Email [spree@example.com]: ') do |q|
+      q.echo = true
+      q.whitespace = :strip
+    end
+    email = 'spree@example.com' if email.blank?
   end
-  email = 'spree@example.com' if email.blank?
+
   email
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_auth
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-14 00:00:00.000000000Z
+date: 2012-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &70296291622140 !ruby/object:Gem::Requirement
+  requirement: &70156358869740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: 1.0.0.rc3
   type: :runtime
   prerelease: false
-  version_requirements: *70296291622140
+  version_requirements: *70156358869740
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70296291621540 !ruby/object:Gem::Requirement
+  requirement: &70156358868540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.8
   type: :runtime
   prerelease: false
-  version_requirements: *70296291621540
+  version_requirements: *70156358868540
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70296291621000 !ruby/object:Gem::Requirement
+  requirement: &70156358867500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,7 +43,7 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70296291621000
+  version_requirements: *70156358867500
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -56,10 +56,8 @@ files:
 - app/assets/javascripts/store/spree_auth.js
 - app/assets/stylesheets/admin/spree_auth.css
 - app/assets/stylesheets/store/spree_auth.css
-- app/controllers/resource_controller_decorator.rb
 - app/controllers/spree/admin/admin_controller_decorator.rb
 - app/controllers/spree/admin/admin_orders_controller_decorator.rb
-- app/controllers/spree/admin/admin_resource_controller_decorator.rb
 - app/controllers/spree/base_controller_decorator.rb
 - app/controllers/spree/checkout_controller_decorator.rb
 - app/controllers/spree/orders_controller_decorator.rb

data/app/controllers/resource_controller_decorator.rb

@@ -1,25 +0,0 @@
-# This overrides the before method provided by resource_controller so that the current_user is authorized
-# for each action before proceding.
-module ResourceController
-  module Helpers
-    module Internal
-      protected
-        # Calls the before block for the action, if one is present.
-        def before(action)
-
-          resource = case action
-          when :index, :new, :create
-            model
-          else object
-          end
-
-          if resource.respond_to? :token
-            authorize! action, resource, session[:access_token]
-          else
-            authorize! action, resource
-          end
-          invoke_callbacks *self.class.send(action).before
-        end
-    end
-  end
-end

data/app/controllers/spree/admin/admin_resource_controller_decorator.rb

@@ -1,3 +0,0 @@
-Spree::Admin::ResourceController.class_eval do
-   authorize_resource :class => lambda { model_class }
-end