thingfish 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00e3affe84cd08994e0a22ce39677827267f153e
-  data.tar.gz: c6e302caa8ddc1be3ba8e2aa882714b225318d47
+  metadata.gz: 9a0df5e14498c987d01ba054873bcfad3e98c364
+  data.tar.gz: b63b33e9f59288acc5d9759a082d13ccfde6b8b0
 SHA512:
-  metadata.gz: 9dd4df271c0085c9afd2f989ae30a6083401691dc4bc46cefb7b316503ded390f0dba9642884cb87c5e399f50fc301861e67eeb78b2a739887424e9e3cc5a180
-  data.tar.gz: e836ef365082a6bad19a32c94f9111e7a87b962210a62c0a72db3aa512c438a3300f0bc8e32e7264b06347edda8722ef7d1e404df853bb6c92bafddb8e704e14
+  metadata.gz: 217f66c0d72e2f644516b6e2b35967a61f519c7c848849d6b3a721721628415e50c95ef9630aba0dde4a9afbd789a52aa16ba4252387f18b872f7246e080b373
+  data.tar.gz: a68b9ffaa68472217321e300962486cb8ad72cd0658f995e7158e5e6c36d3622f700fadc226d15b1152c7160174efe8ec657e5ba9ea2cd045bfa7354b562c983

data/ChangeLog

@@ -1,9 +1,57 @@
+2017-09-13  Mahlon E. Smith  <mahlon@laika.com>
+
+	* .hgtags:
+	Added tag v0.7.0 for changeset c8bfee4b3f80
+	[60864d37774f] [tip]
+
+2017-09-13  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* lib/thingfish.rb:
+	Bunp version.
+	[c8bfee4b3f80] [v0.7.0]
+
+2017-09-13  Mahlon E. Smith  <mahlon@laika.com>
+
+	* lib/thingfish/handler.rb:
+	Explicitly set the HTTP status when returning resources.
+	[15b877ef492e]
+
+	* lib/thingfish/handler.rb, spec/thingfish/handler_spec.rb:
+	Add Last-Modified/If-None-Match support.
+
+	This allows caching to still take place even if not using the
+	checksum plugin.
+	[bf37a1852e61]
+
+2017-06-28  Michael Granger  <ged@FaerieMUD.org>
+
+	* .ruby-version, README.rdoc, Rakefile, thingfish.gemspec:
+	Update build files, bump Strelka dependency
+	[6665c33cf990]
+
+2017-05-31  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* lib/thingfish/handler.rb, spec/thingfish/handler_spec.rb:
+	Move the configure() method to help support deferred configuration.
+	Fix tests for CZTop.
+	[30905f58ff2e]
+
+2017-01-16  Mahlon E. Smith  <mahlon@laika.com>
+
+	* .hgtags:
+	Added tag v0.6.0 for changeset dfcb639cbbe7
+	[fd014c3361f2]
+
+	* .hgsigs:
+	Added signature for changeset 2bc8257c7537
+	[dfcb639cbbe7] [v0.6.0]
+
 2017-01-16  Mahlon E. Smith  <mahlon@martini.nu>
 
 	* .gems, .ruby-gemset, .ruby-version, .rvmrc, History.rdoc, Rakefile,
 	lib/thingfish.rb:
 	Bump Configurability dependency, migrate away from .rvmrc.
-	[2bc8257c7537] [tip]
+	[2bc8257c7537]
 
 2016-11-14  Michael Granger  <ged@FaerieMUD.org>
 

data/README.rdoc

@@ -1,6 +1,6 @@
 = Thingfish
 
-* https://thing.fish/
+* https://thing.fish
 
 == Description
 

data/Rakefile

@@ -26,7 +26,7 @@ hoespec = Hoe.spec 'thingfish' do
 	self.developer 'Mahlon E. Smith', 'mahlon@martini.nu'
 	self.license "BSD"
 
-	self.dependency 'strelka',      '~> 0.13'
+	self.dependency 'strelka',      '~> 0.14'
 
 	self.dependency 'hoe-deveiate', '~> 0.3',  :development
 	self.dependency 'simplecov',    '~> 0.7',  :development
@@ -36,7 +36,7 @@ hoespec = Hoe.spec 'thingfish' do
 	self.hg_sign_tags = true if self.respond_to?( :hg_sign_tags= )
 	spec.check_history_on_release = true if spec.respond_to?( :check_history_on_release= )
 
-	self.rdoc_locations << "deveiate:/usr/local/www/public/code/#{remote_rdoc_dir}"
+	self.rdoc_locations << "deveiate:/usr/local/thingfish/api"
 end
 
 ENV['VERSION'] ||= hoespec.spec.version.to_s
@@ -67,7 +67,7 @@ if File.directory?( '.hg' )
 	    rdoc.main = "README.rdoc"
 		rdoc.markup = 'markdown'
 	    rdoc.rdoc_files.include( "*.rdoc", "ChangeLog", "lib/**/*.rb" )
-	    rdoc.generator = :fivefish
+	    rdoc.generator = :sixfish
 		rdoc.title = 'Thingfish'
 	    rdoc.rdoc_dir = 'doc'
 	end
@@ -79,8 +79,8 @@ task GEMSPEC do |task|
 	spec = $hoespec.spec
 	spec.files.delete( '.gemtest' )
 	spec.signing_key = nil
-	spec.cert_chain = ['certs/ged.pem']
-	spec.version = "#{spec.version}.pre#{Time.now.strftime("%Y%m%d%H%M%S")}"
+	spec.cert_chain = Dir.glob( 'certs/*.pem' )
+	spec.version = "#{spec.version.bump}.0.pre#{Time.now.strftime("%Y%m%d%H%M%S")}"
 	File.open( task.name, 'w' ) do |fh|
 		fh.write( spec.to_ruby )
 	end

data/lib/thingfish.rb

@@ -12,10 +12,10 @@ module Thingfish
 
 
 	# Package version
-	VERSION = '0.6.0'
+	VERSION = '0.7.0'
 
 	# Version control revision
-	REVISION = %q$Revision: 2bc8257c7537 $
+	REVISION = %q$Revision: c8bfee4b3f80 $
 
 
 	### Get the library version. If +include_buildnum+ is true, the version string will

data/lib/thingfish/handler.rb

@@ -74,22 +74,6 @@ class Thingfish::Handler < Strelka::App
 	singleton_attr_accessor :processors
 
 
-	### Configurability API -- install the configuration
-	def self::configure( config=nil )
-		config = self.defaults.merge( config || {} )
-
-		self.datastore        = config[:datastore]
-		self.metastore        = config[:metastore]
-		self.event_socket_uri = config[:event_socket_uri]
-
-		self.processors = self.load_processors( config[:processors] )
-		self.processors.each do |processor|
-			self.filter( :request, &processor.method(:process_request) )
-			self.filter( :response, &processor.method(:process_response) )
-		end
-	end
-
-
 	### Load the Thingfish::Processors in the given +processor_list+ and return an instance
 	### of each one.
 	def self::load_processors( processor_list )
@@ -110,6 +94,24 @@ class Thingfish::Handler < Strelka::App
 	end
 
 
+	### Configurability API -- install the configuration
+	def self::configure( config=nil )
+		config = self.defaults.merge( config || {} )
+
+		self.datastore        = config[:datastore]
+		self.metastore        = config[:metastore]
+		self.event_socket_uri = config[:event_socket_uri]
+
+		self.plugin( :filters ) # pre-load the filters plugin for deferred config
+
+		self.processors = self.load_processors( config[:processors] )
+		self.processors.each do |processor|
+			self.filter( :request, &processor.method(:process_request) )
+			self.filter( :response, &processor.method(:process_response) )
+		end
+	end
+
+
 	### Set up the metastore, datastore, and event socket when the handler is
 	### created.
 	def initialize( * ) # :notnew:
@@ -145,8 +147,8 @@ class Thingfish::Handler < Strelka::App
 	### Set up the event socket.
 	def setup_event_socket
 		if self.class.event_socket_uri && ! @event_socket
-			@event_socket = Mongrel2.zmq_context.socket( :PUB )
-			@event_socket.linger = 0
+			@event_socket = CZTop::Socket::PUB.new
+			@event_socket.options.linger = 0
 			@event_socket.bind( self.class.event_socket_uri )
 		end
 	end
@@ -331,11 +333,12 @@ class Thingfish::Handler < Strelka::App
 		metadata = self.metastore.fetch( uuid )
 
 		res = req.response
-		self.add_etag_headers( req, metadata )
+		self.add_cache_headers( req, metadata )
 		self.add_content_disposition( res, metadata )
 
 		res.body = object
 		res.content_type = metadata['format']
+		res.status = HTTP::OK
 
 		return res
 	end
@@ -354,7 +357,7 @@ class Thingfish::Handler < Strelka::App
 		res = req.response
 		res.content_type = metadata['format']
 
-		self.add_etag_headers( req, metadata )
+		self.add_cache_headers( req, metadata )
 		self.add_content_disposition( res, metadata )
 
 		if object.respond_to?( :path )
@@ -367,6 +370,7 @@ class Thingfish::Handler < Strelka::App
 			res.body = object
 		end
 
+		res.status = HTTP::OK
 		return res
 	end
 
@@ -714,9 +718,9 @@ class Thingfish::Handler < Strelka::App
 	### Return a Hash of default metadata extracted from the given +request+.
 	def extract_default_metadata( request )
 		return self.extract_connection_metadata( request ).merge(
-			'extent'        => request.headers.content_length,
-			'format'        => request.content_type,
-			'created'       => Time.now.getgm
+			'extent'  => request.headers.content_length,
+			'format'  => request.content_type,
+			'created' => Time.now.getgm
 		)
 	end
 
@@ -781,24 +785,34 @@ class Thingfish::Handler < Strelka::App
 	def send_event( type, msg )
 		esock = self.event_socket or return
 		self.log.debug "Publishing %p event: %p" % [ type, msg ]
-		esock.sendm( type.to_s )
-		esock.send( Yajl.dump(msg) )
+		esock << CZTop::Message.new([ type.to_s, Yajl.dump(msg) ])
 	end
 
 
-	### Add browser cache headers for resources.  This requires the sha256
+	### Add browser cache headers for resources.
+	### Last-Modified is always added.  ETag support requires the sha256
 	### processor plugin to be enabled for stored resources.
-	def add_etag_headers( request, metadata )
+	###
+	def add_cache_headers( request, metadata )
 		response = request.response
-		checksum = metadata[ 'checksum' ]
-		return unless checksum
 
-		if (( match = request.headers[ :if_none_match ] ))
-			match = match.gsub( '"', '' ).split( /,\s*/ )
-			finish_with( HTTP::NOT_MODIFIED ) if match.include?( checksum )
+		# ETag takes precedence if available.
+		#
+		if (( checksum = metadata['checksum'] ))
+			if (( match = request.headers[ :if_none_match ] ))
+				match = match.gsub( '"', '' ).split( /,\s*/ )
+				finish_with( HTTP::NOT_MODIFIED ) if match.include?( checksum )
+			end
+			response.headers[ :etag ] = checksum
+		end
+
+		return unless metadata[ 'created' ]
+
+		if (( modified = request.headers[ :if_modified_since ] ))
+			finish_with( HTTP::NOT_MODIFIED ) if Time.parse( modified ) <= metadata['created'].round
 		end
+		response.headers[ :last_modified ] = metadata[ 'created' ].httpdate
 
-		response.headers[ :etag ] = checksum
 		return
 	end
 

data/spec/thingfish/handler_spec.rb

@@ -9,7 +9,7 @@ require 'thingfish/processor'
 
 describe Thingfish::Handler do
 
-	EVENT_SOCKET_URI = 'tcp://127.0.0.1:0'
+	EVENT_SOCKET_URI = 'tcp://127.0.0.1:*'
 
 	before( :all ) do
 		Thingfish::Handler.configure( :event_socket_uri => EVENT_SOCKET_URI )
@@ -359,7 +359,20 @@ describe Thingfish::Handler do
 		end
 
 
-		it "adds browser cache headers to resources with a checksum attribute" do
+		it "adds date cache headers to resources" do
+			created = Time.now
+			uuid = @handler.datastore.save( @png_io )
+			@handler.metastore.save( uuid, 'format' => 'image/png', 'created' => created )
+
+			req = factory.get( "/#{uuid}" )
+			result = @handler.handle( req )
+
+			expect( result.status_line ).to match( /200 ok/i )
+			expect( result.headers.last_modified ).to eq( created.httpdate )
+		end
+
+
+		it "adds content cache headers to resources with a checksum attribute" do
 			uuid = @handler.datastore.save( @png_io )
 			@handler.metastore.save( uuid, 'format' => 'image/png', 'checksum' => '123456' )
 
@@ -385,7 +398,21 @@ describe Thingfish::Handler do
 		end
 
 
-		it "returns a 304 not modified for unchanged client cache requests" do
+		it "returns a 304 not modified for unchanged date cache requests" do
+			created = Time.now
+			uuid = @handler.datastore.save( @png_io )
+			@handler.metastore.save( uuid, 'format' => 'image/png', 'created' => created )
+
+			req = factory.get( "/#{uuid}" )
+			req.headers[ :if_modified_since ] = ( Time.now - 300 ).httpdate
+			result = @handler.handle( req )
+
+			expect( result.status_line ).to match( /304 not modified/i )
+			expect( result.body.read ).to be_empty
+		end
+
+
+		it "returns a 304 not modified for unchanged content cache requests" do
 			uuid = @handler.datastore.save( @png_io )
 			@handler.metastore.save( uuid, 'format' => 'image/png', 'checksum' => '123456' )
 
@@ -398,7 +425,6 @@ describe Thingfish::Handler do
 		end
 
 
-
 		it "can remove everything associated with an object id" do
 			uuid = @handler.datastore.save( @png_io )
 			@handler.metastore.save( uuid, {
@@ -865,10 +891,10 @@ describe Thingfish::Handler do
 		before( :each ) do
 			@handler.setup_event_socket
 
-			@subsock = Mongrel2.zmq_context.socket( :SUB )
-			@subsock.linger = 0
+			@subsock = CZTop::Socket::SUB.new
+			@subsock.options.linger = 0
 			@subsock.subscribe( '' )
-			@subsock.connect( @handler.event_socket.endpoint )
+			@subsock.connect( @handler.event_socket.last_endpoint )
 		end
 
 		after( :each ) do
@@ -878,20 +904,20 @@ describe Thingfish::Handler do
 		it "publishes notifications about uploaded assets to a PUBSUB socket" do
 			req = factory.post( '/', TEST_TEXT_DATA, content_type: 'text/plain' )
 			req.headers.content_length = TEST_TEXT_DATA.bytesize
+
+			poller = CZTop::Poller.new
+			poller.add_reader( @subsock )
+
 			res = @handler.handle( req )
+			event = poller.wait( 500 )
 
-			handles = ZMQ.select( [@subsock], nil, nil, 0 )
-			expect( handles ).to be_an( Array )
-			expect( handles[0].size ).to eq( 1 )
-			expect( handles[0].first ).to be( @subsock )
+			expect( event ).to_not be_nil
 
-			event = @subsock.recv
-			expect( @subsock.rcvmore? ).to be_truthy
-			expect( event ).to eq( 'created' )
+			message = event.socket.receive
+			expect( message.frames.count ).to be( 2 )
 
-			resource = @subsock.recv
-			expect( @subsock.rcvmore? ).to be_falsey
-			expect( resource ).to match( /^\{"uuid":"#{UUID_PATTERN}"\}$/ )
+			expect( message.frames.first.to_s ).to eq( 'created' )
+			expect( message.frames.last.to_s ).to match( /^\{"uuid":"#{UUID_PATTERN}"\}$/ )
 		end
 	end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thingfish
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Michael Granger
@@ -31,7 +31,7 @@ cert_chain:
   DHE5pl144V24tqxZb65WTup/ov22SCXmpU8/wTeZVL3rePGRfwTJNpm+6iYszl7A
   SixmX0X3SOeYg4FRkblUIA==
   -----END CERTIFICATE-----
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: strelka
@@ -39,14 +39,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement
@@ -67,14 +67,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: hoe-highline
   requirement: !ruby/object:Gem::Requirement
@@ -123,14 +123,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
 description: |-
   Thingfish is a extensible, web-based digital asset manager. It can be used to
   store chunks of data on the network in an application-independent way, link the
@@ -188,7 +188,7 @@ files:
 - spec/thingfish/processor/sha256_spec.rb
 - spec/thingfish/processor_spec.rb
 - spec/thingfish_spec.rb
-homepage: https://thing.fish/
+homepage: https://thing.fish
 licenses:
 - BSD-3-Clause
 - BSD
@@ -211,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Thingfish is a extensible, web-based digital asset manager