regurgitator 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e25137895b8a81aec30d1df214183867db1814e5
-  data.tar.gz: 64d515de854a2f3acfc53b7bd752abe0c71000f4
+  metadata.gz: a2d383effa64f09d324b76580dd3f4c2750759b6
+  data.tar.gz: ff6b44450160b68be22d4b86304e5589f77ffa3a
 SHA512:
-  metadata.gz: e19aa4469529c3c1a4a4ac16212dd6594155c040017e56c0a0f092f92cd2777338e42e86c88f7bf687fac1d86224059725542291841384c935a1e53fa0706643
-  data.tar.gz: ca163773416ad27217eaaecab8e0ab8a3c39652397e0e317020772da23615a1178ccf994ea147c2f2ff7e237f771c457283b63097ce9263acb6ddbedd83a5daf
+  metadata.gz: f1a18579be3d5a719e6fb212c1d246fcdf0c693a7e8a85df87fd8763b550e58f92454accd35bb6d261adcacf3bcee7a44a66ad0b879161edb147df84ea6d1fb2
+  data.tar.gz: cd56b2b2b5ec792d89763fceb8b0e6eac7550431053e740cbe193687be3a6bde57c84ada185a46d37a8cc826bee0db6df839ece9da521a4c0fe65de81b25ceb1

data/GIT-VERSION-GEN

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

data/lib/regurgitator/device.rb

@@ -6,15 +6,6 @@ require_relative 'server_settings'
 module Regurgitator::Device # :nodoc:
   include Regurgitator::ServerSettings
 
-  REFRESH_DEVICE = <<-EOS
-    SELECT d.devid, h.hostip, h.http_port, h.http_get_port
-    FROM device d
-      LEFT JOIN host h ON d.hostid = h.hostid
-    WHERE d.status IN ('readonly','alive','drain') AND h.status = 'alive'
-  EOS
-
-  DEVICES_ON = 'SELECT devid FROM file_on WHERE fid = ?'
-
   def device_init
     server_settings_init
     @dev_cache_mtime = 0
@@ -41,7 +32,14 @@ module Regurgitator::Device # :nodoc:
     return @dev_cache if !force && ((Regurgitator.now - @dev_cache_mtime) < 60)
     tmp = {}.compare_by_identity
     refresh_zone(force)
-    @db[REFRESH_DEVICE].each do |x|
+
+    sql = <<-EOS.freeze
+SELECT d.devid, h.hostip, h.http_port, h.http_get_port
+FROM device d
+  LEFT JOIN host h ON d.hostid = h.hostid
+WHERE d.status IN ('readonly','alive','drain') AND h.status = 'alive'
+    EOS
+    @db[sql].each do |x|
       # devices in "drain" status may hit raciness try those as a last resort
       x[:preferred] = !!(x[:d_status] =~ %r{\A(?:readonly|alive)\z})
       hostip = x[:hostip]

data/lib/regurgitator/domain.rb

@@ -2,8 +2,6 @@
 # helpers for domain lookups
 module Regurgitator::Domain # :nodoc:
 
-  REFRESH_DOMAIN = 'SELECT dmid,namespace FROM domain' # :nodoc:
-
   def domain_init
     @domain_lock = Mutex.new
     @domain_cache_mtime = 0
@@ -26,7 +24,9 @@ module Regurgitator::Domain # :nodoc:
   def refresh_domain_unlocked # :nodoc:
     return @domain_cache if ((Regurgitator.now - @domain_cache_mtime) < 15)
     tmp = {}
-    @db[REFRESH_DOMAIN].each { |x| tmp[x[:namespace].freeze] = x[:dmid] }
+    @db['SELECT dmid,namespace FROM domain'.freeze].each do |x|
+      tmp[x[:namespace].freeze] = x[:dmid]
+    end
     @domain_cache_mtime = Regurgitator.now
     @domain_cache = tmp
   end

data/lib/regurgitator/endpoint.rb

@@ -71,6 +71,7 @@ module Regurgitator::Endpoint # :nodoc:
       status, headers, body = r = Regurgitator::FileRequest.run(env, uris)
       filename!(env, headers, dkey)
       headers['ETag'] = %("#{info[:fid]}")
+      headers.delete('Connection'.freeze)
 
       case env["REQUEST_METHOD"]
       when "GET"

data/lib/regurgitator/file_info.rb

