merbful_authentication 0.9.0 → 0.9.1

data/README

@@ -3,7 +3,7 @@ merbful_authentication
 
 This is a port of the rails plugin "restful_authentication" by Rick Olson to the Merb Web Framework.
 
-It is currently very freshly ported.  Please report any bugs / patches to 
+Please report any bugs / patches to 
 has.sox /at/ gmail /dot/ com
 
 You can find the original at http://svn.techno-weenie.net/projects/plugins/restful_authentication/
@@ -30,19 +30,24 @@ Datamapper
 
 === Required Routes
 
-At the moment this version of the plugin requires some named routes.  These are included in 
-lib/authenticated_system/authenticated_routes.rb
-    
-    In config/router.rb
-    
-      r.resources :users
-      r.match("/login").to(:controller => "Sessions", :action => "create").name(:login)
-      r.match("/logout").to(:controller => "Sessions", :action => "destroy").name(:logout)
-      r.match("/users/activate/:activation_code").to(:controller => "Users", :action => "activate").name(:user_activation)
+There are some routes required to use this plugin.  The actual path is unimportant but the _NAME_ of the route is.
 
+These are located in 
+lib/authenticated_system/authenticated_system_routes.rb
+
+A method is appended to routes.rb to call Authenticated.add_routes 
 
 Note:  
   When using activation don't forget to setup your mailer.
+  
+=== Dependencies
+
+There is a list of dependencies for merbful_authentication and these are loaded automatically.
+
+the dependencies are required in 
+lib/authentication_system/authentication_system_dependencies.rb
+
+Some requiring code is appended to init.rb if it is not already required.
 
 
 Copyright of original project

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 
 PLUGIN = "merbful_authentication"
 NAME = "merbful_authentication"
-VERSION = "0.9.0"
+VERSION = "0.9.1"
 AUTHOR = "Daniel Neighman"
 EMAIL = "has.sox@gmail.com"
 HOMEPAGE = "http://rubyforge.org/projects/merbful-auth/"

data/merb_generators/authenticated/authenticated_generator.rb

@@ -131,6 +131,29 @@ class AuthenticatedGenerator < Merb::GeneratorBase
       copy_files
       
 
+      # Add the call to include authenticated_dependencies in init.rb 
+      dr = @destination_root
+      init_path = File.join(dr,"config","init.rb")
+      if File.open(init_path){ |f| f.read !~ /authenticated_dependencies/ }
+        File.open(init_path, "a") do |f|
+          o =<<-END
+
+begin 
+  require File.join(File.dirname(__FILE__), '..', 'lib', 'authenticated_system/authenticated_dependencies') 
+rescue LoadError
+end
+END
+          f << o
+        end
+      end
+      
+      # Add the routes to routes.rb
+      rp = File.join(dr,"config","router.rb")
+      if File.open(rp){|f| f.read !~ /AuthenticatedSystem/ }
+        File.open(rp, 'a') do |f|
+          f << "\n\nAuthenticatedSystem.add_routes rescue nil\n"
+        end
+      end   
       
     end
     

data/merb_generators/authenticated/templates/app/mailers/%singular_name%_mailer.rb

@@ -1,4 +1,3 @@
-dependency "merb-mailer", ">= 0.9"
 class <%= class_name %>Mailer < Merb::MailController
   
   def signup_notification

data/merb_generators/authenticated/templates/lib/authenticated_system/authenticated_dependencies.rb

@@ -1,4 +1,7 @@
-dependency 'merb_helpers', '>= 0.9' rescue NoMethodError
+require 'merb_helpers'
+<% if include_activation -%>
+require 'merb-mailer'
+<% end -%>
 
 base = File.dirname(__FILE__)
 

data/merb_generators/authenticated/templates/lib/authenticated_system/authenticated_routes.rb

@@ -1,9 +1,13 @@
 # Put the correct routes in place
