jeremydurham-restful_authentication 1.1.4 → 1.1.5

data/README.textile

@@ -8,6 +8,14 @@ authentication:
 * Account approval / disabling by admin
 * Rudimentary hooks for authorization and access control.
 
+This fork significantly updates the plugin to provide:
+* 100% passing specs
+* 100% passing cucumber features (with selenium support)
+* Machinist support
+* Pickle support
+* Available as a gem
+* Uses aasm gem
+
 Several features were updated in May, 2008.
 * "Stable newer version":http://github.com/technoweenie/restful-authentication/tree/master
 * "'Classic' (backward-compatible) version":http://github.com/technoweenie/restful-authentication/tree/classic

data/generators/authenticated/templates/features/accounts.feature

@@ -7,12 +7,12 @@ Feature: Sign up
     Given I am not logged in
     When I am on the home page
     And I follow "Sign up"
-    Then I should be on the sign up page
+    Then I should be on the signup page
     
     Scenario:  Create fails when creating an existing <%= file_name %>
       Given I am not logged in
       And someone with the login "testing" already exists
-      When I am on the sign up page
+      When I am on the signup page
       And I fill in "Login" with "testing"
       And I fill in "Email" with "test@testing.com"
       And I fill in "Password" with "password"
@@ -23,7 +23,7 @@ Feature: Sign up
       
     Scenario:  Create fails when given an invalid email
       Given I am not logged in
-      When I am on the sign up page
+      When I am on the signup page
       And I fill in "Login" with "testing"
       And I fill in "Email" with "invalid.email"
       And I fill in "Password" with "password"
@@ -34,7 +34,7 @@ Feature: Sign up
 
     Scenario:  Create fails when no password is given
       Given I am not logged in
-      When I am on the sign up page
+      When I am on the signup page
       And I fill in "Login" with "testing"
       And I fill in "Email" with "test@testing.com"
       And I press "Sign up"
@@ -43,7 +43,7 @@ Feature: Sign up
 
     Scenario:  Create fails when no password confirmation is given
       Given I am not logged in
-      When I am on the sign up page
+      When I am on the signup page
       And I fill in "Login" with "testing"
       And I fill in "Email" with "test@testing.com"
       And I fill in "Password" with "password"      
@@ -53,11 +53,15 @@ Feature: Sign up
 
     Scenario:  Create successful when given valid parameters
       Given I am not logged in
-      When I am on the sign up page
+      When I am on the signup page
       And I fill in "Login" with "testing"
       And I fill in "Email" with "test@testing.com"
       And I fill in "Password" with "password"
       And I fill in "Confirm Password" with "password"
       And I press "Sign up"
       Then I should be on the home page
-      And I should be logged in
+      <% if options[:include_activation] %>
+      And I should not be logged in
+      <% else %>
+      And I should be logged in
+      <% end %>

data/generators/authenticated/templates/spec/blueprints/user.rb

@@ -3,4 +3,11 @@
   password 'testing'
   password_confirmation { password }
   email { Faker::Internet.email }
+<% if options[:include_activation] -%>
+  activation_code { nil }
+  activated_at { 5.days.ago }
+<% end -%>
+<% if options[:stateful] -%>
+  state { 'active' }
+<% end -%>
 end

data/generators/authenticated/templates/spec/controllers/users_controller_spec.rb

@@ -60,12 +60,13 @@ describe <%= model_controller_class_name %>Controller do
   
   <% if options[:include_activation] %>
   it 'activates user' do
+    create_<%= file_name %>(:login => 'aaron', :password => 'monkey', :password_confirmation => 'monkey')
     <%= class_name %>.authenticate('aaron', 'monkey').should be_nil
-    get :activate, :activation_code => <%= table_name %>(:aaron).activation_code
+    get :activate, :activation_code => assigns[:<%= file_name %>].activation_code
     response.should redirect_to('/login')
     flash[:notice].should_not be_nil
     flash[:error ].should     be_nil
-    <%= class_name %>.authenticate('aaron', 'monkey').should == <%= table_name %>(:aaron)
+    <%= class_name %>.authenticate('aaron', 'monkey').should == assigns[:<%= file_name %>]
   end
   
   it 'does not activate user without key' do

data/lib/authorization/aasm_roles.rb

@@ -9,6 +9,7 @@ module Authorization
       recipient.class_eval do
         include StatefulRolesInstanceMethods
         include AASM
+        
         aasm_column :state
         aasm_initial_state :initial => :pending
         aasm_state :passive

data/lib/authorization/stateful_roles.rb

@@ -7,32 +7,34 @@ module Authorization
     def self.included( recipient )
       recipient.extend( StatefulRolesClassMethods )
       recipient.class_eval do
+        include AASM
         include StatefulRolesInstanceMethods
         
-        acts_as_state_machine :initial => :pending
-        state :passive
-        state :pending, :enter => :make_activation_code
-        state :active,  :enter => :do_activate
-        state :suspended
-        state :deleted, :enter => :do_delete
+        aasm_column :state
+        aasm_initial_state :pending
+        aasm_state  :passive
+        aasm_state  :pending, :enter => :make_activation_code
+        aasm_state  :active,  :enter => :do_activate
+        aasm_state  :suspended
+        aasm_state  :deleted, :enter => :do_delete
 
-        event :register do
+        aasm_event :register do
           transitions :from => :passive, :to => :pending, :guard => Proc.new {|u| !(u.crypted_password.blank? && u.password.blank?) }
         end
         
-        event :activate do
+        aasm_event :activate do
           transitions :from => :pending, :to => :active 
         end
         
-        event :suspend do
+        aasm_event :suspend do
           transitions :from => [:passive, :pending, :active], :to => :suspended
         end
         
-        event :delete do
+        aasm_event :delete do
           transitions :from => [:passive, :pending, :active, :suspended], :to => :deleted
         end
 
-        event :unsuspend do
+        aasm_event :unsuspend do
           transitions :from => :suspended, :to => :active,  :guard => Proc.new {|u| !u.activated_at.blank? }
           transitions :from => :suspended, :to => :pending, :guard => Proc.new {|u| !u.activation_code.blank? }
           transitions :from => :suspended, :to => :passive

data/restful_authentication.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jeremydurham-restful_authentication}
-  s.version = "1.1.4"
+  s.version = "1.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["RailsJedi", "Rick Olson"]
-  s.date = %q{2009-11-25}
+  s.date = %q{2009-11-30}
   s.description = %q{This widely-used plugin provides a foundation for securely managing user.}
   s.email = %q{railsjedi@gmail.com}
   s.extra_rdoc_files = ["README.textile"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jeremydurham-restful_authentication
 version: !ruby/object:Gem::Version 
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors: 
 - RailsJedi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-25 00:00:00 -05:00
+date: 2009-11-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency