rufus-jig 0.1.5 → 0.1.6

data/CHANGELOG.txt

@@ -2,7 +2,12 @@
 = rufus-jig CHANGELOG.txt
 
 
-== rufus-jig - 0.1.5    not yet released
+== rufus-jig - 0.1.6    released 2009/12/21
+
+- implemented close for Http and Couch classes
+
+
+== rufus-jig - 0.1.5    released 2009/12/17
 
 - returning true (not raising) in case of 409 conflict
 - using jeweler (thanks Kenneth)

data/Rakefile

@@ -1,7 +1,6 @@
 
 
-$:.unshift(File.join(File.dirname(__FILE__), 'lib'))
-require 'lib/rufus/jig.rb'
+require 'lib/rufus/jig/version.rb'
 
 require 'rubygems'
 require 'rake'

data/lib/rufus/jig/couch.rb

@@ -36,6 +36,11 @@ module Rufus::Jig
       @path ||= '/'
     end
 
+    def close
+
+      @http.close
+    end
+
     def put (doc_or_path, opts={})
 
       path, payload = if doc_or_path.is_a?(String)

data/lib/rufus/jig/http.rb

@@ -97,6 +97,11 @@ module Rufus::Jig
       @error_class = opts[:error_class] || HttpError
     end
 
+    def close
+
+      # default implementation does nothing
+    end
+
     def get (path, opts={})
 
       request(:get, path, nil, opts)
@@ -292,13 +297,25 @@ if defined?(Patron) # gem install patron
       super(host, port, opts)
     end
 
+    def close
+
+      # it's not really closing, it's rather making sure the patron
+      # session can get collected as garbage
+
+      Thread.current[key] = nil
+    end
+
     protected
 
+    def key
+      self.object_id.to_s
+    end
+
     # One patron session per thread
     #
     def get_patron
 
-      k = "#{self.class} #{self.object_id}"
+      k = key
 
       patron = Thread.current[k]
 

data/lib/rufus/jig/version.rb

@@ -0,0 +1,7 @@
+
+module Rufus
+module Jig
+  VERSION = '0.1.6'
+end
+end
+

data/lib/rufus/jig.rb

@@ -26,11 +26,11 @@
 module Rufus
 module Jig
 
+  require 'rufus/jig/version'
+
   require 'rufus/jig/http'
   require 'rufus/jig/json'
 
-  VERSION = '0.1.5'
-
   autoload :Couch, 'rufus/jig/couch'
   autoload :CouchError, 'rufus/jig/couch'
 end

data/rufus-jig.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-jig}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mettraux", "Kenneth Kalmer"]
-  s.date = %q{2009-12-17}
+  s.date = %q{2009-12-21}
   s.description = %q{
     Json Internet Get.
 
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
      "lib/rufus/jig/http.rb",
      "lib/rufus/jig/json.rb",
      "lib/rufus/jig/path.rb",
+     "lib/rufus/jig/version.rb",
      "rufus-jig.gemspec",
      "test/base.rb",
      "test/couch_base.rb",

data/test/base.rb

@@ -1,6 +1,6 @@
 
 lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-$: << lib unless $:.include?(lib)
+$:.unshift(lib) unless $:.include?(lib)
 
 require 'rubygems'
 require 'yajl'

data/test/ct_0_couch.rb

@@ -12,15 +12,23 @@ class CtCouchTest < Test::Unit::TestCase
 
   def setup
 
+    h = Rufus::Jig::Http.new('127.0.0.1', 5984)
     begin
-      Rufus::Jig::Http.new('127.0.0.1', 5984).delete('/rufus_jig_test')
+      h.delete('/rufus_jig_test')
     rescue Exception => e
       #p e
+    ensure
+      h.close rescue nil
     end
 
     @c = Rufus::Jig::Couch.new('127.0.0.1', 5984)
   end
 
+  def teardown
+
+    @c.close
+  end
+
   def test_welcome
 
     assert_equal 'Welcome', @c.get('.')['couchdb']

data/test/ct_1_couchdb.rb

@@ -12,20 +12,27 @@ class CtCouchDbTest < Test::Unit::TestCase
 
   def setup
 
+    h = Rufus::Jig::Http.new('127.0.0.1', 5984)
+
     begin
-      Rufus::Jig::Http.new('127.0.0.1', 5984).delete('/rufus_jig_test')
+      h.delete('/rufus_jig_test')
     rescue Exception => e
       #p e
     end
-    Rufus::Jig::Http.new('127.0.0.1', 5984).put('/rufus_jig_test', '')
 
-    Rufus::Jig::Http.new('127.0.0.1', 5984).put(
-      '/rufus_jig_test/coffee1',
-      '{"_id":"coffee1","type":"ristretto"}')
+    h.put('/rufus_jig_test', '')
+    h.put('/rufus_jig_test/coffee1', '{"_id":"coffee1","type":"ristretto"}')
+
+    h.close
 
     @c = Rufus::Jig::Couch.new('127.0.0.1', 5984, 'rufus_jig_test')
   end
 
+  def teardown
+
+    @c.close
+  end
+
   def test_put_doc
 
     r = @c.put('_id' => 'coffee0', 'type' => 'espresso')

data/test/ut_0_http_get.rb

@@ -11,9 +11,11 @@ require File.join(File.dirname(__FILE__), 'base')
 class UtHttpGetTest < Test::Unit::TestCase
 
   def setup
-
     @h = Rufus::Jig::Http.new('127.0.0.1', 4567)
   end
+  def teardown
+    @h.close
+  end
 
   def test_get_root
 

data/test/ut_1_http_post.rb

@@ -11,11 +11,12 @@ require File.join(File.dirname(__FILE__), 'base')
 class UtHttpPostTest < Test::Unit::TestCase
 
   def setup
-
     @h = Rufus::Jig::Http.new('127.0.0.1', 4567)
-
     @h.delete('/documents')
   end
+  def teardown
+    @h.close
+  end
 
   def test_post
 

data/test/ut_2_http_delete.rb

@@ -18,6 +18,11 @@ class UtHttpDeleteTest < Test::Unit::TestCase
       '/documents/xyz', 'data', :content_type => 'text/plain', :raw => true)
   end
 
