bypass 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Y2ZhMzg2MTM3ZjEwMDkzM2RmZDhmMDdjYTdhNWUyNTgzM2E0ZDljYQ==
-  data.tar.gz: !binary |-
-    NDg3NGIwZGM4MzZjMDJiMjJhNmU0MGYzMWVhNmJmYmJlNWVjY2EyZA==
+SHA1:
+  metadata.gz: 718e8ae5c353526d782ccaa70459e5f5dc70b84f
+  data.tar.gz: 870eadce1dfe1ba0fe41625d12527fe3fa09c03b
 SHA512:
-  metadata.gz: !binary |-
-    ZGFkODc2NDNjODQzN2IzNTM4MDM0ZmY1NzM5OGQyODc3NDA3M2UzZTU1NjQw
-    ZTNiMmYwOTE2MDY3NTg3MGRiMmUxYTgxNDFhMjVkNjQ4ZTllMGYyZTI2NGQ5
-    YmU5ODQ2YzNjMzBmZjUxMTMwMzUxM2QyNWQ4MjY3ZDEwYzIxMzk=
-  data.tar.gz: !binary |-
-    ODYyMDZiODQ3ZjZhOGQxNmIyZGJkNGVmMzBjNWE1NDdhZTU2N2FjODAxODI2
-    ZjE1MTI2NGY0ODc2ZmM1NTc1NmQ2NTk3NDhjMDU3NDE0ZThlOTlkMjMwNjU2
-    YTM1MjNjM2I5NzFiYjgxZWJjZjUzNjA3YmUzNWEyNTMzMGNkNmU=
+  metadata.gz: 6a11749670fe237ebe686e126a9620ed2463c9855284290850c9ca81cf85d14f7c5e679b70543006986ec668d18538ced58ec7e21b889dad8ec79bf43aa02a55
+  data.tar.gz: a2d4dfcd1fc1ff96b30452dc251bfff9a1826fd6de7e860016a2ff00cc1584ba43d6ad33232b23d867f4850fd6b9f2eef6200bae7b6d16af3ddfdadfef42f66e

data/.travis.yml

@@ -2,6 +2,4 @@ language: ruby
 rvm:
   - 2.0.0
   - 1.9.2
-  - jruby-19mode
   - ruby-head
-  - jruby-head

data/README.md

@@ -38,6 +38,7 @@ filter = Bypass::TextFilter.new(text)
 
 filter.replace do |url|
   url.append_to_query_values(:id => 123)
+  url
 end
 
 filter.content
@@ -54,6 +55,7 @@ filter = Bypass::HTMLFilter.new(text)
 
 filter.replace do |url|
   url.append_to_query_values(:id => 123)
+  url
 end
 
 filter.content

data/bypass.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.version       = Bypass::VERSION
   gem.authors       = ["Derrick Reimer"]
   gem.email         = ["derrickreimer@gmail.com"]
-  gem.description   = %q{Mutate URLs and hyperlinks in HTML and plain text documents with ease}
-  gem.summary       = %q{Mutate URLs and hyperlinks in HTML and plain text documents with ease}
+  gem.description   = "Mutate URLs and hyperlinks in HTML and plain text documents"
+  gem.summary       = "Mutate URLs and hyperlinks in HTML and plain text documents with ease"
   gem.homepage      = "https://github.com/djreimer/bypass"
 
   gem.files         = `git ls-files`.split($/)
@@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
   
   gem.add_dependency "nokogiri", "~> 1.5"
   gem.add_dependency "addressable", "~> 2.0"
-  gem.add_development_dependency "shoulda-context", "~> 1.0"
+  gem.add_development_dependency "minitest", "~> 5.0"
+  gem.add_development_dependency "shoulda-context", "~> 1.2"
   gem.add_development_dependency "mocha"
 end

data/lib/bypass/filter.rb

@@ -1,13 +1,14 @@
 module Bypass
   class Filter
