webmention 0.1.5 → 0.1.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fb054d8a144253225b03c07b8cb1b70e78b01c5d
+  data.tar.gz: a73bd416adcbcd7c3aac45eb3fc053cb2a2296f8
+SHA512:
+  metadata.gz: 792d42a1dea5a5be92f1550753688699ddd4da47a166ed52fa09463cae5ce2c5264fc924cc10bb585f3f5eb84a2f7283805db44f11f82b5f6e3833e51da63bba
+  data.tar.gz: f8dd7faaa37ea1de848ccdb6b40dc737707a18c2f93a412d6ea48c2be8ae34058ca887506b3c84f42b93aed89835940003d944f6409e88bc842f6ce321aa2f62

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 1.9.3
-  - 1.9.2
+  - 2.4.1
+  - 2.3.4
+  - 2.2.7
 notifications:
   email: false

data/lib/webmention/client.rb

@@ -69,6 +69,9 @@ module Webmention
         :target => target,
       }
 
+      # Ensure the endpoint is an absolute URL
+      endpoint = absolute_endpoint endpoint, target
+
       begin
         response = HTTParty.post(endpoint, {
           :body => data
@@ -105,7 +108,7 @@ module Webmention
         })
 
         # First check the HTTP Headers
-        if !response.headers['Link'].nil? 
+        if !response.headers['Link'].nil?
           endpoint = self.discover_webmention_endpoint_from_header response.headers['Link']
           return endpoint if endpoint
         end
@@ -129,25 +132,29 @@ module Webmention
 
     def self.discover_webmention_endpoint_from_html html
       doc = Nokogiri::HTML(html)
-      if !doc.css('[rel="webmention"]').empty?
-        doc.css('[rel="webmention"]').attribute("href").value
-      elsif !doc.css('[rel="http://webmention.org/"]').empty?
-        doc.css('[rel="http://webmention.org/"]').attribute("href").value
-      elsif !doc.css('[rel="http://webmention.org"]').empty?
-        doc.css('[rel="http://webmention.org"]').attribute("href").value
+      if !doc.css('[rel~="webmention"]').css('[href]').empty?
+        doc.css('[rel~="webmention"]').css('[href]').attribute("href").value
+      elsif !doc.css('[rel="http://webmention.org/"]').css('[href]').empty?
+        doc.css('[rel="http://webmention.org/"]').css('[href]').attribute("href").value
+      elsif !doc.css('[rel="http://webmention.org"]').css('[href]').empty?
+        doc.css('[rel="http://webmention.org"]').css('[href]').attribute("href").value
       else
         false
       end
     end
 
     def self.discover_webmention_endpoint_from_header header
