authlogic_crowd 0.2.3 → 0.2.4

data/.gitignore

@@ -1,26 +1,27 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-doc
-pkg
-.bundle
-.idea
-.yardoc
-
-## PROJECT::SPECIFIC
-Gemfile.lock
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+doc
+pkg
+.bundle
+.idea
+.yardoc
+.rvmrc
+
+## PROJECT::SPECIFIC
+Gemfile.lock

data/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in simple_crowd.gemspec
+# Specify your gem's dependencies in authlogic_crowd.gemspec
 gemspec

data/authlogic_crowd.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
     test/helper.rb
     test/test_authlogic_crowd.rb
   )
-  s.homepage = %q{http://github.com/lapluviosilla/authlogic_crowd}
+  s.homepage = %q{http://github.com/thinkwell/authlogic_crowd}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Atlassian Crowd support for Authlogic}

data/lib/authlogic_crowd/acts_as_authentic.rb

@@ -42,11 +42,15 @@ module AuthlogicCrowd
       end
       alias_method :crowd_user_token_field=, :crowd_user_token_field
 
+      def crowd_enabled(value=nil)
+        rw_config(:crowd_enabled, value, true)
+      end
+
     end
     module Methods
       def self.included(klass)
         klass.class_eval do
-          validate_on_create :must_have_unique_crowd_login
+          validate_on_create :must_have_unique_crowd_login, :if => :using_crowd?, :unless => :crowd_record
 
           # TODO: Cleanup and refactor into callbacks
           def create
@@ -123,7 +127,7 @@ module AuthlogicCrowd
       end
 
       def using_crowd?
-        !(self.class.crowd_app_name.nil? || self.class.crowd_app_password.nil? || self.class.crowd_service_url.nil?)
+        self.class.crowd_enabled && !(self.class.crowd_app_name.nil? || self.class.crowd_app_password.nil? || self.class.crowd_service_url.nil?)
       end
 
       def validate_password_with_crowd?

data/lib/authlogic_crowd/session.rb

@@ -30,14 +30,15 @@ module AuthlogicCrowd
       alias_method :auto_register=,:auto_register
 
       def crowd_user_token= token
+        # Dup token before storing to make sure we store a pure string to avoid session serialization issues.
+        token = token.dup if token
         session_user_token = controller && controller.session[:"crowd.token_key"]
         cookie_user_token = crowd_sso? && controller && controller.cookies[:"crowd.token_key"]
-        cached_info = Rails.cache.read('crowd_cookie_info')
         @crowd_client ||= SimpleCrowd::Client.new({
           :service_url => klass.crowd_service_url,
           :app_name => klass.crowd_app_name,
           :app_password => klass.crowd_app_password})
-        crowd_cookie_info ||= cached_info || @crowd_client.get_cookie_info
+        crowd_cookie_info = self.crowd_cookie_info(@crowd_client)
         controller.session[:"crowd.token_key"] = token unless session_user_token == token || !controller
         controller.cookies[:"crowd.token_key"] = {:domain => crowd_cookie_info[:domain],
                                                   :secure => crowd_cookie_info[:secure],
@@ -46,6 +47,18 @@ module AuthlogicCrowd
       def crowd_user_token
         controller && (controller.params["crowd.token_key"] || controller.cookies[:"crowd.token_key"] || controller.session[:"crowd.token_key"])
       end
+
+      def crowd_cookie_info(crowd_client)
+        Rails.cache.fetch('crowd_cookie_info') do
+          # Strings returned by crowd contain singleton methods which cannot
+          # be serialized into the Rails.cache.  Do a shallow dup of each string
+          # in the returned hash
+          crowd_client.get_cookie_info.inject({}) do |cookie_info, (key, val)|
+            cookie_info[key] = val ? val.dup : val
+            cookie_info
+          end
+        end
+      end
     end
     module Methods
       def self.included(klass)
@@ -143,7 +156,7 @@ module AuthlogicCrowd
         if !login.blank? && self.unauthorized_record.nil?
           self.unauthorized_record = klass.respond_to?(:login_or_email_equals) ?
                                          klass.send(:login_or_email_equals, login).first :
-                                         klass.send("find_by_#{login_field}", login)
+                                         klass.send(find_by_login_method, login)
           # If passed in login equals the user email then get the REAL login used by crowd instead
           login = unauthorized_record.login if !unauthorized_record.nil? && login = unauthorized_record.email
         end
@@ -165,7 +178,7 @@ module AuthlogicCrowd
           user_token = nil
         end
 
-        raise "No user token" if user_token.blank?
+        raise SimpleCrowd::CrowdError.new "No user token" if user_token.blank?
 
         login = crowd_client.find_username_by_token user_token unless login && 
                 (!cookie_user_token || session_user_token == cookie_user_token) &&
@@ -177,7 +190,7 @@ module AuthlogicCrowd
         if !self.unauthorized_record.nil? && self.unauthorized_record.login == login
           self.attempted_record = self.unauthorized_record
         else
-          self.attempted_record = self.unauthorized_record = klass.send(:"find_by_#{login_field}", login)
+          self.attempted_record = self.unauthorized_record = klass.send(find_by_login_method, login)
         end
 
         if !attempted_record
@@ -217,6 +230,7 @@ module AuthlogicCrowd
             controller.cookies.delete :"#{klass.name.underscore}_credentials"
             controller.cookies.delete :"crowd.token_key", :domain => crowd_cookie_info[:domain] if sso?
           end
+          raise unless e.kind_of? SimpleCrowd::CrowdError
           false
         end
       end
@@ -263,17 +277,20 @@ module AuthlogicCrowd
         @crowd_client ||= SimpleCrowd::Client.new(crowd_config)
       end
       def load_crowd_app_token
-        cached_token = Rails.cache.read('crowd_app_token')
-        crowd_client.app_token = cached_token unless cached_token.nil?
-        Rails.cache.write('crowd_app_token', crowd_client.app_token) unless cached_token == crowd_client.app_token
+        crowd_app_token = Rails.cache.read('crowd_app_token')
+        if crowd_app_token.nil?
+          crowd_app_token = crowd_client.app_token
+          # Strings returned by crowd contain singleton methods which cannot
+          # be serialized into the Rails.cache.  Duping the strings removes the
+          # singleton methods.
+          Rails.cache.write('crowd_app_token', crowd_app_token.dup)
+        else
+          crowd_client.app_token = crowd_app_token
+        end
+        crowd_app_token
       end
       def crowd_cookie_info
-        unless @crowd_cookie_info
-          cached_info = Rails.cache.read('crowd_cookie_info')
-          @crowd_cookie_info ||= cached_info || crowd_client.get_cookie_info
-          Rails.cache.write('crowd_cookie_info', @crowd_cookie_info) unless cached_info == @crowd_cookie_info
-        end
-        @crowd_cookie_info
+        @crowd_cookie_info ||= self.class.crowd_cookie_info(crowd_client)
       end
       def crowd_config
         {:service_url => klass.crowd_service_url,
@@ -282,4 +299,4 @@ module AuthlogicCrowd
       end
     end
   end
-end
+end

data/lib/authlogic_crowd/version.rb

@@ -1,3 +1,3 @@
 module AuthlogicCrowd
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: authlogic_crowd
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Paul Strong
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-11 00:00:00 -05:00
-default_executable: 
+date: 2012-03-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
@@ -123,8 +122,7 @@ files:
 - lib/authlogic_crowd/version.rb
 - test/helper.rb
 - test/test_authlogic_crowd.rb
-has_rdoc: true
-homepage: http://github.com/lapluviosilla/authlogic_crowd
+homepage: http://github.com/thinkwell/authlogic_crowd
 licenses: []
 
 post_install_message: 
@@ -153,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Atlassian Crowd support for Authlogic