+  def teardown
+
+    @h.close
+  end
+
   def test_delete
 
     b = @h.delete('/documents/xyz')

data/test/ut_3_http_put.rb

@@ -11,11 +11,12 @@ require File.join(File.dirname(__FILE__), 'base')
 class UtHttpPutTest < Test::Unit::TestCase
 
   def setup
-
     @h = Rufus::Jig::Http.new('127.0.0.1', 4567)
-
     @h.delete('/documents')
   end
+  def teardown
+    @h.close
+  end
 
   def test_clean
 

data/test/ut_4_http_prefix.rb

@@ -11,9 +11,11 @@ require File.join(File.dirname(__FILE__), 'base')
 class UtHttpPrefixTest < Test::Unit::TestCase
 
   def setup
-
     @h = Rufus::Jig::Http.new('127.0.0.1', 4567, :prefix => '/a/b/')
   end
+  def teardown
+    @h.close
+  end
 
   def test_get
 

data/test/ut_5_http_misc.rb

@@ -10,27 +10,43 @@ require File.join(File.dirname(__FILE__), 'base')
 
 class UtHttpMiscTest < Test::Unit::TestCase
 
-  def test_prefix
+  def teardown
+    @h.close if @h
+  end
+
+  def test_prefix_with_slash
 
     @h = Rufus::Jig::Http.new('127.0.0.1', 4567, :prefix => '/a/b')
 
     assert_equal 'c', @h.get('/c')
     assert_equal 'C', @h.get('c')
+  end
+
+  def test_prefix_without_slash
 
     @h = Rufus::Jig::Http.new('127.0.0.1', 4567, :prefix => 'a/b')
 
     assert_equal 'c', @h.get('/c')
     assert_equal 'C', @h.get('c')
+  end
+
+  def test_without_prefix
 
     @h = Rufus::Jig::Http.new('127.0.0.1', 4567)
 
     assert_equal 'C', @h.get('/a/b/c')
     assert_equal 'C', @h.get('a/b/c')
+  end
+
+  def test_with_single_slash_prefix
 
     @h = Rufus::Jig::Http.new('127.0.0.1', 4567, :prefix => '/')
 
     assert_equal 'C', @h.get('/a/b/c')
     assert_equal 'C', @h.get('a/b/c')
+  end
+
+  def test_with_empty_prefix
 
     @h = Rufus::Jig::Http.new('127.0.0.1', 4567, :prefix => '')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-jig
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - John Mettraux
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-17 00:00:00 +09:00
+date: 2009-12-21 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,6 +46,7 @@ files:
 - lib/rufus/jig/http.rb
 - lib/rufus/jig/json.rb
 - lib/rufus/jig/path.rb
+- lib/rufus/jig/version.rb
 - rufus-jig.gemspec
 - test/base.rb
 - test/couch_base.rb