mm-devise 1.1.10 → 1.2

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

@@ -2,25 +2,10 @@ require 'shared_user'
 
 class User
   include MongoMapper::Document
+  include Shim
+  include SharedUser
 
   key :username, String
   key :facebook_token, String
   timestamps!
-
-  include SharedUser
-  include Shim
-
-  unless DEVISE_ORM == :mongo_mapper_active_model
-    before_validation :update_password_confirmation
-
-    # 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.
-    def update_password_confirmation
-      if self.password && self.password_confirmation.nil?
-        self.password_confirmation = self.password
-      end
-    end
-  end 
 end

data/test/test_helper.rb

@@ -8,19 +8,20 @@ require "rails_app/config/environment"
 require "rails/test_help"
 require "orm/#{DEVISE_ORM}"
 
-MongoMapper.connection = Mongo::Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost')
-MongoMapper.database = 'mm-devise-db'
-
 I18n.load_path << "#{DEVISE_PATH}/test/support/locale/en.yml"
-require 'mocha'
 
+require 'mocha'
+require 'webrat'
 Webrat.configure do |config|
   config.mode = :rails
   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 }
+
+# For generators
+require "rails/generators/test_case"
+require "generators/devise/install_generator"
+require "generators/devise/views_generator"

metadata

@@ -1,223 +1,103 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mm-devise
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 10
-  version: 1.1.10
+version: !ruby/object:Gem::Version
+  version: '1.2'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Kristian Mandrup
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-11 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-06-01 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mongo_mapper
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 4
-        version: 0.8.4
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bson
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 9
-        version: 1.0.9
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rails3-generators
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2153491700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 13
-        - 0
-        version: 0.13.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: jnunemaker-validatable
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 8
-        - 1
-        version: 1.8.1
-  type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2153491700
+- !ruby/object:Gem::Dependency
   name: devise
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2153491200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 1
-        version: 1.1.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: sugar-high
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2153491200
+- !ruby/object:Gem::Dependency
+  name: sugar-high
+  requirement: &2153490740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
-  type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: warden
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 10
-        - 7
-        version: 0.10.7
+      - !ruby/object:Gem::Version
+        version: 0.4.3
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: bcrypt-ruby
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 2
-        version: 2.1.2
-  type: :runtime
-  version_requirements: *id008
-description: dm-devise adds MongoMapper support to devise (http://github.com/plataformatec/devise) for authentication support for Rails
-email: jmorgan@morgancreative.net
+  version_requirements: *2153490740
+description: dm-devise adds MongoMapper support to devise (http://github.com/plataformatec/devise)
+  for authentication support for Rails
+email: kmandrup@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.markdown
-files: 
-- .document
-- .gitignore
-- Gemfile
-- LICENSE
-- README.markdown
-- Rakefile
+extra_rdoc_files: []
+files:
 - lib/devise/orm/mongo_mapper.rb
-- lib/devise/orm/mongo_mapper/compatibility.rb
-- lib/devise/orm/mongo_mapper/date_time.rb
-- lib/devise/orm/mongo_mapper/mm-validations.rb
-- lib/devise/orm/mongo_mapper/schema.rb
-- lib/devise/orm/mongo_mapper_active_model.rb
 - lib/generators/mongo_mapper/devise_generator.rb
 - lib/mm-devise/version.rb
+- Changelog.txt
 - mm-devise.gemspec
+- Gemfile
+- LICENSE
+- Rakefile
+- README.markdown
 - test/mongo_mapper/compatibility_test.rb
 - test/orm/mongo_mapper.rb
-- test/orm/mongo_mapper_active_model.rb
-- test/overrides/mm_validations_test.rb
-- test/overrides/mongo_mapper_test.rb
 - test/rails_app/app/mongo_mapper/admin.rb
 - test/rails_app/app/mongo_mapper/shim.rb
 - test/rails_app/app/mongo_mapper/user.rb
-- test/rails_app/app/mongo_mapper_active_model/admin.rb
-- test/rails_app/app/mongo_mapper_active_model/user.rb
 - test/rails_app/config/application.rb
 - test/rails_app/config/environment.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/kristianmandrup/mm-devise
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Support for using MongoMapper ORM with devise
-test_files: 
+test_files:
 - test/mongo_mapper/compatibility_test.rb
 - test/orm/mongo_mapper.rb
-- test/orm/mongo_mapper_active_model.rb
-- test/overrides/mm_validations_test.rb
-- test/overrides/mongo_mapper_test.rb
 - test/rails_app/app/mongo_mapper/admin.rb
 - test/rails_app/app/mongo_mapper/shim.rb
 - test/rails_app/app/mongo_mapper/user.rb
-- test/rails_app/app/mongo_mapper_active_model/admin.rb
-- test/rails_app/app/mongo_mapper_active_model/user.rb
 - test/rails_app/config/application.rb
 - test/rails_app/config/environment.rb
 - test/test_helper.rb

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.gitignore

@@ -1,5 +0,0 @@
-coverage/*
-.bundle
-rdoc/*
-pkg
-log

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

@@ -1,89 +0,0 @@
-module Devise
-  module Orm
-    module MongoMapper
-      module Compatibility
-        extend ActiveSupport::Concern
-
-        extend ActiveSupport::Concern
-        extend ActiveModel::Naming
-
-        include ActiveModel::Serializers::Xml
-        include ActiveModel::Serializers::JSON
-
-        def to_xml(options = {}, &block)
-          options[:except] ||= []
-          options[:except] << :_id
-
-          super options do |b|
-            b.id self.id
-            block.call(b) if block_given?
-          end
-        end
-
-
-        module ClassMethods
-          # Hooks for confirmable
-          def before_create(*args)
-            wrap_hook(:before, :create, *args)
-          end
-
-          def after_create(*args)
-            wrap_hook(:after, :create, *args)
-          end
-
-          def before_save(*args)
-            wrap_hook(:before, :save, *args)
-          end
-
-          def wrap_hook(action, method, *args)
-            options = args.extract_options!
-
-            args.each do |callback|
-              callback_method = :"#{callback}_callback_wrap"
-              send action, method, callback_method
-              class_eval <<-METHOD, __FILE__, __LINE__ + 1
-                def #{callback_method}
-                  #{callback} if #{options[:if] || true}
-                end
-              METHOD
-            end
-          end
-
-          # Add ActiveRecord like finder
-          def find(*args)
-            case args.first
-            when :first, :all
-              send(args.shift, *args)
-            else          
-              where(:'_id' => args.first).first
-            end
-          end
-        end
-
-        # def changed?
-        #   dirty?
-        # end
-=begin
-        def save(options=nil)
-          if options.is_a?(Hash) && options[:validate] == false
-            save!
-          else
-            super()
-          end
-        end
-
-        def update_attribute(name, value)
-          update_attributes(name => value)
-        end
-        # 
-        # def update_attributes(*args)
-        #   update(*args)
-        # end
-=end
-        def invalid?
-          !valid?
-        end
-      end
-    end
-  end
-end

data/lib/devise/orm/mongo_mapper/date_time.rb

@@ -1,14 +0,0 @@
-class Date
-  unless method_defined?(:gmtime)
-    delegate :gmtime, :to => :to_time
-  end
-
-  def utc           
-    Time.zone.parse("#{hour.to_i - zone.to_i}:#{min}:#{sec}")
-    # self.to_datetime.new_offset(0)
-  end
-  
-  def to_i
-    to_time.utc.to_i
-  end
-end