file-uri 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6a645851a1f2159e72eafaefd02f0d740bead9e
-  data.tar.gz: 0aa68c3ae8150ac81653498069c7fab57693db65
+  metadata.gz: 3525f546d39d44784846b1f02a372cf6bb78b555
+  data.tar.gz: e23b88aa0f6bfa10d88c9fc29c15466c1c37ec48
 SHA512:
-  metadata.gz: bb872d4478f27ec8c8a63e36499db67742c271e1431a34c1770bf86b96bf7a0492727a5d1ecafb656452ffaa1f1b82f50f0e2dbae1700e15b5c5bf1b2f409b54
-  data.tar.gz: 71ec8ecde2ea8631276db2475f3b9b3de89cec206e4c41999348c6ceb3153de322e12bcfa1a56a596547460f7e7375752a68da5c5fcb49d43486b4d244c0e547
+  metadata.gz: 9ae089e1b4a47e938587b75300a43a334fb9df07c1b292373960ad4928d3990106229fe27daba337de6a3787c4500e7d9c3d21ef6dad9989e9aa4def13ada888
+  data.tar.gz: b66d19dfa6aa6025d46990af64fa1f178151d1ea4942648f41e190b7188b387fa0bf6f54936e60bd2039bd15e1286e898df1c176d8deda4909e744ac8ca09b80

data/lib/file-uri/win.rb

@@ -46,6 +46,78 @@ module URI
       super(scheme, userinfo, host, port, registry, path, opaque, query, fragment, parser, arg_check)
     end
 
+    #
+    # == Args
+    #
+    # +oth+::
+    #    URI or String
+    #
+    # == Description
+    #
+    # Merges two URI's.
+    #
+    # == Usage
+    #
+    #   require 'uri'
+    #
+    #   uri = URI.parse("http://my.example.com")
+    #   p uri.merge("/main.rbx?page=1")
+    #   # =>  #<URI::HTTP:0x2021f3b0 URL:http://my.example.com/main.rbx?page=1>
+    #
+    def merge(oth)
+      rel = parser.send(:convert_to_uri, oth)
+
+      if rel.absolute?
+        #raise BadURIError, "both URI are absolute" if absolute?
+        # hmm... should return oth for usability?
+        return rel
+      end
+
+      unless self.absolute?
+        raise BadURIError, "both URI are relative"
+      end
+
+      base = self.dup
+
+      authority = rel.userinfo || rel.host || rel.port
+
+      # RFC2396, Section 5.2, 2)
+      if (rel.path.nil? || rel.path.empty?) && !authority && !rel.query
+        base.fragment=(rel.fragment) if rel.fragment
+        return base
+      end
+
+      base.query = nil
+      base.fragment=(nil)
+
+      # RFC2396, Section 5.2, 4)
+      if !authority
+        # Difference from URI::Generic -- handle drive letter
+        base_path = base.path
+        rel_path = rel.path
+        if base_path && rel_path
+          if rel_path =~ %r[\A(\.\.(?=/|\z)|/(?![A-Z]:(/|\z)))]i && base_path.sub!(%r[\A/?[A-Z]:(?=/|\z)]i, '')
+            base.set_path($~[0] + merge_path(base_path, rel_path))
+          else
+            base.set_path(merge_path(base_path, rel_path))
+          end
+        end
+      else
+        # RFC2396, Section 5.2, 4)
+        base.set_path(rel.path) if rel.path
+      end
+
+      # RFC2396, Section 5.2, 7)
+      base.set_userinfo(rel.userinfo) if rel.userinfo
+      base.set_host(rel.host)         if rel.host
+      base.set_port(rel.port)         if rel.port
+      base.query = rel.query       if rel.query
+      base.fragment=(rel.fragment) if rel.fragment
+
+      return base
+    end # merge
+    alias + merge
+
     ##
     # localhost:
     #

data/test/test-win-file-uri.rb

@@ -111,4 +111,23 @@ class Test_win_file_uri < Test::Unit::TestCase
     end
   end
 
+  def test_relative_resolution
+    [
+      # relative references beginning with dots
+      ['file:/c:/z/y/x', './a',           '/c:/z/y/a'], # \
+      ['file:/c:/z/y/x', '../a',          '/c:/z/a'],   #  ) normal relative resolution
+      ['file:/c:/z/y/x', '../../a',       '/c:/a'],     # /
+      ['file:/c:/z/y/x', '../../../a',    '/c:/a'],     # \_ don't overwrite drive letter
+      ['file:/c:/z/y/x', '../../../../a', '/c:/a'],     # /
+      # ... beginning with a slash
+      ['file:/c:/z/y/x', '/a',            '/c:/a'], # relative to drive letter
+      ['file:/c:/z/y/x', '/d:/a',         '/d:/a'], # whole absolute path
+      ['file:/c:/z/y/x', '/../a',         '/c:/a'], # weird (but legal) reference
+    ].each do |base, rel, merged_path|
+      b = URI.parse(base)
+      m = b + rel
+      assert_equal( merged_path, m.path, "#{base.inspect} + #{rel.inspect}")
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: file-uri
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Matthew Kerwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies: []
 description: |
   == file-uri – the "file" URI Scheme
@@ -50,7 +50,7 @@ rubyforge_project:
 rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
-summary: 'file-uri : the "file" URI Scheme'
+summary: file-uri – the "file" URI Scheme
 test_files:
 - test/test-win-file-uri.rb
 - test/test-file-uri.rb