preadly-bulbasaur 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31c936bb121a4f61275241d5c059222c02f3e7b6
-  data.tar.gz: eeeb22a1d7d7177372fe8e40d7f2ad58feab00d3
+  metadata.gz: 8260cd6a3e468ab1139c0096ee1cbb5086fe7ff1
+  data.tar.gz: 146d9e064d05db1eb3c19c7cdc7290c6027fa79a
 SHA512:
-  metadata.gz: f83867d13892773d3e73758b99f3d1c2289f41ad8a7fdfc073d902b4f21f83612b71cb320da2eac96937fbf733af3a7e520b0134e3a2c98657ad1501f776c241
-  data.tar.gz: 813a56226a7f1ae0db8fd34d3fdafd8666a0aec5c6abea393ec7f73afdbab54805c2b353aeaa010899ba02f4fe7d905ae76e63a22f2ddc2c800575c2aabcdb0d
+  metadata.gz: 61721cf5b99c6edba03b754fe98b863bd9747ab0bd279d4b3023becfc160309a591d931a2b8b814aab69884c940e026c72d8dc52022769101ef9f79f4da90b49
+  data.tar.gz: f8da5d762adf404102767f71c0c68ea99a3f49fbbb716612f01e95f9fda6ab8a5c982068d35d14232bdb8d033bfdcefab69d628c36a3fbdeb54dab390ab490d7

data/lib/bulbasaur/utils/normalize_image_sources.rb

@@ -1,7 +1,5 @@
 module Bulbasaur
   class NormalizeImageSources
-    DOMAIN_REGEX = /^(?:https?:\/\/)?(?:[^@\n]+@)?(?:www\.)?([^:\/\n]+)/im
-
     def initialize(html, target_attrs)
       @html = html
       @target_attrs = target_attrs
@@ -27,16 +25,10 @@ module Bulbasaur
     end
 
     def adjust(element, attr)
-      element.set_attribute 'src', lazy_load_url(element, element.xpath(attr).text)
+      element.set_attribute 'src', element.xpath(attr).text
       remove_target_attrs_from element
     end
 
-    def lazy_load_url(element, text)
-      text_match = text.match(DOMAIN_REGEX).to_s
-      element_match = element.css('@src').text.match(DOMAIN_REGEX).to_s
-      element_match.empty? || text_match == element_match ? text : "#{element_match}/#{text}"
-    end
-
     def remove_target_attrs_from(element)
       @target_attrs.each { |attr| element.xpath("@#{attr}").remove }
     end

data/lib/bulbasaur/utils/normalize_url.rb

@@ -1,7 +1,7 @@
 module Bulbasaur
   class NormalizeURL
     def initialize(base_url, context_url)
-      @base_url = base_url
+      @base_url = clean_url(base_url)
       @context_url = context_url
     end
 
@@ -11,5 +11,13 @@ module Bulbasaur
     rescue
       raise ArgumentError, "Unable to normalize URL. Params: [base_url: #{@base_url}, context_url: #{@context_url}]."
     end
+
+    private
+    def clean_url(url)
+      uri = URI(url)
+      uri.path = ''
+      uri.query = ''
+      uri.to_s
+    end
   end
 end

data/lib/bulbasaur/version.rb

@@ -3,7 +3,7 @@ module Bulbasaur
   module Version
     MAJOR = 0
     MINOR = 8
-    PATCH = 1
+    PATCH = 2
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
   

data/spec/bulbasaur/utils/normalize_image_sources_spec.rb

@@ -9,15 +9,16 @@ RSpec.describe Bulbasaur::NormalizeImageSources do
   describe "#call" do
     
     let(:html) do 
-      %Q(
+      <<-HTML
         <img src="http://somewhere.to/get/a-pixel.gif" data-lazy-src="http://somewhere.to/get/the-real-image.jpg" alt="Image" width="800" height="1200">
         <img src="http://somewhere.to/get/another-pixel.gif" data-image="http://somewhere.to/get/the-other-real-image.jpg">
         <img src="http://somewhere.to/get/a-third-pixel.gif" data-src="get/the-third-real-image.jpg">
         <img src="otherplace.to/load/a-fourth-pixel.gif" lazy-data="otherplace.to/load/the-fourth-real-image.jpg">
+        <img src="http://somewhere.to/get/a-fifth-pixel.gif" data-image="http://elsewhere.to/get/the-fifth-real-image.jpg">
         <img src="https://place.where/an-image/is/without-extension/" data-src="https://place.where/an-image/is/without-extension/">
         <img src="https://place.where/an-image/has-two/lazy-params/" data-src="https://place.where/an-image/has-two/lazy-params/" data-image="https://place.where/an-image/has-two/lazy-params/">
         <img lazy-data="https://place.where/an-image/has/no-src-tag.jpg">
-      )
+      HTML
     end
     
     context "When there are no target attributes" do
@@ -38,15 +39,16 @@ RSpec.describe Bulbasaur::NormalizeImageSources do
       end
     
       let(:html_parsed) do
-        %Q(
+        <<-HTML
           <img src="http://somewhere.to/get/the-real-image.jpg" alt="Image" width="800" height="1200">
           <img src="http://somewhere.to/get/the-other-real-image.jpg">
           <img src="http://somewhere.to/get/a-third-pixel.gif" data-src="get/the-third-real-image.jpg">
           <img src="otherplace.to/load/a-fourth-pixel.gif" lazy-data="otherplace.to/load/the-fourth-real-image.jpg">
+          <img src="http://elsewhere.to/get/the-fifth-real-image.jpg">
           <img src="https://place.where/an-image/is/without-extension/" data-src="https://place.where/an-image/is/without-extension/">
           <img src="https://place.where/an-image/has-two/lazy-params/" data-src="https://place.where/an-image/has-two/lazy-params/">
           <img lazy-data="https://place.where/an-image/has/no-src-tag.jpg">
-        )
+        HTML
       end
 
       it "Returns the HTML code with the specified image tags adjusted" do
@@ -61,15 +63,16 @@ RSpec.describe Bulbasaur::NormalizeImageSources do
       end
     
       let(:html_parsed) do
-        %Q(
+        <<-HTML
           <img src="http://somewhere.to/get/the-real-image.jpg" alt="Image" width="800" height="1200">
           <img src="http://somewhere.to/get/the-other-real-image.jpg">
-          <img src="http://somewhere.to/get/the-third-real-image.jpg">
+          <img src="get/the-third-real-image.jpg">
           <img src="otherplace.to/load/the-fourth-real-image.jpg">
+          <img src="http://elsewhere.to/get/the-fifth-real-image.jpg">
           <img src="https://place.where/an-image/is/without-extension/">
           <img src="https://place.where/an-image/has-two/lazy-params/">
           <img src="https://place.where/an-image/has/no-src-tag.jpg">
-        )
+        HTML
       end
 
       it "Returns the HTML code with the involved image tags fixed with domain and path" do

data/spec/bulbasaur/utils/normalize_url_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe Bulbasaur::NormalizeURL do
   subject do
     described_class.new(base_url, context_url).call
   end
-      
+
   let(:base_url) do
     "http://pread.ly"
   end
@@ -15,16 +15,16 @@ RSpec.describe Bulbasaur::NormalizeURL do
   end
 
   describe "#call" do
-    
+
     context "When use url normalized url: http://www.test.com/hello.jpg" do
-      
+
       it "Does return url normalized: http://www.test.com/hello.jpg" do
         expect(subject).to eq "http://www.test.com/hello.jpg"
       end
     end
 
     context "When use url unnormalized url: test.jpg" do
-     
+
       let(:context_url) do
         "test.jpg"
       end
@@ -35,7 +35,7 @@ RSpec.describe Bulbasaur::NormalizeURL do
     end
 
     context "When use url https normalized: https://www.test.com/hello.jpg" do
-      
+
       let(:context_url) do
         "https://www.test.com/hello.jpg"
       end
@@ -54,7 +54,7 @@ RSpec.describe Bulbasaur::NormalizeURL do
     end
 
     context "When use url not normalized with slash on base: hello.jpg" do
-      
+
       let(:base_url) do
         "https://www.test.com/"
       end
@@ -68,8 +68,36 @@ RSpec.describe Bulbasaur::NormalizeURL do
       end
     end
 
+    context "When base_url contains path" do
+      let!(:base_url) do
+        "http://pread.ly/other-path/"
+      end
+
+      let!(:context_url) do
+        "test.jpg"
+      end
+
+      it "Does return url normalized: http://pread.ly/test.jpg" do
+        expect(subject).to eq "http://pread.ly/test.jpg"
+      end
+    end
+
+    context "When base_url contains query string" do
+      let!(:base_url) do
+        "http://pread.ly/?page=1"
+      end
+
+      let!(:context_url) do
+        "test.jpg"
+      end
+
+      it "Does return url normalized: http://pread.ly/test.jpg" do
+        expect(subject).to eq "http://pread.ly/test.jpg"
+      end
+    end
+
     context "When base url not valid" do
-    
+
       let(:base_url) do
         "test/httml"
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: preadly-bulbasaur
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Magno Costa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler