marquise 0.1.0 → 0.1.1

data/lib/marquise.rb

@@ -47,7 +47,8 @@ class Marquise
 			raise RuntimeError,
 			      "libmarquise failed; check syslog (no, seriously)"
 		end
-		
+
+		$stderr.puts "Consumer is #{@consumer.inspect}" if $DEBUG
 		@connections = {}
 
 		@janitor = Janitor.new(@consumer, @connections)
@@ -55,6 +56,11 @@ class Marquise
 	end
 	
 	def tell(*args)
+		if @consumer.nil?
+			raise IOError,
+			      "Connection has been closed"
+		end
+
 		val, ts, opts = parse_tell_opts(args)
 				
 		k, v, len = if opts.length == 0
@@ -152,7 +158,9 @@ class Marquise
 		if @connections[th].nil?
 			raise RuntimeError.new("marquise_connect() failed... consult syslog (no, seriously)")
 		end
-		
+
+		$stderr.puts "Created new connection #{@connections[th].inspect} for #{th.inspect}" if $DEBUG
+
 		nil
 	end
 	
@@ -175,8 +183,15 @@ class Marquise
 		end
 		
 		def call(*args)
-			@conns.values.each { |c| Marquise::FFI.marquise_close(c) }
+			$stderr.puts "Janitor is running for #{@ptr.inspect}/#{@conns.inspect}" if $DEBUG
+			@conns.values.each do |c|
+				$stderr.puts "Pre-clean #{c.inspect}" if $DEBUG
+				Marquise::FFI.marquise_close(c)
+				$stderr.puts "Post-clean #{c.inspect}" if $DEBUG
+			end
+			$stderr.puts "Pre-clean #{@ptr.inspect}" if $DEBUG
 			Marquise::FFI.marquise_consumer_shutdown(@ptr)
+			$stderr.puts "Cleaned up #{@ptr.inspect} and #{@conns.inspect}" if $DEBUG
 		end
 	end
 	

data/spec/marquise_tell_spec.rb

@@ -23,5 +23,19 @@ describe Marquise do
 			       /Invalid call to Marquise#tell/
 			     )
 		end
+
+		it "assplodes if #close has previously been called" do
+			Marquise::FFI.
+			  should_receive(:marquise_consumer_shutdown).
+			  with('#tell')
+
+			marquise.close
+
+			expect { marquise.tell }.
+			  to raise_error(
+			       IOError,
+			       /Connection has been closed/
+			     )
+		end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marquise
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -240,7 +240,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4428946624076758222
+      hash: 4388250139847967772
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -249,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4428946624076758222
+      hash: 4388250139847967772
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23