0
@@ -5,11 +5,13 @@ base = File.dirname(__FILE__)
0
 name = "can_has_auth"
0
 
0
 if defined?(Merb::Plugins)
0
-  dependency 'merb_helpers'
0
-  dependency 'merb-mailer'
0
-  dependency 'merb-action-args'
0
+  require 'merb_helpers'
0
+  require 'merb-mailer'
0
+  require 'merb-action-args'
0
 
0
   Merb::BootLoader.before_app_loads do
0
+    Application._template_roots.insert(0, [File.join(File.dirname(__FILE__), 'can_has_auth','views'), :_template_location])
0
+    Application._template_roots.insert(0, [File.join(File.dirname(__FILE__), 'can_has_auth','mailers','views'), :_template_location])
0
     if Merb.env == "development"
0
       Merb::Mailer.delivery_method = :test_send
0
     else

0
@@ -41,20 +41,4 @@ class Password < Application
0
       redirect url(:edit_password)
0
     end
0
   end
0
-  
0
-  private
0
-    alias :_orig_template_location :_template_location
0
-  
0
-    def _template_location(action, type = nil, controller = controller_name)
0
-      file = controller == "layout" ? "layout.#{type}" : "#{action}.#{type}"
0
-    
0
-      unless Dir["#{Merb.dir_for(:view)}/#{controller}/#{action}.#{type}.*"].empty?
0
-        _orig_template_location( action, type, controller )
0
-      else
0
-        undo   = Merb.load_paths[:view].first.gsub(%r{[^/]+}, '..')
0
-        prefix = File.dirname(__FILE__)
0
-        folder = 'views'
0
-        File.join( '.',undo, prefix,'..', folder, controller, file )
0
-      end
0
-    end
0
 end

0
@@ -25,20 +25,4 @@ class Session < Application
0
     reset_session
0
     redirect_back_or_default('/')
0
   end
0
-  
0
-  private
0
-    alias :_orig_template_location :_template_location
0
-  
0
-    def _template_location(action, type = nil, controller = controller_name)
0
-      file = controller == "layout" ? "layout.#{type}" : "#{action}.#{type}"
0
-    
0
-      unless Dir["#{Merb.dir_for(:view)}/#{controller}/#{action}.#{type}.*"].empty?
0
-        _orig_template_location( action, type, controller )
0
-      else
0
-        undo   = Merb.load_paths[:view].first.gsub(%r{[^/]+}, '..')
0
-        prefix = File.dirname(__FILE__)
0
-        folder = 'views'
0
-        File.join( '.',undo, prefix,'..', folder, controller, file )
0
-      end
0
-    end
0
 end
0
\ No newline at end of file

0
@@ -28,9 +28,4 @@ class Users < Application
0
       render
0
     end
0
   end
0
-  
0
-  private
0
-  
0
-    _template_roots.insert(0, [File.join(File.dirname(__FILE__), '..', 'views'), :_template_location])
0
-
0
 end
0
\ No newline at end of file

0
@@ -2,7 +2,7 @@ module CanHasAuth #:nodoc:
0
   module VERSION #:nodoc:
0
     MAJOR = 0
0
     MINOR = 1
0
-    TINY  = 0
0
+    TINY  = 2
0
 
0
     STRING = [MAJOR, MINOR, TINY].join('.')
0
   end

0
@@ -4930,3 +4930,181 @@
0
  ~ Filter login_required was not found in your filter chain.
0
  ~ Filter login_required was not found in your filter chain.
0
  ~ Using in-memory sessions; sessions will be lost whenever the server stops.
0
+ ~ Filter login_required was not found in your filter chain.
0
+ ~ Filter login_required was not found in your filter chain.
0
+ ~ Using in-memory sessions; sessions will be lost whenever the server stops.
0
+ ~ Filter login_required was not found in your filter chain.
0
+ ~ Filter login_required was not found in your filter chain.
0
+ ~ Using in-memory sessions; sessions will be lost whenever the server stops.
0
+ ~ Filter login_required was not found in your filter chain.
0
+ ~ Filter login_required was not found in your filter chain.
0
+ ~ Using in-memory sessions; sessions will be lost whenever the server stops.
0
+ ~ Cookie set: _session_id => d945c3d2f4e1a0eac9c960c9600a079b -- {"path"=>"/"}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => 841bd801bef2d1a998779724eec052de -- {"path"=>"/"}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => 71b57bd2f94c3f93f00ee5fc503c2395 -- {"path"=>"/"}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => c156499cc7b89bc5331be74b011bf9e2 -- {"path"=>"/"}
0
+ ~ Redirecting to: /login
0
+ ~ {:action_time=>0.001177, :after_filters_time=>9.0e-06}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => 5894df5395c9ebbccf27997b98955959 -- {"path"=>"/"}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => 8aa72f2e77baf3b337e887772d7e002d -- {"path"=>"/"}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => 4cc2bf017ae71ec4656e251d541ec7f6 -- {"path"=>"/"}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => 4a8ac826ae74a14eee11b6a4500b61ea -- {"path"=>"/"}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => a413873bd68cf84db04ce27b7a53ff7d -- {"path"=>"/"}
0
+ ~ Cookie set: _session_id => 2e84c320293dc6d1c067ebd609bae848 -- {"path"=>"/"}
0
+ ~ Redirecting to: /
0
+ ~ {:action_time=>0.001425, :before_filters_time=>2.1e-05, :after_filters_time=>1.1e-05}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => ae20beffd00d7a404e3b143c1d40ddd2 -- {"path"=>"/"}
0
+ ~ Cookie set: _session_id => a1f598055e9fd0fbaa305c2cd7d6d0d1 -- {"path"=>"/"}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => a5308bdd4d2d6d2d3bccd8de684dd4b9 -- {"path"=>"/"}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => ca65ee548f139fe816601e88b331ee98 -- {"path"=>"/"}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => 229cdac3f520dd0d4158f1fef6ee7eb8 -- {"path"=>"/"}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => 650517b7ae2883b7fead442140f63f51 -- {"path"=>"/"}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => 71b0d0e01f91e315e117c290730b9fd0 -- {"path"=>"/"}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => 9e965737eed07255bcd192a8e0f756fc -- {"path"=>"/"}
0
+ ~ Cookie deleted: auth_token => nil
0
+ ~ Redirecting to: /
0
+ ~ {:action_time=>0.000417, :before_filters_time=>1.3e-05, :after_filters_time=>9.0e-06}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => e8c1f85da7098b33aa292da238e59ae6 -- {"path"=>"/"}
0
+ ~ Cookie deleted: auth_token => nil
0
+ ~ Redirecting to: /
0
+ ~ {:action_time=>0.000383, :before_filters_time=>1.1e-05, :after_filters_time=>8.0e-06}
0
+ ~ Filter login_required was not found in your filter chain.
0
+ ~ Filter login_required was not found in your filter chain.
0
+ ~ Using in-memory sessions; sessions will be lost whenever the server stops.
0
+ ~ Cookie set: _session_id => 8932314ec658e684d28c3320ee46f692 -- {"path"=>"/"}
0
+ ~ {:action_time=>0.00476, :before_filters_time=>1.8e-05, :after_filters_time=>1.0e-05}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => 29fcfb2cc905ceed42e18faaea66219f -- {"path"=>"/"}
0
+ ~ Redirecting to: /login
0
+ ~ {:action_time=>0.010722, :before_filters_time=>2.1e-05, :after_filters_time=>1.2e-05}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => 11407da89e5622fda3bce436c4725f2c -- {"path"=>"/"}
0
+ ~ Redirecting to: /login
0
+ ~ {:action_time=>0.001052, :before_filters_time=>1.5e-05, :after_filters_time=>8.0e-06}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => c4cc2efbd5dc8fe7d77be126865bf0f6 -- {"path"=>"/"}
0
+ ~ Redirecting to: /login
0
+ ~ {:action_time=>0.001093, :after_filters_time=>1.0e-05}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => b3a6b50104dbd8c2fb70bef9867dd1cf -- {"path"=>"/"}
0
+ ~ {:action_time=>0.002609, :before_filters_time=>7.0e-05, :after_filters_time=>1.0e-05}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => 95cb457f63b3e6313a30bd184e72e0e6 -- {"path"=>"/"}
0
+ ~ Redirecting to: /
0
+ ~ {:action_time=>0.009587, :before_filters_time=>7.9e-05, :after_filters_time=>1.3e-05}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => 604dac6414f9479a6eded64a5745ce60 -- {"path"=>"/"}
0
+ ~ Redirecting to: /
0
+ ~ {:action_time=>0.008501, :before_filters_time=>7.1e-05, :after_filters_time=>1.3e-05}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => 93ebc64aa127633399a54f0eb1e90551 -- {"path"=>"/"}
0
+ ~ Redirecting to: /password/edit
0
+ ~ {:action_time=>0.003768, :before_filters_time=>7.1e-05, :after_filters_time=>1.0e-05}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => d75255d54cd06d7aa6c3d0a21f4fb648 -- {"path"=>"/"}
0
+ ~ Redirecting to: /password/edit
0
+ ~ {:action_time=>0.003727, :before_filters_time=>7.1e-05, :after_filters_time=>1.0e-05}
0
+ ~ Cookie set: _session_id => 771255a549243753c9a93886128af4b6 -- {"path"=>"/"}
0
+ ~ Redirecting to: /
0
+ ~ {:action_time=>0.001214, :before_filters_time=>2.3e-05, :after_filters_time=>1.0e-05}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => 0e4451af16041a0fb15abc9553bb3706 -- {"path"=>"/"}
0
+ ~ {:action_time=>0.005423, :before_filters_time=>1.7e-05, :after_filters_time=>8.0e-06}
0
+ ~ Cookie set: _session_id => cc4063d0681e8f32f9722cb6f9d59f47 -- {"path"=>"/"}
0
+ ~ {:action_time=>0.002701, :before_filters_time=>1.1e-05, :after_filters_time=>1.0e-05}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => d55a98237c31ad483f50b59beea23995 -- {"path"=>"/"}
0
+ ~ Redirecting to: /
0
+ ~ {:action_time=>0.00369, :before_filters_time=>1.4e-05, :after_filters_time=>1.0e-05}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => b91c9a6e0373e91aa3b2be54e008dbce -- {"path"=>"/"}
0
+ ~ {:action_time=>0.005631, :before_filters_time=>1.2e-05, :after_filters_time=>1.0e-05}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => 542f7a99f1067a0357da1902cf80d6b7 -- {"path"=>"/"}
0
+ ~ Cookie set: auth_token => 02113c3c0227feb579fef163b9ab3bdb9597f964 -- {"expires"=>"Sun, 01-Jun-2008 20:21:57 GMT", "path"=>"/"}
0
+ ~ Redirecting to: /
0
+ ~ {:action_time=>0.008167, :before_filters_time=>1.0e-05, :after_filters_time=>1.6e-05}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => 524be5de75a74246e93aa6191c2807c1 -- {"path"=>"/"}
0
+ ~ Redirecting to: /
0
+ ~ {:action_time=>0.003556, :before_filters_time=>1.1e-05, :after_filters_time=>1.2e-05}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => 335705ccc422889cbcf3b4eca67a2a06 -- {"path"=>"/"}
0
+ ~ {:action_time=>0.002508, :before_filters_time=>1.1e-05, :after_filters_time=>1.0e-05}
0
+ ~ Cookie set: auth_token => 02113c3c0227feb579fef163b9ab3bdb9597f964 -- {"expires"=>"Sun, 01-Jun-2008 20:21:57 GMT", "path"=>"/"}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => 15f064bed525ba6a8836d4cf8f142879 -- {"path"=>"/"}
0
+ ~ Cookie deleted: auth_token => nil
0
+ ~ Redirecting to: /
0
+ ~ {:action_time=>0.000482, :before_filters_time=>1.3e-05, :after_filters_time=>1.0e-05}
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Cookie set: _session_id => 58da90ee176e900229faa170960bed64 -- {"path"=>"/"}
0
+ ~ Cookie deleted: auth_token => nil
0
+ ~ Redirecting to: /
0
+ ~ {:action_time=>0.000384, :before_filters_time=>1.1e-05, :after_filters_time=>1.0e-05}
0
+ ~ Cookie set: _session_id => 2f4869dbcd123fea8302e4ce124b8728 -- {"path"=>"/"}
0
+ ~ {:action_time=>0.003219, :before_filters_time=>1.3e-05, :after_filters_time=>1.0e-05}
0
+ ~ Cookie set: _session_id => 6dfd896e863768da66a51e3c6768e53e -- {"path"=>"/"}
0
+ ~ Cookie deleted: auth_token => nil
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ Redirecting to: /
0
+ ~ {:action_time=>0.007711, :before_filters_time=>1.6e-05, :after_filters_time=>1.1e-05}
0
+ ~ Cookie set: _session_id => b530da333246dcf9e46fcc62e43cdefc -- {"path"=>"/"}
0
+ ~ {:action_time=>0.00323, :before_filters_time=>1.7e-05, :after_filters_time=>1.1e-05}
0
+ ~ Cookie set: _session_id => d61221d966ce8833f3763ff75ed2152b -- {"path"=>"/"}
0
+ ~ Cookie deleted: auth_token => nil
0
+ ~ signup sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE=?=
0
+ ~ Redirecting to: /
0
+ ~ {:action_time=>0.00757, :before_filters_time=>9.0e-06, :after_filters_time=>1.0e-05}
0
+ ~ Cookie set: _session_id => 94fba652adefaa70a6d480fed9aaf4ae -- {"path"=>"/"}
0
+ ~ activation sent to daniel@example.com about =?utf-8?Q?Welcome_to_MYSITE.__Please_activate_your_account.=?=
0
+ ~ Redirecting to: /
0
+ ~ {:action_time=>0.009227, :before_filters_time=>8.0e-06, :after_filters_time=>1.0e-05}