devise_inactivatable 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb189bdcd26a52b06756bfe2ded95c185897900c
-  data.tar.gz: f038a4014d358e8d5bbe0e6a3c6e83f78d2584bc
+  metadata.gz: 4f152c9908add89e483b81b3886f8b5eb4fd91f0
+  data.tar.gz: 977318b024838c71d14cde51bb3fd250bd138646
 SHA512:
-  metadata.gz: a682aad5f2e416e9cfcd7466afbdf4387c1d661ae2ffa1ac202bb268f48f36555cae4b05c95d6e37c7804625cbaf04aa016e5876125472a90b3ac84520f717a4
-  data.tar.gz: 8ec8c6cde703f3a3b74eda874c42a73393d304f86051749994491b08f6faa3dafaf931a62d986c5f0c1c38717f0d2e6de88c59fb86cccc592a75fb6ae716e28a
+  metadata.gz: fe800078fc34ac6c0f0f9df8d159cd0a0a1fc8b1cacae91a42ad53e9c84365eca56a3f712ffdafcfb82b67911948e055f04a29354683519994d827a72fc76028
+  data.tar.gz: 13f2a77e2e8a45e4948e9791b7021e3a0eb0d24954064d06d3b8d48b1f0bb4dbf098596d0deb1398be352303d78a887315f53ba440dded4e04fd2e7fcaf44231

data/Gemfile

@@ -1,4 +1,25 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-# Specify your gem's dependencies in devise_inactivatable.gemspec
 gemspec
+
+gem "rails", "~> 4.1.0"
+gem "rdoc"
+
+group :test do
+  gem "webrat", "0.7.3", require: false
+  gem "mocha", "~> 1.1", require: false
+end
+
+platforms :jruby do
+  gem "activerecord-jdbc-adapter"
+  gem "activerecord-jdbcsqlite3-adapter"
+  gem "jruby-openssl"
+end
+
+platforms :ruby do
+  gem "sqlite3"
+end
+
+group :mongoid do
+  gem "mongoid", "~> 4.0.0"
+end

data/README.md

@@ -50,13 +50,18 @@ Include in your model:
       devise :database_authentication, :inactivatable
     end
 
-Adding four wonderful new methods, and modifications to two other methods:
+Adding four wonderful new methods:
 
 - activate! : active the account if it is inactive
 - inactivate! : inactive the account if it is active
 - active? : checks whether the account is active
 - inactive? : checks whether the account is inactive
 
+And modifications to two other methods:
+
+- active_for_authentication? : If inactive returns false, else it preforms the super method
+- inactive_message : If inactive returns :inactivated, else it performs the super method
+
 ## License
 
 The devise_inactivatable is hosted on Github: https://github.com/jonathanccalixto/devise_inactivable, where your contributions, forkings, comments and feedback are greatly welcomed.

data/Rakefile

@@ -1 +1,35 @@
+# encoding: UTF-8
 require "bundler/gem_tasks"
+require 'rake/testtask'
+require 'rdoc/task'
+
+desc 'Default: run tests for all ORMs.'
+task default: :test
+
+desc 'Run Devise tests for all ORMs.'
+task :pre_commit do
+  Dir[File.join(File.dirname(__FILE__), 'test', 'orm', '*.rb')].each do |file|
+    orm = File.basename(file).split(".").first
+    # "Some day, my son, rake's inner wisdom will reveal itself.  Until then,
+    # take this `system` -- may its brute force protect you well."
+    exit 1 unless system "rake test DEVISE_ORM=#{orm}"
+  end
+end
+
+desc 'Run Devise unit tests.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+  t.warning = false
+end
+
+desc 'Generate documentation for Devise.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'Devise'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README.md')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/lib/devise/inactivatable/model.rb

@@ -3,7 +3,6 @@ require 'devise/strategies/database_authenticatable'
 module Devise
   module Models
     module Inactivatable
-
       def active_for_authentication?
         active? && super
       end
@@ -27,7 +26,6 @@ module Devise
       def inactive_message
         inactive? ? :inactivated : super
       end
-
     end
   end
 end

data/lib/devise/inactivatable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInactivatable
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/test/devise/inactivatable/inactivatable_test.rb

@@ -3,11 +3,6 @@ require "test_helper"
 class InactivatableTest < ActiveSupport::TestCase
   include Support::Assertions
   include Support::Factories
-  include Support::Swappers
-
-  def encrypt_password(admin, pepper=Admin.pepper, stretches=Admin.stretches, encryptor=Admin.encryptor_class)
-    encryptor.digest('123456', stretches, admin.password_salt, pepper)
-  end
 
   test '#inactivated_at should be nil when admin created' do
     assert_nil create_admin.inactivated_at
@@ -21,14 +16,14 @@ class InactivatableTest < ActiveSupport::TestCase
   end
 
   test '#activate! should set #inactivated_at with nil' do
-    admin = create_admin(:inactivated_at, Time.now)
+    admin = create_admin(:inactivated_at => Time.now)
     assert admin.inactivated_at.present?
-    admin.inactivate!
+    admin.activate!
     assert_not admin.inactivated_at.present?
   end
 
   test '#active? should be true when actived' do
-    admin = create_admin(:inactivated_at, Time.now)
+    admin = create_admin(:inactivated_at => Time.now)
     assert_not admin.active?
     admin.activate!
     assert admin.active?

data/test/rails_app/db/migrate/20120508165529_create_tables.rb

@@ -8,6 +8,9 @@ class CreateTables < ActiveRecord::Migration
       t.string :email,              :null => false, :default => ""
       t.string :encrypted_password, :null => false, :default => ""
 
+      ## Inactivatable
+      t.datetime :inactivated_at
+
       ## Recoverable
       t.string   :reset_password_token
       t.datetime :reset_password_sent_at
@@ -47,6 +50,9 @@ class CreateTables < ActiveRecord::Migration
       t.string :email,              :null => true
       t.string :encrypted_password, :null => true
 
+      ## Inactivatable
+      t.datetime :inactivated_at
+
       ## Recoverable
       t.string   :reset_password_token
       t.datetime :reset_password_sent_at

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: devise_inactivatable
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Jonathan C. Calixto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 description: This is a simple, however wonderful devise extension to activate and
@@ -60,7 +60,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -101,17 +101,17 @@ 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.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Activate and inactivate a devise account