uri-component 0.0.4 → 0.0.5

data/CHANGES

@@ -0,0 +1,4 @@
+Ruby URI::Conponent 0.0.5 (2013-10-23)
+  * Query.new: Support nil (not empty) query string
+  * UserInfoMixin#userinfo: Return nil if @userinfo_component is not set
+

data/Makefile

@@ -0,0 +1,19 @@
+RAKE=		rake
+GEM=		gem
+
+test t: PHONY
+	$(RAKE) test
+
+gem: PHONY
+	$(RAKE) build
+
+upload: PHONY
+	$(RM) pkg/*.gem
+	$(MAKE) gem
+	$(GEM) push pkg/*.gem
+
+install: PHONY
+	$(RAKE) install
+
+PHONY:
+

data/lib/uri/component/query.rb

@@ -45,6 +45,24 @@ module URI #:nodoc:
     ##   p query.to_uri
     ##   #=> "foo=1&foo=2&foo=3&bar=baz%40example.jp"
     class QueryParamsHash < Hash
+      def initialize
+	super
+	@nil = true
+      end
+
+      def clear
+	super
+	@nil = true
+      end
+
+      def nil=(flag)
+	@nil = flag
+      end
+
+      def nil?
+	return !@nil
+      end
+
       def convert_key(key) #:nodoc:
         return key.kind_of?(String) ? key : key.to_s
       end
@@ -70,10 +88,12 @@ module URI #:nodoc:
       end
 
       def []=(key, values) #:nodoc:
+	@nil = false
         values = [values] unless values.kind_of?(Array)
         super(self.convert_key(key), values)
       end
       def store(key, values) #:nodoc:
+	@nil = false
         self[key] = values
       end
 
@@ -126,27 +146,31 @@ module URI #:nodoc:
 	QueryMixin.__send__(:included, klass)
       end
 
-      def initialize(query_str='')
-	unless query_str =~ RE_COMPONENT
+      def initialize(query_str=nil)
+	unless !query_str || query_str =~ RE_COMPONENT
 	  raise InvalidURIError, "bad Query component for URI: #{query_str}"
 	end
 
 	@params = QueryParamsHash.new
-	@params.default_proc = Proc.new {|hash, key|
-	  hash[key] = [] unless hash.key?(key)
-	}
 	@param_separator = DEFAULT_PARAM_SEPARATOR
 
-	query_str.split(/[&;]/).each do |param|
-	  next if param.empty?
-	  name, value = param.split('=', 2).map do |v|
-	    CGI.unescape(v)
+	if query_str
+	  @params.nil = false
+	  query_str.split(/[&;]/).each do |param|
+	    next if param.nil?
+	    name, value = param.split('=', 2).map do |v|
+	      CGI.unescape(v)
+	    end
+	    @params[name] ||= []
+	    @params[name] << value ? value : nil
 	  end
-	  @params[name] ||= []
-	  @params[name] << value ? value : nil
 	end
       end
 
+      def clear
+	@params.clear
+      end
+
       def [](key)
 	return @params[key]
       end
@@ -165,6 +189,8 @@ module URI #:nodoc:
       end
 
       def to_uri(separator=@param_separator)
+	return nil unless @params.nil?
+
 	query = []
 
 	@params.each do |name, values|

data/lib/uri/component/userinfo.rb

@@ -98,7 +98,7 @@ module URI #:nodoc:
       end
 
       def userinfo
-	@userinfo_component.to_uri
+	return @userinfo_component ? @userinfo_component.to_uri : nil
       end
 
       def userinfo=(info_str)

data/lib/uri/component/version.rb

@@ -1,6 +1,6 @@
 module URI #:nodoc:
   module Component
-    VERSION = "0.0.4" ## :nodoc:
+    VERSION = "0.0.5" ## :nodoc:
   end
 end
 

data/test/test_component_query.rb

@@ -14,6 +14,10 @@ class QueryTest < Test::Unit::TestCase
   end
 
   def test_parse
+    q_uri = nil
+    q = UCQ.new(q_uri)
+    assert_equal(q_uri, q.to_uri)
+
     q_uri = ''
     q = UCQ.new(q_uri)
     assert_equal(q_uri, q.to_uri)
@@ -100,6 +104,15 @@ class QueryTest < Test::Unit::TestCase
   end
 
   def test_set
+    q = UCQ.new()
+    assert_nil(q.to_uri)
+    q.params['foo'] = [1]
+    assert_equal('foo=1', q.to_uri)
+    q.params['foo'] = []
+    assert_equal('', q.to_uri)
+    q.params.clear
+    assert_nil(q.to_uri)
+
     q = UCQ.new('')
     q.params['foo'] = [1]
     assert_equal('foo=1', q.to_uri)
@@ -143,6 +156,23 @@ class QueryTest < Test::Unit::TestCase
   def test_mixin
     UCQ.mixin(URI::HTTPS)
 
+    u_uri = 'https://example.jp/'
+    u = URI.parse(u_uri)
+    assert_equal(u_uri, u.to_s)
+    assert_nil(u.query)
+    q = u.query_component
+    assert_kind_of(UCQ, q)
+    assert_nil(q.to_s)
+    q.params['foo'] = [1]
+    assert_equal('foo=1', u.query)
+    assert_equal(u_uri + '?foo=1', u.to_s)
+    q.params['foo'] = []
+    assert_equal('', u.query)
+    assert_equal(u_uri + '?', u.to_s)
+    q.clear
+    assert_nil(q.to_s)
+    assert_equal(u_uri, u.to_s)
+
     u_uri = 'https://example.jp/?foo=123%40example&bar=abc%20xyz'
     u_uri_x = u_uri.gsub('+', '%2B').gsub('%20', '+')
     u = URI.parse(u_uri)

data/test/test_component_userinfo.rb

@@ -103,6 +103,20 @@ class UserInfoTest < Test::Unit::TestCase
   def test_mixin
     UCUI.mixin(URI::HTTPS)
 
+    u_uri = 'https://example.jp/'
+    u = URI.parse(u_uri)
+    assert_equal(u_uri, u.to_s)
+    assert_nil(u.userinfo)
+    i = u.userinfo_component
+    assert_kind_of(UCUI, i)
+    assert_nil(i.to_s)
+    i.user = 'user'
+    assert_equal(u_uri.sub('//', '//user@'), u.to_s)
+    assert_equal('user', i.to_s)
+    i.user = nil
+    assert_equal(u_uri, u.to_s)
+    assert_nil(u.userinfo)
+
     u_uri = 'https://user%20name:p%40ssword@example.jp/'
     u = URI.parse(u_uri)
     i = u.userinfo_component

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uri-component
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-10 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies: []
 description: Handle URI components as an object
 email:
@@ -18,7 +18,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGES
 - Gemfile
+- Makefile
 - Rakefile
 - lib/uri/component.rb
 - lib/uri/component/path.rb
@@ -49,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: URI::Component::* classes