regurgitator 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 540755c4ee64844a72e4785fe8f2e9afd44af42c
-  data.tar.gz: 103abb8cade042a114d9f946ae8430cde845fda2
+  metadata.gz: e25137895b8a81aec30d1df214183867db1814e5
+  data.tar.gz: 64d515de854a2f3acfc53b7bd752abe0c71000f4
 SHA512:
-  metadata.gz: 999e149f5b40e8790c29deb70d38f3cec6f182bcc2a7ca662748c250221c74553de230cff20440af1693bf078a5371f25db18ec0d56eb66e8dcb8abdd7ac4380
-  data.tar.gz: b2ddaf77efd2e6c5ade2aab699af1a44efdf5c06f5527480ae51be5983b2727ab0b231384297289b1a7acce0f5fd846955369e7348ea66bf99a32961a50887a0
+  metadata.gz: e19aa4469529c3c1a4a4ac16212dd6594155c040017e56c0a0f092f92cd2777338e42e86c88f7bf687fac1d86224059725542291841384c935a1e53fa0706643
+  data.tar.gz: ca163773416ad27217eaaecab8e0ab8a3c39652397e0e317020772da23615a1178ccf994ea147c2f2ff7e237f771c457283b63097ce9263acb6ddbedd83a5daf

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 0.7.0
+GIT_VERSION = 0.8.0

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v0.7.0
+DEF_VER=v0.8.0
 
 LF='
 '

data/LATEST

@@ -1,13 +1,14 @@
-=== regurgitator 0.7.0 / 2016-06-11 22:57 UTC
-
-  8 changes since v0.6.0:
-
-        update email address to point to me for now
-        GNUmakefile: publish examples with website
-        update documentation and packaging
-        cleanup documentation on our homepage
-        README: grammar fix
-        README: use lowercase to match the gem name
-        local_file: Content-Length is zero on 416 responses
-        README: updates for HTTPS and new mailing list
+=== regurgitator 0.8.0 - modernizing to Rack 2.x / 2016-11-02 21:46 UTC
+
+  I don't think anybody cares or uses this project,
+  but we now require Rack 2+ and Ruby 2.1+.
+
+  6 changes since 0.7.0:
+
+        pkg.mk: avoid network for "gem install"
+        use monotonic clock for time comparisons
+        gemspec: bump dependencies
+        local_file: avoid deprecated Rack::Utils.byte_ranges
+        reduce autoload footprint
+        fix loading regressions
 

data/NEWS

@@ -1,3 +1,17 @@
+=== regurgitator 0.8.0 - modernizing to Rack 2.x / 2016-11-02 21:46 UTC
+
+  I don't think anybody cares or uses this project,
+  but we now require Rack 2+ and Ruby 2.1+.
+
+  6 changes since 0.7.0:
+
+        pkg.mk: avoid network for "gem install"
+        use monotonic clock for time comparisons
+        gemspec: bump dependencies
+        local_file: avoid deprecated Rack::Utils.byte_ranges
+        reduce autoload footprint
+        fix loading regressions
+
 === regurgitator 0.7.0 / 2016-06-11 22:57 UTC
 
   8 changes since v0.6.0:

data/lib/regurgitator/device.rb

@@ -1,5 +1,8 @@
 # -*- encoding: binary -*-
 # helpers for device lookups
+
+require_relative 'server_settings'
+
 module Regurgitator::Device # :nodoc:
   include Regurgitator::ServerSettings
 
@@ -14,9 +17,9 @@ module Regurgitator::Device # :nodoc:
 
   def device_init
     server_settings_init
-    @device_cache_mtime = Time.at(0)
-    @device_cache = nil
-    @device_cache_lock = Mutex.new
+    @dev_cache_mtime = 0
+    @dev_cache = nil
+    @dev_cache_lock = Mutex.new
   end
 
   def self.extended(obj)
@@ -31,11 +34,11 @@ module Regurgitator::Device # :nodoc:
   # Returns a hash of device info with the Integer +devid+
   # as the hash key.
   def refresh_device(force = false) # :nodoc:
-    @device_cache_lock.synchronize { refresh_device_unlocked(force) }
+    @dev_cache_lock.synchronize { refresh_device_unlocked(force) }
   end
 
   def refresh_device_unlocked(force) # :nodoc:
-    return @device_cache if ! force && ((Time.now - @device_cache_mtime) < 60)
+    return @dev_cache if !force && ((Regurgitator.now - @dev_cache_mtime) < 60)
     tmp = {}.compare_by_identity
     refresh_zone(force)
     @db[REFRESH_DEVICE].each do |x|
@@ -52,7 +55,7 @@ module Regurgitator::Device # :nodoc:
       tmp[devid] = x
     end
     Regurgitator::Local.refresh_addrs!
-    @device_cache_mtime = Time.now
-    @device_cache = tmp
+    @dev_cache_mtime = Regurgitator.now
+    @dev_cache = tmp
   end
 end

data/lib/regurgitator/domain.rb

@@ -6,7 +6,7 @@ module Regurgitator::Domain # :nodoc:
 
   def domain_init
     @domain_lock = Mutex.new
-    @domain_cache_mtime = Time.at(0)
+    @domain_cache_mtime = 0
     @domain_cache = nil
   end
 
@@ -24,10 +24,10 @@ module Regurgitator::Domain # :nodoc:
   end
 
   def refresh_domain_unlocked # :nodoc:
-    return @domain_cache if ((Time.now - @domain_cache_mtime) < 15)
+    return @domain_cache if ((Regurgitator.now - @domain_cache_mtime) < 15)
     tmp = {}
     @db[REFRESH_DOMAIN].each { |x| tmp[x[:namespace].freeze] = x[:dmid] }
-    @domain_cache_mtime = Time.now
+    @domain_cache_mtime = Regurgitator.now
     @domain_cache = tmp
   end
 end

data/lib/regurgitator/domain_host.rb

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+require_relative 'endpoint'
 
 # Matches GET and HEAD requests in the format of ":domain.example.com/:dkey"
 # where domain is read from the Host: header.

data/lib/regurgitator/domain_path.rb

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+require_relative 'endpoint'
 
 # matches GET and HEAD requests in the format of "/:namespace/:dkey"
 # where +:dkey+ may contain multiple slashes

data/lib/regurgitator/endpoint.rb

@@ -1,5 +1,9 @@
 # -*- encoding: binary -*-
 require "socket"
+require_relative 'file_request'
+require_relative 'file_info'
+require_relative 'local'
+
 module Regurgitator::Endpoint # :nodoc:
   include Regurgitator::FileInfo
   include Rack::Utils

data/lib/regurgitator/file_info.rb

@@ -1,4 +1,8 @@
 # -*- encoding: binary -*-
+
+require_relative 'domain'
+require_relative 'device'
+
 module Regurgitator::FileInfo # :nodoc:
   include Regurgitator::Domain
   include Regurgitator::Device

data/lib/regurgitator/list_keys.rb

@@ -1,4 +1,7 @@
 # -*- encoding: binary -*-
+
+require_relative 'domain'
+
 module Regurgitator::ListKeys # :nodoc:
   include Regurgitator::Domain
 

data/lib/regurgitator/local.rb

@@ -1,6 +1,7 @@
 # -*- encoding: binary -*-
 require "socket"
 require "set"
+require_relative 'local_file'
 
 module Regurgitator::Local # :nodoc:
 

data/lib/regurgitator/local_file.rb

@@ -28,7 +28,7 @@ class Regurgitator::LocalFile # :nodoc:
     }
     @response = [ 200, headers ]
 
-    ranges = Rack::Utils.byte_ranges(env, size)
+    ranges = Rack::Utils.get_byte_ranges(env['HTTP_RANGE'], size)
     if nil == ranges || ranges.size > 1
       @range = nil
     elsif @range = ranges[0]

data/lib/regurgitator/one_domain.rb

@@ -1,5 +1,7 @@
 # -*- encoding: binary -*-
 
+require_relative 'endpoint'
+
 # matches GET and HEAD requests in the format of "/:dkey" from a
 # single, preconfigured domain.
 #

data/lib/regurgitator/server_settings.rb

@@ -1,11 +1,13 @@
 # -*- encoding: binary -*-
 # helpers for server_settings lookups
