lockup 1.2.1 → 1.3.0

data/app/controllers/lockup/lockup_controller.rb

@@ -8,7 +8,7 @@ module Lockup
         unless user_agent.match(/crawl|googlebot|slurp|spider|bingbot|tracker|click|parser|spider/)
           @codeword = params[:lockup_codeword].to_s.downcase
           @return_to = params[:return_to]
-          if @codeword == ENV["LOCKUP_CODEWORD"].to_s.downcase
+          if @codeword == ENV["LOCKUP_CODEWORD"].to_s.downcase || ((Rails::VERSION::MAJOR >= 4 && Rails::VERSION::MINOR >= 1) && @codeword == Rails.application.secrets.lockup_codeword.to_s.downcase)
             set_cookie
             run_redirect
           end
@@ -20,7 +20,7 @@ module Lockup
       if request.post?
         @codeword = params[:lockup][:codeword].to_s.downcase
         @return_to = params[:lockup][:return_to]
-        if @codeword == ENV["LOCKUP_CODEWORD"].to_s.downcase
+        if @codeword == ENV["LOCKUP_CODEWORD"].to_s.downcase || ((Rails::VERSION::MAJOR >= 4 && Rails::VERSION::MINOR >= 1) && @codeword == Rails.application.secrets.lockup_codeword.to_s.downcase)
           set_cookie
           run_redirect
         else

data/app/views/lockup/lockup/unlock.html.erb

@@ -13,9 +13,9 @@
     <p><%= form.password_field "codeword", :value => @codeword, :class => 'nope' %></p>
   <% end %>
     
-  <% if ENV["LOCKUP_HINT"].present? %>
+  <% if ENV["LOCKUP_HINT"].present? || ((Rails::VERSION::MAJOR >= 4 && Rails::VERSION::MINOR >= 1) && Rails.application.secrets.lockup_hint.present?) %>
     <p id='hint_icon'>?</p>
-    <p id='hint'><%= ENV["LOCKUP_HINT"] %></p>
+    <p id='hint'><%= ENV["LOCKUP_HINT"].present? ? ENV["LOCKUP_HINT"] : Rails.application.secrets.lockup_hint %></p>
   <% end %>
 
   <% if params[:return_to].present? %>

data/lib/lockup.rb

@@ -10,9 +10,9 @@ module Lockup
   private
 
   def check_for_lockup
-    if ENV["LOCKUP_CODEWORD"].present?
+    if ENV["LOCKUP_CODEWORD"].present? || ((Rails::VERSION::MAJOR >= 4 && Rails::VERSION::MINOR >= 1) && Rails.application.secrets.lockup_codeword.present?)
       if cookies[:lockup].present?
-        if cookies[:lockup] == ENV["LOCKUP_CODEWORD"].to_s.downcase
+        if cookies[:lockup] == ENV["LOCKUP_CODEWORD"].to_s.downcase || ((Rails::VERSION::MAJOR >= 4 && Rails::VERSION::MINOR >= 1) && cookies[:lockup] == Rails.application.secrets.lockup_codeword.to_s.downcase)
           return
         else
           redirect_to lockup.unlock_path(:return_to => request.fullpath.split('?lockup_codeword')[0], :lockup_codeword => params[:lockup_codeword])

data/lib/lockup/version.rb

@@ -1,3 +1,3 @@
 module Lockup
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lockup
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
-  - 1
-  version: 1.2.1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - gb Studio
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-03-15 00:00:00 Z
+date: 2014-10-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails