madness 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb0d081ae46d00e79cca54642f2567e08ee59624
-  data.tar.gz: de90b22a27526fbd5eb9b926972684b8371b738f
+  metadata.gz: 9d689d84e942b4202cd7f75774377232bbff486a
+  data.tar.gz: e7ca04820360f55634fdf4bc7e43bc51e9711709
 SHA512:
-  metadata.gz: ca2e606e2f0f83c36b6878efc7b9d0c45f1bccc32c75b3aaefc234bce62c213a5a53a269aa142aeb2e6e209204929f4fe83dd2b807c6265a10fd76eb6edfffdb
-  data.tar.gz: 573cbceccc5c7a77921a69a368308caba2a5823fa05fa422ee0dbc8bfb35fbbe30b339ad5a3633150007a2b163a1d640371f6f60de9a359f4de2be9d735ee055
+  metadata.gz: 194295cd30781107963f1c9af70fe64b748ec5184e2ccfd97f1dd6c671878686fa7fde367fae16ecd8c642f96326209c6f24fd88577669386ee36db0fb2110fc
+  data.tar.gz: 79c1de311e52ef1ddb55b7afd06837ee2a02561c38a271c5a3d1241460852e9a72f799a0c90e09939744c435cecbd0546265c2361cb010c62c02263a3658daeb

data/lib/madness.rb

@@ -11,10 +11,10 @@ require 'sinatra/reloader'
 require 'sass/plugin/rack'
 require 'docopt'
 require 'colsole'
-require 'rack/contrib/try_static'
 require 'ferret'
 
 require 'madness/version'
+require 'madness/try_static'
 require 'madness/settings'
 require 'madness/server_helper'
 require 'madness/server_base'

data/lib/madness/server_base.rb

@@ -24,7 +24,7 @@ module Madness
     # The CommandLine class and the test suite should both call
     # `Server.prepare` before calling Server.run!
     def self.prepare
-      use Rack::TryStatic, :root => "#{config.path}/public/", :urls => %w[/]
+      use TryStatic, root: "#{config.path}/public/", :urls => %w[/]
       set :bind, config.bind
       set :port, config.port
     end

data/lib/madness/try_static.rb

@@ -0,0 +1,39 @@
+module Madness
+  # This class allows multiple public folders so that we can load our 
+  # CSS from the gem-domain public folder, and other things from the 
+  # user-domain public folder
+  # 
+  # TryStatic is borrowed from rack-contrib, since the gem is out of date
+  # and does not work with Sinatra 2
+  # 
+  # It is used in `server_base.rb` like so:
+  #
+  #     use TryStatic, :root => "#{config.path}/public/", :urls => %w[/]
+  # 
+  # Ref:
+  # - https://stackoverflow.com/questions/18966318/sinatra-multiple-public-directories
+  # - https://github.com/rack/rack-contrib/blob/master/lib/rack/contrib/try_static.rb
+  # - https://github.com/rack/rack-contrib/pull/129
+  #
+  class TryStatic
+    def initialize(app, options)
+      @app = app
+      @try = ['', *options[:try]]
+      # :nocov:
+      @static = ::Rack::Static.new(
+        lambda { |_| [404, {}, []] },
+        options)
+      # :nocov:
+    end
+
+    def call(env)
+      orig_path = env['PATH_INFO']
+      found = nil
+      @try.each do |path|
+        resp = @static.call(env.merge!({'PATH_INFO' => orig_path + path}))
+        break if !(403..405).include?(resp[0]) && found = resp
+      end
+      found or @app.call(env.merge!('PATH_INFO' => orig_path))
+    end
+  end
+end

data/lib/madness/version.rb

@@ -1,3 +1,3 @@
 module Madness
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: madness
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -30,42 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: rack-contrib
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: runfile-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '9.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '9.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -240,14 +240,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -321,6 +321,7 @@ files:
 - lib/madness/server_base.rb
 - lib/madness/server_helper.rb
 - lib/madness/settings.rb
+- lib/madness/try_static.rb
 - lib/madness/version.rb
 homepage: https://github.com/DannyBen/madness
 licenses:
@@ -334,7 +335,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -342,7 +343,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Instant Markdown Server