devise_w3_authenticatable 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/devise_w3_authenticatable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{devise_w3_authenticatable}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rodrigo Navarro"]
-  s.date = %q{2010-09-13}
+  s.date = %q{2010-09-14}
   s.description = %q{Devise strategy to authenticate against IBM w3 LDAP directory.}
   s.email = %q{reu@rnavarro.com.br}
   s.files = [

data/lib/devise_w3_authenticatable/model.rb

@@ -13,7 +13,7 @@ module Devise
         Devise::W3Adapter.valid_credentials? email, password
       end
 
-      def after_w3_authentication(employee = nil)
+      def after_w3_authentication(bluepages_information = nil)
       end
 
       module ClassMethods

data/lib/devise_w3_authenticatable/strategy.rb

@@ -6,16 +6,18 @@ module Devise
       def authenticate!
         resource = mapping.to.find_for_w3_authentication(authentication_hash)
 
-        employee = nil
-
-        if validate(resource) { employee = resource.authenticate_with_w3!(password) }
-          resource.after_w3_authentication employee
+        if validate(resource) { bluepages_information = resource.authenticate_with_w3!(password) }
+          resource.after_w3_authentication bluepages_information
           resource.save if DeviseW3Authenticatable.auto_create_user
           success! resource
         else
           fail :invalid
         end
       end
+
+      private
+
+        attr_accessor :bluepages_information
     end
   end
 end

data/lib/devise_w3_authenticatable/w3_adapter.rb

@@ -5,7 +5,7 @@ require 'nokogiri'
 module Devise
   module W3Adapter
     def self.valid_credentials?(logon, password)
-      return unless employee = get_information_from_bluepages(logon)
+      return unless employee = IBMEmployee.find_by_mail(logon)
 
       user = Net::LDAP.new :host => "bluepages.ibm.com"
       user.authenticate(employee.uid, password)
@@ -13,26 +13,28 @@ module Devise
       user.bind and employee
     end
 
-    def self.get_information_from_bluepages(logon)
-      IBMEmployee.parse_from_bluepages("http://bluepages.ibm.com/BpHttpApisv3/slaphapi?ibmperson/mail=#{logon}.list/byxml")
-    end
-
     class IBMEmployee < Struct.new(:uid, :logon, :name, :serial, :department, :country, :workplace)
-      def self.parse_from_bluepages(bluepages_url)
-        begin
-          entry = Nokogiri::XML(open(bluepages_url)).css("entry").first
+      class << self
+        def parse_from_bluepages(bluepages_url)
+          begin
+            entry = Nokogiri::XML(open(bluepages_url)).css("entry").first
 
-          uid        = entry.attributes["dn"].to_s
-          logon      = entry.css("attr[name='mail'] value").children.first.to_s
-          name       = entry.css("attr[name='cn'] value").children.first.to_s
-          serial     = entry.css("attr[name='serialnumber'] value").children.first.to_s
-          department = entry.css("attr[name='dept'] value").children.first.to_s
-          country    = entry.css("attr[name='co'] value").children.first.to_s
-          workplace  = entry.css("attr[name='physicaldeliveryofficename'] value").children.first.to_s
+            uid        = entry.attributes["dn"].to_s
+            logon      = entry.css("attr[name='mail'] value").children.first.to_s
+            name       = entry.css("attr[name='cn'] value").children.first.to_s
+            serial     = entry.css("attr[name='serialnumber'] value").children.first.to_s
+            department = entry.css("attr[name='dept'] value").children.first.to_s
+            country    = entry.css("attr[name='co'] value").children.first.to_s
+            workplace  = entry.css("attr[name='physicaldeliveryofficename'] value").children.first.to_s
+
+            new(uid, logon, name, serial, department, country, workplace)
+          rescue
+            nil
+          end
+        end
 
-          new(uid, logon, name, serial, department, country, workplace)
-        rescue
-          nil
+        def find_by_mail(mail)
+          parse_from_bluepages("http://bluepages.ibm.com/BpHttpApisv3/slaphapi?ibmperson/mail=#{mail}.list/byxml")
         end
       end
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Rodrigo Navarro
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 -03:00
+date: 2010-09-14 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency