xapian-indexer 1.2.20.1 → 1.2.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1322194dad8b4f2ca4018ff6883e2316c98507ff
-  data.tar.gz: 88d821ad991bb315a3ecfe56eecdbe87a7d0f0c9
+  metadata.gz: e12c81933dc43514b8b7ff7a4cb20b02359e279c
+  data.tar.gz: d5a8b6304636424532e6b90bd75b067052515da5
 SHA512:
-  metadata.gz: dda54be1442b2827b794c0a66d278f455e9721b5db25b4c80f5987727def6508642420710a78fc1b2f2e219c4dd4958a982e359656e485ad0cc3606a1fb8f208
-  data.tar.gz: 96f5f900ecbe6962cc45c492429cca4e77ad3c29a7557ad2d737e63618bf13daaffdc6cbe42a6ac2e58f8c9f0adb9fc9c31d80905a26866c660bed6a1bf22a17
+  metadata.gz: 86318e2ca52eafde44a7ee8330a13525cd9a8ccfe3554bfd9b31e989e3695babd8856148d3a4233d814f07ceb48d7b1973d4681033688fad44c70a64e3141053
+  data.tar.gz: fd85fe7636ade7bb6202dc714e822fa4f3a2e8348ea35b923ddaa36f36533ec8cd3439b32eba8fdc1c3c45ee330c9d5d5540bc6be619af096af066bbb6eab62c

data/lib/xapian/indexer/extensions/uri.rb

@@ -22,20 +22,42 @@ require 'uri'
 
 class URI::Generic
 	# This change allows you to merge relative URLs which otherwise isn't possible.
-	def merge0(oth)
+	def merge(oth)
 		oth = parser.send(:convert_to_uri, oth)
 		
-		if self.absolute? && oth.absolute?
-			#raise BadURIError,
-			#  "both URI are absolute"
-			# hmm... should return oth for usability?
-			return oth, oth
-		end
+		return oth if oth.absolute?
+		
+		base = self.dup
+		rel = oth
 		
-		if self.absolute?
-			return self.dup, oth
+		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
+			base.set_path(merge_path(base.path, rel.path)) if base.path && rel.path
 		else
-			return oth, oth
+			# 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
+	
+	alias + merge
 end

data/lib/xapian/indexer/version.rb

@@ -20,6 +20,6 @@
 
 module Xapian
 	module Indexer
-		VERSION = "1.2.20.1"
+		VERSION = "1.2.20.2"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xapian-indexer
 version: !ruby/object:Gem::Version
-  version: 1.2.20.1
+  version: 1.2.20.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xapian-core
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Xapian::Indexer provides a flexible spider for indexing resources.