turnout 2.4.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02f1d848eeb46276843d9e7a313c040c857888a8
-  data.tar.gz: 8357c006e9a7d8a41d12e5fc06692abc821c7f54
+  metadata.gz: 28688f9c227f64ca86561cc5dcb53b9cb71448f8
+  data.tar.gz: 603319b24986962d1bc52602ab3246e518f6a664
 SHA512:
-  metadata.gz: 0042d84e4989d168955ad234825783ae6621ba0c44182315b5f28e3cc810c68146d3f54405bd278981d1c37edb58f36e19938dc17ed0be1d4c86a1059469f483
-  data.tar.gz: a37a682278fff4e3ba5115c1a1f848f6b6a475839891729ca2791101a2f0c96918f67b9e3658aee2aaddcc08e873ba3a17b317c7796be0a101e4cd6bb55b6795
+  metadata.gz: bde70a83589f2bb455fca464df8ec315ba72da60f2f89bac1aad6f35065f1966edcb1b71394f310ab4e7d89bd8354e67e9544894b8b290b617658d74eb25e9ac
+  data.tar.gz: 0a8de599aefd2a9570796893a36617defe67b1445d2d4f55221d8e68bdf499686f6df53782181eefe87572461bde2a6d3ddb5cfd2de34adf0dd07e791c315f5c

data/README.md

@@ -111,6 +111,7 @@ Turnout can be configured in two different ways:
 
     ```ruby
     Turnout.configure do |config|
+      config.skip_middleware = true
       config.app_root = '/some/path'
       config.named_maintenance_file_paths = {app: 'tmp/app.yml', server: '/tmp/server.yml'}
       config.maintenance_pages_path = 'app/views/maintenance'

data/lib/turnout/configuration.rb

@@ -1,21 +1,33 @@
 require_relative './ordered_options'
 module Turnout
   class Configuration
-    SETTINGS = [:app_root, :named_maintenance_file_paths,
-      :maintenance_pages_path, :default_maintenance_page, :default_reason,
-      :default_allowed_paths, :default_response_code, :default_retry_after, :i18n]
+    SETTINGS = [
+      :app_root,
+      :named_maintenance_file_paths,
+      :maintenance_pages_path,
+      :default_maintenance_page,
+      :default_reason,
+      :default_allowed_ips,
+      :skip_middleware,
+      :default_allowed_paths,
+      :default_response_code,
+      :default_retry_after,
+      :i18n
+    ].freeze
 
     SETTINGS.each do |setting|
       attr_accessor setting
     end
 
     def initialize
+      @skip_middleware = false
       @app_root = '.'
       @named_maintenance_file_paths = {default: app_root.join('tmp', 'maintenance.yml').to_s}
       @maintenance_pages_path = app_root.join('public').to_s
       @default_maintenance_page = Turnout::MaintenancePage::HTML
       @default_reason = "The site is temporarily down for maintenance.\nPlease check back soon."
       @default_allowed_paths = []
+      @default_allowed_ips = []
       @default_response_code = 503
       @default_retry_after = 7200 # 2 hours by default
       @i18n = Turnout::OrderedOptions.new

data/lib/turnout/engine.rb

@@ -7,11 +7,9 @@ if defined? Rails::Engine
   module Turnout
     class Engine < Rails::Engine
       initializer 'turnout.add_to_middleware_stack' do |app|
-        app.config.middleware.use Rack::Turnout
-      end
-
-      rake_tasks do
-        load 'tasks/maintenance.rake'
+        unless Turnout.config.skip_middleware
+          app.config.middleware.use(Rack::Turnout)
+        end
       end
     end
   end

data/lib/turnout/maintenance_file.rb

@@ -12,7 +12,7 @@ module Turnout
       @path = path
       @reason = Turnout.config.default_reason
       @allowed_paths = Turnout.config.default_allowed_paths
-      @allowed_ips = []
+      @allowed_ips = Turnout.config.default_allowed_ips
       @response_code = Turnout.config.default_response_code
       @retry_after = Turnout.config.default_retry_after
 

data/lib/turnout/version.rb

@@ -1,3 +1,3 @@
 module Turnout
-  VERSION = '2.4.1'
+  VERSION = '2.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turnout
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Adam Crownoble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-18 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -68,16 +68,22 @@ dependencies:
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -209,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A Rack based maintenance mode plugin for Rails