devise-encryptable 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dd60f2dee3a54f8dcd5c04c1d8821c93097a24a
-  data.tar.gz: 50fbc07c6d0de371c73aca7965594c80e67b3b2a
+  metadata.gz: fbf15fb45c05086d7ec5401a7920083b11d737ad
+  data.tar.gz: fa2127c87a91d1bc21403a62c99dc862e446538e
 SHA512:
-  metadata.gz: a43d94fb24dae5c551909347591411f0c3c5331a96c78c68559d11ca0b055998a6c94b7c188da1a28b19c8d5d2e596f7fb8474e54cf58ac772dc7ad90333d652
-  data.tar.gz: 757a66eb7ec1f1c1144a457cc8d09b6080ccadc23b7c76fda99dc27a6ffa717eb8451cdb60c6f573461afc88c6ce490b09e39c34e5e9b5ad809a8c306b9a4bf3
+  metadata.gz: 8d207edf83450e9b80d72b9db78393bc1b9aa6f7b6c8dcfa0796565f130d331f863af1b8327ec14d0809268bc7e30b815f4709666c04cae1af46e54cedcde186
+  data.tar.gz: 3f327acac4b9521847aef71c6976d3c411c8ac2a9ffbe9bb639b8f6b7090fba6f39ff0a5ca6465f5b7e63a4b008eccebbd69b620a1456dca3a2bdb4841ba7577

data/Changelog.md

@@ -1,4 +1,16 @@
-## Devise changelog
+### Unreleased.
 
-## trunk (0.0.1)
-  * Added the encryptable module and the encryptors from Devise. 
+* Updated to Rails 4+.
+* Dropped compatibility with Rails 3.1 and Ruby 1.8.
+
+### 0.1.2
+
+* Devise dependency locked at `2.1.x`.
+
+### 0.1.1
+
+*  Initial support for Devise `2.1.0.rc`.
+
+### 0.1.0
+
+* Added the encryptable module and the encryptors from Devise.

data/LICENSE

@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
    same "printed page" as the copyright notice for easier
    identification within third-party archives.
 
-Copyright 2012 Plataformatec (contact@plataformatec.com.br)
+Copyright 2012-2014 Plataformatec (opensource@plataformatec.com.br)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -198,4 +198,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.

data/README.md

@@ -42,4 +42,4 @@ And you're ready to go!
 
 ## License
 
-Apache License version 2. Copyright 2012-2013 Plataformatec http://plataformatec.com.br
+Apache License version 2. Copyright 2012-2014 Plataformatec http://plataformatec.com.br

data/lib/devise/encryptable/encryptors/base.rb

@@ -9,8 +9,8 @@ module Devise
   module Encryptable
     module Encryptors
       class Base
-        def self.digest
-          raise NotImplemented
+        def self.digest(password, stretches, salt, pepper)
+          raise NotImplementedError
         end
 
         def self.salt(stretches)

data/lib/devise/encryptable/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Encryptable
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

data/test/devise/encryptable/encryptable_test.rb

@@ -10,7 +10,7 @@ class EncryptableTest < ActiveSupport::TestCase
   end
 
   test 'should generate salt while setting password' do
-    assert_present create_admin.password_salt
+    assert create_admin.password_salt.present?
   end
 
   test 'should not change password salt when updating' do
@@ -23,7 +23,12 @@ class EncryptableTest < ActiveSupport::TestCase
 
   test 'should generate a base64 hash using SecureRandom for password salt' do
     swap_with_encryptor Admin, :sha1 do
-      SecureRandom.expects(:base64).with(15).returns('01lI').once
+      # Devise 3.1+ uses a different method to generate friendly tokens,
+      # when we drop support for Devise 2 we can remove this hack.
+      # https://github.com/plataformatec/devise/commit/4048545151fe467c9d8c8c6fce164788bb36e25f.
+      expected_method = Devise::VERSION >= '3.1.0' ? :urlsafe_base64 : :base64
+
+      SecureRandom.expects(expected_method).with(15).returns('01lI').once
       salt = create_admin.password_salt
       assert_not_equal '01lI', salt
       assert_equal 4, salt.size
@@ -31,8 +36,8 @@ class EncryptableTest < ActiveSupport::TestCase
   end
 
   test 'should not generate salt if password is blank' do
-    assert_blank create_admin(:password => nil).password_salt
-    assert_blank create_admin(:password => '').password_salt
+    assert create_admin(:password => nil).password_salt.blank?
+    assert create_admin(:password => '').password_salt.blank?
   end
 
   test 'should encrypt password again if password has changed' do
@@ -62,4 +67,4 @@ class EncryptableTest < ActiveSupport::TestCase
       :password_salt
     ]
   end
-end
+end

data/test/devise/encryptable/encryptors_test.rb

@@ -21,6 +21,13 @@ class Encryptors < ActiveSupport::TestCase
     assert_equal clearance, encryptor
   end
 
+  test 'digest should raise NotImplementedError if not implemented in subclass' do
+    c = Class.new(Devise::Encryptable::Encryptors::Base)
+    assert_raise(NotImplementedError) do
+      c.digest('quux', 10, 'foo', 'bar')
+    end
+  end
+
   Devise::ENCRYPTORS_LENGTH.each do |key, value|
     test "should have length #{value} for #{key.inspect}" do
       swap Devise, :encryptor => key do
@@ -29,4 +36,4 @@ class Encryptors < ActiveSupport::TestCase
       end
     end
   end
-end
+end

data/test/rails_app/app/models/admin.rb

@@ -1,5 +1,3 @@
 class Admin < ActiveRecord::Base
   devise :database_authenticatable, :encryptable
-
-  attr_accessible :email, :password, :password_confirmation
-end
+end

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

@@ -1,5 +1,3 @@
 class User < ActiveRecord::Base
   devise :database_authenticatable, :encryptable
-
-  attr_accessible :email, :password, :password_confirmation
-end
+end

data/test/rails_app/config/application.rb

@@ -44,12 +44,6 @@ module RailsApp
     # like if you have constraints or database-specific column types
     # config.active_record.schema_format = :sql
 
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
-
     # Enable the asset pipeline
     config.assets.enabled = true
 

data/test/rails_app/config/environments/development.rb

@@ -5,9 +5,7 @@ RailsApp::Application.configure do
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
-
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

data/test/rails_app/config/environments/test.rb

@@ -6,14 +6,12 @@ RailsApp::Application.configure do
   # your test database is "scratch space" for the test suite and is wiped
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
+  config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false

data/test/test_helper.rb

@@ -1,15 +1,13 @@
 ENV["RAILS_ENV"] = "test"
 require "devise"
+require "devise/version"
 require "active_support/core_ext/module/attribute_accessors"
 
 require "devise/encryptable/encryptable"
 
-require "minitest/autorun"
-require "minitest/unit"
-
-require "mocha/setup"
-
 require "rails_app/config/environment"
+require "rails/test_help"
+require "mocha/setup"
 
 require 'support/assertions'
 require 'support/factories'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise-encryptable
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Carlos Antonio da Silva
@@ -10,39 +10,31 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
 description: Encryption solution for salted-encryptors on Devise
-email: contact@plataformatec.com.br
+email: opensource@plataformatec.com.br
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
 - Changelog.md
-- Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
-- Rakefile
-- devise-encryptable.gemspec
-- gemfiles/Gemfile.rails-3.1.x
-- gemfiles/Gemfile.rails-3.1.x.lock
 - lib/devise-encryptable.rb
 - lib/devise/encryptable/encryptable.rb
 - lib/devise/encryptable/encryptors/authlogic_sha512.rb
@@ -55,16 +47,11 @@ files:
 - lib/devise/encryptable/version.rb
 - test/devise/encryptable/encryptable_test.rb
 - test/devise/encryptable/encryptors_test.rb
