devise 1.4.2 → 1.4.3

data/test/rails_app/config/initializers/devise.rb

@@ -2,7 +2,8 @@
 # four configuration values can also be set straight in your models.
 Devise.setup do |config|
   # ==> Mailer Configuration
-  # Configure the e-mail address which will be shown in DeviseMailer.
+  # Configure the e-mail address which will be shown in Devise::Mailer,
+  # note that it will be overwritten if you use your own mailer class with default "from" parameter.
   config.mailer_sender = "please-change-me@config-initializers-devise.com"
 
   # Configure the class responsible to send e-mails.
@@ -35,7 +36,7 @@ Devise.setup do |config|
   # These keys will be downcased upon creating or modifying a user and when used
   # to authenticate or find a user. Default is :email.
   config.case_insensitive_keys = [ :email ]
-  
+
   # Configure which authentication keys should have whitespace stripped.
   # These keys will have whitespace before and after removed upon creating or
   # modifying a user and when used to authenticate or find a user. Default is :email.

data/test/rails_app/config/routes.rb

@@ -4,7 +4,7 @@ Rails.application.routes.draw do
     get :expire, :on => :member
     get :accept, :on => :member
 
-    authenticate :user do
+    authenticate do
       post :exhibit, :on => :member
     end
   end

data/test/rails_app/lib/shared_user.rb

@@ -7,6 +7,7 @@ module SharedUser
            :trackable, :validatable, :omniauthable
 
     attr_accessor :other_key
+    attr_accessible :username, :email, :password, :password_confirmation, :remember_me
 
     # They need to be included after Devise is called.
     extend ExtendMethods

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 4
-  - 2
-  version: 1.4.2
+  - 3
+  version: 1.4.3
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-30 00:00:00 -03:00
+date: 2011-08-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,12 +59,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 7
         segments: 
-        - 2
-        - 1
-        - 2
-        version: 2.1.2
+        - 3
+        - 0
+        version: "3.0"
   type: :runtime
   version_requirements: *id003
 description: Flexible authentication solution for Rails with Warden
@@ -80,7 +79,6 @@ files:
 - .travis.yml
 - CHANGELOG.rdoc
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -112,7 +110,6 @@ files:
 - lib/devise/controllers/scoped_views.rb
 - lib/devise/controllers/shared_helpers.rb
 - lib/devise/controllers/url_helpers.rb
-- lib/devise/email.rb
 - lib/devise/encryptors/authlogic_sha512.rb
 - lib/devise/encryptors/base.rb
 - lib/devise/encryptors/clearance_sha1.rb
@@ -162,6 +159,7 @@ files:
 - lib/devise/version.rb
 - lib/generators/active_record/devise_generator.rb
 - lib/generators/active_record/templates/migration.rb
+- lib/generators/active_record/templates/migration_existing.rb
 - lib/generators/devise/devise_generator.rb
 - lib/generators/devise/install_generator.rb
 - lib/generators/devise/orm_helpers.rb
@@ -234,6 +232,7 @@ files:
 - test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb
 - test/rails_app/app/controllers/users_controller.rb
 - test/rails_app/app/helpers/application_helper.rb
+- test/rails_app/app/mailers/users/mailer.rb
 - test/rails_app/app/mongoid/admin.rb
 - test/rails_app/app/mongoid/shim.rb
 - test/rails_app/app/mongoid/user.rb
@@ -309,7 +308,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: devise
-rubygems_version: 1.5.3
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Flexible authentication solution for Rails with Warden
@@ -372,6 +371,7 @@ test_files:
 - test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb
 - test/rails_app/app/controllers/users_controller.rb
 - test/rails_app/app/helpers/application_helper.rb
+- test/rails_app/app/mailers/users/mailer.rb
 - test/rails_app/app/mongoid/admin.rb
 - test/rails_app/app/mongoid/shim.rb
 - test/rails_app/app/mongoid/user.rb

data/Gemfile.lock

