bypass 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 714bf5827bed4b9dc48e2e8b02331d3ea037dbcb
-  data.tar.gz: 8308c92ac4c09c9f43ec0829014b372b45912f22
+  metadata.gz: fc4ddc7af4c8b964645097d13bf732dd61916ae7
+  data.tar.gz: 4db28ffabcd537ac7ab691a507bd1c943ce9e771
 SHA512:
-  metadata.gz: 961a97ba6833870c7dbee87389ec2b98795b402baa2c879726f8c0b5d26e585a1234252fb8b6b6cd3da4142cd5e5c494685cb28579ca948f2594d8fc08595532
-  data.tar.gz: 9a915ca624bb6bb3913834f322d3ba2985eff78a74abaa92f70f622d155afed1ac804e30e06bdd842268640143efc01b99a62b7b282e50762fd339b216aef099
+  metadata.gz: f57bc91cec3392defc8640589dcdb99da330910a0a76f3a1646f9319c8227a050a4e110cbee5258cb6ae5b8abbd02577bc6eeafae67713afb2f9f54ac00acbb3
+  data.tar.gz: 542bbfd4e0088f29e0a6c130f3e3dd0b114d38dcfc75b178919d63d8e2fdfee116825053719a694fcb847f3c1af9bcdcf15ab658c2e724480da68f7c81c8c895

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Derrick Reimer
+Copyright (c) 2013-2016 Derrick Reimer
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/bypass/filter.rb

@@ -1,11 +1,11 @@
 module Bypass
   class Filter
     attr_reader :content, :fragment
-    
+
     URL_PATTERN = /\bhttps?:\/\/
       [a-zA-Z0-9\-\._~:\/\?#\[\]@!$&'\(\)\*\+,;=%]+
       [a-zA-Z0-9\-_~:\/\?#\[\]@!$&\*\+;=%]/x
-    
+
     def initialize(content, options = {})
       @content = content.to_s.encode("UTF-8")
       @fragment = options.fetch(:fragment, true)
@@ -14,13 +14,13 @@ module Bypass
     def replace
       raise NotImplementedError
     end
-    
+
     def to_s
       content
     end
-  
+
   private
-  
+
     def gsub_urls(text, &block)
       text.gsub(URL_PATTERN) do |match|
         yield(match.to_s)
@@ -29,8 +29,8 @@ module Bypass
 
     def parse_uri(uri)
       Bypass::URI.parse(uri.to_s.strip)
-    rescue => ex
+    rescue
       nil
     end
   end
-end
+end

data/lib/bypass/html_filter.rb

@@ -3,6 +3,17 @@ require "nokogiri"
 module Bypass
   class HTMLFilter < Filter
 
+    def initialize(content, options = {})
+      if content.respond_to?(:traverse) # then this is Nokogiri
+        @content = content
+        @parsed_content = content
+      else
+        @content = content.to_s.encode("UTF-8")
+      end
+
+      @fragment = options.fetch(:fragment, true)
+    end
+
     def replace(&block)
       parsed_content.traverse do |node|
         if node.name == "a" && href = node.get_attribute("href")
@@ -16,7 +27,7 @@ module Bypass
 
     def auto_link(options = {})
       each_text_node do |node|
-        text = gsub_urls(node.text.to_s) do |url| 
+        text = gsub_urls(node.text.to_s) do |url|
           build_anchor_tag(url, url, options)
         end
         node.replace(parse_html_fragment(text))
@@ -29,10 +40,22 @@ module Bypass
       "<a href=\"#{href}\"#{attributes.join(' ')}>#{text}</a>"
     end
 
+    def parsed_content
+      @parsed_content ||= parse_content
+    end
+
     def content
       parsed_content.to_s
     end
 
+    def parse_content
+      if fragment
+        parse_html_fragment(@content)
+      else
+        parse_html_document(@content)
+      end
+    end
+
   private
 
     def each_text_node(&block)
@@ -45,16 +68,6 @@ module Bypass
       end
     end
 
-    def parsed_content
-      @parsed_content ||= begin
-        if fragment
-          parse_html_fragment(@content)
-        else
-          parse_html_document(@content)
-        end
-      end
-    end
-
     def parse_html_fragment(html)
       Nokogiri::HTML::DocumentFragment.parse(html)
     end
@@ -63,4 +76,4 @@ module Bypass
       Nokogiri::HTML::Document.parse(html)
     end
   end
-end
+end

data/lib/bypass/uri.rb

@@ -1,4 +1,5 @@
 require "addressable/uri"
+require "cgi"
 
 module Bypass
   class URI < Addressable::URI

data/lib/bypass/version.rb

@@ -1,3 +1,3 @@
 module Bypass
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/test/bypass/filter_test.rb

@@ -8,4 +8,4 @@ class Bypass::FilterTest < MiniTest::Test
       assert_equal "foo", filter.to_s
     end
   end
-end
+end

data/test/bypass/html_filter_test.rb

@@ -2,6 +2,23 @@ require 'addressable/uri'
 require File.dirname(__FILE__) + '/../test_helper.rb'
 
 class Bypass::HTMLFilterTest < MiniTest::Test
+  context "content parsing" do
+    should "parse string content on the fly" do
+      filter = Bypass::HTMLFilter.new("foo")
+      filter.expects(:parse_content).returns("bar")
+      assert_equal "bar", filter.content
+      assert_equal "bar", filter.parsed_content
+    end
+
+    should "skip parsing if Nokogiri document is passed in" do
+      document = Nokogiri::HTML::DocumentFragment.parse("<html></html>")
+      filter = Bypass::HTMLFilter.new(document)
+      filter.expects(:parse_content).never
+      assert_equal document.to_s, filter.content
+      assert_equal document, filter.parsed_content
+    end
+  end
+
   context "#replace" do
     should "replace hrefs" do
       text = "<a href=\"http://yahoo.com\">Yahoo</a>"
@@ -44,7 +61,7 @@ class Bypass::HTMLFilterTest < MiniTest::Test
       assert_equal "Hello <a href=\"http://www.google.com\">http://www.google.com</a>.", filter.content
     end
 
-    should "not replace urls inside a-tags" do      
+    should "not replace urls inside a-tags" do
       text = "<a href=\"http://yahoo.com\">http://yahoo.com</a>"
       filter = Bypass::HTMLFilter.new(text)
       filter.auto_link
@@ -58,7 +75,7 @@ class Bypass::HTMLFilterTest < MiniTest::Test
       tag = "<a href=\"http://www.google.com\">Google</a>"
       assert_equal tag, filter.build_anchor_tag("Google", "http://www.google.com")
     end
-    
+
     should "include additional attributes" do
       filter = Bypass::HTMLFilter.new("")
       tag = "<a href=\"http://www.google.com\" class=\"button\">Google</a>"
@@ -104,4 +121,4 @@ class Bypass::HTMLFilterTest < MiniTest::Test
   def normalize_output(html)
     html.lines.map(&:strip).join("")
   end
-end
+end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: bypass
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Derrick Reimer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2017-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Mutate URLs and hyperlinks in HTML and plain text documents
@@ -87,8 +87,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -114,17 +114,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Mutate URLs and hyperlinks in HTML and plain text documents with ease
@@ -134,4 +134,3 @@ test_files:
 - test/bypass/text_filter_test.rb
 - test/bypass/uri_test.rb
 - test/test_helper.rb
-has_rdoc: