spree_auth 1.0.0.rc1 → 1.0.0.rc2

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2011, Spree Commerce, Inc. and other contributors
+Copyright (c) 2007-2012, Spree Commerce, Inc. and other contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/app/controllers/spree/user_passwords_controller.rb

@@ -35,11 +35,4 @@ class Spree::UserPasswordsController < Devise::PasswordsController
     super
   end
 
-  private
-
-    def associate_user
-      return unless current_user and current_order
-      current_order.associate_user!(current_user)
-      session[:guest_token] = nil
-    end
 end

data/app/controllers/spree/user_registrations_controller.rb

@@ -55,9 +55,4 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
       authorize!(:create, resource)
     end
 
-    def associate_user
-      return unless current_user and current_order
-      current_order.associate_user!(current_user)
-      session[:guest_token] = nil
-    end
 end

data/app/controllers/spree/user_sessions_controller.rb

@@ -44,13 +44,7 @@ class Spree::UserSessionsController < Devise::SessionsController
   end
 
   private
-    def associate_user
-      return unless current_user and current_order
-      current_order.associate_user!(current_user)
-      session[:guest_token] = nil
-    end
-
     def accurate_title
-      t(:log_in)
+      t(:login)
     end
 end

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

@@ -8,7 +8,7 @@
     <div id="guest_checkout">
       <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
       <h2><%= t(:guest_user_account) %></h2>
-      <%= form_for @order, :url => spree.update_checkout_registration_path, :html => { :method => :put, :id => 'checkout_form_registration'} do |f| %>
+      <%= 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 />
           <%= f.email_field :email, :class => 'title' %>

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

@@ -16,5 +16,5 @@
     </label>
   </p>
 
-  <p><%= f.submit t(:log_in), :class => 'button primary' %></p>
+  <p><%= f.submit t(:login), :class => 'button primary' %></p>
 <% end %>

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(:log_in), spree.login_path %></li>
+  <li><%= link_to t(:login), spree.login_path %></li>
 <% end %>

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

@@ -1,13 +1,13 @@
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
 <h2><%= t(:change_my_password) %></h2>
 
-<%= form_for @user, :url => spree.user_password_path, :html => {:method => :put} do |f| %>
+<%= form_for @user, :url => spree.user_password_path, :method => :put do |f| %>
   <p>
-    <%= f.label :password %><br />
+    <%= f.label :password, t(:password) %><br />
     <%= f.password_field :password %><br />
   </p>
   <p>
-    <%= f.label :password_confirmation %><br />
+    <%= f.label :password_confirmation, t(:password_confirmation) %><br />
     <%= f.password_field :password_confirmation %><br />
   </p>
   <%= f.hidden_field :reset_password_token %>

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

@@ -4,7 +4,7 @@
 
 <%= form_for Spree::User.new, :as => :user, :url => spree.user_password_path do |f| %>
   <p>
-    <%= f.label :email, t(:email) %>:<br />
+    <%= f.label :email, t(:email) %><br />
     <%= f.email_field :email %>
   </p>
   <p>

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

@@ -2,7 +2,7 @@
 
 <h2><%= t(:editing_user) %></h2>
 
-<%= form_for @user, :url => spree.user_path(@user), :html => { :method => :put } do |f| %>
+<%= form_for @user, :url => spree.user_path(@user), :method => :put do |f| %>
   <%= render :partial => 'spree/shared/user_form', :locals => { :f => f } %>
   <p>
     <%= f.submit t(:update) %>

data/db/default/users.rb

@@ -2,7 +2,7 @@ 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]: ', String) do |q|
+  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.'
@@ -13,7 +13,7 @@ def prompt_for_admin_password
 end
 
 def prompt_for_admin_email
-  email = ask('Email [spree@example.com]: ', String) do |q|
+  email = ask('Email [spree@example.com]: ') do |q|
     q.echo = true
     q.whitespace = :strip
   end

data/lib/spree/auth.rb

@@ -6,9 +6,9 @@ require 'spree/token_resource'
 
 module Spree
   module Auth
-		def self.config(&block)
-	    yield(Spree::Auth::Config)
-	  end
+    def self.config(&block)
+      yield(Spree::Auth::Config)
+    end
   end
 end
 

metadata

@@ -1,83 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spree_auth
-version: !ruby/object:Gem::Version 
-  hash: 15424055
+version: !ruby/object:Gem::Version
+  version: 1.0.0.rc2
   prerelease: 6
-  segments: 
-  - 1
-  - 0
-  - 0
-  - rc
-  - 1
-  version: 1.0.0.rc1
 platform: ruby
-authors: 
+authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-23 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-01-14 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: spree_core
+  requirement: &70296291622140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 15424055
-        segments: 
-        - 1
-        - 0
-        - 0
-        - rc
-        - 1
-        version: 1.0.0.rc1
-  requirement: *id001
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.0.0.rc2
   type: :runtime
   prerelease: false
-  name: spree_core
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70296291622140
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: &70296291621540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 4
-        - 8
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.4.8
-  requirement: *id002
   type: :runtime
   prerelease: false
-  name: devise
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70296291621540
+- !ruby/object:Gem::Dependency
+  name: cancan
+  requirement: &70296291621000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 6
-        - 7
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.6.7
-  requirement: *id003
   type: :runtime
   prerelease: false
-  name: cancan
+  version_requirements: *70296291621000
 description: Required dependency for Spree
-email: sean@railsdog.com
+email: sean@spreecommerce.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - LICENSE
 - README.md
 - app/assets/javascripts/admin/spree_auth.js
@@ -138,35 +110,23 @@ files:
 - db/seeds.rb
 homepage: http://spreecommerce.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
-requirements: 
+requirements:
 - none
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -174,4 +134,3 @@ signing_key:
 specification_version: 3
 summary: Provides authentication and authorization services for use with Spree.
 test_files: []
-