dm-devise 1.1.1 → 1.1.2

data/Gemfile

@@ -13,7 +13,7 @@ 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-rails',          '~> 1.0.0', :git => 'git://github.com/datamapper/dm-rails'
+gem 'dm-rails',          '~> 1.0.3'
 
 group :data_mapper do
   gem 'dm-validations',    '~> 1.0.0'

data/Gemfile.lock

@@ -1,14 +1,3 @@
-GIT
-  remote: git://github.com/datamapper/dm-rails
-  revision: e2ee760
-  specs:
-    dm-rails (1.0.0)
-      actionpack (~> 3.0.0.beta3)
-      activesupport (~> 3.0.0.beta3)
-      dm-active_model (~> 1.0.0)
-      dm-core (~> 1.0.0)
-      railties (~> 3.0.0.beta3)
-
 GIT
   remote: git://github.com/rails/rails.git
   revision: 4952a80
@@ -75,6 +64,12 @@ GEM
       dm-core (~> 1.0.0)
     dm-migrations (1.0.0)
       dm-core (~> 1.0.0)
+    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)
       fastercsv (~> 1.5.3)
@@ -134,7 +129,7 @@ DEPENDENCIES
   bcrypt-ruby
   dm-core (~> 1.0.0)
   dm-migrations (~> 1.0.0)
-  dm-rails (~> 1.0.0)!
+  dm-rails (~> 1.0.3)
   dm-serializer (~> 1.0.0)
   dm-sqlite-adapter (~> 1.0.0)
   dm-timestamps (~> 1.0.0)

data/README.rdoc

@@ -22,27 +22,22 @@ 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-04, commit c0c7aefce4a2a0ba2b85c1185abf73cb213cd79c
+Last tested against devise master: 2010-08-14, commit 81c49c69df752a6c8c408d660768442911b324f4
 
 == Installation
 
-Add devise, dm-devise and dm gems to your Gemfile. The following gems are
-required (although devise version may differ)
+Add dm-devise and dm gems to your Gemfile. The following gems are required:
 
   gem 'dm-core',           '~> 1.0.0'
-  gem 'dm-migrations',     '~> 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-rails',          '~> 1.0.0', :git => 'git://github.com/datamapper/dm-rails'
+  gem 'dm-rails',          '~> 1.0.3'
   gem 'dm-validations',    '~> 1.0.0' # Do not include if using data_mapper_active_model
-
-  gem 'devise',            '~> 1.1.1'
   gem 'dm-devise',         '~> 1.1.0'
 
 If you're using data_mapper_active_model do not include dm-validations in your
-Gemfile. Note that it's fine to follow master on DM gems other than dm-rails,
-but dm-rails is the only one where it's needed.
+Gemfile.
 
 Run the generator:
 

data/Rakefile

@@ -58,8 +58,8 @@ begin
     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.0'
-    gem.add_dependency 'devise'
+    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 is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/dm-devise.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-devise}
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jared Morgan"]
-  s.date = %q{2010-08-05}
+  s.date = %q{2010-08-14}
   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 = [
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
      "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",
@@ -78,8 +79,8 @@ Gem::Specification.new do |s|
       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.0"])
-      s.add_runtime_dependency(%q<devise>, [">= 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"])
     else
@@ -88,8 +89,8 @@ Gem::Specification.new do |s|
       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.0"])
-      s.add_dependency(%q<devise>, [">= 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"])
     end
@@ -99,8 +100,8 @@ Gem::Specification.new do |s|
     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.0"])
-    s.add_dependency(%q<devise>, [">= 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"])
   end

data/lib/devise/orm/data_mapper.rb

@@ -1,3 +1,4 @@
+require 'dm-devise'
 require 'devise/orm/data_mapper/compatibility'
 require 'devise/orm/data_mapper/schema'
 require 'devise/orm/data_mapper/date_time'

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

@@ -1,3 +1,6 @@
+require 'dm-devise'
+require 'devise/schema'
+
 module Devise
   module Orm
     module DataMapper

data/lib/devise/orm/data_mapper_active_model.rb

@@ -1,3 +1,4 @@
+require 'dm-devise'
 require 'devise/orm/data_mapper/compatibility'
 require 'devise/orm/data_mapper/schema'
 require 'devise/orm/data_mapper/date_time'

data/lib/dm-devise.rb

@@ -0,0 +1,7 @@
+require 'devise'
+require 'dm-core'
+require 'dm-serializer'
+require 'dm-timestamps'
+require 'dm-rails'
+
+require 'dm-devise/version'

data/lib/dm-devise/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-devise
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Jared Morgan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-05 00:00:00 -05:00
+date: 2010-08-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,14 +104,14 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 17
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 3
+        version: 1.0.3
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -120,12 +120,14 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 19
         segments: 
+        - 1
+        - 1
         - 0
-        version: "0"
+        version: 1.1.0
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -184,6 +186,7 @@ files:
 - 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