@@ -1,158 +0,0 @@
-PATH
-  remote: .
-  specs:
-    devise (1.4.1)
-      bcrypt-ruby (~> 2.1.2)
-      orm_adapter (~> 0.0.3)
-      warden (~> 1.0.3)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.7)
-      actionpack (= 3.0.7)
-      mail (~> 2.2.15)
-    actionpack (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activerecord-jdbc-adapter (1.1.1)
-    activerecord-jdbcsqlite3-adapter (1.1.1)
-      activerecord-jdbc-adapter (= 1.1.1)
-      jdbc-sqlite3 (~> 3.6.0)
-    activeresource (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-    activesupport (3.0.7)
-    addressable (2.2.4)
-    arel (2.0.9)
-    bcrypt-ruby (2.1.4)
-    bson (1.3.0)
-    bson_ext (1.3.0)
-    builder (2.1.2)
-    columnize (0.3.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    faraday (0.5.7)
-      addressable (~> 2.2.4)
-      multipart-post (~> 1.1.0)
-      rack (>= 1.1.0, < 2)
-    i18n (0.5.0)
-    jdbc-sqlite3 (3.6.14.2.056-java)
-    linecache (0.43)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    mocha (0.9.12)
-    mongo (1.3.0)
-      bson (>= 1.3.0)
-    mongoid (2.0.1)
-      activemodel (~> 3.0)
-      mongo (~> 1.3)
-      tzinfo (~> 0.3.22)
-      will_paginate (~> 3.0.pre)
-    multi_json (0.0.5)
-    multipart-post (1.1.0)
-    nokogiri (1.4.3.1)
-    nokogiri (1.4.3.1-java)
-      weakling (>= 0.0.3)
-    oa-core (0.2.0)
-      rack (~> 1.1)
-    oa-oauth (0.2.0)
-      multi_json (~> 0.0.2)
-      nokogiri (~> 1.4.2)
-      oa-core (= 0.2.0)
-      oauth (~> 0.4.0)
-      oauth2 (~> 0.1.1)
-    oa-openid (0.2.0)
-      oa-core (= 0.2.0)
-      rack-openid (~> 1.2.0)
-      ruby-openid-apps-discovery
-    oauth (0.4.4)
-    oauth2 (0.1.1)
-      faraday (~> 0.5.0)
-      multi_json (~> 0.0.4)
-    orm_adapter (0.0.5)
-    polyglot (0.3.1)
-    rack (1.2.2)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-openid (1.2.0)
-      rack (>= 1.1.0)
-      ruby-openid (>= 2.1.8)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (3.0.7)
-      actionmailer (= 3.0.7)
-      actionpack (= 3.0.7)
-      activerecord (= 3.0.7)
-      activeresource (= 3.0.7)
-      activesupport (= 3.0.7)
-      bundler (~> 1.0)
-      railties (= 3.0.7)
-    railties (3.0.7)
-      actionpack (= 3.0.7)
-      activesupport (= 3.0.7)
-      rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    ruby-openid (2.1.8)
-    ruby-openid-apps-discovery (1.2.0)
-      ruby-openid (>= 2.1.7)
-    sqlite3 (1.3.3)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    thor (0.14.6)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.27)
-    warden (1.0.4)
-      rack (>= 1.0)
-    weakling (0.0.4-java)
-    webrat (0.7.2)
-      nokogiri (>= 1.2.0)
-      rack (>= 1.0)
-      rack-test (>= 0.5.3)
-    will_paginate (3.0.pre2)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  activerecord-jdbcsqlite3-adapter
-  bson_ext (~> 1.3.0)
-  devise!
-  mocha
-  mongo (~> 1.3.0)
-  mongoid (= 2.0.1)
-  oa-oauth (~> 0.2.0)
-  oa-openid (~> 0.2.0)
-  rails (~> 3.0.7)
-  ruby-debug (>= 0.10.3)
-  sqlite3-ruby
-  webrat (= 0.7.2)

data/lib/devise/email.rb

@@ -1,23 +0,0 @@
-# This e-mail validation regexes were retrieved from SixArm Ruby
-# e-mail validation gem (https://github.com/SixArm/sixarm_ruby_email_address_validation)
-# As said on https://github.com/SixArm/sixarm_ruby_email_address_validation/blob/master/LICENSE.txt,
-# we added it using Ruby license terms.
-
-module Devise
-  module Email
-    QTEXT           = Regexp.new '[^\\x0d\\x22\\x5c\\x80-\\xff]', nil, 'n'
-    DTEXT           = Regexp.new '[^\\x0d\\x5b-\\x5d\\x80-\\xff]', nil, 'n'
-    ATOM            = Regexp.new '[^\\x00-\\x20\\x22\\x28\\x29\\x2c\\x2e\\x3a-\\x3c\\x3e\\x40\\x5b-\\x5d\\x7f-\\xff]+', nil, 'n'
-    QUOTED_PAIR     = Regexp.new '\\x5c[\\x00-\\x7f]', nil, 'n'
-    DOMAIN_LITERAL  = Regexp.new "\\x5b(?:#{DTEXT}|#{QUOTED_PAIR})*\\x5d", nil, 'n'
-    QUOTED_STRING   = Regexp.new "\\x22(?:#{QTEXT}|#{QUOTED_PAIR})*\\x22", nil, 'n'
-    DOMAIN_REF      = ATOM
-    SUB_DOMAIN      = "(?:#{DOMAIN_REF}|#{DOMAIN_LITERAL})"
-    WORD            = "(?:#{ATOM}|#{QUOTED_STRING})"
-    DOMAIN          = "#{SUB_DOMAIN}(?:\\x2e#{SUB_DOMAIN})*"
-    LOCAL_PART      = "#{WORD}(?:\\x2e#{WORD})*"
-    SPEC            = "#{LOCAL_PART}\\x40#{DOMAIN}"
-    PATTERN         = Regexp.new "#{SPEC}", nil, 'n'
-    EXACT_PATTERN   = Regexp.new "\\A#{SPEC}\\z", nil, 'n'
-  end
-end