uri-component 0.0.2 → 0.0.3

data/lib/uri/component/path.rb

@@ -41,10 +41,14 @@ module URI
 	end
       end
 
+      def escape(v)
+        return URI.escape(v, RE_UNSAFE)
+      end
+
       def to_uri
 	return '' if @nodes.empty?
 	return '/' + @nodes.map do |node|
-	  URI.escape(node, RE_UNSAFE)
+	  self.escape(node)
 	end.join('/')
       end
       alias to_s to_uri

data/lib/uri/component/query.rb

@@ -10,6 +10,81 @@ require 'cgi'
 
 module URI
   module Component
+    class QueryParamsHash < Hash #:nodoc:
+      def convert_key(key)
+        return key.kind_of?(String) ? key : key.to_s
+      end
+      def [](key)
+        super(self.convert_key(key))
+      end
+      def fetch(key, default = nil)
+        super(self.convert_key(key), default)
+      end
+
+      def values(key = nil)
+        return key ? self[key] : super
+      end
+
+      def values=(key, values)
+        self[key] = values
+      end
+
+      def value(key)
+        return self[key][0]
+      end
+
+      def value=(key, value)
+        self[key] = value
+      end
+
+      def values_at(*keys)
+        super(*keys.map {|key| self.convert_key(key)})
+      end
+
+      def []=(key, values)
+        values = [values] unless values.kind_of?(Array)
+        super(self.convert_key(key), values)
+      end
+      def store(key, values)
+        self[key] = values
+      end
+
+      def delete(key)
+        super(self.convert_key(key))
+      end
+
+      def has_key?(key)
+        super(self.convert_key(key))
+      end
+      alias :include? :has_key?
+      alias :key? :has_key?
+      alias :member? :has_key?
+
+      def merge(hash)
+        hash_new = self.class.new
+        hash.each do |key, value|
+          hash_new[key] = value
+        end
+        return hash_new
+      end
+
+      def merge!(hash)
+        hash.each do |key, value|
+          self[key] = value
+        end
+        return self
+      end
+      alias :update :merge!
+
+      def replace(hash)
+        self.clear
+        hash.each do |key, value|
+          self[key] = value
+        end
+        return self
+      end
+    end
+
     ## Handle a query component in an URI as an object
     class Query
       #:stopdoc:
@@ -26,7 +101,7 @@ module URI
 	  raise InvalidURIError, "bad Query component for URI: #{query_str}"
 	end
 
-	@params = {}
+	@params = QueryParamsHash.new
 	@params.default_proc = Proc.new {|hash, key|
 	  hash[key] = [] unless hash.key?(key)
 	}

data/lib/uri/component/userinfo.rb

@@ -26,7 +26,7 @@ module URI
 	UserInfoMixin.__send__(:included, klass)
       end
 
-      def self.escape(v)
+      def escape(v)
 	return URI.escape(v, RE_UNSAFE)
       end
 
@@ -80,9 +80,9 @@ module URI
 	return nil unless @user
 
 	info_str = ''
-	info_str += self.class.escape(@domain) + ';' if @domain
-	info_str += @user ? self.class.escape(@user) : '';
-	info_str += ':' + self.class.escape(@password) if @password
+	info_str += self.escape(@domain) + ';' if @domain
+	info_str += @user ? self.escape(@user) : '';
+	info_str += ':' + self.escape(@password) if @password
 	return info_str
       end
       alias to_s to_uri
@@ -113,8 +113,8 @@ module URI
 	return nil unless user
 
 	domain = @userinfo_component.domain
-	user_uri = domain ? URI::Component::UserInfo.escape(domain) + ';' : ''
-	user_uri += URI::Component::UserInfo.escape(user)
+	user_uri = domain ? @userinfo_component.escape(domain) + ';' : ''
+	user_uri += @userinfo_component.escape(user)
 	return user_uri
       end
 
@@ -130,7 +130,7 @@ module URI
 
       def password
 	pass = @userinfo_component.password
-	return pass ? URI::Component::UserInfo.escape(pass) : nil
+	return pass ? @userinfo_component.escape(pass) : nil
       end
 
       def password=(pass_uri)

data/lib/uri/component/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uri-component
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-04 00:00:00.000000000 Z
+date: 2011-11-05 00:00:00.000000000 Z
 dependencies: []
 description: Handle URI components as an object
 email: