devise_challenge_questionable 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA512: 
-  data.tar.gz: 8695e654d2bb19c2cc3898c7c37ef3a1b50f4581b8d6984abffe64df691289de2ddbfbaf03454e21a371872c7226ca73fb336077b458bd4cf2d2f3e6bb9fe981
-  metadata.gz: 6ac2620ad0657c87ae83e8e5c48cc13fd10064ddcdf93048aedbfd47137709f072008d501024c78172a78e01e6a47859d924824cb276b04e10fbb3af18b6d1f1
-SHA1: 
-  data.tar.gz: 3c16a6153e9482d879cc84b9c48fd6bd4e28bcd3
-  metadata.gz: fdae3b18830c50d05005ebcd56efd230d81f12fb
+---
+SHA1:
+  metadata.gz: acd5b7ad0c084ac1b32b14e5b1a99304331bcf69
+  data.tar.gz: 0b5a8e1beda7d9fa6122cf82c1cc8d84d8f60888
+SHA512:
+  metadata.gz: 51f20aadea678518607ad1218657ac8f94090b02bc37a6a55a8229c3d5c36c0966997979774727f79ec6d3894eeb158ad2195503cd7298a4984854cd66095717
+  data.tar.gz: bb3661027fe1009ee2f309931a0857ec9004671c10915c8a473daaf206d2dd1e3a7f916f719368bb9ad372e573f7b858095f91dd9e9aba86e21a627e780397b3

data/app/controllers/devise/challenge_questions_controller.rb

@@ -3,13 +3,13 @@ class Devise::ChallengeQuestionsController < DeviseController
   prepend_before_filter :require_no_authentication, :only => [ :new, :create, :edit, :update, :max_challenge_question_attempts_reached ]
   prepend_before_filter :authenticate_scope!, :only => [:show, :authenticate, :manage, :forgot]
   before_filter :prepare_and_validate, :handle_challenge_questions, :only => [:show, :authenticate]
-  
+
   # GET /resource/challenge_question/new
   def new
     build_resource
-    render_with_scope :new
+    render :new
   end
-  
+
   # POST /resource/challenge_question
   def create
     self.resource = resource_class.send_reset_challenge_questions_instructions(params[resource_name])
@@ -17,18 +17,18 @@ class Devise::ChallengeQuestionsController < DeviseController
       set_flash_message :notice, :send_instructions
       redirect_to new_session_path(resource_name)
     else
-      render_with_scope :new
+      render :new
     end
   end
-  
+
   # GET /resource/challenge_question/edit?reset_challenge_questions_token=abcdef
   def edit
     self.resource = resource_class.new
     resource.reset_challenge_questions_token = params[:reset_challenge_questions_token]
     Devise.number_of_challenge_questions_stored.times { resource.send("#{resource_name}_challenge_questions").build }
-    render_with_scope :edit
+    render :edit
   end
-  
+
   # PUT /resource/challenge_question
   def update
     self.resource = resource_class.reset_challenge_questions_by_token(params[resource_name])
@@ -37,7 +37,7 @@ class Devise::ChallengeQuestionsController < DeviseController
       set_flash_message :notice, :updated_challenge_questions
       redirect_to :root
     else
-      render_with_scope :edit
+      render :edit
     end
   end
 
@@ -45,11 +45,11 @@ class Devise::ChallengeQuestionsController < DeviseController
   def show
     @challenge_questions = resource.send("#{resource_name}_challenge_questions").sample(params[:limit].try(:to_i) || Devise.number_of_challenge_questions_asked)
     respond_to do |format|
-      format.html { render_with_scope :show }
+      format.html { render :show }
       format.json { render :json => @challenge_questions.as_json(:only => [:id, :challenge_question]) }
     end
   end
-  
+
   def authenticate
     build_challenge_questions
     if @challenge_questions.present? && challenge_questions_authenticated?
@@ -61,21 +61,21 @@ class Devise::ChallengeQuestionsController < DeviseController
       else
         failed_attempts
       end
-    end 
+    end
   end
-  
+
   # Build token and redirect
   def manage
     resource.set_reset_challenge_questions_token
     sign_out(resource)
-    redirect_to edit_challenge_question_path(resource, :reset_challenge_questions_token => resource.reset_challenge_questions_token) 
+    redirect_to edit_challenge_question_path(resource, :reset_challenge_questions_token => resource.reset_challenge_questions_token)
   end
-  
+
   def forgot
     sign_out(resource)
-    redirect_to new_challenge_question_path(resource_name) 
+    redirect_to new_challenge_question_path(resource_name)
   end
-  
+
   def max_challenge_question_attempts_reached
   end
 
@@ -90,21 +90,21 @@ class Devise::ChallengeQuestionsController < DeviseController
       @limit = resource.class.max_challenge_question_attempts
       if resource.max_challenge_question_attempts?
         sign_out(resource)
-        render_with_scope :max_challenge_question_attempts_reached and return
+        render :max_challenge_question_attempts_reached and return
       end
     end
-    
+
     def challenge_questions_authenticated?
       @challenge_questions.all?{|question| Digest::MD5.hexdigest(question[:challenge_answer].try(:downcase).to_s).eql?(question[:answer])}
     end
-    
+
     def build_challenge_questions
       respond_to do |format|
         format.html { @challenge_questions = (params[:challenge_questions] || []).map{|cq, params| params.merge(:answer => resource.send("#{resource_name}_challenge_questions").find(params[:id]).challenge_answer)} }
         format.json { @challenge_questions = (params[:challenge_questions] || []).map{|cq| cq.merge(:answer => resource.send("#{resource_name}_challenge_questions").find(cq[:id]).challenge_answer)} }
       end
     end
-    
+
     def challenge_questions_authenticated
       respond_to do |format|
         format.html do
@@ -115,25 +115,25 @@ class Devise::ChallengeQuestionsController < DeviseController
       end
       resource.update_attribute(:challenge_question_failed_attempts, 0)
     end
-    
+
     def set_failed_attempt
       resource.challenge_question_failed_attempts += 1
       resource.save
     end
-    
+
     def max_failed_attempts
       resource.max_challenge_question_lock_account
       sign_out(resource)
       respond_to do |format|
-        format.html { render_with_scope :max_challenge_question_attempts_reached and return }
+        format.html { render :max_challenge_question_attempts_reached and return }
         format.json { render :json => {:max_attempts_reached => true, :errors => I18n.t(:"#{resource_name}.#{:max_attempts_reached}", :resource_name => resource_name, :scope => [:devise, controller_name.to_sym], :default => :attempt_failed)} }
       end
     end
-    
+
     def failed_attempts
       respond_to do |format|
         format.html { redirect_to send("#{resource_name}_challenge_question_path" ) }
         format.json { render :json => {:errors => I18n.t(:"#{resource_name}.#{:attempt_failed}", :resource_name => resource_name, :scope => [:devise, controller_name.to_sym], :default => :attempt_failed)} }
       end
     end
-end
+end

data/app/views/devise/challenge_questions/edit.html.erb

@@ -7,7 +7,7 @@
     <%= devise_error_messages! %>
     <%= f.hidden_field :id %>
     <%= f.hidden_field :reset_challenge_questions_token %>
-  
+
     <%= f.fields_for :"#{resource_name}_challenge_questions", resource.send("#{resource_name}_challenge_questions") do |cq| %>
       <% if cq.object.new_record? %>
         <p>
@@ -40,25 +40,10 @@
 
 <script type="text/javascript" language="javascript">
   if (window.jQuery) {
-    jQuery(document).ready(function() {
-      $("select").change(function () {
-        var $this = $(this);
-        var prevVal = $this.data("prev");
-        var otherSelects = $("select").not(this);
-        otherSelects.find('option:contains('+ $(this).val() +')').attr('disabled', 'disabled');
-        if (prevVal) {
-            otherSelects.find('option:contains('+ prevVal +')').removeAttr('disabled');
-        }  
-        $this.data("prev", $this.val());
-      });
-  
-      $("select").each(function () {
-        var $this = $(this);
-        var prevVal = $this.data("prev");
-        var otherSelects = $("select").not(this);
-        otherSelects.find('option:contains('+ $(this).val() +')').attr('disabled', 'disabled');  
-        $this.data("prev", $this.val());
-      });
-    });
+    $('select').on('change', function(e) {
+      var $this = $(this);
+      var otherSelects = $("select").not(this);
+      otherSelects.find('option:contains('+ $(this).val() +')').attr('disabled','disabled')
+    })
   }
-</script>
+</script>

data/devise_challenge_questionable.gemspec

@@ -22,8 +22,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', '>= 2.0.0.rc'
+  s.add_runtime_dependency 'rails', '>= 4.0.0'
+  s.add_runtime_dependency 'devise', '>= 4.0.0'
 
   s.add_development_dependency 'bundler'
 end

data/lib/devise_challenge_questionable/model.rb

@@ -3,12 +3,12 @@ module Devise
   module Models
     module ChallengeQuestionable
       extend ActiveSupport::Concern
-      
+
       # Update challenge questions saving the record and clearing token. Returns true if
       # the challenge questions are valid and the record was saved, false otherwise.
       def reset_challenge_questions!(attributes)
         self.send("#{self.class.name.underscore}_challenge_questions").destroy_all
-        self.attributes = {"#{self.class.name.underscore}_challenge_questions_attributes" => attributes["#{self.class.name.underscore}_challenge_questions_attributes"]}       
+        self.attributes = {"#{self.class.name.underscore}_challenge_questions_attributes" => attributes["#{self.class.name.underscore}_challenge_questions_attributes"]}
         clear_reset_challenge_questions_token if self.valid?
         self.save
       end
@@ -16,11 +16,11 @@ module Devise
       def login_challenge_questions?(request)
         true
       end
-      
+
       def set_challenge_questions?(request)
         true
       end
-      
+
       def max_challenge_question_lock_account
         self.lock_access! if self.class.lock_strategy_enabled?(:failed_attempts)
       end
@@ -28,18 +28,18 @@ module Devise
       def max_challenge_question_attempts?
         challenge_question_failed_attempts >= self.class.max_challenge_question_attempts
       end
-      
+
       # Resets reset challenge question token and send reset challenge question instructions by email
       def send_reset_challenge_questions_instructions
         generate_reset_challenge_questions_token!
         ::Devise.mailer.reset_challenge_questions_instructions(self).deliver
       end
-      
+
       # Generates a new random token for reset challenge_question
       def set_reset_challenge_questions_token
         generate_reset_challenge_questions_token!
       end
-      
+
       def unlock_access_including_challenge_questions!
         if_access_locked do
           self.locked_at = nil
@@ -49,7 +49,7 @@ module Devise
           save(:validate => false)
         end
       end
-      
+
       protected
 
         # Generates a new random token for reset challenge_question
@@ -67,14 +67,14 @@ module Devise
         def clear_reset_challenge_questions_token
           self.reset_challenge_questions_token = nil
         end
-        
+
         def clear_challenge_question_failed_attempts
           self.challenge_question_failed_attempts = 0
         end
-        
+
       module ClassMethods
         ::Devise::Models.config(self, :max_challenge_question_attempts)
-        
+
         # Attempt to find a user by it's email. If a record is found, send new
         # challenge_question instructions to it. If not user is found, returns a new user
         # with an email not found error.
@@ -87,7 +87,10 @@ module Devise
 
         # Generate a token checking if one does not already exist in the database.
         def reset_challenge_questions_token
-          generate_token(:reset_challenge_questions_token)
+          loop do
+            token = Devise.friendly_token
+            break token unless User.find_by(:reset_challenge_questions_token => token)
+          end
         end
 
         # Attempt to find a user by it's reset_challenge_questions_token to reset it's
@@ -103,4 +106,4 @@ module Devise
       end
     end
   end
-end
+end

data/lib/devise_challenge_questionable/version.rb

@@ -1,3 +1,3 @@
 module DeviseChallengeQuestionable
-  VERSION = "2.0.0"
+  VERSION = "3.0.0"
 end

metadata

@@ -1,58 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: devise_challenge_questionable
-version: !ruby/object:Gem::Version 
-  version: 2.0.0
+version: !ruby/object:Gem::Version
+  version: 3.0.0
 platform: ruby
-authors: 
+authors:
 - Andrew Kennedy
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2016-05-16 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2017-01-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        version: 3.0.20
+      - !ruby/object:Gem::Version
+        version: 4.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: devise
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.0.rc
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id004 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: "    ### Features ###\n    * configure max challenge question attempts\n    * per user level control if he really need challenge questions\n"
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: |2
+      ### Features ###
+      * configure max challenge question attempts
+      * per user level control if he really need challenge questions
+email:
 - andrew@akennedy.io
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
 - Gemfile
 - README.md
 - Rakefile
@@ -82,26 +92,25 @@ files:
 - lib/generators/devise_challenge_questionable/views_generator.rb
 homepage: https://github.com/akennedy/devise_challenge_questionable
 licenses: []
-
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id004
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id004
+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: devise_challenge_questionable
-rubygems_version: 2.0.15
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Challenge question plugin for devise
 test_files: []
-