rufus-jig 0.1.16 → 0.1.17

data/CHANGELOG.txt

@@ -2,6 +2,12 @@
 = rufus-jig CHANGELOG.txt
 
 
+== rufus-jig - 0.1.17    not yet released
+
+- using a new Patron::Session for each request (yes, they seem GC friendly)
+- Rufus::Jig::Couch #path and #name methods
+
+
 == rufus-jig - 0.1.16    released 2010/03/17
 
 - Rufus::Jig::Couch returns true (was nil) when trying to put into a missing db

data/lib/rufus/jig/adapters/patron.rb

@@ -46,7 +46,7 @@ class Rufus::Jig::Http < Rufus::Jig::HttpCore
     # it's not really closing, it's rather making sure the patron
     # session can get collected as garbage
 
-    Thread.current[key] = nil
+    #Thread.current[key] = nil
   end
 
   def variant
@@ -55,28 +55,14 @@ class Rufus::Jig::Http < Rufus::Jig::HttpCore
 
   protected
 
-  def key
-    self.object_id.to_s
-  end
-
-  # One patron session per thread
-  #
   def get_patron (opts)
 
     to = (opts[:timeout] || @options[:timeout])
     to = to.to_i if to
     to = nil if to && to < 1
 
-    k = key
-
-    patron = Thread.current[k]
-
-    return patron if patron && patron.timeout == to
-
-    if patron.nil?
-      patron = Patron::Session.new
-      patron.base_url = "#{@host}:#{@port}"
-    end
+    patron = Patron::Session.new
+    patron.base_url = "#{@host}:#{@port}"
 
     #patron.connect_timeout = 1
       # connection timeout defaults to 1 second
@@ -84,11 +70,9 @@ class Rufus::Jig::Http < Rufus::Jig::HttpCore
 
     patron.headers['User-Agent'] =
       @options[:user_agent] ||
-      [
-        self.class, Rufus::Jig::VERSION, Thread.current.object_id, '(patron)'
-      ].join(' ')
+      [ self.class, Rufus::Jig::VERSION, '(patron)' ].join(' ')
 
-    Thread.current[k] = patron
+    patron
   end
 
   def do_request (method, path, data, opts)

data/lib/rufus/jig/couch.rb

@@ -31,6 +31,7 @@ module Rufus::Jig
   #
   class Couch
 
+    attr_reader :path
     attr_reader :http
 
     def initialize (*args)
@@ -40,6 +41,11 @@ module Rufus::Jig
       @path ||= '/'
     end
 
+    def name
+
+      path
+    end
+
     def close
 
       @http.close

data/lib/rufus/jig/http.rb

@@ -280,9 +280,9 @@ module Rufus::Jig
 
     def do_cache (method, path, response, body, opts)
 
-      if method == :delete || (opts[:cache] == false)
+      if (method == :delete) || (opts[:cache] == false)
         @cache.delete(path)
-      elsif et = response.headers['Etag']
+      elsif (method == :get) && (et = response.headers['Etag'])
         @cache[path] = [ et, Rufus::Jig.marshal_copy(body) ]
       end
     end

data/lib/rufus/jig/version.rb

@@ -1,7 +1,7 @@
 
 module Rufus
 module Jig
-  VERSION = '0.1.16'
+  VERSION = '0.1.17'
 end
 end
 

data/rufus-jig.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-jig}
-  s.version = "0.1.16"
+  s.version = "0.1.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mettraux", "Kenneth Kalmer"]
-  s.date = %q{2010-03-17}
+  s.date = %q{2010-03-22}
   s.description = %q{
     Json Interwebs Get.
 

data/test/ct_1_couchdb.rb

@@ -33,6 +33,12 @@ class CtCouchDbTest < Test::Unit::TestCase
     @c.close
   end
 
+  def test_path
+
+    assert_equal 'rufus_jig_test', @c.path
+    assert_equal 'rufus_jig_test', @c.name
+  end
+
   def test_put
 
     r = @c.put('_id' => 'coffee0', 'type' => 'espresso')

data/test/ct_3_couchdb_views.rb

@@ -75,5 +75,23 @@ class CtCouchDbViewsTest < Test::Unit::TestCase
       {"total_rows"=>5, "rows"=>[{"id"=>"c0", "value"=>nil, "key"=>"espresso"}, {"id"=>"c2", "value"=>nil, "key"=>"macchiato"}, {"id"=>"c4", "value"=>nil, "key"=>"macchiato"}], "offset"=>1},
       @c.post('_design/my_test/_view/my_view', { 'keys' => [ 'espresso', 'macchiato' ] }))
   end
+
+  #def test_put_views
+  #  p @c.get('_design/my_test_2')
+  #  @c.put(
+  #    {
+  #      '_id' => '_design/my_test_2',
+  #      'views' => {
+  #        'my_view' => {
+  #          'map' => "function (doc) { emit(doc['type'], null); }"
+  #        }
+  #      }
+  #    })
+  #  p @c.http.cache.keys
+  #  p @c.get('_design/my_test_2/_view/my_view?key=%22macchiato%22')
+  #  p @c.http.cache.keys
+  #  p @c.get('_design/my_test_2/_view/my_view?key=%22macchiato%22')
+  #  p @c.http.cache.keys
+  #end
 end
 

data/test/ut_1_http_post.rb

@@ -31,6 +31,10 @@ class UtHttpPostTest < Test::Unit::TestCase
     assert_equal 201, r.status
     assert_not_nil l
 
+    if l.match(/^http:\/\//)
+      l = '/' + l.split('/')[3..-1].join('/')
+    end
+
     assert_equal({ 'msg' => 'hello' }, @h.get(l))
   end
 
@@ -51,7 +55,7 @@ class UtHttpPostTest < Test::Unit::TestCase
 
     assert_equal({ 'msg' => 'hello world' }, b)
 
-    assert_equal 1, @h.cache.size
+    assert_equal 0, @h.cache.size
   end
 
   def test_post_long_stuff

data/test/ut_3_http_put.rb

@@ -75,7 +75,7 @@ class UtHttpPutTest < Test::Unit::TestCase
       :content_type => :json)
 
     assert_equal({ 'msg' => 'hello world' }, b)
-    assert_equal 1, @h.cache.size
+    assert_equal 0, @h.cache.size
   end
 
   def test_put_conflict

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 16
-  version: 0.1.16
+  - 17
+  version: 0.1.17
 platform: ruby
 authors: 
 - John Mettraux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 +09:00
+date: 2010-03-22 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency