lockup 1.3.1 → 1.3.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmFiY2Y3YTIxODM0MzJmM2E2MzE2ZDYzYjdiZjIyMWUyNTQ1Njc0Mg==
+    ZWY1MWUyNTJiZWI1ZjNhY2JjNWQzNWU2NTU1ZTJmOTYxNTI0NWM1OA==
   data.tar.gz: !binary |-
-    ODY2ZjhlMGZkNjgxZTZkMjkyYzQ3NDcwZGQyZjg5NjhhZTgyODZlYw==
+    ODMwZTVmNWNkYzQ0NmYwNmE5ZTA1OTJhNGM0MGRlODY4OTIyMjQ4Yg==
 SHA512:
   metadata.gz: !binary |-
-    ZWVkNmE0MWE1NjUxYmE3NGI3MzRlNzA5MTFlYTcxYzBhNzM1ZTQ2M2M3OWFm
-    NTM4NDY3NzM3YzQ0MGI1ZDMyZmU2NGNjMjZmOTgyYWQ3ODRkNmQyODVlZjFm
-    N2RjNjMxMmJjMGRlMDgwODMwZmM3ODAxNmYwOTBlODNiMDRjNjA=
+    MGRlMjM5NzRiYzYyYzg5MzkzN2RkNzM0Y2ViNDcyMDRiMTQ4YjcyZDNlNjg4
+    M2Y1M2RiMDZkNjM1MTMwYTgyYWRjY2RhMzc3ZmM2Mjk1NDliN2FjNTM1Yzlj
+    MGEzM2Y2NzM1MWZmZWYwMjkyNDI0YTExYjcwOWQxNDI4OGZlOWE=
   data.tar.gz: !binary |-
-    Yzg2N2I5ZjYyZjQ2MmQyYzAzNjRmZTUzOTg4NjM2NWZkZmZlYTg4OTlkOTI3
-    MGUxNGJkZjU2YTczMzY1NzFiMWVlZTBlZTJjYmQ1NzUwYTNlNGExZjYxNTQ4
-    ZTVmYjAzOGQ4ZTY0MjU0YTZkMmUwNmY5MmUwZjkyZTRlZGZmN2I=
+    YzQ3NzBlOTk4YjkyNzQ2ODA0NTljMGVhOTUyMGQ5OGY2OGIwN2RkZWYyNTA5
+    ZDIxZThkNWJiNjA1MmVlZTU3N2U0ZDk0ZmU4NDhkZjBhY2MxZmJlMzQxY2Zm
+    ZmJhNTBlNWQ2ZDg3Mjc1YjViM2IwMTk3NTkzZDVlY2I3Y2E5MTQ=

data/README.md

@@ -42,9 +42,9 @@ If you’re using Rails 4.1 or greater, you can add your Lockup Codeword via Rai
 
 If you’re using [Figaro](https://github.com/laserlemon/figaro), set your Lockup codeword and hint (optional) in your application.yml file:
 
-    LOCKUP_CODEWORD: 'love'
+    lockup_codeword: 'love'
 
-    LOCKUP_HINT: 'Pepé Le Pew'
+    lockup_hint: 'Pepé Le Pew'
 
 **Codewords are not case-sensitive, by design. Keep it simple.**
 

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 || ((Rails::VERSION::MAJOR >= 4 && Rails::VERSION::MINOR >= 1) && @codeword == Rails.application.secrets.lockup_codeword.to_s.downcase)
+          if @codeword == lockup_codeword
             set_cookie
             run_redirect
           end
@@ -19,7 +19,7 @@ module Lockup
         if params[:lockup].present? && params[:lockup].respond_to?(:'[]')
           @codeword = params[:lockup][:codeword].to_s.downcase
           @return_to = params[:lockup][:return_to]
-          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)
+          if @codeword == lockup_codeword
             set_cookie
             run_redirect
           else

data/app/helpers/lockup/lockup_helper.rb

@@ -0,0 +1,25 @@
+module Lockup
+  module LockupHelper
+
+    def lockup_hint_present?
+      if ENV["LOCKUP_HINT"].present? || ENV["lockup_hint"].present? || Figaro.env.lockup_hint.present? || ((Rails::VERSION::MAJOR >= 4 && Rails::VERSION::MINOR >= 1) && Rails.application.secrets.lockup_hint.present?)
+        true
+      else
+        false
+      end
+    end
+
+    def lockup_hint_display
+      if ENV["LOCKUP_HINT"].present?
+        ENV["LOCKUP_HINT"].to_s
+      elsif ENV["lockup_hint"].present?
+        ENV["lockup_hint"].to_s
+      elsif Figaro.env.lockup_hint.present?
+        Figaro.env.lockup_hint.to_s
+      elsif (Rails::VERSION::MAJOR >= 4 && Rails::VERSION::MINOR >= 1) && Rails.application.secrets.lockup_hint.present?
+        Rails.application.secrets.lockup_hint.to_s
+      end
+    end
+
+  end
+end

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? || ((Rails::VERSION::MAJOR >= 4 && Rails::VERSION::MINOR >= 1) && Rails.application.secrets.lockup_hint.present?) %>
+  <% if lockup_hint_present? %>
     <p id='hint_icon'>?</p>
-    <p id='hint'><%= ENV["LOCKUP_HINT"].present? ? ENV["LOCKUP_HINT"] : Rails.application.secrets.lockup_hint %></p>
+    <p id='hint'><%= lockup_hint_display %></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? || ((Rails::VERSION::MAJOR >= 4 && Rails::VERSION::MINOR >= 1) && Rails.application.secrets.lockup_codeword.present?)
+    if lockup_codeword_present?
       if cookies[:lockup].present?
-        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)
+        if cookies[:lockup] == lockup_codeword
           return
         else
           redirect_to lockup.unlock_path(return_to: request.fullpath.split('?lockup_codeword')[0], lockup_codeword: params[:lockup_codeword])
@@ -23,4 +23,24 @@ module Lockup
     end
   end
 
+  def lockup_codeword_present?
+    if ENV["LOCKUP_CODEWORD"].present? || ENV["lockup_codeword"].present? || Figaro.env.lockup_codeword.present? || ((Rails::VERSION::MAJOR >= 4 && Rails::VERSION::MINOR >= 1) && Rails.application.secrets.lockup_codeword.present?)
+      true
+    else
+      false
+    end
+  end
+
+  def lockup_codeword
+    if ENV["LOCKUP_CODEWORD"].present?
+      ENV["LOCKUP_CODEWORD"].to_s.downcase
+    elsif ENV["lockup_codeword"].present?
+      ENV["lockup_codeword"].to_s.downcase
+    elsif Figaro.env.lockup_codeword.present?
+      Figaro.env.lockup_codeword.to_s.downcase
+    elsif (Rails::VERSION::MAJOR >= 4 && Rails::VERSION::MINOR >= 1) && Rails.application.secrets.lockup_codeword.present?
+      Rails.application.secrets.lockup_codeword.to_s.downcase
+    end
+  end
+
 end

data/lib/lockup/version.rb

@@ -1,3 +1,3 @@
 module Lockup
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lockup
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - gb Studio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2015-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -87,6 +87,7 @@ files:
 - app/controllers/lockup/application_controller.rb
 - app/controllers/lockup/lockup_controller.rb
 - app/helpers/lockup/application_helper.rb
+- app/helpers/lockup/lockup_helper.rb
 - app/views/layouts/lockup/_inline_css.html.erb
 - app/views/layouts/lockup/_inline_js.html.erb
 - app/views/layouts/lockup/application.html.erb