content_urls 0.1.5 → 0.1.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2JjNTViZjFiMzNkMGFkNDJlNmJkOTIzYzZjOGNmZDU3NjI2ODRhMw==
+    MTUxOTdmMDIxMmQzZDQ4ZGE0YWVlNTk5YjBlOTAxM2NkOWZmOTk4Mg==
   data.tar.gz: !binary |-
-    ODA3YmVjNmIyOWE3NDJjMzg5ODBhYjlkODcyNDJkZmZiY2ZiNTk5Mw==
+    MGM3ODQ4MzQ2NTdiYzk1NWYxZDgyMzA1ZjNlOTMzYzZlMTM1Yjc5Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDRhMmI5NDE4NWM4ZmIzMGFhYzkzOTExMTQ1MWIyMjBjZDE5ZTMzNTFlYzdi
-    NTY5NmNkOWQ0OWFlZDMxMDNmNzhlZmVlODhlMTAwMmZmYjQxNzA1MTdhNDhk
-    M2VjNTNiODY3MTUwMDNhZjgxM2NlZTZhMWVmN2U0ZTg5ZWNhZGY=
+    ZTIxYjJhN2FkYzc5NTA1NTdjN2IxOTJmNGNmNzM4OWYwYWE5NjAzYzI4NDU1
+    ZWRhMDcyYzA0ZjY0OTI5NTY3MjZjMjZhNWRjOTYyNzJhYThjZmQ4MjcxNmI0
+    MjAzMGJhY2M4YTRkNDllMWI0YmE5NTkwMzljZGFlYWYzMTYyNmU=
   data.tar.gz: !binary |-
-    ZjUxNjM5NzI1MzAxMDBkYTY5ZDAwODYwNDdhYmE1YTJiZjFhN2RkYWQ2ODMw
-    NDlkOTA4MTc5MzE4ODUyZTVkZWM0NmNlMThiZjI4MjU2OThhNTUzNTU4NDdj
-    MGMzMDFlOWEwYzdjMjg4N2JlNzU1NGUyMTg5NzI0ODcyMzkyMTY=
+    NTQ0MDg3YTJlYmRiZmVmNDU5NzUzYWQyMDFiNmI4YTU1YWE2YWNjODQ3MzQ0
+    NzAzNWY1ZTFiNjAyYWFkNTY1YjNmZjc4OTc2MTE1NTJkNTQwYjA3MzIzMDE4
+    OTg2NmQ4NTM2YTU3NTcyN2Q1ODRiN2I3MmU4N2NlNDBjODAzZTE=

data/Gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 gem "nokogiri", "~> 1.5.10"
 
 group :development do
-  gem "rspec", "~> 2.8.0"
+  gem "rspec", "~> 2.14.1"
   gem "yard", "~> 0.7"
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.3.5"

data/content_urls.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "content_urls"
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dennis Sutch"]
-  s.date = "2013-07-13"
+  s.date = "2013-07-16"
   s.description = "Parses various file types (HTML, CSS, JavaScript, ...) for URLs and provides methods for iterating through URLs and changing URLs."
   s.email = "dennis@sutch.com"
   s.extra_rdoc_files = [
@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<nokogiri>, ["~> 1.5.10"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.14.1"])
       s.add_development_dependency(%q<yard>, ["~> 0.7"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.3.5"])
@@ -54,7 +54,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rake>, ["~> 10.1.0"])
     else
       s.add_dependency(%q<nokogiri>, ["~> 1.5.10"])
-      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.14.1"])
       s.add_dependency(%q<yard>, ["~> 0.7"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.3.5"])
@@ -63,7 +63,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<nokogiri>, ["~> 1.5.10"])
-    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.14.1"])
     s.add_dependency(%q<yard>, ["~> 0.7"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.3.5"])

data/lib/content_urls/parsers/java_script_parser.rb

@@ -46,12 +46,11 @@ class ContentUrls
           rewritten += match.pre_match
           replacement = url.nil? ? nil : (yield url)
           if replacement.nil? or replacement == url  # no change in URL
-            rewritten += url[0]
-            remaining = url[1..-1] + match.post_match
+            rewritten += url
           else
             rewritten += replacement
-            remaining = match.post_match
           end
+          remaining = match.post_match
         else
           rewritten += remaining
           remaining = ''

data/lib/content_urls/version.rb

@@ -2,7 +2,7 @@ class ContentUrls
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 5
+    PATCH = 6
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/spec/html_parser_spec.rb

@@ -10,13 +10,14 @@ describe ContentUrls::HtmlParser do
 end
 
 describe ContentUrls::HtmlParser do
-  it "should return the URLs in the content" do
+  it "should return the URL in the content" do
     ContentUrls::HtmlParser.urls("<a href='index.html").first.should eq 'index.html'
+    ContentUrls::HtmlParser.urls("<a href='index.html").count.should eq 1
   end
 end
 
 describe ContentUrls::HtmlParser do
-  it "should parse HTML Sample 1 and return all a links" do
+  it "should parse HTML Sample 1 and return all a links and no other links" do
 
 html_sample_1 =<<SAMPLE_1
 <html>
@@ -36,6 +37,7 @@ SAMPLE_1
     urls.include?('a-href-link-1.html').should eq true
     urls.include?('http://www.example.com/1/2/3/a-href-link-2.html').should eq true
     urls.include?('/folder/a-href-link-3.html?a=1').should eq true
+    urls.count.should eq 3
   end
 end
 
@@ -69,7 +71,7 @@ SAMPLE_1
 end
 
 describe ContentUrls::HtmlParser do
-  it "should parse HTML Sample 2 and return all 'area href' URLs" do
+  it "should parse HTML Sample 2 and return all 'area href' URLs and no other URLs" do
 
 html_sample_2 =<<SAMPLE_2
 <html>
@@ -78,7 +80,9 @@ html_sample_2 =<<SAMPLE_2
 </head>
 <body>
   <h1>HTML Sample 2</h1>
-  <img src="sample.gif" width="200" height="200" alt="Click somewhere" usemap="#sample-map">
+  <!-- commented out in order to not affect URL count
+    <img src="sample.gif" width="200" height="200" alt="Click somewhere" usemap="#sample-map">
+  -->
   <map name="sample-map">
     <area shape="rect" coords="0,0,100,100" href="area-href-link-1.html" alt="link 1">
     <area shape="circle" coords="150,150,2" href="http://www.example.com/1/2/3/area-href-link-2.html" alt="link 2">
@@ -92,11 +96,12 @@ SAMPLE_2
     urls.include?('area-href-link-1.html').should eq true
     urls.include?('http://www.example.com/1/2/3/area-href-link-2.html').should eq true
     urls.include?('/folder/area-href-link-3.html?a=1').should eq true
+    urls.count.should eq 3
   end
 end
 
 describe ContentUrls::HtmlParser do
-  it "should parse HTML Sample 3 and return 'body background' URL" do
+  it "should parse HTML Sample 3 and return 'body background' URL and no other URLs" do
 
 html_sample_3 =<<SAMPLE_3
 <html>
@@ -111,11 +116,12 @@ SAMPLE_3
 
     urls = ContentUrls::HtmlParser.urls(html_sample_3)
     urls.first.should eq '/images/background.png'
+    urls.count.should eq 1
   end
 end
 
 describe ContentUrls::HtmlParser do
-  it "should parse HTML Sample 4 and return 'embed src' URL" do
+  it "should parse HTML Sample 4 and return 'embed src' URL and no other URLs" do
 
 html_sample_4 =<<SAMPLE_4
 <html>
@@ -131,11 +137,12 @@ SAMPLE_4
 
     urls = ContentUrls::HtmlParser.urls(html_sample_4)
     urls.first.should eq 'sample.swf'
+    urls.count.should eq 1
   end
 end
 
 describe ContentUrls::HtmlParser do
-  it "should parse HTML Sample 5 and return 'img src' URL" do
+  it "should parse HTML Sample 5 and return 'img src' URL and no other URLs" do
 
 html_sample_5 =<<SAMPLE_5
 <html>
@@ -151,11 +158,12 @@ SAMPLE_5
 
     urls = ContentUrls::HtmlParser.urls(html_sample_5)
     urls.first.should eq 'sample.gif'
+    urls.count.should eq 1
   end
 end
 
 describe ContentUrls::HtmlParser do
-  it "should parse HTML Sample 6 and return 'link href' URL" do
+  it "should parse HTML Sample 6 and return 'link href' URL and no other URLs" do
 
 html_sample_6 =<<SAMPLE_6
 <html>
@@ -171,11 +179,12 @@ SAMPLE_6
 
     urls = ContentUrls::HtmlParser.urls(html_sample_6)
     urls.first.should eq '/index.php'
+    urls.count.should eq 1
   end
 end
 
 describe ContentUrls::HtmlParser do
-  it "should parse HTML Sample 7 and return 'object data' URL" do
+  it "should parse HTML Sample 7 and return 'object data' URL and no other URLs" do
 
 html_sample_7 =<<SAMPLE_7
 <html>
@@ -191,11 +200,12 @@ SAMPLE_7
 
     urls = ContentUrls::HtmlParser.urls(html_sample_7)
     urls.first.should eq '/stuff/example.swf'
+    urls.count.should eq 1
   end
 end
 
 describe ContentUrls::HtmlParser do
-  it "should parse HTML Sample 8 and return 'script src' URL" do
+  it "should parse HTML Sample 8 and return 'script src' URL and no other URLs" do
 
 html_sample_8 =<<SAMPLE_8
 <html>
@@ -211,11 +221,12 @@ SAMPLE_8
 
     urls = ContentUrls::HtmlParser.urls(html_sample_8)
     urls.first.should eq '../scripts/go.js'
+    urls.count.should eq 1
   end
 end
 
 describe ContentUrls::HtmlParser do
-  it "should parse HTML Sample 9 and return 'meta content' URL" do
+  it "should parse HTML Sample 9 and return 'meta content' URL and no other URLs" do
 
 html_sample_9 =<<SAMPLE_9
 <html>
@@ -231,11 +242,12 @@ SAMPLE_9
 
     urls = ContentUrls::HtmlParser.urls(html_sample_9)
     urls.first.should eq 'http://example.com/'
+    urls.count.should eq 1
   end
 end
 
 describe ContentUrls::HtmlParser do
-  it "should parse HTML Sample 10 and return URLs found within 'style' attributes" do
+  it "should parse HTML Sample 10 and return URLs found within 'style' attributes, and return no other URLs" do
 
 html_sample_10 =<<SAMPLE_10
 <html>
@@ -250,11 +262,12 @@ SAMPLE_10
 
     urls = ContentUrls::HtmlParser.urls(html_sample_10)
     urls.first.should eq 'background.jpg'
+    urls.count.should eq 1
   end
 end
 
 describe ContentUrls::HtmlParser do
-  it "should parse HTML Sample 11 and return URLs found within 'style' tags" do
+  it "should parse HTML Sample 11 and return URLs found within 'style' tags, and return no other URLs" do
 
 html_sample_11 =<<SAMPLE_11
 <html>
@@ -272,11 +285,12 @@ SAMPLE_11
 
     urls = ContentUrls::HtmlParser.urls(html_sample_11)
     urls.first.should eq '/image/background.jpg'
+    urls.count.should eq 1
   end
 end
 
 describe ContentUrls::HtmlParser do
-  it "should parse HTML Sample 12 and return URLs found within 'script' tags" do
+  it "should parse HTML Sample 12 and return URLs found within 'script' tags, and return no other URLs" do
 
 html_sample_12 =<<SAMPLE_12
 <html>
@@ -295,11 +309,12 @@ SAMPLE_12
 
     urls = ContentUrls::HtmlParser.urls(html_sample_12)
     urls.first.should eq 'http://www.sample.com/index.html'
+    urls.count.should eq 1
   end
 end
 
 describe ContentUrls::HtmlParser do
-  it "should parse HTML Sample 13 and return 'frame src' URL" do
+  it "should parse HTML Sample 13 and return 'frame src' URL and no other URLs" do
 
 html_sample_13 =<<SAMPLE_13
 <html>
@@ -315,11 +330,12 @@ SAMPLE_13
 
     urls = ContentUrls::HtmlParser.urls(html_sample_13)
     urls.first.should eq '/info.html'
+    urls.count.should eq 1
   end
 end
 
 describe ContentUrls::HtmlParser do
-  it "should parse the HTML and return the 'base' URL" do
+  it "should parse the HTML and return the 'base' URL and no other URLs" do
 
   html_base_sample =<<BASE_SAMPLE
 <html>

data/spec/java_script_parser_spec.rb

@@ -7,8 +7,9 @@ describe ContentUrls::JavaScriptParser do
 end
 
 describe ContentUrls::JavaScriptParser do
-  it "should return the URLs in the content" do
+  it "should return only the URLs in the content" do
     ContentUrls::JavaScriptParser.urls('var link="http://www.sample.com/index.html"').first.should eq 'http://www.sample.com/index.html'
+    ContentUrls::JavaScriptParser.urls('var link="http://www.sample.com/index.html"').count.should eq 1
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: content_urls
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Dennis Sutch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-13 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement