dm-devise 2.0.1 → 2.1.0

data/CHANGELOG.rdoc

@@ -1,3 +1,21 @@
+== 2.1.0
+
+* deprecations
+  * Remove support for apply_schema
+
+== 2.0.1
+
+* enhancements
+  * DM 1.3.0.beta compatibility (snusnu)
+
+== 2.0.0
+
+* enhancements
+  * Improve Compatibility hook methods
+  * Add Compatibility#email_was
+  * Compatibility#save(:validate => false) - Use _persist instead of save!
+  * Include property statements in generated models
+
 == 1.5.0
 
 * enhancements

data/Gemfile

@@ -15,7 +15,7 @@ end
 DM_VERSION = '~> 1.2.0'
 
 group :development do
-  gem 'rails', '~> 3.1.0'
+  gem 'rails', '~> 3.2.0'
   gem 'dm-sqlite-adapter', DM_VERSION
 
   gem 'dm-core', DM_VERSION

data/README.rdoc

@@ -1,17 +1,21 @@
+*IMPORTANT:* The apply_schema option is removed in dm-devise 2.1. If you are upgrading, please read: https://github.com/jm81/dm-devise/wiki/How-to:-upgrade-to-devise-2.0-schema-style
+
+*IMPORTANT:* Devise 2.1 is out. If you are upgrading, please read: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.1
+
+*IMPORTANT:* Devise 2.0 is out. If you are upgrading, please read: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.0
+
 = dm-devise
 
 dm-devise lets you use devise (http://github.com/plataformatec/devise) with
 DataMapper.
 
-dm-devise is intended for use with Rails 3 and devise >= 1.1. It may work with
-earlier versions, but it's not been tested (if you try, please let Jared Morgan
-(http://github.com/jm81) know how it goes.)
+dm-devise is intended for use with Rails >= 3.2 and devise >= 2.1.
 
 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: 2012-02-13, commit aa36719bd95971d49e27e2091ad08af067355cce
-Last tested against devise release 2.0.1, 1.5.3
+Last tested against devise master: 2012-05-17, commit f6259531c36795be2766ffefd50de1f8803fc5cd
+Last tested against devise release 2.1.0
 
 == Installation
 
@@ -23,7 +27,7 @@ Add dm-devise and dm gems to your Gemfile. The following gems are required:
   gem 'dm-timestamps',     '~> 1.2.0'
   gem 'dm-rails',          '~> 1.2.0'
   gem 'dm-validations',    '~> 1.2.0' # Do not include if using data_mapper_active_model
-  gem 'dm-devise',         '~> 2.0.1'
+  gem 'dm-devise',         '~> 2.1.0'
 
 If you're using Active Model validations, do not include dm-validations in your
 Gemfile.
@@ -75,11 +79,6 @@ active_model::
   The advantage to this is Active Model's I18n support for error messages, and
   it uses the same validations lib as devise does by default.
 
-=== apply_schema
-
-Tells if dm-devise should apply the devise database schema. You may want to
-set this to false if working with a legacy schema.
-
 === data_mapper_validation_messages
 
 Messages to use as the default DataMapper validation error messages. The

data/lib/devise/orm/data_mapper.rb

@@ -1,8 +1,6 @@
 require 'dm-devise'
 require 'devise/orm/data_mapper/compatibility'
-require 'devise/orm/data_mapper/schema'
 require 'devise/orm/data_mapper/date_time'
-require 'devise/orm/data_mapper/serializable'
 require 'devise/orm/data_mapper/validations/dm-validations'
 require 'devise/orm/data_mapper/validations/active_model'
 require 'orm_adapter/adapters/data_mapper'
@@ -12,8 +10,6 @@ module Devise
     module DataMapper
       module Hook
         def devise_modules_hook!
-          extend Schema
-
           if Devise.data_mapper_validation_lib == 'active_model'
             include ActiveModel::Validations
             include ActiveModelCompatibility
@@ -23,8 +19,6 @@ module Devise
           include Compatibility
 
           yield
-          return unless Devise.apply_schema
-          devise_modules.each { |m| send(m) if respond_to?(m, true) }
         end
       end
     end

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

@@ -64,6 +64,23 @@ module Devise
         def email_was
           original_attributes[:email]
         end
+        
+        # Redefine properties_to_serialize in models for more secure defaults.
+        # By default, it removes from the serializable model all attributes that
+        # are *not* accessible. You can remove this default by using :force_exclude
+        # and passing a new list of attributes you want to exempt. All attributes
+        # given to :exclude will simply add names to exempt to Devise internal list.
+        def properties_to_serialize(options=nil)
+          options ||= {}
+          if options.key?(:force_except) || options.key?(:force_exclude)
+            options[:exclude] = options.delete(:force_except) || options.delete(:force_exclude)
+            super(options)
+          else
+            blacklist = Devise::Models::Authenticatable.const_defined?(:BLACKLIST_FOR_SERIALIZATION) ? Devise::Models::Authenticatable::BLACKLIST_FOR_SERIALIZATION : []
+            except = Array(options[:exclude]) + Array(options[:except]) + blacklist
+            super(options.merge(:exclude => except))
+          end
+        end
       end
     end
   end

data/lib/dm-devise/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Devise
-    VERSION = '2.0.1'.freeze
+    VERSION = '2.1.0'.freeze
   end
 end

data/lib/generators/data_mapper/devise_generator.rb

@@ -53,6 +53,9 @@ module DataMapper
 
   ## Token authenticatable
   # property :authentication_token, String, :length => 255
+
+  ## Invitable
+  # property :invitation_token, String, :length => 255
 RUBY
       end
     end

data/lib/generators/data_mapper/devise_install_generator.rb

@@ -19,13 +19,7 @@ module DataMapper
 VALIDATIONS
         inject_into_file devise_init_file, validations, :before => '  # ==> ORM configuration'
 
-        data_mapper_options = <<APPLY_SCHEMA
-
-  # ==> Apply Schema
-  # Tells if dm-devise should apply the devise database schema via property
-  # declarations. You may want to set this to false if working with a legacy
-  # schema.
-  # config.apply_schema = true
+        data_mapper_options = <<OPTIONS
 
   # ==> dm-validations Default Error Messages
   # Messages to use as the default DataMapper validation error messages. The
@@ -35,7 +29,7 @@ VALIDATIONS
   # :not_locked, and :expired). If set to false, the messages are left as
   # defined by the dm-validations gem. See dm-devise.rb for default.
   # config.data_mapper_validation_messages = {}
-APPLY_SCHEMA
+OPTIONS
       inject_into_file devise_init_file, data_mapper_options, :after => "orm/data_mapper'\n"
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-devise
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000 Z
+date: 2012-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
-  requirement: &73066270 !ruby/object:Gem::Requirement
+  requirement: &84857470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *73066270
+  version_requirements: *84857470
 - !ruby/object:Gem::Dependency
   name: dm-migrations
-  requirement: &73065590 !ruby/object:Gem::Requirement
+  requirement: &84857070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,10 +38,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *73065590
+  version_requirements: *84857070
 - !ruby/object:Gem::Dependency
   name: dm-serializer
-  requirement: &73065090 !ruby/object:Gem::Requirement
+  requirement: &84856700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -52,10 +52,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *73065090
+  version_requirements: *84856700
 - !ruby/object:Gem::Dependency
   name: dm-timestamps
-  requirement: &73064350 !ruby/object:Gem::Requirement
+  requirement: &84856330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *73064350
+  version_requirements: *84856330
 - !ruby/object:Gem::Dependency
   name: dm-rails
-  requirement: &73063600 !ruby/object:Gem::Requirement
+  requirement: &84855950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -80,10 +80,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *73063600
+  version_requirements: *84855950
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &73062940 !ruby/object:Gem::Requirement
+  requirement: &84855550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -91,7 +91,7 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *73062940
+  version_requirements: *84855550
 description: dm-devise adds DataMapper support to devise (http://github.com/plataformatec/devise)
   for authentication support for Rails
 email: jmorgan@morgancreative.net
@@ -110,8 +110,6 @@ files:
 - 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/schema.rb
-- lib/devise/orm/data_mapper/serializable.rb
 - lib/devise/orm/data_mapper/validations/active_model.rb
 - lib/devise/orm/data_mapper/validations/dm-validations.rb
 - lib/devise/orm/data_mapper_active_model.rb
@@ -120,7 +118,6 @@ files:
 - lib/generators/data_mapper/devise_generator.rb
 - lib/generators/data_mapper/devise_install_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/overrides/data_mapper_test.rb

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

@@ -1,41 +0,0 @@
-require 'dm-devise'
-require 'devise/schema'
-
-module Devise
-  module Orm
-    module DataMapper
-      module Schema
-        include Devise::Schema
-
-        SCHEMA_OPTIONS = {
-          :null  => :required,
-          :limit => :length
-        }
-
-        # 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
-              # :required is opposite of :null
-              options[new_key] = !options.delete(old_key)
-            else
-              options[new_key] = options.delete(old_key)
-            end
-          end
-
-          if String == type && !options[:length]
-            options[:length] = 255
-          end
-
-          options[:required] ||= false
-
-          options.delete(:default) if options[:default].nil?
-          property name, type, options
-        end
-      end
-    end
-  end
-end

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

@@ -1,36 +0,0 @@
-module Devise
-  module Models
-    # This module redefines properties_to_serialize in models for more
-    # secure defaults. By default, it removes from the serializable model
-    # all attributes whose writer or reader is *not* public. You can remove this default
-    # by using :force_except and passing a new list of attributes you want
-    # to exempt. All attributes given to :exclude will simply add names to
-    # exempt to Devise internal list.
-    module Serializable
-      extend ActiveSupport::Concern
-
-      def properties_to_serialize(options=nil)
-        options ||= {}
-        if options.key?(:force_except) || options.key?(:force_exclude)
-          options[:exclude] = options.delete(:force_except) || options.delete(:force_exclude)
-          super(options)
-        else
-          except = Array(options[:exclude]) + Array(options[:except])
-          super(options.merge(:exclude => except + self.class.blacklist_keys))
-        end
-      end
-
-      # Get back to DataMapper's #to_xml.
-      def to_xml(*args)
-        super
-      end
-
-      module ClassMethods
-        # Returns keys that should be removed when serializing the record.
-        def blacklist_keys
-          @blacklist_keys ||= properties.select { |property| property.reader_visibility != :public || property.writer_visibility != :public }.map(&:name)
-        end
-      end
-    end
-  end
-end

data/test/data_mapper/schema_test.rb

@@ -1,16 +0,0 @@
-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