microformats2 2.0.0 → 2.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDA0ZWM4YmYxYWI1NzNkMmZkZDY3ZjU1YmM4YzU5ZDFjNGUwZTgyZg==
+    MDc5YzFkOTExNDgwZTEwM2U2YjVlMTM1YmVlYjExZTA1ZTRkYmQ3Yw==
   data.tar.gz: !binary |-
-    ZDAxYjVmMDJjNzNjOGYyNGY5NzcyOGJlY2U0OGQwN2JkODk2OTAxNw==
+    OGU4ZmI0YWI3YjBiNGM4M2Q1M2U3MGFhMTRhYjMxMTc4ZDE3NGEzNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjQ3YmMzZjEwNzk3OWEzOTJkMWMzMjkyMTkyNzZjOTM2Y2Q5OTRhYTYwNDgw
-    YTM2ZjExMDYwMTVkODY2M2Q2Yzc4ZGEyYWFhNGFiMzA4Yjc0YmYzOGYyZWEw
-    ZGNmNGJkMzI0NzY2MmVmZGY4ZGJkYTgzMDE1MWIyZDc4OTkyYzk=
+    Yzg5MjdhODY1Yjc0OWY1YjJlNmY0MzY0YTY3OTliMTY4MGZiYjQyMmJlMjNj
+    NTk4MjEzYjYwZTBlYWYxNTA5OTNlNzcyNDA2OWZhYTY4MDZiNmZlNzdlZGY0
+    ZGMwNThlYmU0OTk5NGJlN2Y1MzQzMjFmOWE4Y2E2MTc5MWE5Yjg=
   data.tar.gz: !binary |-
-    MzQ3NjZkYmQxZTMzMzkyZTk0MjI0YzRjNzBhM2NjYzZkNzJmNzY5NTA1YTgw
-    ZjhlMjEwMjhlMDA4YmE4NzZlNWNhZWQ2Yzg3ODI2OTFmMmYwZGFjYzc2ZDcz
-    ZWExYmFjYjMwZDlmOTU5MzE2ZTk2OGNhZWIxMzhjNzNkYmQ5MjI=
+    Yjk5Zjk2YzFlNmI0OWRlYzdjMzFkYzFhZThmYzAwMzcxMTA4YzQ1ZTgxYTgx
+    OWIwMWU0NWZmODExMzI3ZWIxODE3YmU0MTJmMWQ4MzQ1ZTk1ZmNmYmQyMmQ2
+    N2Y2NzRkZDU1NTUwNTZmZmY4ZGM1MjQ4ZjZmYWIyNjkwY2ExNmM=

data/README.md

@@ -33,7 +33,7 @@ Not Implemented:
 
 ## Current Version
 
-2.0.0
+2.0.1
 
 
 ## Requirements
