snatch 1.0.6 → 1.0.7

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.0.7

data/lib/snatch/clean/html.rb

@@ -24,9 +24,8 @@ class Snatch
         end
 
         def prepend_slash(a)
-          includes_colon   = a['href'].include?(':')
-          starts_with_dots = a['href'][0..1] == '..'
-          a['href'] = a['href'].sub(%r{^/?}, '/') unless includes_colon || starts_with_dots
+          includes_special_chars = !(%w(: .) & a['href'].split(//)).empty?
+          a['href'] = a['href'].sub(%r{^/?}, '/') unless includes_special_chars
         end
 
         def append_slash(a)
@@ -36,7 +35,7 @@ class Snatch
 
       module SrcFixMethods
         def replace_absolute(link)
-          link['src'] = link['src'].sub(%r{(https?)://#{MARKETING_SITE}/}, '/')
+          link['src'] = link['src'].sub(%r{^(https?)://#{MARKETING_SITE}/}, '/')
         end
 
         def rewrite_uploads(link)

data/snatch.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{snatch}
-  s.version = "1.0.6"
+  s.version = "1.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Conroy-Finn"]

data/spec/snatch/clean/html_spec.rb

@@ -48,11 +48,27 @@ describe Snatch::Clean::HTML do
     end
 
     it 'should preserve parent directories within a URL' do
-      anchor = '<a href="../relative/index.html"></a>'
+      anchor = '<a href="../relative/folder"></a>'
       doc = Nokogiri::XML(anchor)
       @html.doc = doc
       @html.send(:update)
-      @html.doc.to_xhtml.strip.should == '<a href="../relative/index.html"></a>'
+      @html.doc.to_xhtml.strip.should == '<a href="../relative/folder/index.html"></a>'
+    end
+
+    it 'should preserve parent directories within a URL' do
+      anchor = '<a href="http://cms.alphasights-002.vm.brightbox.net/advisor/our-guarantee"></a>"'
+      doc = Nokogiri::XML(anchor)
+      @html.doc = doc
+      @html.send(:update)
+      @html.doc.to_xhtml.strip.should == '<a href="/advisor/our-guarantee/index.html"></a>'
+    end
+
+    it 'should preserve parent directories within a URL' do
+      anchor = '<a href="our-guarantee/index.html"></a>"'
+      doc = Nokogiri::XML(anchor)
+      @html.doc = doc
+      @html.send(:update)
+      @html.doc.to_xhtml.strip.should == '<a href="our-guarantee/index.html"></a>'
     end
 
     it 'should replace an absolute CMS URL with a domainless absolute URL' do
@@ -91,8 +107,8 @@ describe Snatch::Clean::HTML do
 
     describe "leading slashes and colons" do
       it 'should append a slash when there is no colon' do
-        fix_node(:prepend_slash, %Q{<a href="blah/file.txt"></a>}) do |node|
-          node.should have_href('/blah/file.txt')
+        fix_node(:prepend_slash, %Q{<a href="blah/file"></a>}) do |node|
+          node.should have_href('/blah/file')
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: snatch
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors: 
 - James Conroy-Finn