dm-devise 1.1.2 → 1.1.3

data/Gemfile

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem "rails", :git => "git://github.com/rails/rails.git"
+gem "rails", '3.0.0'
 
 gem "warden", "0.10.7"
 gem "webrat", "0.7.0"
@@ -8,13 +8,13 @@ gem "mocha", :require => false
 gem "bcrypt-ruby", :require => "bcrypt"
 gem "oauth2"
 
-gem 'dm-core',           '~> 1.0.0'
-gem 'dm-migrations',     '~> 1.0.0'
-gem 'dm-sqlite-adapter', '~> 1.0.0'
-gem 'dm-serializer',     '~> 1.0.0'
-gem 'dm-timestamps',     '~> 1.0.0'
+gem 'dm-core',           '~> 1.0.2'
+gem 'dm-migrations',     '~> 1.0.2'
+gem 'dm-sqlite-adapter', '~> 1.0.2'
+gem 'dm-serializer',     '~> 1.0.2'
+gem 'dm-timestamps',     '~> 1.0.2'
 gem 'dm-rails',          '~> 1.0.3'
 
 group :data_mapper do
-  gem 'dm-validations',    '~> 1.0.0'
+  gem 'dm-validations',    '~> 1.0.2'
 end

data/Gemfile.lock

@@ -1,86 +1,68 @@
-GIT
-  remote: git://github.com/rails/rails.git
-  revision: 4952a80
+GEM
+  remote: http://rubygems.org/
   specs:
-    actionmailer (3.0.0.rc)
-      actionpack (= 3.0.0.rc)
+    abstract (1.0.0)
+    actionmailer (3.0.0)
+      actionpack (= 3.0.0)
       mail (~> 2.2.5)
-    actionpack (3.0.0.rc)
-      activemodel (= 3.0.0.rc)
-      activesupport (= 3.0.0.rc)
+    actionpack (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4.1)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.9)
+      rack-mount (~> 0.6.12)
       rack-test (~> 0.5.4)
-      tzinfo (~> 0.3.22)
-    activemodel (3.0.0.rc)
-      activesupport (= 3.0.0.rc)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.0)
+      activesupport (= 3.0.0)
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
-    activerecord (3.0.0.rc)
-      activemodel (= 3.0.0.rc)
-      activesupport (= 3.0.0.rc)
-      arel (~> 0.4.0)
-      tzinfo (~> 0.3.22)
-    activeresource (3.0.0.rc)
-      activemodel (= 3.0.0.rc)
-      activesupport (= 3.0.0.rc)
-    activesupport (3.0.0.rc)
-    rails (3.0.0.rc)
-      actionmailer (= 3.0.0.rc)
-      actionpack (= 3.0.0.rc)
-      activerecord (= 3.0.0.rc)
-      activeresource (= 3.0.0.rc)
-      activesupport (= 3.0.0.rc)
-      bundler (>= 1.0.0.rc.1)
-      railties (= 3.0.0.rc)
-    railties (3.0.0.rc)
-      actionpack (= 3.0.0.rc)
-      activesupport (= 3.0.0.rc)
-      rake (>= 0.8.3)
-      thor (~> 0.14.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    addressable (2.1.2)
-    arel (0.4.0)
-      activesupport (>= 3.0.0.beta)
+    activerecord (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+      arel (~> 1.0.0)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+    activesupport (3.0.0)
+    addressable (2.2.0)
+    arel (1.0.1)
+      activesupport (~> 3.0.0)
     bcrypt-ruby (2.1.2)
     builder (2.1.2)
     data_objects (0.10.2)
       addressable (~> 2.1)
-    dm-active_model (1.0.0)
-      activemodel (~> 3.0.0.beta3)
-      dm-core (~> 1.0.0)
-    dm-core (1.0.0)
-      addressable (~> 2.1)
+    dm-active_model (1.0.2)
+      activemodel (~> 3.0.0)
+      dm-core (~> 1.0.2)
+    dm-core (1.0.2)
+      addressable (~> 2.2)
       extlib (~> 0.9.15)
-    dm-do-adapter (1.0.0)
-      data_objects (~> 0.10.1)
-      dm-core (~> 1.0.0)
-    dm-migrations (1.0.0)
-      dm-core (~> 1.0.0)
+    dm-do-adapter (1.0.2)
+      data_objects (~> 0.10.2)
+      dm-core (~> 1.0.2)
+    dm-migrations (1.0.2)
+      dm-core (~> 1.0.2)
     dm-rails (1.0.3)
       actionpack (~> 3.0.0.rc)
       activesupport (~> 3.0.0.rc)
       dm-active_model (~> 1.0.0)
       dm-core (~> 1.0.0)
       railties (~> 3.0.0.rc)
-    dm-serializer (1.0.0)
-      dm-core (~> 1.0.0)
+    dm-serializer (1.0.2)
+      dm-core (~> 1.0.2)
       fastercsv (~> 1.5.3)
-      json_pure (~> 1.4.3)
-    dm-sqlite-adapter (1.0.0)
-      dm-do-adapter (~> 1.0.0)
+      json_pure (~> 1.4)
+    dm-sqlite-adapter (1.0.2)
+      dm-do-adapter (~> 1.0.2)
       do_sqlite3 (~> 0.10.2)
-    dm-timestamps (1.0.0)
-      dm-core (~> 1.0.0)
-    dm-validations (1.0.0)
-      dm-core (~> 1.0.0)
+    dm-timestamps (1.0.2)
+      dm-core (~> 1.0.2)
+    dm-validations (1.0.2)
+      dm-core (~> 1.0.2)
     do_sqlite3 (0.10.2)
       data_objects (= 0.10.2)
     erubis (2.6.6)
@@ -91,7 +73,7 @@ GEM
       rack (>= 1.0.1)
     fastercsv (1.5.3)
     i18n (0.4.1)
-    json_pure (1.4.3)
+    json_pure (1.4.6)
     mail (2.2.5)
       activesupport (>= 2.3.6)
       mime-types
@@ -100,21 +82,34 @@ GEM
     mocha (0.9.8)
       rake
     multi_json (0.0.4)
-    nokogiri (1.4.2)
-    oauth2 (0.0.10)
+    nokogiri (1.4.3.1)
+    oauth2 (0.0.13)
       faraday (~> 0.4.1)
       multi_json (>= 0.0.4)
     polyglot (0.3.1)
     rack (1.2.1)
-    rack-mount (0.6.9)
+    rack-mount (0.6.13)
       rack (>= 1.0.0)
     rack-test (0.5.4)
       rack (>= 1.0)
+    rails (3.0.0)
+      actionmailer (= 3.0.0)
+      actionpack (= 3.0.0)
+      activerecord (= 3.0.0)
+      activeresource (= 3.0.0)
+      activesupport (= 3.0.0)
+      bundler (~> 1.0.0)
+      railties (= 3.0.0)
+    railties (3.0.0)
+      actionpack (= 3.0.0)
+      activesupport (= 3.0.0)
+      rake (>= 0.8.4)
+      thor (~> 0.14.0)
     rake (0.8.7)
     thor (0.14.0)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.22)
+    tzinfo (0.3.23)
     warden (0.10.7)
       rack (>= 1.0.0)
     webrat (0.7.0)
@@ -127,15 +122,15 @@ PLATFORMS
 
 DEPENDENCIES
   bcrypt-ruby
-  dm-core (~> 1.0.0)
-  dm-migrations (~> 1.0.0)
+  dm-core (~> 1.0.2)
+  dm-migrations (~> 1.0.2)
   dm-rails (~> 1.0.3)
-  dm-serializer (~> 1.0.0)
-  dm-sqlite-adapter (~> 1.0.0)
-  dm-timestamps (~> 1.0.0)
-  dm-validations (~> 1.0.0)
+  dm-serializer (~> 1.0.2)
+  dm-sqlite-adapter (~> 1.0.2)
+  dm-timestamps (~> 1.0.2)
+  dm-validations (~> 1.0.2)
   mocha
   oauth2
-  rails!
+  rails (= 3.0.0)
   warden (= 0.10.7)
   webrat (= 0.7.0)

data/README.rdoc

@@ -22,18 +22,18 @@ README http://github.com/plataformatec/devise/blob/master/README.rdoc
 
 Last tested against devise release: v1.1.1
 
-Last tested against devise master: 2010-08-14, commit 81c49c69df752a6c8c408d660768442911b324f4
+Last tested against devise master: 2010-08-14, commit 0f0eb4e8cee4c1f042ffdbc4f77e755c757920a8
 
 == Installation
 
 Add dm-devise and dm gems to your Gemfile. The following gems are required:
 
-  gem 'dm-core',           '~> 1.0.0'
-  gem 'dm-sqlite-adapter', '~> 1.0.0' # or your preferred adapter
-  gem 'dm-serializer',     '~> 1.0.0'
-  gem 'dm-timestamps',     '~> 1.0.0'
+  gem 'dm-core',           '~> 1.0.2'
+  gem 'dm-sqlite-adapter', '~> 1.0.2' # or your preferred adapter
+  gem 'dm-serializer',     '~> 1.0.2'
+  gem 'dm-timestamps',     '~> 1.0.2'
   gem 'dm-rails',          '~> 1.0.3'
-  gem 'dm-validations',    '~> 1.0.0' # Do not include if using data_mapper_active_model
+  gem 'dm-validations',    '~> 1.0.2' # Do not include if using data_mapper_active_model
   gem 'dm-devise',         '~> 1.1.0'
 
 If you're using data_mapper_active_model do not include dm-validations in your

data/dm-devise.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-devise}
-  s.version = "1.1.2"
+  s.version = "1.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jared Morgan"]
-  s.date = %q{2010-08-14}
+  s.date = %q{2010-09-08}
   s.description = %q{dm-devise adds DataMapper support to devise (http://github.com/plataformatec/devise) for authentication support for Rails}
   s.email = %q{jmorgan@morgancreative.net}
   s.extra_rdoc_files = [

data/lib/devise/orm/data_mapper_active_model.rb

@@ -12,7 +12,6 @@ module Devise
           include ActiveModel::Validations
           include ActiveModelCompatibility
           include Compatibility
-          class << self; attr_reader :descendants; end;
 
           def self.validates_uniqueness_of(*fields)
             validates_with UniquenessValidator, _merge_attributes(fields)

data/lib/dm-devise/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Devise
-    VERSION = '1.1.2'.freeze
+    VERSION = '1.1.3'.freeze
   end
 end

data/lib/generators/data_mapper/devise_generator.rb

@@ -3,7 +3,7 @@ require 'generators/devise/orm_helpers'
 module DataMapper
   module Generators
     class DeviseGenerator < Rails::Generators::NamedBase
-      include Devise::Generators::OrmHelpers
+      include ::Devise::Generators::OrmHelpers
 
       def generate_model
         invoke "data_mapper:model", [name] unless model_exists?

data/test/rails_app/app/data_mapper/user.rb

@@ -11,17 +11,15 @@ class User
   include SharedUser
   include Shim
 
-  unless DEVISE_ORM == :data_mapper_active_model
-    before :valid?, :update_password_confirmation
+  before :valid?, :update_password_confirmation
 
-    # DM's validates_confirmation_of requires the confirmation field to be present,
-    # while ActiveModel by default skips the confirmation test if the confirmation
-    # value is nil. This test takes advantage of AM's behavior, so just add the
-    # :password_confirmation value.
-    def update_password_confirmation
-      if self.password && self.password_confirmation.nil?
-        self.password_confirmation = self.password
-      end
+  # DM's validates_confirmation_of requires the confirmation field to be present,
+  # while ActiveModel by default skips the confirmation test if the confirmation
+  # value is nil. This test takes advantage of AM's behavior, so just add the
+  # :password_confirmation value.
+  def update_password_confirmation
+    if self.password && self.password_confirmation.nil?
+      self.password_confirmation = self.password
     end
   end 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-devise
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Jared Morgan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-14 00:00:00 -05:00
+date: 2010-09-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency