turnout 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adf33ca2dc98cb6fa15b8e17290193dd24f16795
-  data.tar.gz: abff4e95ca98a1dc8bc2d10e11eea6e677fb0724
+  metadata.gz: f239e00975d88e68f53e7a3cc03df4124c02858a
+  data.tar.gz: 81227d4c7b4f6b74b45215291d3863a945a9acca
 SHA512:
-  metadata.gz: 9d3f40a2d6701f652ffbddf93cb07f7b2d7ca7ce229b29283ad0079b51b1fbf948fdb597bfd36bd5000746b3dd1d74e3ffc48687c58c0a897f3b5e113ee3e164
-  data.tar.gz: eca42d7c3acb642cc8dc5aa68f5790838756279a74eb143268087172ec1d69c89f4e82486f3c3fdfef8afea462454be53a11d8acbf0cea198a51fadfb698c432
+  metadata.gz: 7a507e6ed38712a52d941bb47ae7e5760d15d47278179c71410a2282990a7d16eadabd51a7eb3e940011984ff78fed9ac3eb5bd6e5751de1da02f3c79c0f5843
+  data.tar.gz: d36bd8d89167dfaeb95681dfd7554a07da861dcddd057e41decee83736aff60fb43a13ba7d176428e8e6afcba46b91cc62cb1425a346daf713dec0f6bdbaa597

data/README.markdown

@@ -82,7 +82,7 @@ A [default maintenance page](https://github.com/biola/turnout/blob/master/public
 Tips
 ====
 
-There is no `denied_paths` feature because turnout denies everyhing by default.
+There is no `denied_paths` feature because turnout denies everything by default.
 However you can achieve the same sort of functionality by using
 [negative lookaheads](http://www.regular-expressions.info/lookaround.html) with the `allowed_paths` setting, like so:
 
@@ -106,4 +106,4 @@ Example maintenance.yml File
     - ^/contact_us
     allowed_ips:
     - 127.0.0.1
-    - 192.168.0.0/24
+    - 192.168.0.0/24

data/lib/rack/turnout.rb

@@ -10,9 +10,10 @@ class Rack::Turnout
   end
 
   def call(env)
+    self.request = Rack::Request.new(env)
     reload_settings
 
-    if on?(env)
+    if on?
       [ 503, { 'Content-Type' => 'text/html', 'Content-Length' => content_length }, [content] ]
     else
       @app.call(env)
@@ -21,27 +22,32 @@ class Rack::Turnout
 
   protected
 
-  def on?(env)
-    request = Rack::Request.new(env)
+  attr_accessor :request
 
-    return false if path_allowed?(request.path)
-    return false if ip_allowed?(request.ip)
-    maintenance_file_exists?
+  def on?
+    maintenance_file_exists? && !request_allowed?
   end
 
-  def path_allowed?(path)
-    (settings['allowed_paths'] || []).each do |allowed_path|
-      return true if path =~ Regexp.new(allowed_path)
+  def request_allowed?
+    path_allowed? || ip_allowed?
+  end
+
+  def path_allowed?
+    (settings['allowed_paths'] || []).any? do |allowed_path|
+      request.path =~ Regexp.new(allowed_path)
     end
-    false
   end
 
-  def ip_allowed?(ip)
-    ip = IPAddr.new(ip) unless ip.is_a? IPAddr
-    (settings['allowed_ips'] || []).each do |allowed_ip|
-      return true if IPAddr.new(allowed_ip).include? ip
+  def ip_allowed?
+    begin
+      ip = IPAddr.new(request.ip.to_s)
+    rescue ArgumentError
+      return false
+    end
+
+    (settings['allowed_ips'] || []).any? do |allowed_ip|
+      IPAddr.new(allowed_ip).include? ip
     end
-    false
   end
 
   def reload_settings

data/lib/turnout/version.rb

@@ -1,3 +1,3 @@
 module Turnout
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turnout
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Adam Crownoble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A Rack based maintenance mode plugin for Rails