rufus-jig 0.1.19 → 0.1.20

data/CHANGELOG.txt

@@ -2,6 +2,11 @@
 = rufus-jig CHANGELOG.txt
 
 
+== rufus-jig - 0.1.20    released 2010/06/22
+
+- URI.parse(x) can't do UTF-8, so working around...
+
+
 == rufus-jig - 0.1.19    released 2010/05/14
 
 - couch #nuke_design_documents to clean out [old/all] views

data/Rakefile

@@ -10,7 +10,7 @@ require 'rake'
 # CLEAN
 
 require 'rake/clean'
-CLEAN.include('pkg', 'tmp', 'html')
+CLEAN.include('pkg', 'tmp', 'html', 'rdoc')
 task :default => [ :clean ]
 
 
@@ -55,33 +55,40 @@ Jeweler::GemcutterTasks.new
 #
 # DOC
 
-begin
+#begin
+#  require 'yard'
+#  YARD::Rake::YardocTask.new do |doc|
+#    doc.options = [
+#      '-o', 'html/rufus-jig', '--title',
+#      "rufus-jig #{Rufus::Jig::VERSION}"
+#    ]
+#  end
+#rescue LoadError
+#  task :yard do
+#    abort "YARD is not available : sudo gem install yard"
+#  end
+#end
 
-  require 'yard'
-
-  YARD::Rake::YardocTask.new do |doc|
-    doc.options = [
-      '-o', 'html/rufus-jig', '--title',
-      "rufus-jig #{Rufus::Jig::VERSION}"
-    ]
-  end
-
-rescue LoadError
-
-  task :yard do
-    abort "YARD is not available : sudo gem install yard"
-  end
+#
+# make sure to have rdoc 2.5.x to run that
+#
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rd|
+  rd.main = 'README.rdoc'
+  rd.rdoc_dir = 'rdoc/rufus-jig'
+  rd.rdoc_files.include('README.rdoc', 'CHANGELOG.txt', 'lib/**/*.rb')
+  rd.title = "rufus-jig #{Rufus::Jig::VERSION}"
 end
 
 
 #
 # TO THE WEB
 
-task :upload_website => [ :clean, :yard ] do
+task :upload_website => [ :clean, :rdoc ] do
 
   account = 'jmettraux@rubyforge.org'
   webdir = '/var/www/gforge-projects/rufus'
 
-  sh "rsync -azv -e ssh html/rufus-jig #{account}:#{webdir}/"
+  sh "rsync -azv -e ssh rdoc/rufus-jig #{account}:#{webdir}/"
 end
 

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

@@ -79,7 +79,7 @@ class Rufus::Jig::Http < Rufus::Jig::HttpCore
   end
 
   def em_request( uri = '/' )
-    uri = URI.parse( uri )
+    uri = Rufus::Jig.parse_uri( uri )
     uri = URI::HTTP.build(
       :host => ( uri.host || @host ),
       :port => ( uri.port || @port ),

data/lib/rufus/jig/http.rb

@@ -23,6 +23,7 @@
 #++
 
 require 'uri'
+require 'ostruct'
 
 require 'rufus/lru' # gem install rufus-lru
 
@@ -68,6 +69,44 @@ module Rufus::Jig
     attr_reader :original
   end
 
+  URI_REGEX = /https?:\/\/([^\/]+)([^\?]*)(\?.+)?$/
+
+  # The current URI lib is not UTF-8 friendly, so this is a workaround.
+  # Temporary hopefully.
+  #
+  def self.parse_uri (s)
+
+    m = URI_REGEX.match(s)
+
+    host, port, path, query = if m
+
+      h, p = m[1].split(':')
+      p ||= 80
+
+      query = m[3] ? m[3][1..-1] : nil
+
+      [ h, p, m[2], query ]
+
+    else
+
+      p, q = s.split('?')
+
+      [ nil, nil, p, q ]
+    end
+
+    OpenStruct.new(:host => host, :port => port, :path => path, :query => query)
+  end
+
+  # The current URI lib is not UTF-8 friendly, so this is a workaround.
+  # Temporary hopefully.
+  #
+  def self.parse_host (s)
+
+    u = parse_uri(s)
+
+    u ? u.host : nil
+  end
+
   # The base for the Rufus::Jig::Http class.
   #
   class HttpCore
@@ -223,22 +262,17 @@ module Rufus::Jig
 
     def add_prefix (path, opts)
 
-      uri = URI.parse( path )
-
-      if !uri.host.nil?
-        return uri.to_s
-
-      else
-        uri.host.nil?
+      host = Rufus::Jig.parse_host(path)
 
-        elts = [ path ]
+      return path if host
 
-        if path.match(/^[^\/]/) && prefix = @options[:prefix]
-          elts.unshift(prefix)
-        end
+      elts = [ path ]
 
-        return Path.join(*elts)
+      if path.match(/^[^\/]/) && prefix = @options[:prefix]
+        elts.unshift(prefix)
       end
+
+      Path.join(*elts)
     end
 
     def add_params (path, opts)
@@ -340,7 +374,7 @@ class Rufus::Jig::Http
         args.shift
 
       when /^http:\/\//
-        u = URI.parse(args.shift)
+        u = Rufus::Jig.parse_uri(args.shift)
         args.unshift(u.path)
         [ u.host, u.port ]
 

data/lib/rufus/jig/version.rb

@@ -1,7 +1,7 @@
 
 module Rufus
 module Jig
-  VERSION = '0.1.19'
+  VERSION = '0.1.20'
 end
 end
 

data/rufus-jig.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-jig}
-  s.version = "0.1.19"
+  s.version = "0.1.20"
 
   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-05-14}
