dm-devise 1.1.3 → 1.1.4

data/Gemfile

@@ -1,20 +1,16 @@
 source :rubygems
 
+gemspec
+
 gem "rails", '3.0.0'
 
-gem "warden", "0.10.7"
 gem "webrat", "0.7.0"
 gem "mocha", :require => false
-gem "bcrypt-ruby", :require => "bcrypt"
 gem "oauth2"
 
-gem 'dm-core',           '~> 1.0.2'
-gem 'dm-migrations',     '~> 1.0.2'
+gem 'sugar-high',        '~> 0.2.10'
 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.2'
+  gem 'dm-validations',    '~> 1.0.0'
 end

data/Gemfile.lock

@@ -1,3 +1,16 @@
+PATH
+  remote: .
+  specs:
+    dm-devise (1.1.3)
+      bcrypt-ruby (~> 2.1.2)
+      devise (~> 1.1.0)
+      dm-core (~> 1.0.0)
+      dm-migrations (~> 1.0.0)
+      dm-rails (>= 1.0.3)
+      dm-serializer (~> 1.0.0)
+      dm-timestamps (~> 1.0.0)
+      sugar-high (~> 0.2.10)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -28,13 +41,16 @@ GEM
       activemodel (= 3.0.0)
       activesupport (= 3.0.0)
     activesupport (3.0.0)
-    addressable (2.2.0)
+    addressable (2.2.2)
     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)
+    devise (1.1.3)
+      bcrypt-ruby (~> 2.1.2)
+      warden (~> 0.10.7)
     dm-active_model (1.0.2)
       activemodel (~> 3.0.0)
       dm-core (~> 1.0.2)
@@ -74,7 +90,7 @@ GEM
     fastercsv (1.5.3)
     i18n (0.4.1)
     json_pure (1.4.6)
-    mail (2.2.5)
+    mail (2.2.7)
       activesupport (>= 2.3.6)
       mime-types
       treetop (>= 1.4.5)
@@ -90,7 +106,7 @@ GEM
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.4)
+    rack-test (0.5.6)
       rack (>= 1.0)
     rails (3.0.0)
       actionmailer (= 3.0.0)
@@ -106,7 +122,11 @@ GEM
       rake (>= 0.8.4)
       thor (~> 0.14.0)
     rake (0.8.7)
-    thor (0.14.0)
+    require_all (1.2.0)
+    sugar-high (0.2.12)
+      mocha (~> 0.9.8)
+      require_all (~> 1.2.0)
+    thor (0.14.3)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
@@ -121,16 +141,18 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bcrypt-ruby
-  dm-core (~> 1.0.2)
-  dm-migrations (~> 1.0.2)
-  dm-rails (~> 1.0.3)
-  dm-serializer (~> 1.0.2)
+  bcrypt-ruby (~> 2.1.2)
+  devise (~> 1.1.0)
+  dm-core (~> 1.0.0)
+  dm-devise!
+  dm-migrations (~> 1.0.0)
+  dm-rails (>= 1.0.3)
+  dm-serializer (~> 1.0.0)
   dm-sqlite-adapter (~> 1.0.2)
-  dm-timestamps (~> 1.0.2)
-  dm-validations (~> 1.0.2)
+  dm-timestamps (~> 1.0.0)
+  dm-validations (~> 1.0.0)
   mocha
   oauth2
   rails (= 3.0.0)
-  warden (= 0.10.7)
+  sugar-high (~> 0.2.10)
   webrat (= 0.7.0)

data/README.rdoc

@@ -22,7 +22,7 @@ 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 0f0eb4e8cee4c1f042ffdbc4f77e755c757920a8
+Last tested against devise master: 2010-09-25, commit 2aa1d2f3b76ce87c087a010c02d78a1156ac8669
 
 == Installation
 

data/Rakefile

@@ -55,13 +55,12 @@ begin
     gem.authors = ["Jared Morgan"]
     gem.add_dependency 'dm-core',        '~> 1.0.0'
     gem.add_dependency 'dm-migrations',  '~> 1.0.0'
-    gem.add_dependency 'dm-validations', '~> 1.0.0'
     gem.add_dependency 'dm-serializer',  '~> 1.0.0'
     gem.add_dependency 'dm-timestamps',  '~> 1.0.0'
     gem.add_dependency 'dm-rails',       '>= 1.0.3'
     gem.add_dependency 'devise',         '~> 1.1.0'
-    gem.add_dependency 'warden',         '~> 0.10.7'
     gem.add_dependency 'bcrypt-ruby',    '~> 2.1.2'
+    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

data/dm-devise.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-devise}
-  s.version = "1.1.3"
+  s.version = "1.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jared Morgan"]
-  s.date = %q{2010-09-08}
+  s.date = %q{2010-10-16}
   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 = [
@@ -76,34 +76,31 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0"])
       s.add_runtime_dependency(%q<dm-migrations>, ["~> 1.0.0"])
-      s.add_runtime_dependency(%q<dm-validations>, ["~> 1.0.0"])
       s.add_runtime_dependency(%q<dm-serializer>, ["~> 1.0.0"])
       s.add_runtime_dependency(%q<dm-timestamps>, ["~> 1.0.0"])
       s.add_runtime_dependency(%q<dm-rails>, [">= 1.0.3"])
       s.add_runtime_dependency(%q<devise>, ["~> 1.1.0"])
-      s.add_runtime_dependency(%q<warden>, ["~> 0.10.7"])
       s.add_runtime_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
+      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.10"])
     else
       s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
       s.add_dependency(%q<dm-migrations>, ["~> 1.0.0"])
-      s.add_dependency(%q<dm-validations>, ["~> 1.0.0"])
       s.add_dependency(%q<dm-serializer>, ["~> 1.0.0"])
       s.add_dependency(%q<dm-timestamps>, ["~> 1.0.0"])
       s.add_dependency(%q<dm-rails>, [">= 1.0.3"])
       s.add_dependency(%q<devise>, ["~> 1.1.0"])
-      s.add_dependency(%q<warden>, ["~> 0.10.7"])
       s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
+      s.add_dependency(%q<sugar-high>, ["~> 0.2.10"])
     end
   else
     s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
     s.add_dependency(%q<dm-migrations>, ["~> 1.0.0"])
-    s.add_dependency(%q<dm-validations>, ["~> 1.0.0"])
     s.add_dependency(%q<dm-serializer>, ["~> 1.0.0"])
     s.add_dependency(%q<dm-timestamps>, ["~> 1.0.0"])
     s.add_dependency(%q<dm-rails>, [">= 1.0.3"])
     s.add_dependency(%q<devise>, ["~> 1.1.0"])
-    s.add_dependency(%q<warden>, ["~> 0.10.7"])
     s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
+    s.add_dependency(%q<sugar-high>, ["~> 0.2.10"])
   end
 end
 

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

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

data/lib/dm-devise/version.rb

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

data/lib/generators/data_mapper/devise_generator.rb

@@ -1,4 +1,5 @@
 require 'generators/devise/orm_helpers'
+require 'sugar-high/file'
 
 module DataMapper
   module Generators
@@ -12,6 +13,11 @@ module DataMapper
       def inject_devise_content
         inject_into_file model_path, model_contents, :after => "include DataMapper::Resource\n"
       end
+
+      def replace_default_devise_orm
+        devise_init_file = File.join(Rails.root, 'config', 'initializers', 'devise.rb')
+        File.replace_content_from devise_init_file, :where => 'orm/active_record', :with => 'orm/data_mapper'
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-devise
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 1
-  - 3
-  version: 1.1.3
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - Jared Morgan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-08 00:00:00 -05:00
+date: 2010-10-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,7 +51,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: dm-validations
+  name: dm-serializer
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -67,7 +67,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: dm-serializer
+  name: dm-timestamps
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -82,26 +82,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: dm-timestamps
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :runtime
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: dm-rails
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -113,11 +97,11 @@ dependencies:
         - 3
         version: 1.0.3
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: devise
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -129,39 +113,39 @@ dependencies:
         - 0
         version: 1.1.0
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: warden
+  name: bcrypt-ruby
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 57
+        hash: 15
         segments: 
-        - 0
-        - 10
-        - 7
-        version: 0.10.7
+        - 2
+        - 1
+        - 2
+        version: 2.1.2
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: bcrypt-ruby
+  name: sugar-high
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
+        - 0
         - 2
-        - 1
-        - 2
-        version: 2.1.2
+        - 10
+        version: 0.2.10
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id008
 description: dm-devise adds DataMapper support to devise (http://github.com/plataformatec/devise) for authentication support for Rails
 email: jmorgan@morgancreative.net
 executables: []