webmention 0.1.2 → 0.1.3

data/lib/webmention.rb

@@ -1,9 +1,9 @@
 require 'json'
-require 'net/http'
+require 'httparty'
 require 'nokogiri'
 require 'open-uri'
 require 'set'
 require 'uri'
 
-require './lib/webmention/version'
-require './lib/webmention/client'
+require 'webmention/version'
+require 'webmention/client'

data/lib/webmention/client.rb

@@ -70,16 +70,11 @@ module Webmention
       }
 
       begin
-        uri = URI.parse(endpoint)
-        http = Net::HTTP.new(uri.host, uri.port)
+        response = HTTParty.post(endpoint, {
+          :body => data
+        })
 
-        request = Net::HTTP::Post.new(uri.request_uri)
-        request.set_form_data(data)
-        request['Content-Type'] = "application/x-www-form-urlencoded"
-        request['Accept'] = 'application/json'
-        response = http.request(request)
-
-        return response.code.to_i == 200
+        return response.code == 200 || response.code == 202
       rescue
         return false
       end
@@ -97,21 +92,17 @@ module Webmention
       doc = nil
 
       begin
-        uri = URI.parse(url)
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.open_timeout = 3 # in seconds
-        http.read_timeout = 3 # in seconds
-
-        request = Net::HTTP::Get.new(uri.request_uri)
-        # Send a user agent like a browser because some sites seem to reject requests made by non-browsers
-        request["User-Agent"] = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.57 Safari/537.36 (https://rubygems.org/gems/webmention)"
-        request["Accept"] = "*/*"
-
-        response = http.request(request)
+        response = HTTParty.get(url, {
+          :timeout => 3,
+          :headers => {
+            'User-Agent' => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.57 Safari/537.36 (https://rubygems.org/gems/webmention)",
+            'Accept' => '*/*'
+          }
+        })
 
         # First check the HTTP Headers
-        if !response['Link'].nil? 
-          endpoint = self.discover_webmention_endpoint_from_header response['Link']
+        if !response.headers['Link'].nil? 
+          endpoint = self.discover_webmention_endpoint_from_header response.headers['Link']
           return endpoint if endpoint
         end
 

data/lib/webmention/version.rb

@@ -1,3 +1,3 @@
 module Webmention
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/test/lib/webmention/mention_test.rb

@@ -3,19 +3,19 @@ require_relative '../../test_helper'
 describe Webmention::Client do
   before do
     WebMock.stub_request(:any, 'http://source.example.com/post/100').to_return(
-      :status => 200,
+      :status => 202,
       :body => SampleData.sample_source_post_html,
       :headers => {}
     )
 
     WebMock.stub_request(:any, 'http://target.example.com/post/4').to_return(
-      :status => 200,
+      :status => 202,
       :body => SampleData.rel_webmention_href,
       :headers => {}
     )
 
     WebMock.stub_request(:any, 'http://target.example.com/post/5').to_return(
-      :status => 200,
+      :status => 202,
       :body => '',
       :headers => {
         'Link' => 'rel="webmention"; <http://webmention.io/example/webmention>'
@@ -23,7 +23,7 @@ describe Webmention::Client do
     )
 
     WebMock.stub_request(:any, 'http://webmention.io/example/webmention').to_return(
-      :status => 200
+      :status => 202
     )
 
     @client = Webmention::Client.new "http://source.example.com/post/100"

data/webmention.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'json'
   s.add_dependency 'nokogiri'
+  s.add_dependency 'httparty', '~> 0.13.1'
 
   s.add_development_dependency 'bundler', '~> 1.3'
   s.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webmention
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -44,6 +44,22 @@ dependencies:
     - - ! '>='
       - !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
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement