mack-distributed 0.8.2 → 0.8.3

data/lib/gems/{addressable-2.0.0 → addressable-2.0.1}/lib/addressable/uri.rb

@@ -990,7 +990,8 @@ module Addressable
       end
       if ![String, ::Addressable::URI].include?(returning)
         raise TypeError,
-          "Expected String or Addressable::URI, got #{returning.inspect}"
+          "Expected Class (String or Addressable::URI), " +
+          "got #{returning.inspect}"
       end
       result = uri.to_str.gsub(/%[0-9a-f]{2}/i) do |sequence|
         sequence[1..3].to_i(16).chr
@@ -1030,7 +1031,8 @@ module Addressable
       end
       if ![String, ::Addressable::URI].include?(returning)
         raise TypeError,
-          "Expected String or Addressable::URI, got #{returning.inspect}"
+          "Expected Class (String or Addressable::URI), " +
+          "got #{returning.inspect}"
       end
       uri_object = uri.kind_of?(self) ? uri : self.parse(uri.to_str)
       encoded_uri = Addressable::URI.new(
@@ -1077,7 +1079,8 @@ module Addressable
       end
       if ![String, ::Addressable::URI].include?(returning)
         raise TypeError,
-          "Expected String or Addressable::URI, got #{returning.inspect}"
+          "Expected Class (String or Addressable::URI), " +
+          "got #{returning.inspect}"
       end
       uri_object = uri.kind_of?(self) ? uri : self.parse(uri.to_str)
       components = {
@@ -1099,9 +1102,9 @@ module Addressable
         :scheme => self.encode_component(components[:scheme],
           Addressable::URI::CharacterClasses::SCHEME),
         :user => self.encode_component(components[:user],
-          Addressable::URI::CharacterClasses::AUTHORITY),
+          Addressable::URI::CharacterClasses::UNRESERVED),
         :password => self.encode_component(components[:password],
-          Addressable::URI::CharacterClasses::AUTHORITY),
+          Addressable::URI::CharacterClasses::UNRESERVED),
         :host => components[:host],
         :port => components[:port],
         :path => self.encode_component(components[:path],
@@ -1245,7 +1248,12 @@ module Addressable
           if self.scheme =~ /^\s*ssh\+svn\s*$/i
             "svn+ssh"
           else
-            self.scheme.strip.downcase
+            Addressable::URI.encode_component(
+              Addressable::IDNA.unicode_normalize_kc(
+                Addressable::URI.unencode_component(
+                  self.scheme.strip.downcase)),
+              Addressable::URI::CharacterClasses::SCHEME
+            )
           end
         else
           nil
@@ -1284,7 +1292,11 @@ module Addressable
               (!self.password || self.password.strip == "")
             nil
           else
-            self.user.strip
+            Addressable::URI.encode_component(
+              Addressable::IDNA.unicode_normalize_kc(
+                Addressable::URI.unencode_component(self.user.strip)),
+              Addressable::URI::CharacterClasses::UNRESERVED
+            )
           end
         else
           nil
@@ -1333,7 +1345,11 @@ module Addressable
               (!self.user || self.user.strip == "")
             nil
           else
-            self.password.strip
+            Addressable::URI.encode_component(
+              Addressable::IDNA.unicode_normalize_kc(
+                Addressable::URI.unencode_component(self.password.strip)),
+              Addressable::URI::CharacterClasses::UNRESERVED
+            )
           end
         else
           nil
@@ -1608,6 +1624,9 @@ module Addressable
     #
     # @param [String, Integer, #to_s] new_port The new port component.
     def port=(new_port)
+      if new_port != nil && new_port.respond_to?(:to_str)
+        new_port = Addressable::URI.unencode_component(new_port.to_str)
+      end
       if new_port != nil && !(new_port.to_s =~ /^\d+$/)
         raise InvalidURIError,
           "Invalid port number: #{new_port.inspect}"
@@ -1659,7 +1678,12 @@ module Addressable
     # @return [String] The path component, normalized.
     def normalized_path
       @normalized_path ||= (begin
-        result = self.class.normalize_path(self.path.strip)
+        result = Addressable::URI.encode_component(
+          Addressable::IDNA.unicode_normalize_kc(
+            Addressable::URI.unencode_component(self.path.strip)),
+          Addressable::URI::CharacterClasses::PATH
+        )
+        result = self.class.normalize_path(result)
         if result == "" &&
             ["http", "https", "ftp", "tftp"].include?(self.normalized_scheme)
           result = "/"
@@ -1714,7 +1738,17 @@ module Addressable
     #
     # @return [String] The query component, normalized.
     def normalized_query
-      @normalized_query ||= (self.query ? self.query.strip : nil)
+      @normalized_query ||= (begin
+        if self.query
+          Addressable::URI.encode_component(
+            Addressable::IDNA.unicode_normalize_kc(
+              Addressable::URI.unencode_component(self.query.strip)),
+            Addressable::URI::CharacterClasses::QUERY
+          )
+        else
+          nil
+        end
+      end)
     end
 
     ##
@@ -1722,7 +1756,7 @@ module Addressable
     #
     # @param [String, #to_str] new_query The new query component.
     def query=(new_query)
-      @query = new_query.to_str
+      @query = new_query ? new_query.to_str : nil
 
       # Reset dependant values
       @normalized_query = nil
@@ -1840,7 +1874,17 @@ module Addressable
     #
     # @return [String] The fragment component, normalized.
     def normalized_fragment
-      @normalized_fragment ||= (self.fragment ? self.fragment.strip : nil)
+      @normalized_fragment ||= (begin
+        if self.fragment
+          Addressable::URI.encode_component(
+            Addressable::IDNA.unicode_normalize_kc(
+              Addressable::URI.unencode_component(self.fragment.strip)),
+            Addressable::URI::CharacterClasses::FRAGMENT
+          )
+        else
+          nil
+        end
+      end)
     end
 
     ##
@@ -2171,15 +2215,12 @@ module Addressable
         end
       end
 
-      return Addressable::URI.normalized_encode(
-        Addressable::URI.new(
-          :scheme => normalized_scheme,
-          :authority => normalized_authority,
-          :path => normalized_path,
-          :query => normalized_query,
-          :fragment => normalized_fragment
-        ),
-        ::Addressable::URI
+      return Addressable::URI.new(
+        :scheme => normalized_scheme,
+        :authority => normalized_authority,
+        :path => normalized_path,
+        :query => normalized_query,
+        :fragment => normalized_fragment
       )
     end
 

data/lib/gems/{addressable-2.0.0 → addressable-2.0.1}/lib/addressable/version.rb

@@ -27,7 +27,7 @@ if !defined?(Addressable::VERSION)
     module VERSION #:nodoc:
       MAJOR = 2
       MINOR = 0
-      TINY  = 0
+      TINY  = 1
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack-distributed
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-30 00:00:00 -05:00
+date: 2009-01-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.8.2
+        version: 0.8.3
     version: 
 description: Distributed Application Support for Mack Framework
 email: mark@mackframework.com
@@ -32,12 +32,12 @@ extra_rdoc_files: []
 
 files: 
 - lib/gems
-- lib/gems/addressable-2.0.0
-- lib/gems/addressable-2.0.0/lib
-- lib/gems/addressable-2.0.0/lib/addressable
-- lib/gems/addressable-2.0.0/lib/addressable/idna.rb
-- lib/gems/addressable-2.0.0/lib/addressable/uri.rb
-- lib/gems/addressable-2.0.0/lib/addressable/version.rb
+- lib/gems/addressable-2.0.1
+- lib/gems/addressable-2.0.1/lib
+- lib/gems/addressable-2.0.1/lib/addressable
+- lib/gems/addressable-2.0.1/lib/addressable/idna.rb
+- lib/gems/addressable-2.0.1/lib/addressable/uri.rb
+- lib/gems/addressable-2.0.1/lib/addressable/version.rb
 - lib/gems/cache
 - lib/gems/doc
 - lib/gems/gems