+
+require_relative 'local'
 module Regurgitator::ServerSettings # :nodoc:
 
   SETTINGS_LOOKUP = 'SELECT value FROM server_settings WHERE field = ? LIMIT 1'
 
   def server_settings_init
-    @zone_cache_mtime = Time.at(0)
+    @zone_cache_mtime = 0
     @zone_cache = nil
     @zone_cache_lock = Mutex.new
   end
@@ -19,7 +21,7 @@ module Regurgitator::ServerSettings # :nodoc:
   end
 
   def refresh_zone_unlocked(force)
-    return @zone_cache if ! force && ((Time.now - @zone_cache_mtime) < 60)
+    return @zone_cache if !force && ((Regurgitator.now-@zone_cache_mtime) < 60)
     tmp = Patricia.new
     begin
       row = @db[SETTINGS_LOOKUP, 'network_zones'].first or return tmp
@@ -31,7 +33,7 @@ module Regurgitator::ServerSettings # :nodoc:
         end
       end
     ensure
-      @zone_cache_mtime = Time.now
+      @zone_cache_mtime = Regurgitator.now
       return @zone_cache = tmp
     end
   end

data/lib/regurgitator.rb

@@ -13,14 +13,6 @@ require 'rpatricia'
 # so just "require 'regurgitator'" in your code.
 module Regurgitator
 
-  autoload :ServerSettings, 'regurgitator/server_settings'
-  autoload :Domain, 'regurgitator/domain'
-  autoload :Device, 'regurgitator/device'
-  autoload :FileInfo, 'regurgitator/file_info'
-  autoload :Endpoint, 'regurgitator/endpoint'
-  autoload :FileRequest, 'regurgitator/file_request'
-  autoload :Local, 'regurgitator/local'
-  autoload :LocalFile, 'regurgitator/local_file'
   autoload :ListKeys, 'regurgitator/list_keys'
   # Rack middlewares/apps
   autoload :DomainPath, 'regurgitator/domain_path'
@@ -36,4 +28,10 @@ module Regurgitator
   # raised by FileRequest when the HTTP status code
   # is outside of (200-299, 304)
   BadResponse = Class.new(Error) # :nodoc:
+
+  def self.now # :nodoc:
+    Process.clock_gettime(Process::CLOCK_MONOTONIC)
+  end
 end
+
+require_relative 'regurgitator/local'

data/pkg.mk

@@ -86,7 +86,7 @@ fix-perms:
 gem: $(pkggem)
 
 install-gem: $(pkggem)
-	gem install $(CURDIR)/$<
+	gem install --local $(CURDIR)/$<
 
 $(pkggem): manifest fix-perms
 	gem build $(rfpackage).gemspec

data/regurgitator.gemspec

@@ -18,10 +18,12 @@ Gem::Specification.new do |s|
   s.summary = summary
   s.test_files = Dir["test/test_*.rb"]
 
-  s.add_dependency("rack", ["~> 1.3"])
+  s.add_dependency("rack", ['~> 2.0'])
   s.add_dependency("sequel", ["~> 4.0"])
-  s.add_dependency("http_spew", ["~> 0.4", ">= 0.4.1" ])
+  s.add_dependency("http_spew", ['~> 0.5'])
   s.add_dependency("rpatricia", ["~> 1.0"])
   s.add_development_dependency('olddoc', "~> 1.0")
+
+  s.required_ruby_version = '>= 2.1'
   s.licenses = %w(GPL-2.0+)
 end

data/test/test_local.rb

@@ -1,7 +1,8 @@
 require "test/unit"
-require "regurgitator"
 require "tmpdir"
 require "fileutils"
+require "regurgitator"
+require "regurgitator/local"
 
 class TestLocal < Test::Unit::TestCase
   include Regurgitator::Local

data/test/test_server_settings.rb

@@ -1,5 +1,6 @@
 require 'test/unit'
 require 'regurgitator'
+require 'regurgitator/server_settings'
 
 class TestServerSettings < Test::Unit::TestCase
   include Regurgitator::ServerSettings

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regurgitator
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Regurgitators
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-11 00:00:00.000000000 Z
+date: 2016-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -44,20 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rpatricia
   requirement: !ruby/object:Gem::Requirement
@@ -170,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -178,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: read-only Rack endpoints for MogileFS