-      if matches = header.match(%r{<(https?://[^>]+)>; rel="webmention"})
+      if matches = header.match(%r{<([^>]+)>; rel="[^"]*\s?webmention\s?[^"]*"})
+        return matches[1]
+      elsif matches = header.match(%r{<([^>]+)>; rel=webmention})
+          return matches[1]
+      elsif matches = header.match(%r{rel="[^"]*\s?webmention\s?[^"]*"; <([^>]+)>})
         return matches[1]
-      elsif matches = header.match(%r{rel="webmention"; <(https?://[^>]+)>})
+      elsif matches = header.match(%r{rel=webmention; <([^>]+)>})
         return matches[1]
-      elsif matches = header.match(%r{<(https?://[^>]+)>; rel="http://webmention\.org/?"})
+      elsif matches = header.match(%r{<([^>]+)>; rel="http://webmention\.org/?"})
         return matches[1]
-      elsif matches = header.match(%r{rel="http://webmention\.org/?"; <(https?://[^>]+)>})
+      elsif matches = header.match(%r{rel="http://webmention\.org/?"; <([^>]+)>})
         return matches[1]
       end
       return false
@@ -165,5 +172,19 @@ module Webmention
 
       return (url.is_a? URI::HTTP or url.is_a? URI::HTTPS)
     end
+
+    # Public: Takes an endpoint and ensures an absolute URL is returned
+    #
+    # endpoint - Endpoint which may be an absolute or relative URL
+    # url - URL of the webmention
+    #
+    # Returns original endpoint if it is already an absolute URL; constructs
+    # new absolute URL using relative endpoint if not
+    def self.absolute_endpoint endpoint, url
+      unless Webmention::Client.valid_http_url? endpoint
+        endpoint = URI.join(url, endpoint).to_s
+      end
+      endpoint
+    end
   end
 end

data/lib/webmention/version.rb

@@ -1,3 +1,3 @@
 module Webmention
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/test/data/sample_html.rb

@@ -82,5 +82,44 @@ class SampleData
       </html>
     eos
   end
+  
+  def self.rel_webmention_relative_with_path
+    <<-eos
+      <html>
+        <head>
+          <link href="/example/webmention" rel="webmention">
+        </head>
+      </html>
+    eos
+  end
 
+  def self.rel_webmention_relative_without_path
+    <<-eos
+      <html>
+        <head>
+          <link href="webmention.php" rel="webmention">
+        </head>
+      </html>
+    eos
+  end
+  
+  def self.link_tag_multiple_rel_values
+    <<-eos
+      <html>
+        <head>
+          <link href="http://webmention.io/example/webmention" rel="webmention foo bar">
+        </head>
+      </html>
+    eos
+  end
+
+  def self.empty_link_tag_no_href
+    <<-eos
+      <html>
+        <head>
+          <link href="" rel="webmention">
+        </head>
+      </html>
+    eos
+  end
 end

data/test/lib/webmention/discovery_test.rb

@@ -36,14 +36,22 @@ describe Webmention::Client do
   end
 
   describe "#discover_webmention_endpoint_from_string" do
-    it "should find rel=webmention followed by href in header" do
+    it "should find rel=\"webmention\" followed by href in header" do
       Webmention::Client.discover_webmention_endpoint_from_header('rel="webmention"; <http://webmention.io/example/webmention>').must_equal "http://webmention.io/example/webmention"
     end
 
-    it "should find href followed by rel=webmention in header" do
+    it "should find rel=webmention followed by href in header" do
+      Webmention::Client.discover_webmention_endpoint_from_header('rel=webmention; <http://webmention.io/example/webmention>').must_equal "http://webmention.io/example/webmention"
+    end
+
+    it "should find href followed by rel=\"webmention\" in header" do
       Webmention::Client.discover_webmention_endpoint_from_header('<http://webmention.io/example/webmention>; rel="webmention"').must_equal "http://webmention.io/example/webmention"
     end
 
+    it "should find href followed by rel=webmention in header" do
+      Webmention::Client.discover_webmention_endpoint_from_header('<http://webmention.io/example/webmention>; rel=webmention').must_equal "http://webmention.io/example/webmention"
+    end
+
     it "should find rel=http://webmention.org followed by href in header" do
       Webmention::Client.discover_webmention_endpoint_from_header('rel="http://webmention.org"; <http://webmention.io/example/webmention>').must_equal "http://webmention.io/example/webmention"
     end
@@ -83,6 +91,34 @@ describe Webmention::Client do
     it "should find href followed by rel=http://webmention.org/ in html" do
       Webmention::Client.discover_webmention_endpoint_from_html(SampleData.rel_href_webmention_org_slash).must_equal "http://webmention.io/example/webmention"
     end
+    
+    it "should find rel=webmention followed by relative href with path in header" do
+      Webmention::Client.discover_webmention_endpoint_from_header('</example/webmention>; rel="http://webmention.org"').must_equal "/example/webmention"
+    end
+
+    it "should find rel=webmention followed by relative href with path in html" do
+      Webmention::Client.discover_webmention_endpoint_from_html(SampleData.rel_webmention_relative_with_path).must_equal "/example/webmention"
+    end
+
+    it "should find rel=webmention followed by relative href without path in header" do
+      Webmention::Client.discover_webmention_endpoint_from_header('<webmention.php>; rel="http://webmention.org"').must_equal "webmention.php"
+    end
+
+    it "should find rel=webmention followed by relative href without path in html" do
+      Webmention::Client.discover_webmention_endpoint_from_html(SampleData.rel_webmention_relative_without_path).must_equal "webmention.php"
+    end
+    
+    it "should find webmention in a link tag among multiple rel values" do
+      Webmention::Client.discover_webmention_endpoint_from_html(SampleData.link_tag_multiple_rel_values).must_equal "http://webmention.io/example/webmention"
+    end
+    
+    it "should find webmention in a link header among multiple rel values" do
+      Webmention::Client.discover_webmention_endpoint_from_header('<http://webmention.io/example/webmention>; rel="webmention foo bar"').must_equal "http://webmention.io/example/webmention"
+    end
+
+    it "should find rel=webmention in a link tag with an empty href" do
+      Webmention::Client.discover_webmention_endpoint_from_html(SampleData.empty_link_tag_no_href).must_equal ""
+    end
   end
 
 end

data/test/lib/webmention/url_test.rb

@@ -28,4 +28,18 @@ describe Webmention::Client do
       end
     end
   end
+  
+  describe "#absolute_endpoint" do
+    it "should expand an endpoint url with a path to an absolute url based on the webmention url" do
+      Webmention::Client.absolute_endpoint('/webmention', 'http://webmention.io/example/1').must_equal "http://webmention.io/webmention"
+    end
+
+    it "should expand an endpoint url without a path to an absolute url based on the webmention url" do
+      Webmention::Client.absolute_endpoint('webmention.php', 'http://webmention.io/example/1').must_equal "http://webmention.io/example/webmention.php"
+    end
+
+    it "should take an empty endpoint url and return the webmention url" do
+      Webmention::Client.absolute_endpoint('', 'http://webmention.io/example/1').must_equal "http://webmention.io/example/1"
+    end
+  end
 end

data/webmention.gemspec

@@ -5,7 +5,7 @@ require 'webmention/version'
 Gem::Specification.new do |s|
   s.name          = 'webmention'
   s.version       = Webmention::VERSION
-  s.date          = '2014-05-25'
+  s.date          = '2017-06-27'
   s.homepage      = 'https://github.com/indieweb/mention-client-ruby'
   s.summary       = 'A gem for sending webmention (and pingback) notifications'
   s.authors       = [
@@ -24,10 +24,10 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'json'
   s.add_dependency 'nokogiri'
-  s.add_dependency 'httparty', '~> 0.13.1'
+  s.add_dependency 'httparty', '~> 0.15.5'
   s.add_dependency 'link_header', '~> 0.0.8'
 
-  s.add_development_dependency 'bundler', '~> 1.3'
+  s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'webmock'

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webmention
 version: !ruby/object:Gem::Version
-  version: 0.1.5
-  prerelease: 
+  version: 0.1.6
 platform: ruby
 authors:
 - Aaron Parecki
@@ -10,134 +9,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.15.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.15.5
 - !ruby/object:Gem::Dependency
   name: link_header
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -147,8 +130,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -167,27 +150,26 @@ files:
 - webmention.gemspec
 homepage: https://github.com/indieweb/mention-client-ruby
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.5.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A gem for sending webmention (and pingback) notifications
 test_files:
 - test/data/sample_html.rb