spree_auth_devise 1.2.0 → 1.3.1

data/README.md

@@ -1,7 +1,5 @@
 # Spree Auth (Devise)
 
-[![Build Status](https://secure.travis-ci.org/spree/spree_auth_devise.png?branch=1-2-stable)](https://travis-ci.org/spree/spree_auth_devise)
-
 Provides authentication services for Spree, using the Devise gem.
 
 ## Installation
@@ -10,7 +8,7 @@ At one stage in the past, this used to be the auth component for Spree. If that'
 
 Just add this line to your Gemfile:
 
-    gem 'spree_auth_devise', :git => 'git://github.com/spree/spree_auth_devise', :branch => '1-2-stable'
+    gem "spree_auth_devise", :git => "git://github.com/spree/spree_auth_devise"
 
 Then run `bundle install`. Authentication will then work exactly as it did in previous versions of Spree.
 

data/app/controllers/spree/user_passwords_controller.rb

@@ -6,7 +6,9 @@ class Spree::UserPasswordsController < Devise::PasswordsController
     helper 'spree/analytics'
   end
 
-  include Spree::Core::ControllerHelpers
+  include Spree::Core::ControllerHelpers::Auth
+  include Spree::Core::ControllerHelpers::Common
+  include Spree::Core::ControllerHelpers::Order
 
   ssl_required
 

data/app/controllers/spree/user_registrations_controller.rb

@@ -1,4 +1,5 @@
 class Spree::UserRegistrationsController < Devise::RegistrationsController
+
   include SslRequirement
   helper 'spree/users', 'spree/base'
 
@@ -6,7 +7,10 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
     helper 'spree/analytics'
   end
 
-  include Spree::Core::ControllerHelpers
+  include Spree::Core::ControllerHelpers::Auth
+  include Spree::Core::ControllerHelpers::Common
+  include Spree::Core::ControllerHelpers::Order
+
   ssl_required
   before_filter :check_permissions, :only => [:edit, :update]
   skip_before_filter :require_no_authentication

data/app/controllers/spree/user_sessions_controller.rb

@@ -5,24 +5,20 @@ class Spree::UserSessionsController < Devise::SessionsController
     helper 'spree/analytics'
   end
 
-  include Spree::Core::CurrentOrder
-  include Spree::Core::ControllerHelpers
+  include Spree::Core::ControllerHelpers::Auth
+  include Spree::Core::ControllerHelpers::Common
+  include Spree::Core::ControllerHelpers::Order
 
   ssl_required :new, :create, :destroy, :update
   ssl_allowed :login_bar
 
-  # GET /resource/sign_in
-  def new
-    super
-  end
-
   def create
     authenticate_user!
 
     if user_signed_in?
       respond_to do |format|
         format.html {
-          flash.notice = t(:logged_in_succesfully)
+          flash[:success] = t(:logged_in_succesfully)
           redirect_back_or_default(root_path)
         }
         format.js {

data/app/controllers/spree/users_controller.rb

@@ -1,4 +1,6 @@
 class Spree::UsersController < Spree::BaseController
+  include Spree::Core::ControllerHelpers::Order
+
   ssl_required
   prepend_before_filter :load_object, :only => [:show, :edit, :update]
   prepend_before_filter :authorize_actions, :only => :new

data/app/models/spree/current_order_decorator.rb

@@ -1,4 +1,4 @@
-Spree::Core::CurrentOrder.module_eval do
+Spree::Core::ControllerHelpers::Order.module_eval do
   # Associate the new order with the currently authenticated user before saving
   def before_save_new_order
     @current_order.user ||= try_spree_current_user

data/app/overrides/admin_tab.rb

@@ -1,6 +1,6 @@
 Deface::Override.new(:virtual_path => "spree/layouts/admin",
                      :name => "user_admin_tabs",
                      :insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
-                     :text => "<%= tab(:users, :url => spree.admin_users_path) %>",
+                     :text => "<%= tab(:users, :url => spree.admin_users_path, :icon => 'icon-user') %>",
                      :disabled => false)
 

data/app/overrides/auth_admin_login_navigation_bar.rb

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

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

@@ -1,19 +1,37 @@
-<div data-hook="admin_user_form_fields">
-  <%= f.field_container :email do %>
-    <%= f.label :email, t(:email) %><br />
-    <%= f.email_field :email %>
-    <%= error_message_on :user, :email %>
-  <% end %>
+<div data-hook="admin_user_form_fields" class="row">
+  <div class="alpha five columns">
+    <%= f.field_container :email do %>
+      <%= f.label :email, t(:email) %>
+      <%= f.email_field :email, :class => 'fullwidth' %>
+      <%= error_message_on :user, :email %>
+    <% end %>
 
-  <%= f.field_container :password do %>
-    <%= f.label :password, t(:password) %><br />
-    <%= f.password_field :password %>
-    <%= f.error_message_on :password %>
-  <% end %>
+    <div data-hook="admin_user_form_roles" class="field">      
+      <%= label_tag nil, t(:roles) %>
+      <ul>
+        <% @roles.each do |role| %>
+          <li>
+            <%= check_box_tag 'user[spree_role_ids][]', role.id, @user.spree_roles.include?(role), :id => "user_spree_role_#{role.name}" %>
+            <%= label_tag role.name %>  
+          </li>
+        <% end %>      
+      </ul>
+      <%= hidden_field_tag 'user[spree_role_ids][]', '' %>
+    </div>
 
-  <%= f.field_container :password do %>
-    <%= f.label :password_confirmation, t(:confirm_password) %><br />
-    <%= f.password_field :password_confirmation %>
-    <%= f.error_message_on :password_confirmation %>
-  <% end %>
+  </div>
+  
+  <div class="omega five columns">
+    <%= f.field_container :password do %>
+      <%= f.label :password, t(:password) %>
+      <%= f.password_field :password, :class => 'fullwidth' %>
+      <%= f.error_message_on :password %>
+    <% end %>
+
+    <%= f.field_container :password do %>
+      <%= f.label :password_confirmation, t(:confirm_password) %>
+      <%= f.password_field :password_confirmation, :class => 'fullwidth' %>
+      <%= f.error_message_on :password_confirmation %>
+    <% end %>
+  </div>
 </div>

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

@@ -1,14 +1,28 @@
-<div data-hook="admin_user_edit_form_header">
-  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
-  <h1><%= t(:editing_user) %></h1>
-</div>
+  <% content_for :page_title do %>
+    <%= t(:editing_user) %>
+  <% end %>
+
+  <% content_for :page_actions do %>
+    <li>
+      <%= button_link_to t(:back_to_users_list), spree.admin_users_path, :icon => 'icon-arrow-left' %>
+    </li>
+  <% end %>
 
-<div data-hook="admin_user_edit_form">
-  <%= form_for [:admin, @user] do |f| %>
-    <%= render :partial => 'form', :locals => { :f => f } %>
+  <fieldset data-hook="admin_user_edit_general_settings" class="alpha ten columns">
+    <legend><%= t(:general_settings) %></legend>
 
-    <div data-hook="admin_user_edit_form_button">
-      <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+    <div data-hook="admin_user_edit_form_header">
+      <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
     </div>
-  <% end %>
-</div>
+
+    <div data-hook="admin_user_edit_form">
+      <%= form_for [:admin, @user] do |f| %>
+        <%= render :partial => 'form', :locals => { :f => f } %>
+
+        <div data-hook="admin_user_edit_form_button">
+          <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+        </div>
+      <% end %>
+    </div>
+
+  </fieldset>

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

@@ -1,28 +1,31 @@
-<div class="toolbar" data-hook="toolbar">
-  <ul class="actions">
-    <li>
-      <p><%= button_link_to t(:new_user), new_object_url, :icon => 'add', :id => 'admin_new_user_link' %></p>
-    </li>
-  </ul>
-  <br class="clear" />
-</div>
+<% content_for :page_title do %>
+  <%= t(:listing_users) %>
+<% end %>
 
-<h1><%= t(:listing_users) %></h1>
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to t(:new_user), new_object_url, :icon => 'icon-plus', :id => 'admin_new_user_link' %>
+  </li>
+<% end %>
 
 <table class="index" id="listing_users" data-hook>
+  <colgroup>
+    <col style="width: 85%">
+    <col style="width: 15%">
+  </colgroup>
   <thead>
     <tr data-hook="admin_users_index_headers">
       <th><%= sort_link @search,:email, t(:user), {}, {:title => 'users_email_title'} %></th>
-      <th data-hook="admin_users_index_header_actions"></th>
+      <th data-hook="admin_users_index_header_actions" class="actions"></th>
     </tr>
   </thead>
   <tbody>
     <% @users.each do |user|%>
-      <tr id="<%= spree_dom_id user %>" data-hook="admin_users_index_rows">
-        <td width="350px" class='user_email'><%=link_to user.email, object_url(user) %></td>
-        <td data-hook="admin_users_index_row_actions">
-          <%= link_to_edit user, :class => 'edit' %> &nbsp;
-          <%= link_to_delete user %>
+      <tr id="<%= spree_dom_id user %>" data-hook="admin_users_index_rows" class="<%= cycle('odd', 'even')%>">
+        <td class='user_email'><%=link_to user.email, object_url(user) %></td>
+        <td data-hook="admin_users_index_row_actions" class="actions">
+          <%= link_to_edit user, :no_text => true %>
+          <%= link_to_delete user, :no_text => true %>
         </td>
       </tr>
     <% end %>
@@ -31,17 +34,19 @@
 
 <%= paginate @users %>
 
+<% content_for :sidebar_title do %>
+  <%= t(:search) %>
+<% end %>
 
 <% content_for :sidebar do %>
-  <div class="box" data-hook="admin_users_index_search">
-    <h3><%= t(:search) %></h3>
+  <div class="box align-center" data-hook="admin_users_index_search">    
     <%= search_form_for [:admin, @search] do |f| %>
-      <p>
-        <%= t(:email) %><br />
-        <%= f.text_field :email_cont, :size =>18 %>
-      </p>
+      <div class="field">
+        <%= f.label t(:email) %> <br>
+        <%= f.text_field :email_cont, :class => 'fullwidth' %>
+      </div>
       <div data-hook="admin_users_index_search_buttons">
-        <p><%= button t(:search) %></p>
+        <%= button t(:search), 'icon-search' %>
       </div>
     <% end %>
   </div>

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

@@ -1,6 +1,15 @@
+<% content_for :page_title do %>
+  <%= t(:new_user) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to t(:back_to_users_list), spree.admin_users_path, :icon => 'icon-arrow-left' %>
+  </li>
+<% end %>
+
 <div data-hook="admin_user_new_form_header">
   <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
-  <h1><%= t(:new_user) %></h1>
 </div>
 
 <div data-hook="admin_user_new_form">

data/app/views/spree/layouts/admin/_login_nav.html.erb

@@ -1,8 +1,8 @@
 <% if spree_current_user %>
-  <ul id="login-nav">
-    <li><%= t(:logged_in_as) %>: <%= spree_current_user.email %></li>
-    <li><%= link_to t(:account), spree.edit_user_path(spree_current_user) %></li>
-    <li><%= link_to t(:logout), spree.destroy_user_session_path %></li>
-    <li><%= link_to t(:store), spree.products_path %></li>
+  <ul id="login-nav" class="inline-menu">
+    <li data-hook="user-logged-in-as"><%= t(:logged_in_as) %>: <%= spree_current_user.email %></li>
+    <li data-hook="user-account-link"><i class="icon-user"></i><%= link_to t(:account), spree.edit_user_path(spree_current_user) %></li>
+    <li data-hook="user-logout-link"><i class="icon-signout"></i><%= link_to t(:logout), spree.destroy_user_session_path %></li>
+    <li data-hook="store-frontend-link"><i class="icon-external-link"></i><%= link_to t(:store), spree.products_path, :target => '_blank' %></li>
   </ul>
 <% end %>

data/config/initializers/devise.rb

@@ -139,6 +139,4 @@ Devise.setup do |config|
   # change their passwords.
   config.reset_password_within = 6.hours
   config.sign_out_via = :get
-
-  config.case_insensitive_keys = [:email]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_auth_devise
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-15 00:00:00.000000000 Z
+date: 2012-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 1.6.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 1.6.8
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -83,7 +83,6 @@ files:
 - app/controllers/spree/user_registrations_controller.rb
 - app/controllers/spree/user_sessions_controller.rb
 - app/controllers/spree/users_controller.rb
-- app/helpers/spree/admin/users_helper.rb
 - app/helpers/spree/users_helper.rb
 - app/mailers/spree/user_mailer.rb
 - app/models/spree/auth_configuration.rb
@@ -91,11 +90,9 @@ files:
 - app/models/spree/user.rb
 - app/overrides/admin_tab.rb
 - app/overrides/auth_admin_login_navigation_bar.rb
-- app/overrides/auth_admin_user_roles.rb
 - app/overrides/auth_shared_login_bar.rb
 - app/overrides/auth_user_login_form.rb
 - app/views/spree/admin/users/_form.html.erb
-- app/views/spree/admin/users/_roles.html.erb
 - app/views/spree/admin/users/edit.html.erb
 - app/views/spree/admin/users/index.html.erb
 - app/views/spree/admin/users/new.html.erb

data/app/helpers/spree/admin/users_helper.rb

@@ -1,10 +0,0 @@
-module Spree
-  module Admin
-    module UsersHelper
-      def list_roles(user)
-        # while testing spree-core itself user model does not have method roles
-        user.respond_to?(:spree_roles) ? user.spree_roles.collect { |role| role.name }.join(", ") : []
-      end
-    end
-  end
-end

data/app/overrides/auth_admin_user_roles.rb

@@ -1,6 +0,0 @@
-Deface::Override.new(:virtual_path => "spree/admin/users/_form",
-                     :name => "auth_admin_user_roles",
-                     :insert_after => "[data-hook='admin_user_form_fields']",
-                     :partial => "spree/admin/users/roles",
-                     :disabled => false,
-                     :original => '0e121156115799a53f5c5dddfb65c1ec80cb5f09')

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

@@ -1,12 +0,0 @@
-<div data-hook="admin_user_form_roles">
-  <p>
-    <%= label_tag nil, t(:roles) %><br />
-    <% @roles.each do |role| %>
-      <label class="sub">
-        <%= check_box_tag 'user[spree_role_ids][]', role.id, @user.spree_roles.include?(role), :id => "user_spree_role_#{role.name}" %>
-        <%= role.name %>
-      </label> &nbsp;
-    <% end %>
-    <%= hidden_field_tag 'user[spree_role_ids][]', '' %>
-  </p>
-</div>