devise_pg_authenticatable 0.1.0 → 0.2.0

data/{README.md → README.rdoc}

@@ -1,24 +1,31 @@
-Devise PG Authenticatable
-=================
+= Devise PG Authenticatable
 
-Devise PG Authenticatable is a PostgreSQL based authentication strategy for the [Devise](http://github.com/plataformatec/devise) authentication framework. PG Authenticatable is replacement for module :database\_authenticatable from Devise. This module authenticate users against PostgreSQL system database.
+Devise PG Authenticatable is a PostgreSQL based authentication strategy for the Devise[http://github.com/plataformatec/devise] authentication framework. PG Authenticatable is replacement for module database\_authenticatable from Devise. This module authenticate users against PostgreSQL system database.
 
 This module is based on Devise-Imapable and Devise-LDAP-ldap\_authenticatable.
 
-Requirements
-------------
+== Requirements
 
-- Rails 2.3.5
-- Devise 1.0.7
+* Rails 2.3.5
+* Devise 1.0.7
 
-Installation
-------------
+== Installation
 
-    script/plugin install git://github.com/boblin/devise_pg_authenticatable.git
+  script/plugin install git://github.com/boblin/devise_pg_authenticatable.git
 
+or
+  
+  gem install devise_pg_authenticatable
 
-Setup
------
+
+Your config/environment.rb file may looks like this:
+
+  config.gem 'devise', :version => '1.0.7'
+  config.gem 'devise_pg_authenticatable'
+
+
+
+== Setup
 
 Once devise\_pg\_authenticatable is installed, all you need to do is setup the user model which includes a small addition to the model itself and to the schema.
 
@@ -32,7 +39,7 @@ and indexes (optional) :
 
     add_index :login, :unique => true
 
-and don’t forget to migrate :
+and do not forget to migrate :
 
     rake db:migrate.
 
@@ -46,44 +53,39 @@ then the model :
       ...
     end
 
-and finally change the authentication key in the devise initializer :
+and finally change the authentication key in the config/initializers/devise.rb :
 
 	Devise.setup do |config|
-	  ...
-	  config.authentication_keys = [ :login ]
-	  ...
+	  config.login_attribute = [ :login_name ] # default :login
 	end
 
 I recommend using :rememberable, :trackable, :timeoutable as it gives a full feature set for logins.
 
-Usage
------
+== Usage
 
 Devise PG Authenticatable works in replacement of Authenticatable, 
 but because we have to change the authentication\_keys, you'll need to run:
 
     script/generate devise_views
 
-and customize your login pages to use :login, instead of :email.
+and customize your login pages to use :login or your custom login_attribute , instead of :email.
 
-------------------------------------------------------------
 
-**_Please Note_**
+=== Please Note
 
 This devise plugin has not been tested with Authenticatable enabled at the same time. This is meant as a drop in replacement for Authenticatable allowing for a semi single sign on approach.
 
 
-References
-----------
+== References
 
-* [Devise](http://github.com/plataformatec/devise)
-* [Warden](http://github.com/hassox/warden)
+* http://github.com/plataformatec/devise
+* http://github.com/hassox/warden
 
 
-TODO
-----
+== TODO
 
-- Tests
+* tests
+* allow users to change password
 
 Released under the MIT license
 

data/VERSION

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

data/devise_pg_authenticatable.gemspec

@@ -5,20 +5,20 @@
 
 Gem::Specification.new do |s|
   s.name = %q{devise_pg_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 = ["Bohuslav Blin"]
-  s.date = %q{2010-06-11}
+  s.date = %q{2010-06-14}
   s.description = %q{Devise PostgreSQL authentication module}
   s.email = %q{bohuslav@blin.cz}
   s.extra_rdoc_files = [
-    "README.md"
+    "README.rdoc"
   ]
   s.files = [
     ".gitignore",
      "MIT-LICENSE",
-     "README.md",
+     "README.rdoc",
      "Rakefile",
      "VERSION",
      "devise_pg_authenticatable.gemspec",

data/lib/devise_pg_authenticatable.rb

@@ -6,9 +6,9 @@ require 'devise_pg_authenticatable/pg_adapter'
 require 'devise_pg_authenticatable/routes'
 
 module Devise
-  # database
-  # mattr_accessor :pg_database
-  # @@pg_database = nil
+  # login
+  mattr_accessor :login_attribute
+  @@login_attribute = "login"
 end
 
 # Add pg_authenticatable strategy to defaults.

data/lib/devise_pg_authenticatable/model.rb

@@ -23,28 +23,20 @@ module Devise
       end
 
       # Checks if a resource is valid upon authentication.
-      def valid_pg_authentication?(password)
-        Devise::PgAdapter.valid_credentials?(self.login, password)
+      def valid_pg_authentication?(login, password)
+        Devise::PgAdapter.valid_credentials?(login, password)
       end
 
       module ClassMethods
+        Devise::Models.config(self, :login_attribute)
         # Authenticate a user based on configured attribute keys. Returns the
         # authenticated user if it's valid or nil.
         def authenticate_with_pg(attributes={})
-          return unless attributes[:login].present? 
-          conditions = attributes.slice(:login)
-
-          unless conditions[:login]
-            conditions[:login] = "#{conditions[:login]}"
-          end
-
+          return unless attributes[login_attribute].present?
+          conditions = attributes.slice(login_attribute)
           resource = find_for_pg_authentication(conditions)
-          # resource = new(conditions) if resource.nil?
-
-          # resource = find_for_pg_authentication(conditions) || new(conditions)
-
            
-          if resource.try(:valid_pg_authentication?, attributes[:password])
+          if resource.try(:valid_pg_authentication?, attributes[login_attribute], attributes[:password])
              resource.new_record? ? create(conditions) : resource
           end
         end
@@ -56,7 +48,7 @@ module Devise
         # namedscope to filter records while authenticating.
         # Example:
         #
-        #   def self.find_for_imap_authentication(conditions={})
+        #   def self.find_for_pg_authentication(conditions={})
         #     conditions[:active] = true
         #     find(:first, :conditions => conditions)
         #   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: 
 - Bohuslav Blin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-11 00:00:00 +02:00
+date: 2010-06-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,11 +38,11 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.md
+- README.rdoc
 files: 
 - .gitignore
 - MIT-LICENSE
-- README.md
+- README.rdoc
 - Rakefile
 - VERSION
 - devise_pg_authenticatable.gemspec