oxy 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1c9e36fe6c37d1b9d3fa3319998d949cdd1df3d
-  data.tar.gz: 26093eb8b3a01ed4bcf05921510b6db5ab4e626c
+  metadata.gz: 8414aa2bc0fe1bd32e9a82242100afc5b834b6bc
+  data.tar.gz: 44df9d1db468f8dab50c432257216f7f83c6601d
 SHA512:
-  metadata.gz: 67c8d1ac950fbb0740c2e86ae64c85de4a22daad553d06e5bfdb4f4a29fc2cf169b4ec7024d7bdd5e95452630179f7ba072c0e351b1b77474a48176511745679
-  data.tar.gz: 6969b380b266179e1862d31e485b524500941ebb4286013cb154188a18750820e6a2e3efca811f6e85a0f8ca3bf8a1e71652b351741210b83989265e630d8b96
+  metadata.gz: 2ad33b86ebcf4b2fc86942961fa6b1627bc2f2290e180a682087e4377146e20c5b61d4986262ba623b683f1a08440fd66101566c67aa3221689f4ecd6fc52918
+  data.tar.gz: cc129435f205580ae34466b51eab7bb53560fb2bd9169835c8dd6f2173f94cc12c54d2ec2ae2419ce0052966c0de18668ea835fb45e0b9f699db6e1aea4bc4dd

data/lib/oxy.rb

@@ -2,6 +2,8 @@ require "oxy/version"
 
 require "oxy/server"
 require "oxy/middleware/rsvp"
+require "oxy/middleware/try_static"
+require "oxy/middleware/custom_headers"
 require "oxy/module/subscribe"
 require "oxy/firebase/submissions"
 require "oxy/firebase/submission"

data/lib/oxy/middleware/custom_headers.rb

@@ -0,0 +1,28 @@
+require "safe_yaml/load"
+
+# Simple middleware to set custom http headers
+class Oxy::CustomHeaders
+  def initialize(app, options)
+    @app, @custom_headers = app, load_from_file(options)
+  end
+
+  def call(env)
+    response = @app.call(env)
+    headers = Rack::Utils::HeaderHash.new(response[1])
+    response[1] = headers.merge(@custom_headers)
+    response
+  end
+
+private
+  def load_from_file(options)
+    # parse custom headers from _config.yml
+    filename = File.join(options.document_root, "_config.yml")
+    conf = SafeYAML.load_file(filename) if File.exist?(filename)
+    # yield custom headers (if any)
+    if conf && conf.key?("webrick") && conf["webrick"]
+      headers = conf["webrick"]["headers"]
+    end
+    # default to empty headers (if necessary)
+    headers || {}
+  end
+end

data/lib/oxy/middleware/try_static.rb

@@ -0,0 +1,21 @@
+require "rack/contrib"
+
+class Oxy::TryStatic < Rack::TryStatic
+  def initialize(app, options)
+    @app, @exclude = app, ["_config.yml"]
+    # call superclass
+    super(app, :root => options.document_root, :urls => %w[/], :try => [".html", "index.html", "/index.html"])
+  end
+
+  def call(env)
+    orig_path = env['PATH_INFO']
+    found = nil
+    # match requested path against excluded files
+    @exclude.each do |filename|
+      # detour Rack::TryStatic middleware by calling the next middleware in the pipeline
+      break if orig_path.end_with?(filename) && found = @app.call(env)
+    end
+    # pass thru or ask parent middleware to do the job
+    found or super(env)
+  end
+end

data/lib/oxy/server.rb

@@ -43,10 +43,12 @@ module Oxy
       not_found_path = nil unless File.exist?(not_found_path)
       # build new app
       stack = Rack::Builder.new {
+        # middleware to handle custom HTTP headers
+        use Oxy::CustomHeaders, options
         # middleware to handle RSVP features
         use Oxy::RSVP, logger if options.rsvp
-        # middleware to handle static resources
-        use Rack::TryStatic, :root => options.document_root, :urls => %w[/], :try => [".html", "index.html", "/index.html"]
+        # middleware to handle static resources and prohibit access to the configuration files
+        use Oxy::TryStatic, options
         # fallback to 404 middleware as the main application
         run Rack::NotFound.new(not_found_path)
       }

data/lib/oxy/version.rb

@@ -1,3 +1,3 @@
 module Oxy
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

data/oxy.gemspec

@@ -21,9 +21,10 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "rack", "~> 2.0"
   spec.add_runtime_dependency "rack-contrib", "~> 2.0.1"
-  spec.add_runtime_dependency "puma", "~> 3.10"
+  spec.add_runtime_dependency "puma", "~> 3.11"
   spec.add_runtime_dependency "threaded", "~> 0.0.4"
   spec.add_runtime_dependency "httparty", "~> 0.15.6"
+  spec.add_runtime_dependency "safe_yaml", "~> 1.0.4"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oxy
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Pavel Tsurbeleu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: threaded
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.6
+- !ruby/object:Gem::Dependency
+  name: safe_yaml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -227,7 +241,9 @@ files:
 - lib/oxy.rb
 - lib/oxy/firebase/submission.rb
 - lib/oxy/firebase/submissions.rb
+- lib/oxy/middleware/custom_headers.rb
 - lib/oxy/middleware/rsvp.rb
+- lib/oxy/middleware/try_static.rb
 - lib/oxy/module/subscribe.rb
 - lib/oxy/server.rb
 - lib/oxy/version.rb