pipa-authmagic 0.0.2 → 0.0.3

data/lib/authmagic/rails.rb

@@ -3,6 +3,7 @@ require 'authmagic/rails/modules'
 class << ActionController::Base
   def authmagic(*modules, &block)
     context = Authmagic::Context.new(modules, :application_controller => self, &block)
-    define_method(:security_context) { context }
+    metaclass.send(:define_method, :security_context) { context }
+    define_method(:security_context) { self.class.security_context }
   end
 end

data/lib/authmagic/rails/modules/application_framework.rb

@@ -24,7 +24,19 @@ module Authmagic
 
       session = @context.config.session
       @context.config.new_session_path ||= :"new_#{session}_path"
-      @context.config.application_controller.send(:include, ApplicationControllerMethods)
+      context = @context
+      @context.config.application_controller.class_eval do
+        include ApplicationControllerMethods
+        bn = context.principal.name.underscore
+        unless bn == 'principal'
+          cp = "current_#{bn}"
+          cpid = "#{cp}_id"
+          private
+          alias_method cp, :current_principal
+          alias_method cpid, :current_principal_id
+          helper_method cp, cpid
+        end
+      end
     end
 
     module ContextMethods
@@ -97,7 +109,7 @@ module Authmagic
         p = security_context.principal.authenticate(
           login => options[login] || params[sess][login],
           password => options[password] || params[sess][password])
-        session[:current_principal_id] = p.id
+        session[:current_principal_id], session[:current_principal] = p.id, p
       end
     end
   end

data/lib/authmagic/rails/modules/login_password.rb

@@ -61,8 +61,8 @@ module Authmagic
         end
 
         define_method encryptor do |plaintext|
-          hash = (digest = digest.new << send(salt) << plaintext).hexdigest
-          stretches.times { hash = digest.hexdigest(hash) }
+          hash = (digest.new << send(salt) << plaintext).hexdigest
+          stretches.times { hash = (digest.new << hash).hexdigest }
           hash
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pipa-authmagic
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Igor Gunko
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-27 00:00:00 -08:00
+date: 2008-12-28 00:00:00 -08:00
 default_executable: 
 dependencies: []