@@ -88,6 +88,7 @@ collection.entry.author.format.name.to_s #=> "Jessica Lynn Suttles"
 * Shane Becker / [@veganstraightedge](https://github.com/veganstraightedge)
 * Chris Stringer / [@jcstringer](https://github.com/jcstringer)
 * Michael Mitchell / [@variousred](https://github.com/variousred)
+* Jessica Dillon / [@jessicard](https://github.com/jessicard)
 
 ## Contributions
 

data/lib/microformats2.rb

@@ -4,6 +4,7 @@ require "json"
 require "active_support/inflector"
 
 require "microformats2/version"
+require "microformats2/absolute_uri"
 require "microformats2/parser"
 require "microformats2/format_parser"
 require "microformats2/property_parser"

data/lib/microformats2/absolute_uri.rb

@@ -0,0 +1,26 @@
+module Microformats2
+  class AbsoluteUri
+    attr_accessor :base, :relative
+
+    def initialize(base, relative)
+      @base = base
+      @relative = relative
+    end
+
+    def absolutize
+      return nil if relative.nil? or relative == ""
+
+      uri = URI.parse(relative)
+
+      if base && !uri.absolute?
+        uri = URI.join(base.to_s, relative.to_s)
+      end
+
+      uri.normalize!
+      uri.to_s
+
+    rescue URI::BadURIError, URI::InvalidURIError => e
+      relative.to_s
+    end
+  end
+end

data/lib/microformats2/collection.rb

@@ -88,7 +88,7 @@ module Microformats2
 
         if rel_values.member?("alternate")
           alternate_inst = {}
-          alternate_inst["url"] = absolutize(rel.attribute("href").text)
+          alternate_inst["url"] = Microformats2::AbsoluteUri.new(@base, rel.attribute("href").text).absolutize
           alternate_inst["rel"] = (rel_values - ["alternate"]).join(" ")
           unless rel.attribute("media").nil?
             alternate_inst["media"] = rel.attribute("media").text
@@ -103,21 +103,10 @@ module Microformats2
         else
           rel_values.each do |rel_value|
             @rels[rel_value] = [] unless @rels.has_key?(rel_value)
-            @rels[rel_value] << absolutize(rel.attribute("href").text)
+            @rels[rel_value] << Microformats2::AbsoluteUri.new(@base, rel.attribute("href").text).absolutize
           end
         end
       end
     end
-
-    def absolutize(href)
-      uri = URI.parse(href)
-
-      if @base && !uri.absolute?
-        uri = URI.join(@base, href)
-      end
-
-      uri.normalize!
-      uri.to_s
-    end
   end
 end

data/lib/microformats2/implied_property/url.rb

@@ -7,19 +7,7 @@ module Microformats2
       end
 
       def to_s
-        @to_s = absolutize(super.to_s) if super.to_s != ""
-      end
-
-      # TODO: make dry, repeated in Collection
-      def absolutize(href)
-        uri = URI.parse(href)
-
-        if @base && !uri.absolute?
-          uri = URI.join(@base, href)
-        end
-
-        uri.normalize!
-        uri.to_s
+        @to_s = Microformats2::AbsoluteUri.new(@base, super.to_s).absolutize
       end
 
       protected

data/lib/microformats2/property/url.rb

@@ -3,19 +3,7 @@ module Microformats2
     class Url < Foundation
 
       def to_s
-        @to_s = absolutize(super.to_s)
-      end
-
-      # TODO: make dry, repeated in Collection
-      def absolutize(href)
-        uri = URI.parse(href)
-
-        if @base && !uri.absolute?
-          uri = URI.join(@base, href)
-        end
-
-        uri.normalize!
-        uri.to_s
+        @to_s = Microformats2::AbsoluteUri.new(@base, super.to_s).absolutize
       end
 
       protected

data/lib/microformats2/version.rb

@@ -1,3 +1,3 @@
 module Microformats2
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/microformats2.gemspec

@@ -6,8 +6,8 @@ require 'microformats2/version'
 Gem::Specification.new do |gem|
   gem.name          = "microformats2"
   gem.version       = Microformats2::VERSION
-  gem.authors       = ["Jessica Lynn Suttles"]
-  gem.email         = ["jlsuttles@gmail.com"]
+  gem.authors       = ["Jessica Lynn Suttles", "Jessica Dillon"]
+  gem.email         = ["jlsuttles@gmail.com", "jessicard@mac.com"]
   gem.description   = %q{parses HTML for microformats and return a collection of dynamically defined Ruby objects}
   gem.summary       = %q{microformats2 parser}
   gem.homepage      = "https://github.com/G5/microformats2"

data/spec/lib/microformats2/absolute_uri_spec.rb

@@ -0,0 +1,48 @@
+require "spec_helper"
+require "microformats2/absolute_uri"
+
+describe Microformats2::AbsoluteUri do
+  describe "#absolutize" do
+    subject { Microformats2::AbsoluteUri.new(base, relative).absolutize }
+    let(:base) { nil }
+
+    context "when relative is nil" do
+      let(:relative) { nil }
+      it { should be_nil }
+    end
+
+    context "when relative is an empty string" do
+      let(:relative) { "" }
+      it { should be_nil }
+    end
+
+    context "when relative is a valid absolute URI" do
+      let(:relative) { "http://google.com" }
+      it { should eq("http://google.com/") }
+    end
+
+    context "when relative is a valid non-absolute URI" do
+      let(:relative) { "bar/qux" }
+
+      context "and base is present but not absolute" do
+        let(:base) { "foo" }
+        it { should eq("bar/qux") }
+      end
+
+      context "and base is present and absolute" do
+        let(:base) { "http://google.com" }
+        it { should eq("http://google.com/bar/qux") }
+      end
+
+      context "and base is not present" do
+        let(:base) { nil }
+        it { should eq("bar/qux") }
+      end
+    end
+
+    context "when relative is an invalid URI" do
+      let(:relative) { "git@github.com:G5/microformats2.git" }
+      it { should eq("git@github.com:G5/microformats2.git") }
+    end
+  end
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: microformats2
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Jessica Lynn Suttles
+- Jessica Dillon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -140,6 +141,7 @@ description: parses HTML for microformats and return a collection of dynamically
   Ruby objects
 email:
 - jlsuttles@gmail.com
+- jessicard@mac.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -153,6 +155,7 @@ files:
 - README.md
 - Rakefile
 - lib/microformats2.rb
+- lib/microformats2/absolute_uri.rb
 - lib/microformats2/collection.rb
 - lib/microformats2/format.rb
 - lib/microformats2/format_parser.rb
@@ -170,6 +173,7 @@ files:
 - lib/microformats2/property_parser.rb
 - lib/microformats2/version.rb
 - microformats2.gemspec
+- spec/lib/microformats2/absolute_uri_spec.rb
 - spec/lib/microformats2/collection_spec.rb
 - spec/lib/microformats2/implied_property/name_spec.rb
 - spec/lib/microformats2/implied_property/photo_spec.rb
@@ -372,6 +376,7 @@ signing_key:
 specification_version: 4
 summary: microformats2 parser
 test_files:
+- spec/lib/microformats2/absolute_uri_spec.rb
 - spec/lib/microformats2/collection_spec.rb
 - spec/lib/microformats2/implied_property/name_spec.rb
 - spec/lib/microformats2/implied_property/photo_spec.rb