@@ -7,8 +7,6 @@ module Regurgitator::FileInfo # :nodoc:
   include Regurgitator::Domain
   include Regurgitator::Device
 
-  FILE_INFO = 'SELECT fid,length FROM file WHERE dmid = ? AND dkey = ? LIMIT 1'
-
   def file_info_init
     domain_init
     device_init
@@ -27,7 +25,11 @@ module Regurgitator::FileInfo # :nodoc:
   def file_info(env, domain, dkey, update = false)
     dmid = get_dmid(domain) or return
     devices = refresh_device(update)
-    info = @db[FILE_INFO, dmid, dkey].first or return
+
+    info = @db[
+      'SELECT fid,length FROM file WHERE dmid = ? AND dkey = ? LIMIT 1'.freeze,
+      dmid, dkey
+    ].first or return
     0 == info[:length] and return info
     fid = info[:fid]
     read_uris = Hash.new { |h,k| h[k] = [] }
@@ -35,12 +37,12 @@ module Regurgitator::FileInfo # :nodoc:
 
     zone = env['regurgitator.zone']
 
-    @db[DEVICES_ON, fid].each do |x|
+    @db['SELECT devid FROM file_on WHERE fid = ?'.freeze, fid].each do |x|
       devinfo = devices[x[:devid]] or next
       fid >= 10_000_000_000 and next # TODO: support larger FIDs
 
       uris = devinfo[:uris][:pri]
-      nfid = sprintf('%010u', fid)
+      nfid = sprintf('%010u'.freeze, fid)
       /\A(\d)(\d{3})(\d{3})(?:\d{3})\z/ =~ nfid
       fid_path = "/#$1/#$2/#$3/#{nfid}.fid"
       uris = uris.map do |u|

data/lib/regurgitator/file_request.rb

@@ -38,9 +38,9 @@ class Regurgitator::FileRequest < HTTP_Spew::Request # :nodoc:
     }
     PASS_HEADERS.each { |k| pass = env[k] and req[k] = pass }
     tmp = HTTP_Spew.wait(1, uri_group.map { |uris| new(req, uris) }, timeout)
-    tmp.delete_if { |t| t.error }
+    tmp.delete_if(&:error)
     ready = tmp.shift or raise Regurgitator::NoDevices, "no readable devices"
-    tmp.each { |t| t.close }
+    tmp.each(&:close)
     ready.response
   end
 end

data/lib/regurgitator/list_keys.rb

@@ -19,7 +19,8 @@ module Regurgitator::ListKeys # :nodoc:
     limit = LIST_KEYS_MAX if limit > LIST_KEYS_MAX
     sql = "SELECT fid,dkey,length,devcount,classid " \
           "FROM file WHERE dmid = #{dmid}"
-    sql << " AND dkey LIKE /*! BINARY */ #{@db.literal(prefix+'%')}" if prefix
+    prefix and
+      sql << " AND dkey LIKE /*! BINARY */ #{@db.literal(prefix+'%'.freeze)}"
     sql << " AND dkey > #{@db.literal(after)}" if after
     sql << " ORDER BY dkey LIMIT #{limit}"
 

data/lib/regurgitator/local_file.rb

@@ -21,10 +21,10 @@ class Regurgitator::LocalFile # :nodoc:
     size = stat.size
 
     headers = {
-      "Content-Type" => "application/octet-stream", # always ".fid"
+      "Content-Type" => "application/octet-stream".freeze, # always ".fid"
       "Content-Length" => size.to_s,
       "Last-Modified" => stat.mtime.httpdate,
-      "Accept-Ranges" => "bytes",
+      "Accept-Ranges" => "bytes".freeze,
     }
     @response = [ 200, headers ]
 
@@ -38,7 +38,7 @@ class Regurgitator::LocalFile # :nodoc:
     else
       @response[0] = 416
       headers["Content-Range"] = "bytes */#{size}"
-      headers["Content-Length"] = '0'
+      headers["Content-Length"] = '0'.freeze
       @response << []
       return
     end
@@ -72,6 +72,7 @@ class Regurgitator::LocalFile # :nodoc:
           yield buf
         end
       end
+      buf.clear
     end
   end
 

data/lib/regurgitator/server_settings.rb

@@ -4,8 +4,6 @@
 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 = 0
     @zone_cache = nil
@@ -23,10 +21,12 @@ module Regurgitator::ServerSettings # :nodoc:
   def refresh_zone_unlocked(force)
     return @zone_cache if !force && ((Regurgitator.now-@zone_cache_mtime) < 60)
     tmp = Patricia.new
+    sql = 'SELECT value FROM server_settings WHERE field = ? LIMIT 1'.freeze
+
     begin
-      row = @db[SETTINGS_LOOKUP, 'network_zones'].first or return tmp
+      row = @db[sql, 'network_zones'.freeze].first or return tmp
       row[:value].split(/\s*,\s*/).each do |zone|
-        row = @db[SETTINGS_LOOKUP, "zone_#{zone}"].first or next
+        row = @db[sql, "zone_#{zone}"].first or next
         begin
           tmp.add(row[:value], zone)
         rescue ArgumentError

data/regurgitator.gemspec

@@ -1,29 +1,24 @@
 # -*- encoding: binary -*-
-ENV["VERSION"] or abort "VERSION= must be specified"
-manifest = File.readlines('.manifest').map! { |x| x.chomp! }
-require 'olddoc'
-extend Olddoc::Gemspec
-name, summary, title = readme_metadata
+manifest = File.exist?('.manifest') ?
+  IO.readlines('.manifest').map!(&:chomp!) : `git ls-files`.split("\n")
 
 Gem::Specification.new do |s|
   s.name = %q{regurgitator}
-  s.version = ENV["VERSION"].dup
-
-  s.authors = ["Regurgitators"]
-  s.description = readme_description
-  s.email = %q{e@80x24.org}
-  s.extra_rdoc_files = extra_rdoc_files(manifest)
+  s.version = (ENV['VERSION'].dup || '0.9.0')
+  s.authors = ['regurgitator hackers']
+  s.description = File.read('README').split("\n\n")[1]
+  s.email = %q{regurgitator-public@bogomips.org}
+  s.extra_rdoc_files = IO.readlines('.document').map!(&:chomp!).keep_if do |f|
+    File.exist?(f)
+  end
   s.files = manifest
-  s.homepage = Olddoc.config['rdoc_url']
-  s.summary = summary
+  s.homepage = 'https://bogomips.org/regurgitator/'
+  s.summary = 'regurgitator - read-only Rack endpoints for MogileFS'
   s.test_files = Dir["test/test_*.rb"]
-
   s.add_dependency("rack", ['~> 2.0'])
   s.add_dependency("sequel", ["~> 4.0"])
   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/t/t0002-domain_host.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
-t_plan 7 "DomainHost tests"
+t_plan 8 "DomainHost tests"
 
 t_begin "setup" && {
 	setup domain_host.ru
@@ -50,11 +50,14 @@ t_begin "reproxy existing file" && {
 	grep '^< Etag: "1"' $curl_err
 }
 
-t_begin "using CNAME host name" && {
+t_begin "update host name and sleep 16s for cache refresh" && {
 	sqlite3 $db <<EOF
 UPDATE domain SET namespace = 'i-have-a-cname.example.org'
 WHERE namespace = 'd';
 EOF
+}
+
+t_begin 'retry using CNAME host name' && {
 	sleep 16
 	cksum="$(curl -sSvf 2> $curl_err \
 	         -H Host:i-have-a-cname.example.org \

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regurgitator
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
-- Regurgitators
+- regurgitator hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -66,41 +66,14 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: olddoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: |-
   regurgitator is a GPL-licensed library and Rack middleware for
   serving files stored in MogileFS.  It can be embedded inside
   any existing Rack application or be used as a standalone Rack app.
-email: e@80x24.org
+email: regurgitator-public@bogomips.org
 executables: []
 extensions: []
 extra_rdoc_files:
-- lib/regurgitator.rb
-- lib/regurgitator/device.rb
-- lib/regurgitator/domain.rb
-- lib/regurgitator/domain_host.rb
-- lib/regurgitator/domain_path.rb
-- lib/regurgitator/endpoint.rb
-- lib/regurgitator/file_info.rb
-- lib/regurgitator/file_request.rb
-- lib/regurgitator/list_keys.rb
-- lib/regurgitator/local.rb
-- lib/regurgitator/local_file.rb
-- lib/regurgitator/one_domain.rb
-- lib/regurgitator/server_settings.rb
 - NEWS
 - README
 - LICENSE
@@ -172,10 +145,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
-summary: read-only Rack endpoints for MogileFS
+summary: regurgitator - read-only Rack endpoints for MogileFS
 test_files:
 - test/test_local.rb
 - test/test_server_settings.rb