devise_w3_authenticatable 0.1.0 → 0.2.0

data/.gitignore

@@ -14,3 +14,4 @@ nbproject/*
 public/stylesheets/*.css
 public/system/*
 db/*.sqlite3
+pkg/*

data/Rakefile

@@ -22,8 +22,8 @@ begin
     gemspec.email = "reu@rnavarro.com.br"
     gemspec.homepage = "http://github.com/reu/devise_w3_authenticatable"
     gemspec.authors = ["Rodrigo Navarro"]
-    gemspec.add_dependency "devise",      ">= 1.1.rc1"
-    gemspec.add_dependency "hpricot",     ">= 0.8.0"
+    gemspec.add_dependency "devise",      "~> 1.1"
+    gemspec.add_dependency "nokogiri",    "~> 1.4.3.1"
     gemspec.add_dependency "net-ldap",    ">= 0.1.1"
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/devise_w3_authenticatable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{devise_w3_authenticatable}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rodrigo Navarro"]
-  s.date = %q{2010-06-11}
+  s.date = %q{2010-08-24}
   s.description = %q{Devise strategy to authenticate against IBM w3 LDAP directory.}
   s.email = %q{reu@rnavarro.com.br}
   s.files = [
@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
      "devise_w3_authenticatable.gemspec",
      "lib/devise_w3_authenticatable.rb",
      "lib/devise_w3_authenticatable/model.rb",
-     "lib/devise_w3_authenticatable/routes.rb",
      "lib/devise_w3_authenticatable/schema.rb",
      "lib/devise_w3_authenticatable/strategy.rb",
      "lib/devise_w3_authenticatable/w3_adapter.rb",
@@ -30,7 +29,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/reu/devise_w3_authenticatable}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Devise IBM w3 authentication strategy}
   s.test_files = [
     "test/devise_w3_authenticatable_test.rb",
@@ -41,18 +40,18 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<devise>, [">= 1.1.rc1"])
-      s.add_runtime_dependency(%q<hpricot>, [">= 0.8.0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<devise>, ["~> 1.1"])
+      s.add_runtime_dependency(%q<nokogiri>, ["~> 1.4.3.1"])
       s.add_runtime_dependency(%q<net-ldap>, [">= 0.1.1"])
     else
-      s.add_dependency(%q<devise>, [">= 1.1.rc1"])
-      s.add_dependency(%q<hpricot>, [">= 0.8.0"])
+      s.add_dependency(%q<devise>, ["~> 1.1"])
+      s.add_dependency(%q<nokogiri>, ["~> 1.4.3.1"])
       s.add_dependency(%q<net-ldap>, [">= 0.1.1"])
     end
   else
-    s.add_dependency(%q<devise>, [">= 1.1.rc1"])
-    s.add_dependency(%q<hpricot>, [">= 0.8.0"])
+    s.add_dependency(%q<devise>, ["~> 1.1"])
+    s.add_dependency(%q<nokogiri>, ["~> 1.4.3.1"])
     s.add_dependency(%q<net-ldap>, [">= 0.1.1"])
   end
 end

data/lib/devise_w3_authenticatable.rb

@@ -3,11 +3,10 @@ require 'devise'
 
 require 'devise_w3_authenticatable/schema'
 require 'devise_w3_authenticatable/w3_adapter'
-require 'devise_w3_authenticatable/routes'
 
 # Add w3_authenticatable strategy to defaults.
 Devise.add_module(:w3_authenticatable,
                   :strategy   => true,
                   :controller => :sessions,
-                  :route => :w3_authenticatable,
+                  :route => :session,
                   :model  => 'devise_w3_authenticatable/model')

data/lib/devise_w3_authenticatable/model.rb

@@ -9,16 +9,16 @@ module Devise
         attr_accessor :password
       end
 
-      def valid_w3_password?(password)
-        Devise::W3Adapter.valid_credentials? logon, password
+      def authenticate_with_w3!(password)
+        Devise::W3Adapter.valid_credentials? email, password
       end
 
-      def after_w3_authentication
+      def after_w3_authentication(employee = nil)
       end
 
       module ClassMethods
         def find_for_w3_authentication(conditions={})
-          find_or_initialize_by_logon(conditions[:email])
+          find_or_initialize_by_email(conditions[:email])
         end
       end
     end

data/lib/devise_w3_authenticatable/schema.rb

@@ -1,8 +1,7 @@
 Devise::Schema.class_eval do
   def w3_authenticatable(options={})
     null = options[:null] || false
-    default = options[:default] || ""
 
-    apply_schema :logon, String, :null => null, :default => default
+    apply_devise_schema :email, String, :null => null
   end
 end

data/lib/devise_w3_authenticatable/strategy.rb

@@ -6,8 +6,10 @@ module Devise
       def authenticate!
         resource = mapping.to.find_for_w3_authentication(authentication_hash)
 
-        if validate(resource) { resource.valid_w3_password?(password) }
-          resource.after_w3_authentication
+        employee = nil
+
+        if validate(resource) { employee = resource.authenticate_with_w3!(password) }
+          resource.after_w3_authentication employee
           success! resource
         else
           fail :invalid

data/lib/devise_w3_authenticatable/w3_adapter.rb

@@ -1,26 +1,39 @@
 require 'net/ldap'
 require 'open-uri'
-require 'hpricot'
+require 'nokogiri'
 
 module Devise
   module W3Adapter
     def self.valid_credentials?(logon, password)
-      return unless dn = get_dn_from_bluepages(logon)
+      return unless employee = get_information_from_bluepages(logon)
 
       user = Net::LDAP.new :host => "bluepages.ibm.com"
-      user.authenticate(dn, password)
-      user.bind
+      user.authenticate(employee.uid, password)
+
+      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
 
-    protected
+    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
+
+          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
 
-    def self.get_dn_from_bluepages(logon)
-      begin
-        bluepages_url = "http://bluepages.ibm.com/BpHttpApisv3/slaphapi?ibmperson/mail=#{logon}.list/byxml?cn"
-        ibmer = Hpricot.XML open(bluepages_url)
-        (ibmer/:"entry").first.attributes["dn"]
-      rescue
-        nil
+          new(uid, logon, name, serial, department, country, workplace)
+        rescue
+          nil
+        end
       end
     end
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Rodrigo Navarro
@@ -14,41 +14,44 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-11 00:00:00 -03:00
+date: 2010-08-24 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: devise
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
         - 1
-        - rc1
-        version: 1.1.rc1
+        version: "1.1"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: nokogiri
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        - 8
-        - 0
-        version: 0.8.0
+        - 1
+        - 4
+        - 3
+        - 1
+        version: 1.4.3.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: net-ldap
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -74,7 +77,6 @@ files:
 - devise_w3_authenticatable.gemspec
 - lib/devise_w3_authenticatable.rb
 - lib/devise_w3_authenticatable/model.rb
-- lib/devise_w3_authenticatable/routes.rb
 - lib/devise_w3_authenticatable/schema.rb
 - lib/devise_w3_authenticatable/strategy.rb
 - lib/devise_w3_authenticatable/w3_adapter.rb
@@ -91,6 +93,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -98,6 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -107,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Devise IBM w3 authentication strategy

data/lib/devise_w3_authenticatable/routes.rb

@@ -1,10 +0,0 @@
-ActionDispatch::Routing::Mapper.class_eval do
-  protected
-  def devise_w3_authenticatable(mapping, controllers)
-    scope mapping.full_path do
-      get  mapping.path_names[:sign_in],  :to => "#{controllers[:sessions]}#new",     :as => :"new_#{mapping.name}_session"
-      post mapping.path_names[:sign_in],  :to => "#{controllers[:sessions]}#create",  :as => :"#{mapping.name}_session"
-      get  mapping.path_names[:sign_out], :to => "#{controllers[:sessions]}#destroy", :as => :"destroy_#{mapping.name}_session"
-    end
-  end
-end