dm-devise 1.2.0.beta → 1.2.0.rc

data/Gemfile

@@ -2,16 +2,27 @@ source :rubygems
 
 gemspec
 
-gem 'rails', '3.0.3'
+gem 'oa-oauth', '~> 0.2.0', :require => 'omniauth/oauth'
+gem 'oa-openid', '~> 0.2.0', :require => 'omniauth/openid'
 
-gem 'webrat', '0.7.1'
-gem 'mocha', :require => false
-gem "oa-oauth", :require => "omniauth/oauth"
-gem "oa-openid", :require => "omniauth/openid"
+group :test do
+  gem 'webrat', '0.7.2', :require => false
+  gem 'mocha', :require => false
+end
+
+DM_VERSION = '~> 1.1.0.rc3'
 
-gem 'sugar-high',        '~> 0.2.10'
-gem 'dm-sqlite-adapter', '~> 1.0.2'
+group :development do
+  gem 'rails', '~> 3.0.4'
+  gem 'dm-sqlite-adapter', DM_VERSION
+
+  gem 'dm-core', DM_VERSION
+  gem 'dm-migrations', DM_VERSION
+  gem 'dm-serializer', DM_VERSION
+  gem 'dm-timestamps', DM_VERSION
+  gem 'dm-rails', DM_VERSION
+end
 
 group :data_mapper do
-  gem 'dm-validations',    '~> 1.0.0'
+  gem 'dm-validations', DM_VERSION
 end

data/Gemfile.lock

@@ -2,122 +2,118 @@ PATH
   remote: .
   specs:
     dm-devise (1.2.0.beta)
-      devise (~> 1.2.rc)
-      dm-core (~> 1.0.2)
-      dm-migrations (~> 1.0.2)
-      dm-rails (>= 1.0.3)
-      dm-serializer (~> 1.0.2)
-      dm-timestamps (~> 1.0.2)
+      devise (~> 1.2.rc2)
+      dm-core (>= 1.0.2, < 1.2)
+      dm-migrations (>= 1.0.2, < 1.2)
+      dm-rails (>= 1.0.3, < 1.2)
+      dm-serializer (>= 1.0.2, < 1.2)
+      dm-timestamps (>= 1.0.2, < 1.2)
       sugar-high (~> 0.2.10)
 
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    actionmailer (3.0.5)
+      actionpack (= 3.0.5)
+      mail (~> 2.2.15)
+    actionpack (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4)
       rack (~> 1.2.1)
       rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    addressable (2.2.2)
-    arel (2.0.6)
-    bcrypt-ruby (2.1.3)
+    activeresource (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+    activesupport (3.0.5)
+    addressable (2.2.4)
+    arel (2.0.9)
+    bcrypt-ruby (2.1.4)
     builder (2.1.2)
-    data_objects (0.10.2)
+    data_objects (0.10.3)
       addressable (~> 2.1)
-    devise (1.2.rc)
+    devise (1.2.rc2)
       bcrypt-ruby (~> 2.1.2)
-      orm_adapter (~> 0.0.2)
-      warden (~> 1.0.0)
-    dm-active_model (1.0.3)
-      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.2)
+      orm_adapter (~> 0.0.3)
+      warden (~> 1.0.3)
+    dm-active_model (1.1.0.rc3)
+      activemodel (~> 3.0.4)
+      dm-core (~> 1.1.0.rc3)
+    dm-core (1.1.0.rc3)
+      addressable (~> 2.2.4)
+    dm-do-adapter (1.1.0.rc3)
       data_objects (~> 0.10.2)
-      dm-core (~> 1.0.2)
-    dm-migrations (1.0.2)
-      dm-core (~> 1.0.2)
-    dm-rails (1.0.4)
-      actionpack (~> 3.0.0)
-      activesupport (~> 3.0.0)
-      dm-active_model (~> 1.0.3)
-      dm-core (~> 1.0.0)
-      railties (~> 3.0.0)
-    dm-serializer (1.0.2)
-      dm-core (~> 1.0.2)
-      fastercsv (~> 1.5.3)
-      json_pure (~> 1.4)
-    dm-sqlite-adapter (1.0.2)
-      dm-do-adapter (~> 1.0.2)
+      dm-core (~> 1.1.0.rc3)
+    dm-migrations (1.1.0.rc3)
+      dm-core (~> 1.1.0.rc3)
+    dm-rails (1.1.0.rc3)
+      actionpack (~> 3.0.4)
+      dm-active_model (~> 1.1.0.rc3)
+      dm-core (~> 1.1.0.rc3)
+      railties (~> 3.0.4)
+    dm-serializer (1.1.0.rc3)
+      dm-core (~> 1.1.0.rc3)
+      fastercsv (~> 1.5.4)
+      json (~> 1.4.6)
+    dm-sqlite-adapter (1.1.0.rc3)
+      dm-do-adapter (~> 1.1.0.rc3)
       do_sqlite3 (~> 0.10.2)
-    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)
+    dm-timestamps (1.1.0.rc3)
+      dm-core (~> 1.1.0.rc3)
+    dm-validations (1.1.0.rc3)
+      dm-core (~> 1.1.0.rc3)
+    do_sqlite3 (0.10.3)
+      data_objects (= 0.10.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    extlib (0.9.15)
-    faraday (0.5.3)
-      addressable (~> 2.2.2)
-      multipart-post (~> 1.0.1)
+    faraday (0.5.7)
+      addressable (~> 2.2.4)
+      multipart-post (~> 1.1.0)
       rack (>= 1.1.0, < 2)
-    fastercsv (1.5.3)
+    fastercsv (1.5.4)
     i18n (0.5.0)
-    json_pure (1.4.6)
-    mail (2.2.12)
+    json (1.4.6)
+    mail (2.2.15)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    mocha (0.9.10)
-      rake
+    mocha (0.9.12)
     multi_json (0.0.5)
-    multipart-post (1.0.1)
+    multipart-post (1.1.0)
     nokogiri (1.4.4)
-    oa-core (0.1.6)
+    oa-core (0.2.0)
       rack (~> 1.1)
-    oa-oauth (0.1.6)
+    oa-oauth (0.2.0)
       multi_json (~> 0.0.2)
       nokogiri (~> 1.4.2)
-      oa-core (= 0.1.6)
+      oa-core (= 0.2.0)
       oauth (~> 0.4.0)
-      oauth2 (~> 0.1.0)
-    oa-openid (0.1.6)
-      oa-core (= 0.1.6)
+      oauth2 (~> 0.1.1)
+    oa-openid (0.2.0)
+      oa-core (= 0.2.0)
       rack-openid (~> 1.2.0)
       ruby-openid-apps-discovery
     oauth (0.4.4)
-    oauth2 (0.1.0)
+    oauth2 (0.1.1)
       faraday (~> 0.5.0)
       multi_json (~> 0.0.4)
-    orm_adapter (0.0.3)
+    orm_adapter (0.0.4)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
@@ -125,19 +121,19 @@ GEM
     rack-openid (1.2.0)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-test (0.5.6)
+    rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
+    rails (3.0.5)
+      actionmailer (= 3.0.5)
+      actionpack (= 3.0.5)
+      activerecord (= 3.0.5)
+      activeresource (= 3.0.5)
+      activesupport (= 3.0.5)
       bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
+      railties (= 3.0.5)
+    railties (3.0.5)
+      actionpack (= 3.0.5)
+      activesupport (= 3.0.5)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
@@ -151,10 +147,10 @@ GEM
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
+    tzinfo (0.3.24)
     warden (1.0.3)
       rack (>= 1.0.0)
-    webrat (0.7.1)
+    webrat (0.7.2)
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
@@ -163,18 +159,16 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  devise (~> 1.2.rc)
-  dm-core (~> 1.0.2)
+  dm-core (~> 1.1.0.rc3)
   dm-devise!
-  dm-migrations (~> 1.0.2)
-  dm-rails (>= 1.0.3)
-  dm-serializer (~> 1.0.2)
-  dm-sqlite-adapter (~> 1.0.2)
-  dm-timestamps (~> 1.0.2)
-  dm-validations (~> 1.0.0)
+  dm-migrations (~> 1.1.0.rc3)
+  dm-rails (~> 1.1.0.rc3)
+  dm-serializer (~> 1.1.0.rc3)
+  dm-sqlite-adapter (~> 1.1.0.rc3)
+  dm-timestamps (~> 1.1.0.rc3)
+  dm-validations (~> 1.1.0.rc3)
   mocha
-  oa-oauth
-  oa-openid
-  rails (= 3.0.3)
-  sugar-high (~> 0.2.10)
-  webrat (= 0.7.1)
+  oa-oauth (~> 0.2.0)
+  oa-openid (~> 0.2.0)
+  rails (~> 3.0.4)
+  webrat (= 0.7.2)

data/README.rdoc

@@ -20,23 +20,27 @@ earlier versions, but it's not been tested (if you try, please let Jared Morgan
 This README only covers dm-devise specifics. Make sure to read the devise
 README http://github.com/plataformatec/devise/blob/master/README.rdoc
 
-Last tested against devise master: 2011-01-31, commit 76a480044688672acdd40469c74c6abfea35f8a4
+Last tested against devise master: 2011-03-12, commit 15d195d2f064508e074cdd3c3733c94fbdd281c4
+Last tested against devise release 1.2.rc2
 
 == Installation
 
 Add dm-devise and dm gems to your Gemfile. The following gems are required:
 
-  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.2' # Do not include if using data_mapper_active_model
-  gem 'dm-devise',         '~> 1.1.4'
+  gem 'dm-core',           '~> 1.1.0.rc3'
+  gem 'dm-sqlite-adapter', '~> 1.1.0.rc3' # or your preferred adapter
+  gem 'dm-serializer',     '~> 1.1.0.rc3'
+  gem 'dm-timestamps',     '~> 1.1.0.rc3'
+  gem 'dm-rails',          '~> 1.1.0.rc3'
+  gem 'dm-validations',    '~> 1.1.0.rc3' # Do not include if using data_mapper_active_model
+  gem 'dm-devise',         '~> 1.2.0.rc'
 
 If you're using data_mapper_active_model do not include dm-validations in your
 Gemfile.
 
+dm-devise works with versions of DataMapper gems >= 1.0.2 on the 1.0 branch
+and >= 1.1.0.rc3 on the 1.1 branch.
+
 Run the generator:
 
   rails generate devise:install

data/Rakefile

@@ -1,5 +1,14 @@
 # encoding: UTF-8
 
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
@@ -40,27 +49,3 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "dm-devise"
-    gem.version = DataMapper::Devise::VERSION.dup
-    gem.summary = %Q{Support for using DataMapper ORM with devise}
-    gem.description = %Q{dm-devise adds DataMapper support to devise (http://github.com/plataformatec/devise) for authentication support for Rails}
-    gem.email = "jmorgan@morgancreative.net"
-    gem.homepage = "http://github.com/jm81/dm-devise"
-    gem.authors = ["Jared Morgan"]
-    gem.add_dependency 'dm-core',        '~> 1.0.2'
-    gem.add_dependency 'dm-migrations',  '~> 1.0.2'
-    gem.add_dependency 'dm-serializer',  '~> 1.0.2'
-    gem.add_dependency 'dm-timestamps',  '~> 1.0.2'
-    gem.add_dependency 'dm-rails',       '>= 1.0.3'
-    gem.add_dependency 'devise',         '~> 1.2.rc'
-    gem.add_dependency 'sugar-high',     '~> 0.2.10'
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end

data/dm-devise.gemspec

@@ -1,103 +1,26 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "dm-devise/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{dm-devise}
-  s.version = "1.2.0.beta"
+  s.name        = "dm-devise"
+  s.version     = DataMapper::Devise::VERSION.dup
+  s.summary     = "DataMapper support for devise"
+  s.description = "dm-devise adds DataMapper support to devise (http://github.com/plataformatec/devise) for authentication support for Rails"
+  s.email       = "jmorgan@morgancreative.net"
+  s.homepage    = "https://github.com/jm81/dm-devise"
+  s.authors     = ["Jared Morgan"]
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jared Morgan"]
-  s.date = %q{2011-02-03}
-  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 = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "dm-devise.gemspec",
-     "lib/devise/orm/data_mapper.rb",
-     "lib/devise/orm/data_mapper/compatibility.rb",
-     "lib/devise/orm/data_mapper/date_time.rb",
-     "lib/devise/orm/data_mapper/dm-validations.rb",
-     "lib/devise/orm/data_mapper/schema.rb",
-     "lib/devise/orm/data_mapper_active_model.rb",
-     "lib/dm-devise.rb",
-     "lib/dm-devise/version.rb",
-     "lib/generators/data_mapper/devise_generator.rb",
-     "test/data_mapper/compatibility_test.rb",
-     "test/orm/data_mapper.rb",
-     "test/orm/data_mapper_active_model.rb",
-     "test/overrides/data_mapper_test.rb",
-     "test/overrides/dm_validations_test.rb",
-     "test/rails_app/app/data_mapper/admin.rb",
-     "test/rails_app/app/data_mapper/shim.rb",
-     "test/rails_app/app/data_mapper/user.rb",
-     "test/rails_app/app/data_mapper_active_model/admin.rb",
-     "test/rails_app/app/data_mapper_active_model/user.rb",
-     "test/rails_app/config/application.rb",
-     "test/rails_app/config/environment.rb",
-     "test/test_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/jm81/dm-devise}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Support for using DataMapper ORM with devise}
-  s.test_files = [
-    "test/test_helper.rb",
-     "test/data_mapper/compatibility_test.rb",
-     "test/rails_app/config/environment.rb",
-     "test/rails_app/config/application.rb",
-     "test/rails_app/app/data_mapper/admin.rb",
-     "test/rails_app/app/data_mapper/shim.rb",
-     "test/rails_app/app/data_mapper/user.rb",
-     "test/rails_app/app/data_mapper_active_model/admin.rb",
-     "test/rails_app/app/data_mapper_active_model/user.rb",
-     "test/overrides/data_mapper_test.rb",
-     "test/overrides/dm_validations_test.rb",
-     "test/orm/data_mapper.rb",
-     "test/orm/data_mapper_active_model.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.2"])
-      s.add_runtime_dependency(%q<dm-migrations>, ["~> 1.0.2"])
-      s.add_runtime_dependency(%q<dm-serializer>, ["~> 1.0.2"])
-      s.add_runtime_dependency(%q<dm-timestamps>, ["~> 1.0.2"])
-      s.add_runtime_dependency(%q<dm-rails>, [">= 1.0.3"])
-      s.add_runtime_dependency(%q<devise>, ["~> 1.2.rc"])
-      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.10"])
-    else
-      s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
-      s.add_dependency(%q<dm-migrations>, ["~> 1.0.2"])
-      s.add_dependency(%q<dm-serializer>, ["~> 1.0.2"])
-      s.add_dependency(%q<dm-timestamps>, ["~> 1.0.2"])
-      s.add_dependency(%q<dm-rails>, [">= 1.0.3"])
-      s.add_dependency(%q<devise>, ["~> 1.2.rc"])
-      s.add_dependency(%q<sugar-high>, ["~> 0.2.10"])
-    end
-  else
-    s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
-    s.add_dependency(%q<dm-migrations>, ["~> 1.0.2"])
-    s.add_dependency(%q<dm-serializer>, ["~> 1.0.2"])
-    s.add_dependency(%q<dm-timestamps>, ["~> 1.0.2"])
-    s.add_dependency(%q<dm-rails>, [">= 1.0.3"])
-    s.add_dependency(%q<devise>, ["~> 1.2.rc"])
-    s.add_dependency(%q<sugar-high>, ["~> 0.2.10"])
-  end
+  s.add_dependency('dm-core', '>= 1.0.2', '< 1.2')
+  s.add_dependency('dm-migrations', '>= 1.0.2', '< 1.2')
+  s.add_dependency('dm-serializer', '>= 1.0.2', '< 1.2')
+  s.add_dependency('dm-timestamps', '>= 1.0.2', '< 1.2')
+  s.add_dependency('dm-rails', '>= 1.0.3', '< 1.2')
+  s.add_dependency('devise', '~> 1.2.rc2')
+  s.add_dependency('sugar-high', '~> 0.2.10')
 end
-

data/lib/devise/orm/data_mapper/schema.rb

@@ -15,6 +15,7 @@ module Devise
         # Tell how to apply schema methods. This automatically maps :limit to
         # :length and :null to :required.
         def apply_devise_schema(name, type, options={})
+          return false if properties[name]
           SCHEMA_OPTIONS.each do |old_key, new_key|
             next unless options.key?(old_key)
             if :null == old_key

data/lib/dm-devise/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Devise
-    VERSION = '1.2.0.beta'.freeze
+    VERSION = '1.2.0.rc'.freeze
   end
 end

data/test/data_mapper/schema_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+
+class DataMapperSchemaTest < ActiveSupport::TestCase
+  test 'required explicitly set to false' do
+    begin
+      DataMapper::Property.required(true)
+      model = Class.new(User)
+      model.apply_devise_schema :required_string, String, :required => true
+      model.apply_devise_schema :not_required_string, String
+      assert model.properties['required_string'].required?
+      assert !model.properties['not_required_string'].required?
+    ensure
+      DataMapper::Property.required(false)
+    end
+  end
+end

data/test/generators/data_mapper_generator_test.rb

@@ -0,0 +1,22 @@
+require "test_helper"
+
+if [:data_mapper, :data_mapper_active_model].include?(DEVISE_ORM)
+  require "generators/data_mapper/devise_generator"
+
+  class DataMapperGeneratorTest < Rails::Generators::TestCase
+    tests DataMapper::Generators::DeviseGenerator
+    destination File.expand_path("../../tmp", __FILE__)
+    setup :prepare_destination
+  
+    test "all files are properly created" do
+      run_generator %w(monster)
+      assert_file "app/models/monster.rb", /devise/
+    end
+  
+    test "all files are properly deleted" do
+      run_generator %w(monster)
+      run_generator %w(monster), :behavior => :revoke
+      assert_no_file "app/models/monster.rb"
+    end
+  end
+end

data/test/overrides/data_mapper_test.rb

@@ -74,6 +74,6 @@ class AuthenticationRedirectTest < ActionController::IntegrationTest
     create_user
     post user_session_path(:format => 'xml', :user => {:email => "user@test.com", :password => '123456'})
     assert_response :success
-    assert_match /\A<user><id/, response.body
+    assert_match /\A<user>\s*<id/, response.body
   end
 end

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

@@ -5,15 +5,11 @@ module Shim
   end
 
   module ModelMethods
-    # Override version in SharedUser which uses #find_by_email.
-    def find_for_facebook_oauth(access_token, signed_in_resource=nil)
-      data = ActiveSupport::JSON.decode(access_token.get('/me'))
-      user = signed_in_resource || User.first(:email => data["email"]) || User.new
-      user.update_with_facebook_oauth(access_token, data)
-      user.save
-      user
+    # For benefit of Users::OmniauthCallbacksController
+    def find_by_email(email)
+      first(:email => email)
     end
-    
+
     def create!(*args)
       create(*args)
     end

data/test/test_helper.rb

@@ -4,6 +4,7 @@ DEVISE_PATH = ENV['DEVISE_PATH']
 
 puts "\n==> Devise.orm = #{DEVISE_ORM.inspect}"
 
+require 'dm-migrations'
 require "rails_app/config/environment"
 require "rails/test_help"
 require "orm/#{DEVISE_ORM}"
@@ -11,13 +12,12 @@ require "orm/#{DEVISE_ORM}"
 I18n.load_path << "#{DEVISE_PATH}/test/support/locale/en.yml"
 require 'mocha'
 
+require 'webrat'
 Webrat.configure do |config|
   config.mode = :rails
   config.open_error_files = false
 end
 
-Devise::OmniAuth.test_mode!
-
 # Add support to load paths so we can overwrite broken webrat setup
 $:.unshift "#{DEVISE_PATH}/test/support"
 Dir["#{DEVISE_PATH}/test/support/**/*.rb"].each { |f| require f }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dm-devise
 version: !ruby/object:Gem::Version 
-  hash: 31098177
-  prerelease: true
+  hash: 7712026
+  prerelease: 6
   segments: 
   - 1
   - 2
   - 0
-  - beta
-  version: 1.2.0.beta
+  - rc
+  version: 1.2.0.rc
 platform: ruby
 authors: 
 - Jared Morgan
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 -06:00
+date: 2011-03-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,7 +25,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 19
         segments: 
@@ -33,6 +33,13 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,7 +48,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 19
         segments: 
@@ -49,6 +56,13 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -57,7 +71,7 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 19
         segments: 
@@ -65,6 +79,13 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -73,7 +94,7 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 19
         segments: 
@@ -81,6 +102,13 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -97,6 +125,13 @@ dependencies:
         - 0
         - 3
         version: 1.0.3
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -107,12 +142,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7712074
+        hash: 15424225
         segments: 
         - 1
         - 2
         - rc
-        version: 1.2.rc
+        - 2
+        version: 1.2.rc2
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -137,9 +173,8 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
@@ -159,6 +194,8 @@ files:
 - lib/dm-devise/version.rb
 - lib/generators/data_mapper/devise_generator.rb
 - test/data_mapper/compatibility_test.rb
+- test/data_mapper/schema_test.rb
+- test/generators/data_mapper_generator_test.rb
 - test/orm/data_mapper.rb
 - test/orm/data_mapper_active_model.rb
 - test/overrides/data_mapper_test.rb
@@ -172,12 +209,12 @@ files:
 - test/rails_app/config/environment.rb
 - test/test_helper.rb
 has_rdoc: true
-homepage: http://github.com/jm81/dm-devise
+homepage: https://github.com/jm81/dm-devise
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -203,21 +240,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
-summary: Support for using DataMapper ORM with devise
-test_files: 
-- test/test_helper.rb
-- test/data_mapper/compatibility_test.rb
-- test/rails_app/config/environment.rb
-- test/rails_app/config/application.rb
-- test/rails_app/app/data_mapper/admin.rb
-- test/rails_app/app/data_mapper/shim.rb
-- test/rails_app/app/data_mapper/user.rb
-- test/rails_app/app/data_mapper_active_model/admin.rb
-- test/rails_app/app/data_mapper_active_model/user.rb
-- test/overrides/data_mapper_test.rb
-- test/overrides/dm_validations_test.rb
-- test/orm/data_mapper.rb
-- test/orm/data_mapper_active_model.rb
+summary: DataMapper support for devise
+test_files: []
+