+  s.date = %q{2010-06-22}
   s.description = %q{
     Json Interwebs Get.
 
@@ -60,7 +60,8 @@ Gem::Specification.new do |s|
      "test/ut_3_http_put.rb",
      "test/ut_4_http_prefix.rb",
      "test/ut_5_http_misc.rb",
-     "test/ut_6_args.rb"
+     "test/ut_6_args.rb",
+     "test/ut_7_parse_uri.rb"
   ]
   s.homepage = %q{http://github.com/jmettraux/rufus-jig/}
   s.rdoc_options = ["--charset=UTF-8"]

data/test/ct_1_couchdb.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 
 #
 # testing rufus-jig
@@ -187,5 +188,17 @@ class CtCouchDbTest < Test::Unit::TestCase
 
     assert_equal true, r
   end
+
+  def test_put_utf8_id
+
+    r = @c.put('_id' => 'コーヒー', 'type' => 'espresso')
+
+    assert_nil r
+
+    doc =
+      Rufus::Jig::Http.new('127.0.0.1', 5984).get('/rufus_jig_test/コーヒー')
+
+    assert_not_nil doc['_rev']
+  end
 end
 

data/test/ut_0_http_get.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 
 #
 # testing rufus-jig
@@ -178,5 +179,13 @@ class UtHttpGetTest < Test::Unit::TestCase
     assert_equal 'Peugeot', b['car']
     assert_equal 200, @h.last_response.status
   end
+
+  def test_get_utf8_uri
+
+    b = @h.get('/川崎')
+
+    assert_nil b
+    assert_equal 404, @h.last_response.status
+  end
 end
 

data/test/ut_7_parse_uri.rb

@@ -0,0 +1,52 @@
+# encoding: utf-8
+
+#
+# testing rufus-jig
+#
+# Tue Jun 22 12:31:35 JST 2010
+#
+
+require File.join(File.dirname(__FILE__), 'base')
+
+
+class UtParseUriTest < Test::Unit::TestCase
+
+  def test_parse_host
+
+    assert_equal 'www.unifr.ch', Rufus::Jig.parse_host('http://www.unifr.ch')
+    assert_equal 'mufg.jp', Rufus::Jig.parse_host('http://mufg.jp/大和')
+  end
+
+  def test_parse_uri
+
+    assert_equal(
+      'www.unifr.ch',
+      Rufus::Jig.parse_uri('http://www.unifr.ch').host)
+    assert_equal(
+      'www.unifr.ch',
+       Rufus::Jig.parse_uri('http://www.unifr.ch/').host)
+    assert_equal(
+      'mufg.jp',
+       Rufus::Jig.parse_uri('http://mufg.jp/大和').host)
+    assert_equal(
+      '8080',
+       Rufus::Jig.parse_uri('http://mufg.jp:8080/大和').port)
+    assert_equal(
+      '/大和',
+       Rufus::Jig.parse_uri('http://mufg.jp:8080/大和').path)
+    assert_equal(
+      'nada=surf&rock=roll',
+       Rufus::Jig.parse_uri('http://mufg.jp:8080/大和?nada=surf&rock=roll').query)
+    assert_equal(
+      '脳=電',
+       Rufus::Jig.parse_uri('http://mufg.jp:8080/大和?脳=電').query)
+  end
+
+  def test_parse_uri_with_path
+
+    assert_equal(
+      nil,
+      Rufus::Jig.parse_uri('/').host)
+  end
+end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 19
-  version: 0.1.19
+  - 20
+  version: 0.1.20
 platform: ruby
 authors: 
 - John Mettraux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-14 00:00:00 +09:00
+date: 2010-06-22 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -152,6 +152,7 @@ files:
 - test/ut_4_http_prefix.rb
 - test/ut_5_http_misc.rb
 - test/ut_6_args.rb
+- test/ut_7_parse_uri.rb
 has_rdoc: true
 homepage: http://github.com/jmettraux/rufus-jig/
 licenses: []