madness 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f277569da4b4196ac7b2ad110ad00c97d8271f9f00845222971d6dfa38cb298
-  data.tar.gz: ca6fe615836d8d8c627a1228b7c9240f1230104f23145a7fe578d8604f7ad42f
+  metadata.gz: 177c0fe6c496b8b07eed2b80140a40db946c8a5af01a1e3d42655e652f3c50b2
+  data.tar.gz: 4e351e74d0a5df4d0111e02ebbe070a4c06cff2fb615b38ed7ef3f1407d3c7fd
 SHA512:
-  metadata.gz: 7b402d979c6640fe5bb1117b3df11106038a0b54d6f0e3c08061c1898d7a3701d1e25fe2ba9aef101f9f0df43dace648304f9bf8add5e9e5d66b47a309fb9926
-  data.tar.gz: bdbe0eaeb2cbe253f27aca7b51ffe540c0fa8b2a024913d9b02418db1e955a30a334dec1a4dc52a08192d0c6862ef73dd010c432a2672caf74177678dc82cce6
+  metadata.gz: 875ff85eb026afc5146b56dfd213ec5943ff337847d1a0c4f131963f3350c0a8220b516290b4bd56015e4d59b009bb43445f03a323fda03a97bf28cb4baf4d5f
+  data.tar.gz: 8d6dd211a8b35b1a70b74adcf02b178876631fc55d19d07b409947a57420fcdb11b89f1b2ecf7d3a111203e9bdacc3ffefd75d126b45a791d7bbaf44b0bf62ee

data/lib/madness/docopt.txt

@@ -16,17 +16,17 @@ Subcommands:
 
 Parameters:
   PATH:
-    Path to the markdown directory [default: .].
-    (Config option: path)
+    Path to the markdown directory.
+    (Config option: path, default: .)
 
 Options:
   -p, --port NUMBER
-    Set server port number [default: 3000].
-    (Config option: port)
+    Set server port number.
+    (Config option: port, default: 3000)
 
   -b, --bind ADDRESS
-    Set server listen address [default: 0.0.0.0].
-    (Config option: bind)
+    Set server listen address.
+    (Config option: bind, default: 0.0.0.0)
 
   --no-auto-h1
     By default, if a markdown document does not start with an H1 caption,
@@ -77,8 +77,8 @@ Options:
     (Config option: auth)
 
   --auth-realm REALM
-    The basic authentication realm [default: Madness].
-    (Config option: auth_realm)
+    The basic authentication realm.
+    (Config option: auth_realm, default: Madness)
 
   --open
     Open the browser pointing at the madness webserver.

data/lib/madness/refinements/string_refinements.rb

@@ -1,3 +1,5 @@
+require 'addressable'
+
 module Madness
   module StringRefinements
     refine String do
@@ -6,7 +8,7 @@ module Madness
       end
 
       def to_href
-        URI.escape self
+        Addressable::URI.escape self
       end
 
       def to_slug

data/lib/madness/server_base.rb

@@ -1,9 +1,8 @@
-require 'rack/contrib/try_static'
+# require 'sinatra/reloader'
 require 'rack/ssl'
 require 'sass'
 require 'sass/plugin/rack'
 require 'sinatra/base'
-require 'sinatra/reloader'
 require 'slim'
 
 module Madness
@@ -19,11 +18,16 @@ module Madness
     use Rack::SSL if ENV['MADNESS_FORCE_SSL']
     set :root, File.expand_path('../../', __dir__)
     set :server, :puma
+    set :environment, ENV['MADNESS_ENV'] || :production
 
-    configure :development do
-      register Sinatra::Reloader
-      also_reload "#{__dir__}/*.rb"
-    end    
+    # TODO: Uncomment when the upstream issue is resolved
+    # At this time, we cannot use reloader, since it prints deprecation
+    # warnings in Ruby 2.7
+    # ref: https://github.com/sinatra/sinatra/issues/1590
+    # configure :development do
+    #   register Sinatra::Reloader
+    #   also_reload "#{__dir__}/*.rb"
+    # end
 
     # Since we cannot use any config values in the main body of the class,
     # since they will be updated later, we need to set anything that relys
@@ -31,7 +35,7 @@ module Madness
     # The CommandLine class and the test suite should both call
     # `Server.prepare` before calling Server.run!
     def self.prepare
-      use Madness::Static, root: "#{config.path}/", :urls => %w[/]
+      use Madness::Static, root: "#{config.path}/", urls: %w[/], cascade: true
       set :bind, config.bind
       set :port, config.port
 

data/lib/madness/static.rb

@@ -1,11 +1,11 @@
 module Madness
 
   # The Madness::Static middleware delegates requests to 
-  # Rack::TryStatic middleware unless the request URI ends with .md
+  # Rack::Static middleware unless the request URI ends with .md
   class Static
     def initialize(app, options)
       @app = app
-      @static = ::Rack::TryStatic.new(app, options)
+      @static = Rack::Static.new app, options
     end
 
     def call(env)

data/lib/madness/version.rb

@@ -1,3 +1,3 @@
 module Madness
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: madness
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2020-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay
@@ -136,20 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: rack-contrib
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rack-ssl
   requirement: !ruby/object:Gem::Requirement
@@ -213,53 +199,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.5
 - !ruby/object:Gem::Dependency
-  name: sinatra-contrib
+  name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: slim
+  name: extended_yaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: extended_yaml
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '2.7'
 description: Start a markdown server in any directory
 email: db@dannyben.com
 executables:
@@ -347,7 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Instant Markdown Server