adsf 1.3.1 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d209e17b4b260c9bc77e4c435a94d51b8b6cf4e0ce7b38a4f77d90bc8bf27fc3
-  data.tar.gz: 472632fb8c5f1e29e1fe773b30cc2c6a341c35725e7942546bdaefe7b3326223
+  metadata.gz: 60390346b41657096f88db3706f4a7c231c2f1b7556caacc7ba7e74eaad8c057
+  data.tar.gz: 83d02b5d039061ca9bf4bca4516cf2dcf2cfe0ecbe8618ea8d15deff7d1c9216
 SHA512:
-  metadata.gz: cefc44acb68c0f56faaa5495f824b266e2d4267dce825afa950ec61a9b5c2c92c2e4a27dd526cb8e00b0085979e695f61d853bf04c64a41a7ed516657bc7904c
-  data.tar.gz: 154c0da23d3c09430e5813a1c613ad6bcdb0530057aa98d0e6b785ce8a59505a1832d63dacd98f1fe9a16a0979f27e95819fc3106546bbcded63c57bec18a6e5
+  metadata.gz: 1ae356ddc04b843a65f841bc46f4799588bcbf8a0c3ba07a57b2749a08101e496049d9e8b05fc1630ed795a52deccc8a54b2818bcf19d29e0c3702f1863d14ce
+  data.tar.gz: 1869f1595e050c7f89aaacbb1b1a445e1340887942351c006783ec538b9fe250b0c03042c8ac20556b5b87188a113dd30c1b1bc131916a26bf870419ed39c238

data/NEWS.md

@@ -1,4 +1,34 @@
-# adsf News
+# Release notes for adsf
+
+## 1.4.4 (2020-12-18)
+
+Enhancements:
+
+* Let Rack handler default to what Rack considers to be default (not Thin)
+
+## 1.4.3 (2019-12-06)
+
+Fixes:
+
+* Fixed incorrect Cache-Control stale-if-error header value (#20) [Chris Chapman]
+
+## 1.4.2 (2019-05-26)
+
+Enhancements:
+
+* Set `Cache-Control` HTTP header to prevent caching (#17, #18) [Daniel Aleksandersen]
+
+## 1.4.1 (2018-02-02)
+
+Fixes:
+
+* [adsf-live] Fixed Windows compatibility (#14)
+
+## 1.4.0 (2017-11-26)
+
+Features:
+
+* Added `--live-reload` option (requires `adsf-live`)
 
 ## 1.3.1 (2017-11-25)
 

data/README.md

@@ -25,6 +25,8 @@ _adsf_ (**A** **D**ead **S**imple **F**ileserver) is a tiny static web server th
 
 See `adsf --help` for details.
 
+To use `adsf --live-reload`, please install the separate `adsf-live` gem. (The live-reload support is not part of adsf itself, because the dependencies of `adsf-live` make it difficult to install under some circumstances.)
+
 Using adsf programmatically
 ---------------------------
 

data/bin/adsf

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'optparse'
 require 'adsf'
@@ -9,6 +10,7 @@ options = {
   index_filenames: %w[index.html],
   root: '.',
   host: '0.0.0.0',
+  live: false,
 }
 
 OptionParser.new do |opts|
@@ -42,6 +44,10 @@ OptionParser.new do |opts|
   opts.on('-a', '--listen-address [host]', 'Specify the address to listen to') do |o|
     options[:host] = o
   end
+
+  opts.on('-L', '--live-reload', 'Reload on changes (requires adsf-live)') do
+    options[:live] = true
+  end
 end.parse!
 
 server = Adsf::Server.new(options)

data/lib/adsf.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rack'
 
 module Adsf

data/lib/adsf/rack.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 module Adsf
   module Rack
   end
 end
 
 require 'adsf/rack/index_file_finder'
+require 'adsf/rack/caching'
 require 'adsf/rack/cors'

data/lib/adsf/rack/caching.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Adsf::Rack
+  class Caching
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      status, headers, body = *@app.call(env)
+
+      new_headers =
+        headers.merge(
+          'Cache-Control' => 'max-age=0, stale-if-error=0',
+        )
+
+      [status, new_headers, body]
+    end
+  end
+end

data/lib/adsf/rack/cors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Adsf::Rack
   class CORS
     def initialize(app)

data/lib/adsf/rack/index_file_finder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Adsf::Rack
   class IndexFileFinder
     def initialize(app, root:, index_filenames: ['index.html'])

data/lib/adsf/server.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 module Adsf
   class Server
-    DEFAULT_HANDLER_NAME = :thin
-
-    def initialize(root:, index_filenames: ['index.html'], host: '127.0.0.1', port: 3000, handler: nil)
+    def initialize(root:, live: false, index_filenames: ['index.html'], host: '127.0.0.1', port: 3000, handler: nil)
       @root = root
+      @live = live
       @index_filenames = index_filenames
       @host = host
       @port = port
@@ -15,6 +16,7 @@ module Adsf
     def run
       handler = build_handler
       app = build_app(root: @root, index_filenames: @index_filenames)
+      start_watcher if @live
 
       url = "http://#{@host}:#{@port}/"
       puts "View the site at #{url}"
@@ -30,6 +32,12 @@ module Adsf
 
     private
 
+    def start_watcher
+      require 'adsf/live'
+
+      ::Adsf::Live::Watcher.new(root_dir: File.absolute_path(@root)).tap(&:start)
+    end
+
     def wait_for_stop_async(server)
       Thread.new { wait_for_stop(server) }
     end
@@ -40,16 +48,24 @@ module Adsf
     end
 
     def build_app(root:, index_filenames:)
+      is_live = @live
+
       ::Rack::Builder.new do
         use ::Rack::CommonLogger
         use ::Rack::ShowExceptions
         use ::Rack::Lint
         use ::Rack::Head
+        use Adsf::Rack::Caching
         use Adsf::Rack::CORS
         use Adsf::Rack::IndexFileFinder,
             root: root,
             index_filenames: index_filenames
 
+        if is_live
+          require 'adsf/live'
+          use ::Rack::LiveReload, source: :vendored
+        end
+
         run ::Rack::File.new(root)
       end.to_app
     end
@@ -58,11 +74,7 @@ module Adsf
       if @handler
         ::Rack::Handler.get(@handler)
       else
-        begin
-          ::Rack::Handler.get(DEFAULT_HANDLER_NAME)
-        rescue LoadError
-          ::Rack::Handler::WEBrick
-        end
+        ::Rack::Handler.default
       end
     end
   end

data/lib/adsf/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Adsf
-  VERSION = '1.3.1'.freeze
+  VERSION = '1.4.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adsf
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.4
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-25 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -37,15 +37,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
-- Gemfile.lock
-- LICENSE
 - NEWS.md
 - README.md
-- Rakefile
 - bin/adsf
 - lib/adsf.rb
 - lib/adsf/rack.rb
+- lib/adsf/rack/caching.rb
 - lib/adsf/rack/cors.rb
 - lib/adsf/rack/index_file_finder.rb
 - lib/adsf/server.rb
@@ -60,17 +57,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.2
+rubygems_version: 3.2.2
 signing_key: 
 specification_version: 4
 summary: a tiny static file server

data/Gemfile

@@ -1,12 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-group :development do
-  gem 'codecov', require: false
-  gem 'm'
-  gem 'minitest'
-  gem 'rack-test'
-  gem 'rake'
-  gem 'rubocop'
-end

data/Gemfile.lock

@@ -1,61 +0,0 @@
-PATH
-  remote: .
-  specs:
-    adsf (1.3.1)
-      rack (>= 1.0.0, < 3.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.3.0)
-    codecov (0.1.10)
-      json
-      simplecov
-      url
-    docile (1.1.5)
-    json (2.1.0)
-    m (1.5.1)
-      method_source (>= 0.6.7)
-      rake (>= 0.9.2.2)
-    method_source (0.9.0)
-    minitest (5.10.3)
-    parallel (1.12.0)
-    parser (2.4.0.2)
-      ast (~> 2.3)
-    powerpack (0.1.1)
-    rack (2.0.3)
-    rack-test (0.8.2)
-      rack (>= 1.0, < 3)
-    rainbow (2.2.2)
-      rake
-    rake (12.3.0)
-    rubocop (0.51.0)
-      parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    simplecov (0.15.1)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    unicode-display_width (1.3.0)
-    url (0.3.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  adsf!
-  codecov
-  m
-  minitest
-  rack-test
-  rake
-  rubocop
-
-BUNDLED WITH
-   1.16.0

data/LICENSE

@@ -1,19 +0,0 @@
-Copyright (c) 2009 Denis Defreyne
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

data/Rakefile

@@ -1,12 +0,0 @@
-require 'rubocop/rake_task'
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.test_files = Dir['test/**/test_*.rb']
-  t.libs << 'test'
-  t.verbose = false
-end
-
-RuboCop::RakeTask.new(:rubocop)
-
-task default: %i[test rubocop]