dm-is-authenticatable 0.2.0 → 0.3.0

data/ChangeLog.md

@@ -1,3 +1,9 @@
+### 0.3.0 / 2013-04-22
+
+* If `encrypted_password` is `nil`, have
+  {DataMapper::Is::Authenticatable::InstanceMethods#has_password?} only accept
+  `nil` or `""`.
+
 ### 0.2.0 / 2012-10-06
 
 * Added {DataMapper::Is::Authenticatable::InstanceMethods#password_required?}.

data/Gemfile

@@ -80,7 +80,7 @@
 # Gemfile.lock is added to the .gitignore file, so you don't need to worry
 # about accidentally checking it into version control.
 
-source :rubygems
+source 'https://rubygems.org'
 
 DATAMAPPER = 'http://github.com/datamapper'
 DM_VERSION = '~> 1.0'
@@ -95,7 +95,7 @@ gem 'dm-types',		    DM_VERSION, :git => "#{DATAMAPPER}/dm-types.git"
 gem 'dm-validations',	DM_VERSION, :git => "#{DATAMAPPER}/dm-validations.git"
 
 group :development do
-  gem 'rake',		        '~> 0.8'
+  gem 'rake',		        '~> 10.0'
   gem 'rubygems-tasks',	'~> 0.1'
   gem 'rspec',		      '~> 2.4'
 

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2012 Hal Brodigan
+Copyright (c) 2010-2013 Hal Brodigan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -85,10 +85,10 @@ Using dm-is-authenticatable with [warden]:
 
 ## Requirements
 
-* [bcrypt-ruby](https://github.com/codahale/bcrypt-ruby#readme) ~> 3.0, >= 2.1.0
-* [dm-core](https://github.com/datamapper/dm-core#readme) ~> 1.0
-* [dm-types](https://github.com/datamapper/dm-types#readme) ~> 1.0
-* [dm-validations](https://github.com/datamapper/dm-validations#readme) ~> 1.0
+* [bcrypt-ruby] ~> 3.0, >= 2.1.0
+* [dm-core] ~> 1.0
+* [dm-types] ~> 1.0
+* [dm-validations] ~> 1.0
 
 ## Install
 
@@ -96,10 +96,15 @@ Using dm-is-authenticatable with [warden]:
 
 ## License
 
-Copyright (c) 2010-2012 Hal Brodigan
+Copyright (c) 2010-2013 Hal Brodigan
 
 See {file:LICENSE.txt} for license information.
 
 [warden]: https://github.com/hassox/warden#readme
 [sinatra_warden]: https://github.com/jsmestad/sinatra_warden#readme
 [padrino-warden]: https://github.com/jondot/padrino-warden#readme
+
+[bcrypt-ruby]: https://github.com/codahale/bcrypt-ruby#readme
+[dm-core]: https://github.com/datamapper/dm-core#readme
+[dm-types]: https://github.com/datamapper/dm-types#readme
+[dm-validations]: https://github.com/datamapper/dm-validations#readme

data/Rakefile

@@ -23,6 +23,7 @@ Gem::Tasks.new
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new
+task :test    => :spec
 task :default => :spec
 
 require 'yard'

data/dm-is-authenticatable.gemspec

@@ -2,126 +2,59 @@
 
 require 'yaml'
 
-Gem::Specification.new do |gemspec|
-  files = if File.directory?('.git')
-            `git ls-files`.split($/)
-          elsif File.directory?('.hg')
-            `hg manifest`.split($/)
-          elsif File.directory?('.svn')
-            `svn ls -R`.split($/).select { |path| File.file?(path) }
-          else
-            Dir['{**/}{.*,*}'].select { |path| File.file?(path) }
-          end
+Gem::Specification.new do |gem|
+  gemspec = YAML.load_file('gemspec.yml')
 
-  filter_files = lambda { |paths|
-    case paths
-    when Array
-      (files & paths)
-    when String
-      (files & Dir[paths])
-    end
-  }
-
-  version = {
-    :file => 'lib/dm-is-authenticatable/version.rb',
-    :constant => 'DataMapper::Is::Authenticatable::VERSION'
-  }
-
-  defaults = {
-    'name' => File.basename(File.dirname(__FILE__)),
-    'files' => files,
-    'executables' => filter_files['bin/*'].map { |path| File.basename(path) },
-    'test_files' => filter_files['{test/{**/}*_test.rb,spec/{**/}*_spec.rb}'],
-    'extra_doc_files' => filter_files['*.{txt,rdoc,md,markdown,tt,textile}'],
-  }
-
-  metadata = defaults.merge(YAML.load_file('gemspec.yml'))
-
-  gemspec.name = metadata.fetch('name',defaults[:name])
-  gemspec.version = if metadata['version']
-                      metadata['version']
-                    elsif File.file?(version[:file])
-                      require File.join('.',version[:file])
-                      eval(version[:constant])
-                    end
-
-  gemspec.summary = metadata.fetch('summary',metadata['description'])
-  gemspec.description = metadata.fetch('description',metadata['summary'])
-
-  case metadata['license']
-  when Array
-    gemspec.licenses = metadata['license']
-  when String
-    gemspec.license = metadata['license']
-  end
-
-  case metadata['authors']
-  when Array
-    gemspec.authors = metadata['authors']
-  when String
-    gemspec.author = metadata['authors']
-  end
+  gem.name    = gemspec.fetch('name')
+  gem.version = gemspec.fetch('version') do
+                  lib_dir = File.join(File.dirname(__FILE__),'lib')
+                  $LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir)
 
-  gemspec.email = metadata['email']
-  gemspec.homepage = metadata['homepage']
+                  require 'dm-is-authenticatable/is/authenticatable/version'
+                  DataMapper::Is::Authenticatable::VERSION
+                end
 
-  case metadata['require_paths']
-  when Array
-    gemspec.require_paths = metadata['require_paths']
-  when String
-    gemspec.require_path = metadata['require_paths']
-  end
+  gem.summary     = gemspec['summary']
+  gem.description = gemspec['description']
+  gem.licenses    = Array(gemspec['license'])
+  gem.authors     = Array(gemspec['authors'])
+  gem.email       = gemspec['email']
+  gem.homepage    = gemspec['homepage']
 
-  gemspec.files = filter_files[metadata['files']]
+  glob = lambda { |patterns| gem.files & Dir[*patterns] }
 
-  gemspec.executables = metadata['executables']
-  gemspec.extensions = metadata['extensions']
+  gem.files = `git ls-files`.split($/)
+  gem.files = glob[gemspec['files']] if gemspec['files']
 
-  if Gem::VERSION < '1.7.'
-    gemspec.default_executable = gemspec.executables.first
+  gem.executables = gemspec.fetch('executables') do
+    glob['bin/*'].map { |path| File.basename(path) }
   end
+  gem.default_executable = gem.executables.first if Gem::VERSION < '1.7.'
 
-  gemspec.test_files = filter_files[metadata['test_files']]
-
-  unless gemspec.files.include?('.document')
-    gemspec.extra_rdoc_files = metadata['extra_doc_files']
-  end
-
-  gemspec.post_install_message = metadata['post_install_message']
-  gemspec.requirements = metadata['requirements']
-
-  if gemspec.respond_to?(:required_ruby_version=)
-    gemspec.required_ruby_version = metadata['required_ruby_version']
-  end
+  gem.extensions       = glob[gemspec['extensions'] || 'ext/**/extconf.rb']
+  gem.test_files       = glob[gemspec['test_files'] || '{test/{**/}*_test.rb']
+  gem.extra_rdoc_files = glob[gemspec['extra_doc_files'] || '*.{txt,md}']
 
-  if gemspec.respond_to?(:required_rubygems_version=)
-    gemspec.required_rubygems_version = metadata['required_rubygems_version']
-  end
+  gem.require_paths = Array(gemspec.fetch('require_paths') {
+    %w[ext lib].select { |dir| File.directory?(dir) }
+  })
 
-  parse_versions = lambda { |versions|
-    case versions
-    when Array
-      versions.map { |v| v.to_s }
-    when String
-      versions.split(/,\s*/)
-    end
-  }
+  gem.requirements              = gemspec['requirements']
+  gem.required_ruby_version     = gemspec['required_ruby_version']
+  gem.required_rubygems_version = gemspec['required_rubygems_version']
+  gem.post_install_message      = gemspec['post_install_message']
 
-  if metadata['dependencies']
-    metadata['dependencies'].each do |name,versions|
-      gemspec.add_dependency(name,parse_versions[versions])  
-    end
-  end
+  split = lambda { |string| string.split(/,\s*/) }
 
-  if metadata['runtime_dependencies']
-    metadata['runtime_dependencies'].each do |name,versions|
-      gemspec.add_runtime_dependency(name,parse_versions[versions])  
+  if gemspec['dependencies']
+    gemspec['dependencies'].each do |name,versions|
+      gem.add_dependency(name,split[versions])
     end
   end
 
-  if metadata['development_dependencies']
-    metadata['development_dependencies'].each do |name,versions|
-      gemspec.add_development_dependency(name,parse_versions[versions])  
+  if gemspec['development_dependencies']
+    gemspec['development_dependencies'].each do |name,versions|
+      gem.add_development_dependency(name,split[versions])
     end
   end
 end

data/gemspec.yml

@@ -1,5 +1,5 @@
 name: dm-is-authenticatable
-version: 0.2.0
+version: 0.3.0
 summary: DataMapper plugin for adding authentication to models.
 description:
   A DataMapper plugin for adding authentication and encrypted passwords to

data/lib/dm-is-authenticatable/is/authenticatable.rb

@@ -4,6 +4,10 @@ require 'dm-validations'
 module DataMapper
   module Is
     module Authenticatable
+      #
+      # Adds the `encrypted_password property` and mixs in {ClassMethods}
+      # and {InstanceMethods}.
+      #
       def is_authenticatable(options={})
         # The encrypted password
         property :encrypted_password, DataMapper::Property::BCryptHash
@@ -14,6 +18,9 @@ module DataMapper
         validates_confirmation_of :password
       end
 
+      #
+      # Class methods.
+      #
       module ClassMethods
         #
         # Finds and authenticates a resource.
@@ -38,6 +45,9 @@ module DataMapper
         end
       end
 
+      #
+      # Instance methods.
+      #
       module InstanceMethods
         # The clear-text password
         attr_reader :password
@@ -83,7 +93,11 @@ module DataMapper
         # @since 0.2.0
         #
         def has_password?(submitted_password)
-          !password_required? || (self.encrypted_password == submitted_password)
+          if password_required?
+            self.encrypted_password == submitted_password
+          else
+            submitted_password.nil? || submitted_password.empty?
+          end
         end
       end
     end

data/spec/integration/authenticatable_spec.rb

@@ -72,8 +72,16 @@ describe DataMapper::Is::Authenticatable do
     context "when #password_required? is false" do
       before { subject.stub(:password_required?).and_return(false) }
 
-      it "should return true" do
-        subject.should have_password('does not matter')
+      it "should return true for nil" do
+        subject.should have_password(nil)
+      end
+
+      it "should return true for ''" do
+        subject.should have_password('')
+      end
+
+      it "should return false for any other String" do
+        subject.should_not have_password('foo')
       end
     end
   end
@@ -117,5 +125,29 @@ describe DataMapper::Is::Authenticatable do
 
       user.should be_nil
     end
+
+    context "when encrypted password is nil" do
+      before(:all) do
+        User.first(:name => name).update(:encrypted_password => nil)
+      end
+
+      it "should allow authenticating with a nil password" do
+        user = subject.authenticate(:name => name, :password => nil)
+
+        user.name.should == name
+      end
+
+      it "should allow authenticating with an empty password" do
+        user = subject.authenticate(:name => name, :password => '')
+
+        user.name.should == name
+      end
+
+      it "should not allow authenticating with any other password" do
+        user = subject.authenticate(:name => name, :password => 'foo')
+
+        user.should be_nil
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-is-authenticatable
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-07 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -159,9 +159,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: DataMapper plugin for adding authentication to models.
-test_files:
-- spec/integration/authenticatable_spec.rb
+test_files: []