resync 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeaccafe9b78c6c1b73438dbc3615691e55acf37
-  data.tar.gz: 20ca197220dff4f8ac252d1fd3060446fad6e5e4
+  metadata.gz: 8c504db116de3859b95c4acea4ea950fb2a37a48
+  data.tar.gz: 1f0c7ef67cb41ca6dcdbf87ef943aa64b38b16d7
 SHA512:
-  metadata.gz: b82cd0986b56ea9aed5f12abc1532ead2bb942128938fed721b68fee918987acbc8fdb8683074d0669c5999cd9036d6b28c72b184ab39d44ed2f8928c48f2d85
-  data.tar.gz: eb88c946de862ab36cf3be1f9c01ff94f1f5ebe01d586ae6424bc729c004f0c6c80fd8b8a779415502c550faed3b350ee0f56b3e6c53e3d2e6273bd3934d10a9
+  metadata.gz: 8b4ae0258fe913c876274be50963832f0022a2a71fee6d0c9cb9ad40e7cb2e83e97cba776eba0a7194e631177b16e19aab8e80ce89a4343c862572c7f3c1fb87
+  data.tar.gz: 3e04a2227d2434fda5c8628a484027542a9d7bf713f742a3c062d87a5836339037b0c520363dc348b59487eebb2d6fb801a9f41e7f7e0f21e548fac352bfa71f

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.2.1
+
+- Fixed issue where extra whitespace in `<loc/>` tags could prevent URI parsing.
+
 ## 0.2.0
 
 - `BaseResourceList#resources` now returns an `IndexableLazy` instead of a plain array.

data/lib/resync/version.rb

@@ -1,4 +1,4 @@
 module Resync
   # The version of this gem.
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/resync/xml.rb

@@ -15,7 +15,9 @@ module Resync
     # @raise [URI::InvalidURIError] if +url+ cannot be converted to a URI.
     def self.to_uri(url)
       return nil unless url
-      (url.is_a? URI) ? url : URI.parse(url)
+      return url if url.is_a? URI
+      stripped = url.respond_to?(:strip) ? url.strip : url.to_s.strip
+      URI.parse(stripped)
     end
 
     # Extracts a +REXML::Element+ from the specified object.
@@ -91,7 +93,8 @@ module Resync
 
       # Implements +::XML::Mapping::SingleAttributeNode#extract_attr_value+.
       def extract_attr_value(xml)
-        URI(default_when_xpath_err { @path.first(xml).text })
+        val = default_when_xpath_err { @path.first(xml).text }
+        URI(val.strip)
       end
 
       # Implements +::XML::Mapping::SingleAttributeNode#set_attr_value+.

data/spec/unit/resync/change_list_spec.rb

@@ -69,6 +69,36 @@ module Resync
           xml = list.save_to_xml
           expect(xml).to be_xml(data)
         end
+
+        it 'can round-trip with pretty-printing' do
+          data = "
+            <urlset xmlns='http://www.sitemaps.org/schemas/sitemap/0.9' xmlns:rs='http://www.openarchives.org/rs/terms/'>
+              <rs:ln rel='up' href='http://example.com/dataset1/capabilitylist.xml'/>
+              <rs:md from='2013-01-03T00:00:00Z' capability='changelist'/>
+              <url>
+                <loc>
+                  http://example.com/res4
+                </loc>
+                <lastmod>
+                  2013-01-03T17:00:00Z
+                </lastmod>
+                <rs:ln modified='2013-01-03T17:00:00Z' length='73' type='application/json-patch' hash='sha-256:f4OxZX_x_DFGFDgghgdfb6rtSx-iosjf6735432nklj' rel='http://www.openarchives.org/rs/terms/patch' href='http://example.com/res4-json-patch'/>
+                <rs:md length='56778' type='application/json' hash='sha-256:f4OxZX_x_DFGFDgghgdfb6rtSx-iosjf6735432nklj' change='updated'/>
+              </url>
+              <url>
+                <loc>
+                  http://example.com/res5-full.tiff
+                </loc>
+                <lastmod>
+                  2013-01-03T18:00:00Z
+                </lastmod>
+                <rs:md change='deleted'/>
+              </url>
+            </urlset>"
+          list = ChangeList.load_from_xml(XML.element(data))
+          xml = list.save_to_xml
+          expect(xml).to be_xml(data)
+        end
       end
     end
   end

data/spec/unit/resync/shared/uri_field_examples.rb

@@ -23,6 +23,14 @@ module Resync
       expect(instance.uri).to eq(URI(uri))
     end
 
+    it 'accepts a string URI with extra whitespace' do
+      uri_val = '
+                  http://example.org/
+                '
+      instance = new_instance(uri: uri_val)
+      expect(instance.uri).to eq(URI('http://example.org/'))
+    end
+
     it 'rejects an invalid URI' do
       invalid_url = 'I am not a valid URI'
       expect { new_instance(uri: invalid_url) }.to raise_error(URI::InvalidURIError)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resync
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - David Moles