-    attr_reader :content
+    attr_reader :content, :fragment
     
     URL_PATTERN = /\bhttps?:\/\/
       [a-zA-Z0-9\-\._~:\/\?#\[\]@!$&'\(\)\*\+,;=%]+
       [a-zA-Z0-9\-_~:\/\?#\[\]@!$&\*\+;=%]/x
     
-    def initialize(content)
-      @content = content.to_s
+    def initialize(content, options = {})
+      @content = content.to_s.encode("UTF-8")
+      @fragment = options.fetch(:fragment, true)
     end
 
     def replace

data/lib/bypass/html_filter.rb

@@ -46,11 +46,21 @@ module Bypass
     end
 
     def parsed_content
-      @parsed_content ||= parse_html_fragment(@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
+
+    def parse_html_document(html)
+      Nokogiri::HTML::Document.parse(html)
+    end
   end
 end

data/lib/bypass/version.rb

@@ -1,3 +1,3 @@
 module Bypass
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/bypass/filter_test.rb

@@ -1,7 +1,7 @@
 require 'addressable/uri'
 require File.dirname(__FILE__) + '/../test_helper.rb'
 
-class Bypass::FilterTest < Test::Unit::TestCase
+class Bypass::FilterTest < MiniTest::Test
   context "#to_s" do
     should "return content" do
       filter = Bypass::Filter.new("foo")

data/test/bypass/html_filter_test.rb

@@ -1,7 +1,7 @@
 require 'addressable/uri'
 require File.dirname(__FILE__) + '/../test_helper.rb'
 
-class Bypass::HTMLFilterTest < Test::Unit::TestCase
+class Bypass::HTMLFilterTest < MiniTest::Test
   context "#replace" do
     should "replace hrefs" do
       text = "<a href=\"http://yahoo.com\">Yahoo</a>"
@@ -72,5 +72,36 @@ class Bypass::HTMLFilterTest < Test::Unit::TestCase
       filter.expects(:parsed_content).returns(stub(:to_s => "bar"))
       assert_equal "bar", filter.content
     end
+
+    should "handle document fragments" do
+      filter = Bypass::HTMLFilter.new("<div>text</div>")
+      assert_equal "<div>text</div>", filter.content
+    end
+
+    should "handle whole documents" do
+      lines = []
+
+      lines << "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\">"
+      lines << "<html>"
+      lines << "  <head></head>"
+      lines << "  <body>"
+      lines << "    <div>Content</div>"
+      lines << "  </body>"
+      lines << "</html>"
+
+      document = lines.join("\n")
+      expected = document.sub("<head></head>", "<head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"></head>")
+
+      filter = Bypass::HTMLFilter.new(document, :fragment => false)
+      assert_normalized_equal expected, filter.content
+    end
+  end
+
+  def assert_normalized_equal(expected, actual)
+    assert_equal normalize_output(expected), normalize_output(actual)
+  end
+
+  def normalize_output(html)
+    html.lines.map(&:strip).join("")
   end
 end

data/test/bypass/text_filter_test.rb

@@ -1,7 +1,7 @@
 require 'addressable/uri'
 require File.dirname(__FILE__) + '/../test_helper.rb'
 
-class Bypass::TextFilterTest < Test::Unit::TestCase
+class Bypass::TextFilterTest < MiniTest::Test
   context "#replace" do
     should "replace URLs" do
       text = "http://yahoo.com"

data/test/bypass/uri_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper.rb'
 
-class Bypass::URITest < Test::Unit::TestCase
+class Bypass::URITest < MiniTest::Test
   context "#append_to_query_values" do
     should "add values to the query string if it starts empty" do
       uri = Bypass::URI.parse("http://www.getdrip.com")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bypass
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Derrick Reimer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -38,35 +38,49 @@ dependencies:
     - - ~>
       - !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.0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        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 with ease
+description: Mutate URLs and hyperlinks in HTML and plain text documents
 email:
 - derrickreimer@gmail.com
 executables: []
@@ -100,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.1.10
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Mutate URLs and hyperlinks in HTML and plain text documents with ease