-- test/rails_app/.gitignore
-- test/rails_app/Rakefile
 - test/rails_app/app/controllers/application_controller.rb
-- test/rails_app/app/models/.gitkeep
 - test/rails_app/app/models/admin.rb
 - test/rails_app/app/models/user.rb
-- test/rails_app/config.ru
 - test/rails_app/config/application.rb
 - test/rails_app/config/boot.rb
-- test/rails_app/config/database.yml
 - test/rails_app/config/environment.rb
 - test/rails_app/config/environments/development.rb
 - test/rails_app/config/environments/production.rb
@@ -76,7 +63,8 @@ files:
 - test/support/swappers.rb
 - test/test_helper.rb
 homepage: http://github.com/plataformatec/devise-encryptable
-licenses: []
+licenses:
+- Apache 2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -84,33 +72,28 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Encryption solution for salted-encryptors on Devise
 test_files:
 - test/devise/encryptable/encryptable_test.rb
 - test/devise/encryptable/encryptors_test.rb
-- test/rails_app/.gitignore
-- test/rails_app/Rakefile
 - test/rails_app/app/controllers/application_controller.rb
-- test/rails_app/app/models/.gitkeep
 - test/rails_app/app/models/admin.rb
 - test/rails_app/app/models/user.rb
-- test/rails_app/config.ru
 - test/rails_app/config/application.rb
 - test/rails_app/config/boot.rb
-- test/rails_app/config/database.yml
 - test/rails_app/config/environment.rb
 - test/rails_app/config/environments/development.rb
 - test/rails_app/config/environments/production.rb

data/.gitignore

@@ -1,17 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-*.sqlite

data/.travis.yml

@@ -1,13 +0,0 @@
-language: ruby
-rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-notifications:
-  email: false
-  campfire:
-    on_success: change
-    on_failure: always
-    rooms:
-      - secure: "apo8q+63WTaltM6kUD4GFoMO3zVXaMV0O38yo7LN0xyD2O9650UpTZZdMZ6D\narJ29YCumJf3KsdPcxq3wcM0JhNCkg/G+apJYUDRJdlcboYr84v3/MbJf53U\ng8p7Big1TYbt5cjD40VQJTSqlzHgPoQAy2wGjuryuCY8jt+6wB0="

data/Gemfile

@@ -1,10 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-gem 'devise', '~> 2.1'
-gem 'minitest'
-gem 'rails', "~> 3.2"
-gem 'sqlite3'
-
-gem 'mocha', '~> 0.13.3', :require => false

data/Gemfile.lock

@@ -1,111 +0,0 @@
-PATH
-  remote: .
-  specs:
-    devise-encryptable (0.1.2)
-      devise (>= 2.1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    bcrypt-ruby (3.0.1)
-    builder (3.0.4)
-    devise (2.2.4)
-      bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (~> 3.1)
-      warden (~> 1.2.1)
-    erubis (2.7.0)
-    hike (1.2.2)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.7.7)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.23)
-    minitest (4.7.4)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    multi_json (1.7.3)
-    orm_adapter (0.4.0)
-    polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
-    thor (0.18.1)
-    tilt (1.4.0)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-    warden (1.2.1)
-      rack (>= 1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  devise (~> 2.1)
-  devise-encryptable!
-  minitest
-  mocha (~> 0.13.3)
-  rails (~> 3.2)
-  sqlite3

data/Rakefile

@@ -1,14 +0,0 @@
-#!/usr/bin/env rake
-require "bundler/gem_tasks"
-require 'rake/testtask'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Run unit tests.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end

data/devise-encryptable.gemspec

@@ -1,19 +0,0 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/devise/encryptable/version', __FILE__)
-
-Gem::Specification.new do |gem|
-  gem.authors       = ["Carlos Antonio da Silva", "José Valim", "Rodrigo Flores"]
-  gem.email         = "contact@plataformatec.com.br"
-  gem.description   = %q{Encryption solution for salted-encryptors on Devise}
-  gem.summary       = %q{Encryption solution for salted-encryptors on Devise}
-  gem.homepage      = "http://github.com/plataformatec/devise-encryptable"
-
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "devise-encryptable"
-  gem.require_paths = ["lib"]
-  gem.version       = Devise::Encryptable::VERSION
-
-  gem.add_dependency("devise", '>= 2.1.0')
-end

data/gemfiles/Gemfile.rails-3.1.x

@@ -1,10 +0,0 @@
-source 'https://rubygems.org'
-
-gem "devise-encryptable", :path => ".."
-
-gem 'devise', '~> 2.1'
-gem 'minitest'
-gem 'rails', "3.1.4"
-gem 'sqlite3'
-
-gem 'mocha', '~> 0.13.3', :require => false

data/gemfiles/Gemfile.rails-3.1.x.lock

@@ -1,112 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    devise-encryptable (0.1.2)
-      devise (>= 2.1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (3.1.4)
-      actionpack (= 3.1.4)
-      mail (~> 2.3.0)
-    actionpack (3.1.4)
-      activemodel (= 3.1.4)
-      activesupport (= 3.1.4)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.6)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.4)
-      activesupport (= 3.1.4)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.4)
-      activemodel (= 3.1.4)
-      activesupport (= 3.1.4)
-      arel (~> 2.2.3)
-      tzinfo (~> 0.3.29)
-    activeresource (3.1.4)
-      activemodel (= 3.1.4)
-      activesupport (= 3.1.4)
-    activesupport (3.1.4)
-      multi_json (~> 1.0)
-    arel (2.2.3)
-    bcrypt-ruby (3.0.1)
-    builder (3.0.4)
-    devise (2.2.4)
-      bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (~> 3.1)
-      warden (~> 1.2.1)
-    erubis (2.7.0)
-    hike (1.2.2)
-    i18n (0.6.4)
-    json (1.7.7)
-    mail (2.3.3)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.23)
-    minitest (4.7.4)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    multi_json (1.7.3)
-    orm_adapter (0.4.0)
-    polyglot (0.3.3)
-    rack (1.3.10)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.1.4)
-      actionmailer (= 3.1.4)
-      actionpack (= 3.1.4)
-      activerecord (= 3.1.4)
-      activeresource (= 3.1.4)
-      activesupport (= 3.1.4)
-      bundler (~> 1.0)
-      railties (= 3.1.4)
-    railties (3.1.4)
-      actionpack (= 3.1.4)
-      activesupport (= 3.1.4)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (10.0.4)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    sprockets (2.0.4)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
-    thor (0.14.6)
-    tilt (1.4.0)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-    warden (1.2.1)
-      rack (>= 1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  devise (~> 2.1)
-  devise-encryptable!
-  minitest
-  mocha (~> 0.13.3)
-  rails (= 3.1.4)
-  sqlite3

data/test/rails_app/.gitignore

@@ -1,15 +0,0 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile ~/.gitignore_global
-
-# Ignore bundler config
-/.bundle
-
-# Ignore the default SQLite database.
-/db/*.sqlite3
-
-# Ignore all logfiles and tempfiles.
-/log/*.log
-/tmp

data/test/rails_app/Rakefile

@@ -1,7 +0,0 @@
-#!/usr/bin/env rake
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require File.expand_path('../config/application', __FILE__)
-
-RailsApp::Application.load_tasks

data/test/rails_app/config.ru

@@ -1,4 +0,0 @@
-# This file is used by Rack-based servers to start the application.
-
-require ::File.expand_path('../config/environment',  __FILE__)
-run RailsApp::Application

data/test/rails_app/config/database.yml

@@ -1,7 +0,0 @@
-development:
-  adapter: sqlite3
-  database: ":memory:"
-
-test:
-  adapter: sqlite3
-  database: ":memory:"