rufus-jig 0.1.21 → 0.1.22

data/test/ct_1_couchdb.rb

@@ -13,7 +13,7 @@ class CtCouchDbTest < 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')
@@ -26,7 +26,7 @@ class CtCouchDbTest < Test::Unit::TestCase
 
     h.close
 
-    @c = Rufus::Jig::Couch.new('127.0.0.1', 5984, 'rufus_jig_test')
+    @c = Rufus::Jig::Couch.new(couch_url, 'rufus_jig_test')
   end
 
   def teardown
@@ -46,7 +46,7 @@ class CtCouchDbTest < Test::Unit::TestCase
 
     assert_nil r
 
-    doc = Rufus::Jig::Http.new('127.0.0.1', 5984).get('/rufus_jig_test/coffee0')
+    doc = Rufus::Jig::Http.new(couch_url).get('/rufus_jig_test/coffee0')
 
     assert_not_nil doc['_rev']
   end
@@ -131,7 +131,7 @@ class CtCouchDbTest < Test::Unit::TestCase
     assert_nil r
 
     assert_nil(
-      Rufus::Jig::Http.new('127.0.0.1', 5984).get('/rufus_jig_test/coffee1'))
+      Rufus::Jig::Http.new(couch_url).get('/rufus_jig_test/coffee1'))
   end
 
   def test_delete_2_args
@@ -141,7 +141,7 @@ class CtCouchDbTest < Test::Unit::TestCase
     @c.delete(doc['_id'], doc['_rev'])
 
     assert_nil(
-      Rufus::Jig::Http.new('127.0.0.1', 5984).get('/rufus_jig_test/coffee1'))
+      Rufus::Jig::Http.new(couch_url).get('/rufus_jig_test/coffee1'))
   end
 
   def test_delete_conflict
@@ -196,7 +196,7 @@ class CtCouchDbTest < Test::Unit::TestCase
     assert_nil r
 
     doc =
-      Rufus::Jig::Http.new('127.0.0.1', 5984).get('/rufus_jig_test/コーヒー')
+      Rufus::Jig::Http.new(couch_url).get('/rufus_jig_test/コーヒー')
 
     assert_not_nil doc['_rev']
   end

data/test/ct_2_couchdb_options.rb

@@ -12,7 +12,7 @@ class CtCouchDbOptionsTest < 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')
@@ -25,11 +25,7 @@ class CtCouchDbOptionsTest < Test::Unit::TestCase
 
     h.close
 
-    @c = Rufus::Jig::Couch.new(
-      #'127.0.0.1', 5984, 'rufus_jig_test', :re_put_ok => false)
-      '127.0.0.1', 5984, 'rufus_jig_test')
-
-    # CouchDB >= 0.11 rendered re_put_ok useless
+    @c = Rufus::Jig::Couch.new(couch_url, 'rufus_jig_test')
   end
 
   def teardown

data/test/ct_3_couchdb_views.rb

@@ -12,7 +12,7 @@ class CtCouchDbViewsTest < 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')
@@ -42,7 +42,7 @@ class CtCouchDbViewsTest < Test::Unit::TestCase
 
     h.close
 
-    @c = Rufus::Jig::Couch.new('127.0.0.1', 5984, 'rufus_jig_test')
+    @c = Rufus::Jig::Couch.new(couch_url, 'rufus_jig_test')
   end
 
   def teardown

data/test/ct_4_attachments.rb

@@ -12,7 +12,7 @@ class CtAttachmentsTest < 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
@@ -22,7 +22,7 @@ class CtAttachmentsTest < Test::Unit::TestCase
     h.put('/rufus_jig_test', '')
     h.close
 
-    @c = Rufus::Jig::Couch.new('127.0.0.1', 5984, 'rufus_jig_test')
+    @c = Rufus::Jig::Couch.new(couch_url, 'rufus_jig_test')
 
     @c.put('_id' => 'thedoc', 'function' => 'recipient for attachements')
     @d = @c.get('thedoc')

data/test/ct_5_couchdb_continuous.rb

@@ -13,7 +13,7 @@ class CtCouchDbContinuousTest < 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')
@@ -23,7 +23,7 @@ class CtCouchDbContinuousTest < Test::Unit::TestCase
     h.put('/rufus_jig_test', '')
     h.close
 
-    @c = Rufus::Jig::Couch.new('127.0.0.1', 5984, 'rufus_jig_test')
+    @c = Rufus::Jig::Couch.new(couch_url, 'rufus_jig_test')
   end
 
   def teardown
@@ -84,7 +84,9 @@ class CtCouchDbContinuousTest < Test::Unit::TestCase
     sleep 0.154
     t.kill
 
-    assert_equal [["angel4", false], ["angel4", true]], stack
+    assert(
+      [["angel4", false], ["angel4", true]] == stack ||
+      [["angel4", true]] == stack)
   end
 end
 

data/test/cut_0_auth_couch.rb

@@ -0,0 +1,62 @@
+
+#
+# testing rufus-jig
+#
+# Sun Sep 26 18:26:15 JST 2010
+#
+
+require File.join(File.dirname(__FILE__), 'base')
+
+
+class UtAuthTest < Test::Unit::TestCase
+
+  def setup
+    @c = Rufus::Jig::Couch.new(
+      '127.0.0.1', 4567, 'tcouch', :basic_auth => %w[ admin nimda ])
+  end
+  def teardown
+    @c.close
+  end
+
+  def test_denied
+
+    c = Rufus::Jig::Couch.new('127.0.0.1', 4567, 'tcouch')
+
+    assert_raise Rufus::Jig::HttpError do
+      c.get('.')
+    end
+  end
+
+  def test_authorized
+
+    assert_equal({ 'id' => 'nada' }, @c.get('.'))
+  end
+
+  def test_on_change
+
+    res = nil
+
+    t = Thread.new {
+      @c.on_change do |id, deleted, doc|
+        res = [ id, deleted, doc ]
+      end
+    }
+
+    sleep 0.200
+
+    t.kill
+
+    assert_equal [ 'x', false, { 'hello' => 'world' } ], res
+  end
+
+  def test_on_change_denied
+
+    c = Rufus::Jig::Couch.new('127.0.0.1', 4567, 'tcouch')
+
+    assert_raise Rufus::Jig::HttpError do
+      c.on_change do |id, deleted, doc|
+      end
+    end
+  end
+end
+

data/test/server.rb

@@ -216,3 +216,54 @@ get '/later' do
   'later'
 end
 
+
+#
+# BASIC AUTH
+
+helpers do
+
+  def basic_auth_required
+
+    return if authorized?
+
+    response['WWW-Authenticate'] = 'Basic realm="rufus-jig test"'
+    throw :halt, [ 401, "Not authorized\n" ]
+  end
+
+  def authorized?
+
+    @auth ||= Rack::Auth::Basic::Request.new(request.env)
+    @auth.provided? && @auth.basic? && @auth.credentials == [ 'admin', 'nimda' ]
+  end
+end
+
+get '/protected' do
+
+  basic_auth_required
+
+  content_type 'application/json'
+  '{ "info": "secretive" }'
+end
+
+
+#
+# AUTH COUCH
+#
+# simulating a basic authentified couchdb instance
+
+get '/tcouch' do
+
+  basic_auth_required
+
+  content_type 'application/json'
+  '{ "id": "nada" }'
+end
+
+get '/tcouch/_changes' do
+
+  basic_auth_required
+
+  content_type 'application/json'
+  '{ "id": "x", "deleted": false, "doc": { "hello": "world" }' + "\r\n"
+end
+

data/test/test.rb

@@ -21,7 +21,7 @@ set = if ARGV.include?('--all')
 elsif ARGV.include?('--couch')
   %w[ ct ]
 else
-  %w[ ut ]
+  %w[ ut cut ]
 end
 
 set.each { |prefix| load_tests(prefix) }

data/test/ut_0_http_get.rb

@@ -63,14 +63,14 @@ class UtHttpGetTest < Test::Unit::TestCase
       @h.get('/server_error')
     end
 