-Merb::BootLoader.after_app_loads do
-  Merb::Router.prepend do |r|
-    r.match("/login").to(:controller => "<%= controller_class_name %>", :action => "create").name(:login)
-    r.match("/logout").to(:controller => "<%= controller_class_name %>", :action => "destroy").name(:logout)
-    r.match("/<%= plural_name %>/activate/:activation_code").to(:controller => "<%= model_controller_class_name %>", :action => "activate").name(:<%= singular_name %>_activation)
-    r.resources :users
+module AuthenticatedSystem
+  def self.add_routes
+    Merb::BootLoader.after_app_loads do
+      Merb::Router.prepend do |r|
+        r.match("/login").to(:controller => "<%= controller_class_name %>", :action => "create").name(:login)
+        r.match("/logout").to(:controller => "<%= controller_class_name %>", :action => "destroy").name(:logout)
+        r.match("/<%= plural_name %>/activate/:activation_code").to(:controller => "<%= model_controller_class_name %>", :action => "activate").name(:<%= singular_name %>_activation)
+        r.resources :users
+      end
+    end
   end
 end

data/rspec_generators/merbful_authentication_tests/templates/spec/authenticated_system_spec_helper.rb

@@ -2,10 +2,6 @@ Merb::Config.use do |c|
   c[:session_store] = "memory"
 end
 
-[Merb::Test::ControllerHelper, Merb::Test::ViewHelper, Merb::Test::RouteHelper].each do |m|
-  Merb::Test::Helpers.send(:include, m)
-end
-
 <% if include_activation -%>
 class Merb::Mailer
   self.delivery_method = :test_send

data/test_unit_generators/merbful_authentication_tests/merbful_authentication_tests_generator.rb

@@ -42,8 +42,14 @@ class MerbfulAuthenticationTestsGenerator < Merb::GeneratorBase
       @m = m
       
       @choices = []
