devise_password_expirable 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  data.tar.gz: 580d34c38ff0183b3a09f42988a1c77441df2945
-  metadata.gz: 55c8b247f7f7a72167a97d4d5320bbc86d05271d
 SHA512: 
-  data.tar.gz: 37da798f6da4020241ad192e3d1c0f7bb644dfcc6b63e8167b345c31dccb32627221dadbaf515e0240a6fafa79a7de50a7c4ce93d3462f369838b6ad4c59f0e7
-  metadata.gz: aade38df02cfb36229bb7c4993786e1e6fdfe9cc4b73f88bb517bd103551515e0d222e102003eeb485a0ffff31a412750380f0d7001a93a51bd89b4474c18e24
+  metadata.gz: 1b378548f93783f04fe45db7e8b412e1f7f3f90a55274e90a83e200a74eb4b1a86b3413816f8694a4ca5384d6d93db751d01d403ec28aebda9ad65c54f3918cf
+  data.tar.gz: ba579f4edb72e39cbbba04566202580767517fdba43be23bba69ca43fef50863dcb4e583a5e61d59f5413a75bfeb00477fd170b5cbdfcc072ba562d2a7c7ff34
+SHA1: 
+  metadata.gz: 07c5709271f496dd1c5aa31c7680245be5bd5f59
+  data.tar.gz: 90cdcb77894e11dd20e9e8159f6826cce7502158

data/.document

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

data/Gemfile

@@ -2,5 +2,5 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in devise_ip_filter.gemspec
 gemspec
-gem "rails"
+gem "rails", ">= 3.0.20"
 gem "devise"

data/app/controllers/devise/password_expired_controller.rb

@@ -1,31 +1,29 @@
-class Devise::PasswordExpiredController < DeviseController
+class Devise::PasswordExpiredController < ApplicationController
   skip_before_filter :handle_password_change
   prepend_before_filter :authenticate_scope!, :only => [:show, :update]
+  include Devise::Controllers::InternalHelpers
 
   def show
     if not resource.nil? and resource.need_change_password?
-      respond_with(resource)
+      render_with_scope :show
     else
       redirect_to :root
     end
   end
 
   def update
-    if resource.update_with_password(resource_params)
+    if resource.update_with_password(params[resource_name])
       warden.session(scope)[:password_expired] = false
       set_flash_message :notice, :updated
-      sign_in scope, resource, :bypass => true
+      sign_in scope, resource
       redirect_to stored_location_for(scope) || :root
     else
       clean_up_passwords(resource)
-      respond_with(resource, action: :show)
+      render_with_scope :show
     end
   end
 
   private
-    def resource_params
-      params.require(resource_name).permit!
-    end
 
   def scope
     resource_name.to_sym

data/app/views/devise/password_expired/show.html.erb

@@ -1,4 +1,5 @@
 <h2>Renew your password</h2>
+<p>Your password is out of date and must be updated.</p>
 
 <%= form_for(resource, :as => resource_name, :url => [resource_name, :password_expired], :html => { :method => :put }) do |f| %>
   <%= devise_error_messages! %>

data/devise_password_expirable.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/jenjaina/devise_password_expirable"
   s.licenses    = ["MIT"]
   s.summary     = %q{Expire passwords plugin for devise}
-  s.description = "An extension to devise that will expire user passwords after a set amount of time and prompt them to update their password."
+  s.description = "A plugin to devise that will expire user passwords after a set amount of time and prompt them to update their password."
 
   # s.rubyforge_project = "devise_password_expirable"
 
@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'rails', '3.0.20'
-  s.add_runtime_dependency 'devise', '1.1.3'
+  s.add_runtime_dependency 'rails', '>= 3.0.20'
+  s.add_runtime_dependency 'devise', '>= 1.1.3'
 
   s.add_development_dependency 'bundler'
 end

data/lib/devise_password_expirable.rb

@@ -1,11 +1,12 @@
 require 'devise_password_expirable/version'
-require 'active_record'
+require 'active_record/connection_adapters/abstract/schema_definitions'
 require 'active_support/core_ext/integer'
 require 'active_support/ordered_hash'
 require 'active_support/concern'
 require 'devise'
 
-module Devise
+module Devise # :nodoc:
+  
   # Should the password expire (e.g 3.months)
   mattr_accessor :expire_password_after
   @@expire_password_after = 3.months
@@ -30,3 +31,4 @@ Devise.add_module :password_expirable, :controller => :password_expirable, :mode
 # requires
 require 'devise_password_expirable/routes'
 require 'devise_password_expirable/rails'
+require 'devise_password_expirable/orm/active_record'

data/lib/devise_password_expirable/controllers/helpers.rb

@@ -1,6 +1,6 @@
 module DevisePasswordExpirable
-  module Controllers
-    module Helpers
+  module Controllers # :nodoc:
+    module Helpers # :nodoc:
       extend ActiveSupport::Concern
 
       included do
@@ -8,14 +8,14 @@ module DevisePasswordExpirable
       end
 
       # controller instance methods
-
+      module InstanceMethods
         private
 
         # lookup if an password change needed
         def handle_password_change
           if not devise_controller? and not ignore_password_expire? and not request.format.nil? and request.format.html?
             Devise.mappings.keys.flatten.any? do |scope|
-              if signed_in?(scope) and warden.session(scope)['password_expired']
+              if signed_in?(scope) and warden.session(scope)[:password_expired]
                 session["#{scope}_return_to"] = request.path if request.get?
                 redirect_for_password_change scope
                 return
@@ -43,7 +43,7 @@ module DevisePasswordExpirable
           false
         end
 
-
+      end
     end
   end
 

data/lib/devise_password_expirable/hooks/password_expirable.rb

@@ -1,5 +1,5 @@
 Warden::Manager.after_authentication do |record, warden, options|
   if record.respond_to?(:need_change_password?)
-    warden.session(options[:scope])['password_expired'] = record.need_change_password?
+    warden.session(options[:scope])[:password_expired] = record.need_change_password?
   end
 end

data/lib/devise_password_expirable/models/password_expirable.rb

@@ -1,57 +1,63 @@
-require 'devise_password_expirable/hooks/password_expirable'
+require 'devise_security_extension/hooks/password_expirable'
 
-module Devise
-  module Models
+module Devise # :nodoc:
+  module Models # :nodoc:
 
     # PasswordExpirable takes care of change password after
     module PasswordExpirable
-      extend ActiveSupport::Concern
 
-      included do
-        before_save :update_password_changed
-      end
+      def self.included(base) # :nodoc:
+        base.extend ClassMethods
 
-      # is an password change required?
-      def need_change_password?
-        if self.class.expire_password_after.is_a? Fixnum or self.class.expire_password_after.is_a? Float
-          self.last_password_reset.nil? or self.last_password_reset < self.class.expire_password_after.ago
-        else
-          false
+        base.class_eval do
+          before_save :update_password_changed
+          include InstanceMethods
         end
       end
 
-      # set a fake datetime so a password change is needed and save the record
-      def need_change_password!
-        if self.class.expire_password_after.is_a? Fixnum or self.class.expire_password_after.is_a? Float
-          need_change_password
-          self.save(:validate => false)
+      module InstanceMethods # :nodoc:
+
+        # is an password change required?
+        def need_change_password?
+          if self.class.expire_password_after.is_a? Fixnum
+            self.last_password_reset.nil? or self.last_password_reset < self.class.expire_password_after.ago
+          else
+            false
+          end
         end
-      end
 
-      # set a fake datetime so a password change is needed
-      def need_change_password
-        if self.class.expire_password_after.is_a? Fixnum or self.class.expire_password_after.is_a? Float
-          self.last_password_reset = self.class.expire_password_after.ago
+        # set a fake datetime so a password change is needed and save the record
+        def need_change_password!
+          if self.class.expire_password_after.is_a? Fixnum
+            need_change_password
+            self.save(:validate => false)
+          end
         end
 
-        # is date not set it will set default to need set new password next login
-        need_change_password if self.last_password_reset.nil?
+        # set a fake datetime so a password change is needed
+        def need_change_password
+          if self.class.expire_password_after.is_a? Fixnum
+            self.last_password_reset = self.class.expire_password_after.ago
+          end
 
-        self.last_password_reset
-      end
+          # is date not set it will set default to need set new password next login
+          need_change_password if self.last_password_reset.nil?
 
-      private
+          self.last_password_reset
+        end
+
+        private
 
         # is password changed then update password_cahanged_at
         def update_password_changed
           self.last_password_reset = Time.now if (self.new_record? or self.encrypted_password_changed?) and not self.last_password_reset_changed?
         end
+      end
 
-      module ClassMethods
+      module ClassMethods #:nodoc:
         ::Devise::Models.config(self, :expire_password_after)
       end
     end
-
   end
 
-end
+end

data/lib/devise_password_expirable/orm/active_record.rb

@@ -0,0 +1,20 @@
+module DevisePasswordExpirable
+  module Orm
+    # This module contains some helpers and handle schema (migrations):
+    #
+    #   create_table :accounts do |t|
+    #     t.password_expirable
+    #   end
+    #
+    module ActiveRecord
+      module Schema
+        include DevisePasswordExpirable::Schema
+
+
+      end
+    end
+  end
+end
+
+ActiveRecord::ConnectionAdapters::Table.send :include, DevisePasswordExpirable::Orm::ActiveRecord::Schema
+ActiveRecord::ConnectionAdapters::TableDefinition.send :include, DevisePasswordExpirable::Orm::ActiveRecord::Schema

data/lib/devise_password_expirable/rails.rb

@@ -1,7 +1,7 @@
 module DevisePasswordExpirable
-  class Engine < ::Rails::Engine
+  class Engine < ::Rails::Engine # :nodoc:
     ActiveSupport.on_load(:action_controller) do
       include DevisePasswordExpirable::Controllers::Helpers
-    end
+    end    
   end
 end

data/lib/devise_password_expirable/routes.rb

@@ -1,5 +1,5 @@
-module ActionDispatch::Routing
-  class Mapper
+module ActionDispatch::Routing # :nodoc:
+  class Mapper # :nodoc:
 
     protected
 

data/lib/devise_password_expirable/version.rb

@@ -1,3 +1,3 @@
 module DevisePasswordExpirable
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/generators/devise_password_expirable/install_generator.rb

@@ -0,0 +1,39 @@
+module DevisePasswordExpirable
+  module Generators # :nodoc:
+    # Install Generator
+    class InstallGenerator < Rails::Generators::Base
+      source_root File.expand_path("../../templates", __FILE__)
+
+      desc "Install the devise password expirable extension"
+
+      def add_configs
+        devise_initializer_path = "config/initializers/devise.rb"
+        if File.exist?(devise_initializer_path)
+          old_content = File.read(devise_initializer_path)
+          
+          if old_content.match(Regexp.new(/^\s# ==> Password Expirable Extension\n/))
+            false
+          else
+            inject_into_file(devise_initializer_path, :before => "  # ==> Configuration for :confirmable\n") do
+<<-CONTENT
+  # ==> Password Expirable Extension
+  # Configure expire passwords extension for devise
+
+  # Should the password expire (e.g 3.months)
+  # config.expire_password_after = false
+
+  # Need 1 char of A-Z, a-z and 0-9
+  # config.password_regex = /(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])/
+
+CONTENT
+            end
+          end
+        end
+      end
+
+      def copy_locale
+        copy_file "../../../config/locales/en.yml", "config/locales/devise.password_expirable.en.yml"
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devise_password_expirable
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jenni Kissinger
@@ -9,14 +9,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-10-21 00:00:00 Z
+date: 2014-10-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 3.0.20
   type: :runtime
@@ -26,7 +26,7 @@ dependencies:
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 1.1.3
   type: :runtime
@@ -42,7 +42,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
-description: An extension to devise that will expire user passwords after a set amount of time and prompt them to update their password.
+description: A plugin to devise that will expire user passwords after a set amount of time and prompt them to update their password.
 email: 
 - jkissinger@carekinesis.com
 executables: []
@@ -52,6 +52,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .document
 - .gitignore
 - Gemfile
 - README.md
@@ -64,11 +65,12 @@ files:
 - lib/devise_password_expirable/controllers/helpers.rb
 - lib/devise_password_expirable/hooks/password_expirable.rb
 - lib/devise_password_expirable/models/password_expirable.rb
+- lib/devise_password_expirable/orm/active_record.rb
 - lib/devise_password_expirable/rails.rb
 - lib/devise_password_expirable/routes.rb
 - lib/devise_password_expirable/schema.rb
 - lib/devise_password_expirable/version.rb
-- lib/generators/devise_expire_passwords/install_generator.rb
+- lib/generators/devise_password_expirable/install_generator.rb
 homepage: https://github.com/jenjaina/devise_password_expirable
 licenses: 
 - MIT

data/lib/generators/devise_expire_passwords/install_generator.rb

@@ -1,23 +0,0 @@
-module DevisePasswordExpirable
-  module Generators
-    # Install Generator
-    class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path("../../templates", __FILE__)
-
-      desc "Install the devise password expirable extension"
-
-      def add_configs
-        inject_into_file "config/initializers/devise.rb", "\n  # ==> Password Expirable Extension\n  # Configure expire passwords extension for devise\n\n" +
-        "  # Should the password expire (e.g 3.months)\n" +
-        "  # config.expire_password_after = false\n\n" +
-        "  # Need 1 char of A-Z, a-z and 0-9\n" +
-        "  # config.password_regex = /(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])/\n\n" +
-        "", :before => /end[ |\n|]+\Z/
-      end
-
-      def copy_locale
-        copy_file "../../../config/locales/en.yml", "config/locales/devise.password_expirable.en.yml"
-      end
-    end
-  end
-end