-    assert 500, @h.last_response.status
+    assert_equal 500, @h.last_response.status
   end
 
   def test_get_500_raw
 
     r = @h.get('/server_error', :raw => true)
 
-    assert 500, r.status
+    assert_equal 500, r.status
   end
 
   def test_get_with_accept

data/test/ut_6_args.rb

@@ -10,80 +10,89 @@ require File.join(File.dirname(__FILE__), 'base')
 
 class UtArgsTest < Test::Unit::TestCase
 
-  def test_extract_args
-
-    # [ http, path, payload, opts ]
-
-    a = eh(false, 'http://127.0.0.1:5984')
-    assert_equal '127.0.0.1', a[0].host
-    assert_equal 5984, a[0].port
-    assert_equal '/', a[1]
-    assert_equal nil, a[2]
-    assert_equal '{}', a[3].inspect
-
-    a = eh(false, '127.0.0.1', 5984, '/')
-    assert_equal '127.0.0.1', a[0].host
-    assert_equal 5984, a[0].port
-    assert_equal '/', a[1]
-    assert_equal nil, a[2]
-    assert_equal '{}', a[3].inspect
-
-    a = eh(false, '127.0.0.1', 5984, '/', :option => true)
-    assert_equal '127.0.0.1', a[0].host
-    assert_equal 5984, a[0].port
-    assert_equal '/', a[1]
-    assert_equal nil, a[2]
-    assert_equal '{:option=>true}', a[3].inspect
+  def test_simple_uri
+
+    h = Rufus::Jig::Http.new('http://127.0.0.1:5984')
+
+    assert_equal 'http', h.scheme
+    assert_equal '127.0.0.1', h.host
+    assert_equal 5984, h.port
+    assert_equal '', h._path
+    assert_equal nil, h._query
+    assert_equal nil, h.options[:basic_auth]
   end
 
-  def test_payload_expected
+  def test_uri_with_path_and_query
 
-    a = eh(true, 'http://127.0.0.1:5984', [ 1, 2, 3 ])
-    assert_equal '127.0.0.1', a[0].host
-    assert_equal 5984, a[0].port
-    assert_equal '/', a[1]
-    assert_equal [ 1, 2, 3 ], a[2]
-    assert_equal '{}', a[3].inspect
+    h = Rufus::Jig::Http.new('http://127.0.0.1:5984/nada?a=b&c=d')
 
-    assert_raise(ArgumentError) {
-      eh(true, 'http://127.0.0.1:5984', :nada, [ 1, 2, 3 ])
-    }
+    assert_equal 'http', h.scheme
+    assert_equal '127.0.0.1', h.host
+    assert_equal 5984, h.port
+    assert_equal '/nada', h._path
+    assert_equal 'a=b&c=d', h._query
+    assert_equal nil, h.options[:basic_auth]
   end
 
-  def test_payload_is_a_hash
-
-    a = eh(true, 'http://127.0.0.1:5984', { 'cheese' => 'burger' })
-    assert_equal '127.0.0.1', a[0].host
-    assert_equal 5984, a[0].port
-    assert_equal '/', a[1]
-    assert_equal '{"cheese"=>"burger"}', a[2].inspect
-    assert_equal '{}', a[3].inspect
-
-    a = eh(true, 'http://127.0.0.1:5984', { 'cheese' => 'burger' }, { :cache => true })
-    assert_equal '127.0.0.1', a[0].host
-    assert_equal 5984, a[0].port
-    assert_equal '/', a[1]
-    assert_equal '{"cheese"=>"burger"}', a[2].inspect
-    assert_equal '{:cache=>true}', a[3].inspect
+  def test_uri_with_basic_auth
+
+    h = Rufus::Jig::Http.new('http://u:p@127.0.0.1:5984')
+
+    assert_equal 'http', h.scheme
+    assert_equal '127.0.0.1', h.host
+    assert_equal 5984, h.port
+    assert_equal '', h._path
+    assert_equal nil, h._query
+    assert_equal %w[ u p ], h.options[:basic_auth]
   end
 
-  def test_with_http_instance
+  def test_host_port
 
     h = Rufus::Jig::Http.new('127.0.0.1', 5984)
 
-    a = eh(true, h, '/', { 'cheese' => 'burger' })
-    assert_equal '127.0.0.1', a[0].host
-    assert_equal 5984, a[0].port
-    assert_equal '/', a[1]
-    assert_equal '{"cheese"=>"burger"}', a[2].inspect
-    assert_equal '{}', a[3].inspect
+    assert_equal 'http', h.scheme
+    assert_equal '127.0.0.1', h.host
+    assert_equal 5984, h.port
+    assert_equal nil, h._path
+    assert_equal nil, h._query
+    assert_equal nil, h.options[:basic_auth]
+  end
+
+  def test_host_port_path
+
+    h = Rufus::Jig::Http.new('127.0.0.1', 5984, '/banana')
+
+    assert_equal 'http', h.scheme
+    assert_equal '127.0.0.1', h.host
+    assert_equal 5984, h.port
+    assert_equal '/banana', h._path
+    assert_equal nil, h._query
+    assert_equal nil, h.options[:basic_auth]
+  end
+
+  def test_host_port_path_options
+
+    h = Rufus::Jig::Http.new(
+      '127.0.0.1', 5984, '/banana', :basic_auth => %w[ u p ])
+
+    assert_equal 'http', h.scheme
+    assert_equal '127.0.0.1', h.host
+    assert_equal 5984, h.port
+    assert_equal '/banana', h._path
+    assert_equal nil, h._query
+    assert_equal %w[ u p ], h.options[:basic_auth]
   end
 
-  protected
+  def test_uri_plus_path
 
-  def eh (pe, *args)
+    h = Rufus::Jig::Http.new('http://127.0.0.1:5984', '/banana')
 
-    Rufus::Jig::Http.extract_http(pe, *args)
+    assert_equal 'http', h.scheme
+    assert_equal '127.0.0.1', h.host
+    assert_equal 5984, h.port
+    assert_equal '/banana', h._path
+    assert_equal nil, h._query
+    assert_equal nil, h.options[:basic_auth]
   end
 end
 

data/test/ut_7_parse_uri.rb

@@ -6,7 +6,12 @@
 # Tue Jun 22 12:31:35 JST 2010
 #
 
-require File.join(File.dirname(__FILE__), 'base')
+#require File.join(File.dirname(__FILE__), 'base')
+lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+$:.unshift(lib) unless $:.include?(lib)
+
+require 'test/unit'
+require 'rufus/jig'
 
 
 class UtParseUriTest < Test::Unit::TestCase
@@ -19,6 +24,12 @@ class UtParseUriTest < Test::Unit::TestCase
 
   def test_parse_uri
 
+    assert_equal(
+      'http',
+      Rufus::Jig.parse_uri('http://www.unifr.ch').scheme)
+    assert_equal(
+      'https',
+      Rufus::Jig.parse_uri('https://www.unifr.ch').scheme)
     assert_equal(
       'www.unifr.ch',
       Rufus::Jig.parse_uri('http://www.unifr.ch').host)
@@ -29,7 +40,7 @@ class UtParseUriTest < Test::Unit::TestCase
       'mufg.jp',
        Rufus::Jig.parse_uri('http://mufg.jp/大和').host)
     assert_equal(
-      '8080',
+      8080,
        Rufus::Jig.parse_uri('http://mufg.jp:8080/大和').port)
     assert_equal(
       '/大和',
@@ -48,5 +59,21 @@ class UtParseUriTest < Test::Unit::TestCase
       nil,
       Rufus::Jig.parse_uri('/').host)
   end
+
+  def test_parse_uri_with_auth
+
+    assert_equal(
+      'admin',
+      Rufus::Jig.parse_uri('http://admin:nimda@example.com').username)
+    assert_equal(
+      'nimda',
+      Rufus::Jig.parse_uri('http://admin:nimda@example.com').password)
+    assert_equal(
+      'http',
+      Rufus::Jig.parse_uri('http://admin:nimda@example.com').scheme)
+    assert_equal(
+      'example.com',
+      Rufus::Jig.parse_uri('http://admin:nimda@example.com').host)
+  end
 end