-      @choices << relative(File.join(@base, "test", "mailers"))
-      @choices << relative(File.join(@base, "test", "mailers", "%singular_name%_mailer_test.rb"))
+      @choices << "test/mailers"
+      Dir[File.join(@base, "test", "mailers", "**", "*")].each do |f|
+        @choices << relative(f)
+      end
+      
+      @choices.each do |f|
+        options[f] = include_activation ? true : false
+      end
       
       @assigns = {
         :name                                   => name,  

data/test_unit_generators/merbful_authentication_tests/templates/test/authenticated_system_test_helper.rb

@@ -2,10 +2,6 @@ Merb::Config.use do |c|
   c[:session_store] = "memory"
 end
 
-[Merb::Test::ControllerHelper, Merb::Test::ViewHelper, Merb::Test::RouteHelper].each do |m|
-  Merb::Test::Helpers.send(:include, m)
-end
-
 <% if include_activation -%>
 class Merb::Mailer
   self.delivery_method = :test_send
@@ -40,7 +36,7 @@ def assert_no_difference(expressions, message = nil, &block)
 end
 
 
-def assert_response(code = :success)
+def assert_response(code = :success, controller = (@controller || nil))
   case code
   when :success
     assert_equal 200, controller.status

data/test_unit_generators/merbful_authentication_tests/templates/test/functional/%controller_file_path%_test.rb

@@ -10,9 +10,8 @@ class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
 
   def setup
     <%= class_name %>.clear_database_table
-    @controller = <%= controller_class_name %>.build(fake_request)
-    @request = @controller.request
-    @response = @controller.response
+    @controller = <%= controller_class_name %>.new(fake_request)
+    @controller.setup_session
       
     @<%= singular_name %> = <%= class_name %>.new(valid_<%= singular_name %>_hash.with(:login => 'quentin', :password => 'test', :password_confirmation => 'test'))
     @<%= singular_name %>.save
@@ -20,67 +19,72 @@ class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
     @<%= singular_name %>.activate
 <% end -%>
   end
+  
+  def test_helper_login_as_method
+    login_as :quentin
+    assert @controller.send(:logged_in?)
+  end
 
   def test_should_login_and_redirect
-    controller.params.merge!(:login => 'quentin', :password => 'test')
-    controller.dispatch(:create)
-    assert controller.session[:<%= singular_name %>]
+    @controller.params.merge!(:login => 'quentin', :password => 'test')
+    @controller._dispatch(:create)
+    assert @controller.session[:<%= singular_name %>]
     assert_response :redirect
   end
 
   def test_should_fail_login_and_not_redirect
-    controller.params.merge!(:login => 'quentin', :password => 'bad password')
-    controller.dispatch(:create)
-    assert_nil controller.session[:<%= file_name %>]
+    @controller.params.merge!(:login => 'quentin', :password => 'bad password')
+    @controller._dispatch(:create)
+    assert_nil @controller.session[:<%= file_name %>]
     assert_response :success
   end
 
   def test_should_logout
     login_as :quentin
-    controller.dispatch(:destroy)
-    assert_nil controller.session[:<%= file_name %>]
+    @controller._dispatch(:destroy)
+    assert_nil @controller.session[:<%= file_name %>]
     assert_response :redirect
   end
 
   def test_should_remember_me
-    controller.params.merge!(:login => 'quentin', :password => 'test', :remember_me => '1')
-    controller.dispatch(:create)
-    assert_not_nil controller.cookies["auth_token"]
+    @controller.params.merge!(:login => 'quentin', :password => 'test', :remember_me => '1')
+    @controller._dispatch(:create)
+    assert_not_nil @controller.cookies["auth_token"]
   end
 
   def test_should_not_remember_me
-    controller.params.merge!(:login => 'quentin', :password => 'test', :remember_me => '0')
-    controller.dispatch(:create)
-    assert_nil controller.cookies["auth_token"]
+    @controller.params.merge!(:login => 'quentin', :password => 'test', :remember_me => '0')
+    @controller._dispatch(:create)
+    assert_nil @controller.cookies["auth_token"]
   end
   
   def test_should_delete_token_on_logout
     login_as :quentin
-    controller.dispatch(:destroy)
-    assert_nil controller.cookies["auth_token"]
+    @controller._dispatch(:destroy)
+    assert_nil @controller.cookies["auth_token"]
   end
 
   def test_should_login_with_cookie
     @user.remember_me
-    controller.cookies["auth_token"] = @<%= singular_name %>.remember_token
-    controller.dispatch(:new)
-    assert controller.send(:logged_in?)
+    @controller.cookies["auth_token"] = @<%= singular_name %>.remember_token
+    @controller._dispatch(:new)
+    assert @controller.send(:logged_in?)
   end
   
   def test_should_fail_expired_cookie_login
     @<%= singular_name %>.remember_me
     @<%= singular_name %>.remember_token_expires_at = (Time.now - (5 * 60))
     @<%= singular_name %>.save
-    controller.cookies["auth_token"] = @<%= singular_name %>.remember_token
-    controller.dispatch(:new)
-    assert !(controller.send(:logged_in?))
+    @controller.cookies["auth_token"] = @<%= singular_name %>.remember_token
+    @controller._dispatch(:new)
+    assert !(@controller.send(:logged_in?))
   end
   
   def test_should_fail_cookie_login
     @<%= singular_name %>.remember_me
-    controller.cookies["auth_token"] = 'invalid_auth_token'
-    controller.dispatch(:new)
-    assert !controller.send(:logged_in?)
+    @controller.cookies["auth_token"] = 'invalid_auth_token'
+    @controller._dispatch(:new)
+    assert !@controller.send(:logged_in?)
   end
 
   protected

data/test_unit_generators/merbful_authentication_tests/templates/test/functional/%model_controller_file_path%_test.rb

@@ -10,22 +10,20 @@ class <%= model_controller_class_name %>Test < Test::Unit::TestCase
 
   def setup
     <%= class_name %>.clear_database_table
-    @controller = <%= model_controller_class_name %>.build(fake_request)
-    @request = @controller.request
-    @response = @controller.response
+    @controller = <%= model_controller_class_name %>.new(fake_request)
   end
 
   def test_should_allow_signup
     assert_difference '<%= class_name %>.count', 1 do
       create_<%= file_name %>
-      assert_equal 302, controller.status
+      assert_equal 302, @controller.status
     end
   end
 
   def test_should_require_login_on_signup
     assert_no_difference '<%= class_name %>.count' do
       create_<%= file_name %>(:login => nil)
-      assert controller.assigns(:<%= file_name %>).errors.on(:login)
+      assert @controller.assigns(:<%= file_name %>).errors.on(:login)
       assert_response :success
     end
   end
@@ -33,7 +31,7 @@ class <%= model_controller_class_name %>Test < Test::Unit::TestCase
   def test_should_require_password_on_signup
     assert_no_difference '<%= class_name %>.count' do
       create_<%= file_name %>(:password => nil)
-      assert controller.assigns(:<%= file_name %>).errors.on(:password)
+      assert @controller.assigns(:<%= file_name %>).errors.on(:password)
       assert_response :success
     end
   end
@@ -41,7 +39,7 @@ class <%= model_controller_class_name %>Test < Test::Unit::TestCase
   def test_should_require_password_confirmation_on_signup
     assert_no_difference '<%= class_name %>.count' do
       create_<%= file_name %>(:password_confirmation => nil)
-      assert controller.assigns(:<%= file_name %>).errors.on(:password_confirmation)
+      assert @controller.assigns(:<%= file_name %>).errors.on(:password_confirmation)
       assert_response :success
     end
   end
@@ -49,7 +47,7 @@ class <%= model_controller_class_name %>Test < Test::Unit::TestCase
   def test_should_require_email_on_signup
     assert_no_difference '<%= class_name %>.count' do
       create_<%= file_name %>(:email => nil)
-      assert controller.assigns(:<%= file_name %>).errors.on(:email)
+      assert @controller.assigns(:<%= file_name %>).errors.on(:email)
       assert_response :success
     end
   end
@@ -59,8 +57,8 @@ class <%= model_controller_class_name %>Test < Test::Unit::TestCase
       @<%= singular_name %> = <%= class_name %>.find_with_conditions( :login => 'aaron' )
       assert_not_nil @<%= singular_name %>
       assert_nil <%= class_name %>.authenticate('aaron', 'test')
-      get url(:<%= singular_name %>_activation, :activation_code => @<%= singular_name %>.activation_code )
-      assert_equal '/', controller.headers['Location']
+      @controller = get @controller.url(:<%= singular_name %>_activation, :activation_code => @<%= singular_name %>.activation_code )
+      assert_equal '/', @controller.headers['Location']
       assert_response :redirect
     end
 
@@ -69,10 +67,6 @@ class <%= model_controller_class_name %>Test < Test::Unit::TestCase
       @<%= singular_name %> = <%= class_name %>.find_with_conditions( :login => 'aaron' )
       assert_not_nil @<%= singular_name %>
       assert_nil <%= class_name %>.authenticate('aaron', 'test')
-      assert_raise ArgumentError do
-        @controller = <%= model_controller_class_name %>.build(fake_request)
-        controller.dispatch(:activate)
-      end
       assert_nil User.authenticate('aaron', 'test')
     end
 
@@ -81,12 +75,12 @@ class <%= model_controller_class_name %>Test < Test::Unit::TestCase
       @<%= singular_name %> = <%= class_name %>.find_with_conditions( :login => 'aaron' )
       assert_not_nil @<%= singular_name %>
       assert_nil <%= class_name %>.authenticate('aaron', 'test')
-      get url(:user_activation, :activation_code => "")
+      @controller = get @controller.url(:user_activation, :activation_code => " ")
       assert_nil <%= class_name %>.authenticate('aaron', 'test')
     end<% end %>
 
   protected
   def create_<%= singular_name %>(options = {})
-    post "/<%= model_controller_plural_name %>", :<%= singular_name %> => valid_<%= singular_name %>_hash.merge(options)
+    @controller = post "/<%= model_controller_singular_name %>", :<%= singular_name %> => valid_<%= singular_name %>_hash.merge(options)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merbful_authentication
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -9,7 +9,7 @@ autorequire: merbful_authentication
 bindir: bin
 cert_chain: []
 
-date: 2008-02-27 00:00:00 +11:00
+date: 2008-03-05 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency