dm-devise 1.1.4 → 1.1.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dm-devise (1.1.3)
+    dm-devise (1.1.4)
       bcrypt-ruby (~> 2.1.2)
       devise (~> 1.1.0)
       dm-core (~> 1.0.0)

data/README.rdoc

@@ -20,9 +20,7 @@ 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 release: v1.1.1
-
-Last tested against devise master: 2010-09-25, commit 2aa1d2f3b76ce87c087a010c02d78a1156ac8669
+Last tested against devise release: v1.1.3
 
 == Installation
 

data/dm-devise.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-devise}
-  s.version = "1.1.4"
+  s.version = "1.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jared Morgan"]
-  s.date = %q{2010-10-16}
+  s.date = %q{2010-11-12}
   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 = [
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
      "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/orm/data_mapper.rb",
      "test/orm/data_mapper_active_model.rb",
      "test/overrides/data_mapper_test.rb",
@@ -55,6 +56,7 @@ Gem::Specification.new do |s|
   s.summary = %q{Support for using DataMapper ORM with devise}
   s.test_files = [
     "test/test_helper.rb",
+     "test/data_mapper/schema_test.rb",
      "test/data_mapper/compatibility_test.rb",
      "test/rails_app/config/environment.rb",
      "test/rails_app/config/application.rb",

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

@@ -28,6 +28,8 @@ module Devise
           if String == type && !options[:length]
             options[:length] = 255
           end
+          
+          options[:required] ||= false
 
           options.delete(:default) if options[:default].nil?
           property name, type, options

data/lib/dm-devise/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Devise
-    VERSION = '1.1.4'.freeze
+    VERSION = '1.1.5'.freeze
   end
 end

data/test/data_mapper/schema_test.rb

@@ -0,0 +1,13 @@
+require 'test_helper'
+
+class DataMapperSchemaTest < ActiveSupport::TestCase
+  test 'required explicitly set to false' do
+    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?
+    DataMapper::Property.required(false)
+  end
+end

data/test/overrides/dm_validations_test.rb

@@ -29,13 +29,13 @@ if DEVISE_ORM == :data_mapper
 
   class AuthenticationOthersTest < ActionController::IntegrationTest
 
-    undef test_registration_in_xml_format_works_when_recognizing_path
+    undef test_registration_in_xml_format
 
     # 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.
-    test 'registration in xml format works when recognizing path' do
+    test 'registration in xml format' do
       assert_nothing_raised do
         # post user_registration_path(:format => 'xml', :user => {:email => "test@example.com", :password => "invalid"} )
         post user_registration_path(:format => 'xml', :user => {:email => "test@example.com", :password => "invalid", :password_confirmation => "invalid"} )

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

@@ -1,11 +1,10 @@
-require 'shared_admin'
-
 class Admin
   include DataMapper::Resource
 
   property :id,   Serial
   property :username, String
-
-  include SharedAdmin
+  
   include Shim
+  
+  devise :database_authenticatable, :timeoutable, :registerable, :recoverable, :lockable, :unlock_strategy => :time
 end

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

@@ -1,5 +1,3 @@
-require 'shared_user'
-
 class User
   include DataMapper::Resource
 
@@ -8,7 +6,10 @@ class User
   property :facebook_token, String
   timestamps :at
 
-  include SharedUser
+  devise :database_authenticatable, :confirmable, :lockable, :recoverable,
+         :registerable, :rememberable, :timeoutable, :token_authenticatable,
+         :trackable, :validatable
+
   include Shim
 
   before :valid?, :update_password_confirmation

data/test/rails_app/app/data_mapper_active_model/admin.rb

@@ -1,4 +1,3 @@
-require 'shared_admin'
 require File.join(File.dirname(__FILE__), '../data_mapper/shim.rb')
 
 class Admin
@@ -7,6 +6,7 @@ class Admin
   property :id,   Serial
   property :username, String
 
-  include SharedAdmin
   include Shim
+
+  devise :database_authenticatable, :timeoutable, :registerable, :recoverable, :lockable, :unlock_strategy => :time
 end

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

@@ -1,4 +1,3 @@
-require 'shared_user'
 require File.join(File.dirname(__FILE__), '../data_mapper/shim.rb')
 
 class User
@@ -9,6 +8,9 @@ class User
   property :facebook_token, String
   timestamps :at
 
-  include SharedUser
+  devise :database_authenticatable, :confirmable, :lockable, :recoverable,
+         :registerable, :rememberable, :timeoutable, :token_authenticatable,
+         :trackable, :validatable
+
   include Shim
 end

data/test/test_helper.rb

@@ -16,8 +16,6 @@ Webrat.configure do |config|
   config.open_error_files = false
 end
 
-Devise::Oauth.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,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-devise
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 1
-  - 4
-  version: 1.1.4
+  - 5
+  version: 1.1.5
 platform: ruby
 authors: 
 - Jared Morgan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-16 00:00:00 -05:00
+date: 2010-11-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -174,6 +174,7 @@ 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/orm/data_mapper.rb
 - test/orm/data_mapper_active_model.rb
 - test/overrides/data_mapper_test.rb
@@ -222,6 +223,7 @@ specification_version: 3
 summary: Support for using DataMapper ORM with devise
 test_files: 
 - test/test_helper.rb
+- test/data_mapper/schema_test.rb
 - test/data_mapper/compatibility_test.rb
 - test/rails_app/config/environment.rb
 - test/rails_app/config/application.rb