rufus-jig 0.1.21 → 0.1.22

data/lib/rufus/jig/http.rb

@@ -22,7 +22,6 @@
 # Made in Japan.
 #++
 
-require 'uri'
 require 'ostruct'
 
 require 'rufus/lru' # gem install rufus-lru
@@ -69,7 +68,7 @@ module Rufus::Jig
     attr_reader :original
   end
 
-  URI_REGEX = /https?:\/\/([^\/]+)([^\?]*)(\?.+)?$/
+  URI_REGEX = /(https?):\/\/([^@]+:[^@]+@)?([^\/]+)([^\?]*)(\?.+)?$/
 
   # The current URI lib is not UTF-8 friendly, so this is a workaround.
   # Temporary hopefully.
@@ -78,23 +77,29 @@ module Rufus::Jig
 
     m = URI_REGEX.match(s)
 
-    host, port, path, query = if m
+    scheme, uname, pass, host, port, path, query = if m
 
-      h, p = m[1].split(':')
-      p ||= 80
+      ho, po = m[3].split(':')
+      po = (po || 80).to_i
 
-      query = m[3] ? m[3][1..-1] : nil
+      query = m[5] ? m[5][1..-1] : nil
 
-      [ h, p, m[2], query ]
+      un, pa = m[2] ? m[2][0..-2].split(':') : [ nil, nil ]
+
+      [ m[1], un, pa, ho, po, m[4], query ]
 
     else
 
-      p, q = s.split('?')
+      pa, qu = s.split('?')
 
-      [ nil, nil, p, q ]
+      [ nil, nil, nil, nil, nil, pa, qu ]
     end
 
-    OpenStruct.new(:host => host, :port => port, :path => path, :query => query)
+    OpenStruct.new(
+      :scheme => scheme,
+      :host => host, :port => port,
+      :path => path, :query => query,
+      :username => uname, :password => pass)
   end
 
   # The current URI lib is not UTF-8 friendly, so this is a workaround.
@@ -123,33 +128,59 @@ module Rufus::Jig
     #
     attr_reader :options
 
-    # host and port, vanilla
+    # scheme, host and port, vanilla
     #
-    attr_reader :host, :port
+    attr_reader :scheme, :host, :port
 
     # The class of the error that should be raised when a request is not 2xx.
     #
     attr_accessor :error_class
 
-    def initialize (host, port, opts)
+    # Sometimes a URI is passed for initialization, if the URI contained a
+    # path, it is stored in @_path (and not used).
+    # Rufus::Jig::Couch uses it though.
+    #
+    attr_accessor :_path, :_query
+
+    def initialize (*args)
+
+      @options = args.last.is_a?(Hash) ? args.pop.dup : {}
+
+      if args[1].is_a?(Fixnum) # host, port[, path]
 
-      @host = host
-      @port = port
+        @scheme = 'http'
+        @host, @port, @_path = args
 
-      @options = opts.dup
+      else # uri
+
+        u = Rufus::Jig.parse_uri(args.first)
+
+        @scheme = u.scheme
+        @host = u.host
+        @port = u.port
+
+        @options[:basic_auth] ||= [ u.username, u.password ] if u.username
+
+        if args[1]
+          @_path, @_query = args[1].split('?')
+        else
+          @_path = u.path
+          @_query = u.query
+        end
+      end
 
-      @cache = LruHash.new((opts[:cache_size] || 35).to_i)
+      @cache = LruHash.new((@options[:cache_size] || 35).to_i)
 
       if pf = @options[:prefix]
         @options[:prefix] = "/#{pf}" if (not pf.match(/^\//))
       end
 
-      @error_class = opts[:error_class] || HttpError
+      @error_class = @options[:error_class] || HttpError
     end
 
-    def close
+    def uri
 
-      # default implementation does nothing
+      OpenStruct.new(:scheme => @scheme, :host => @host, :port => @port)
     end
 
     def get (path, opts={})
@@ -335,8 +366,15 @@ module Rufus::Jig
   end
 end
 
+#--
+# now load an adapter
+#++
+
+if defined?(Net::HTTP::Persistent) # gem install net-http-persistent
+
+  require 'rufus/jig/adapters/net_persistent'
 
-if defined?(Patron) # gem install patron
+elsif defined?(Patron) # gem install patron
 
   require 'rufus/jig/adapters/patron'
 
@@ -350,56 +388,3 @@ else
 
 end
 
-#--
-#
-# re-opening the HTTP class to add some class methods
-#
-#++
-class Rufus::Jig::Http
-
-  # Makes sense of arguments and extract an array that goes like
-  # [ http, path, payload, opts ].
-  #
-  # Typical input :
-  #
-  #   a = Rufus::Jig::Http.extract_http(false, 'http://127.0.0.1:5984')
-  #   a = Rufus::Jig::Http.extract_http(false, '127.0.0.1', 5984, '/')
-  #   a = Rufus::Jig::Http.extract_http(true, 'http://127.0.0.1:5984', :payload)
-  #
-  def self.extract_http (payload_expected, *args)
-
-    host, port = case args.first
-
-      when Rufus::Jig::Http
-        args.shift
-
-      when /^http:\/\//
-        u = Rufus::Jig.parse_uri(args.shift)
-        args.unshift(u.path)
-        [ u.host, u.port ]
-
-      else
-        [ args.shift, args.shift ]
-    end
-
-    port = port.to_i
-
-    path = args.shift
-    path = '/' if path == ''
-
-    payload = payload_expected ? args.shift : nil
-
-    opts = args.shift || {}
-
-    raise(
-      ArgumentError.new("option Hash expected, not #{opts.inspect}")
-    ) unless opts.is_a?(Hash)
-
-    http = host.is_a?(Rufus::Jig::Http) ?
-      host :
-      Rufus::Jig::Http.new(host, port, opts)
-
-    [ http, path, payload, opts ]
-  end
-end
-

data/lib/rufus/jig/version.rb

@@ -1,7 +1,7 @@
 
 module Rufus
 module Jig
-  VERSION = '0.1.21'
+  VERSION = '0.1.22'
 end
 end
 

data/rufus-jig.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-jig}
-  s.version = "0.1.21"
+  s.version = "0.1.22"
 
   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-09-21}
+  s.date = %q{2010-09-30}
   s.description = %q{
     Json Interwebs Get.
 
@@ -34,6 +34,8 @@ Gem::Specification.new do |s|
      "lib/rufus/jig.rb",
      "lib/rufus/jig/adapters/em.rb",
      "lib/rufus/jig/adapters/net.rb",
+     "lib/rufus/jig/adapters/net_persistent.rb",
+     "lib/rufus/jig/adapters/net_response.rb",
      "lib/rufus/jig/adapters/patron.rb",
      "lib/rufus/jig/couch.rb",
      "lib/rufus/jig/http.rb",
@@ -41,14 +43,18 @@ Gem::Specification.new do |s|
      "lib/rufus/jig/version.rb",
      "rufus-jig.gemspec",
      "test/base.rb",
+     "test/bm/bm0.rb",
+     "test/bm/bm1.rb",
      "test/conc/put_vs_delete.rb",
      "test/couch_base.rb",
+     "test/couch_url.txt",
      "test/ct_0_couch.rb",
      "test/ct_1_couchdb.rb",
      "test/ct_2_couchdb_options.rb",
      "test/ct_3_couchdb_views.rb",
      "test/ct_4_attachments.rb",
      "test/ct_5_couchdb_continuous.rb",
+     "test/cut_0_auth_couch.rb",
      "test/server.rb",
      "test/test.rb",
      "test/to.sh",
@@ -61,7 +67,8 @@ Gem::Specification.new do |s|
      "test/ut_4_http_prefix.rb",
      "test/ut_5_http_misc.rb",
      "test/ut_6_args.rb",
-     "test/ut_7_parse_uri.rb"
+     "test/ut_7_parse_uri.rb",
+     "test/ut_8_auth.rb"
   ]
   s.homepage = %q{http://github.com/jmettraux/rufus-jig/}
   s.rdoc_options = ["--charset=UTF-8"]

data/test/base.rb

@@ -6,17 +6,24 @@ require 'rubygems'
 require 'yajl'
 
 # Our default
-transport_library = 'patron'
+transport_library = 'net/http'
 
 if ARGV.include?( '--em' )
   require 'openssl'
   transport_library = 'em-http'
-elsif ARGV.include?( '--net' )
-  transport_library = 'net/http'
+elsif ARGV.include?( '--netp' )
+  transport_library = 'net/http/persistent'
+elsif ARGV.include?( '--patron' )
+  transport_library = 'patron'
 end
 
 require transport_library
 
+unless $advertised
+  p transport_library
+  $advertised = true
+end
+
 require 'rufus/jig'
 
 require 'test/unit'

data/test/bm/bm0.rb

@@ -0,0 +1,49 @@
+
+$:.unshift('lib')
+require 'benchmark'
+require 'patron'
+require 'yajl'
+require 'rufus/jig'
+
+N = 1
+
+DOC = {}
+1000.times { |i| DOC["key#{i}"] = { 'a' => 'b', 'c' => 'd', 'e' =>'f' } }
+
+Rufus::Jig::Couch.delete_db('http://127.0.0.1:5984/test_bm0') rescue nil
+CDB = Rufus::Jig::Couch.put_db('http://127.0.0.1:5984/test_bm0')
+
+Benchmark.benchmark(' ' * 31 + Benchmark::Tms::CAPTION, 31) do |b|
+
+  b.report('marshal to file') do
+    N.times do
+      File.open('out.marshal', 'wb') { |f| f.write(Marshal.dump(DOC)) }
+    end
+  end
+  b.report('yajl to file') do
+    N.times do
+      File.open('out.json', 'wb') { |f| f.write(Rufus::Jig::Json.encode(DOC)) }
+    end
+  end
+  b.report('to couch') do
+    N.times do |i|
+      CDB.put_doc("out#{i}", DOC)
+    end
+  end
+
+  b.report('marshal from file') do
+    N.times do
+      doc = Marshal.load(File.read('out.marshal'))
+    end
+  end
+  b.report('yajl from file') do
+    N.times do
+      doc = Rufus::Jig::Json.decode(File.read('out.json'))
+    end
+  end
+  b.report('from couch') do
+    N.times do |i|
+      doc = CDB.get_doc("out#{i}")
+    end
+  end
+end

data/test/bm/bm1.rb

@@ -0,0 +1,43 @@
+
+$:.unshift('lib')
+require 'rubygems'
+require 'yajl'
+
+# Our default
+transport_library = 'net/http'
+
+if ARGV.include?( '--em' )
+  require 'openssl'
+  transport_library = 'em-http'
+elsif ARGV.include?( '--netp' )
+  transport_library = 'net/http/persistent'
+elsif ARGV.include?( '--patron' )
+  transport_library = 'patron'
+end
+
+require transport_library
+
+require 'rufus/jig'
+
+#c = Rufus::Jig::Couch.new('127.0.0.1', 5984, 'artsr_development_ruote_msgs')
+#p c.get('_all_docs')
+#p c.delete("1100!2148379060!2010-06-28!1277767412.550787!002")
+
+require 'benchmark'
+
+N = 10_000
+
+c = Rufus::Jig::Couch.new('127.0.0.1', 5984, 'artsr_development_ruote_msgs')
+
+puts
+puts RUBY_VERSION
+puts c.http.variant
+puts
+
+Benchmark.benchmark(' ' * 31 + Benchmark::Tms::CAPTION, 31) do |b|
+
+  b.report('get') do
+    N.times { c.get('_all_docs?include_docs=true') }
+  end
+end
+

data/test/couch_base.rb

@@ -6,19 +6,24 @@ require 'rubygems'
 require 'yajl'
 
 # Our default
-transport_library = 'patron'
+transport_library = 'net/http'
 
 if ARGV.include?( '--em' )
   require 'openssl'
   transport_library = 'em-http'
-elsif ARGV.include?( '--net' )
-  transport_library = 'net/http'
+elsif ARGV.include?( '--netp' )
+  transport_library = 'net/http/persistent'
+elsif ARGV.include?( '--patron' )
+  transport_library = 'patron'
 end
 
-p [ :lib, transport_library ]
-
 require transport_library
 
+unless $advertised
+  p transport_library
+  $advertised = true
+end
+
 require 'rufus/jig'
 
 require 'test/unit'
@@ -39,3 +44,9 @@ rescue Exception => e
   exit(1)
 end
 
+class Test::Unit::TestCase
+  def couch_url
+    File.read('test/couch_url.txt').strip
+  end
+end
+

data/test/couch_url.txt

@@ -0,0 +1 @@
+http://admin:admin@127.0.0.1:5984

data/test/ct_0_couch.rb

@@ -12,7 +12,7 @@ class CtCouchTest < Test::Unit::TestCase
 
   def setup
 
-    h = Rufus::Jig::Http.new('127.0.0.1', 5984)
+    h = Rufus::Jig::Http.new(couch_url)
     begin
       h.delete('/rufus_jig_test')
     rescue Exception => e
@@ -21,7 +21,7 @@ class CtCouchTest < Test::Unit::TestCase
       h.close rescue nil
     end
 
-    @c = Rufus::Jig::Couch.new('127.0.0.1', 5984)
+    @c = Rufus::Jig::Couch.new(couch_url)
   end
 
   def teardown
@@ -38,16 +38,16 @@ class CtCouchTest < Test::Unit::TestCase
 
     @c.put('rufus_jig_test')
 
-    assert_not_nil Rufus::Jig::Http.new('127.0.0.1', 5984).get('/rufus_jig_test')
+    assert_not_nil Rufus::Jig::Http.new(couch_url).get('/rufus_jig_test')
   end
 
   def test_delete_db
 
-    Rufus::Jig::Http.new('127.0.0.1', 5984).put('/rufus_jig_test', '')
+    Rufus::Jig::Http.new(couch_url).put('/rufus_jig_test', '')
 
     @c.delete('rufus_jig_test')
 
-    assert_nil Rufus::Jig::Http.new('127.0.0.1', 5984).get('/rufus_jig_test')
+    assert_nil Rufus::Jig::Http.new(couch_url).get('/rufus_jig_test')
   end
 
 #  def test_uuids