pubsubhubbub-rails 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db805f0b5e1c3942f199fa90c96179beda252310
-  data.tar.gz: c23a61d4bf6e18e322021f7c7c3fb9a034b4aca4
+  metadata.gz: 8c675e536b288c0e673e17095e1e71e9e3291b29
+  data.tar.gz: f483dbe28eeb7c04504e8860fa2c89f337475085
 SHA512:
-  metadata.gz: b6e44824c58667cc3ff7dd580fd66e9f79f84817cf76d5cb6db0d4abcee43ec476e40401c2af71c65746641992b0441c5215d2eedeee2460eb3e93947564e503
-  data.tar.gz: 4862e4e6728fb2db4b28ad93ac1b9cd0006b36ea0a4a71c9c6cfd17d0514e8dfe8227e12e73ef991be2bb8ad468c27913436158f4e22b28a872e0d28be620b95
+  metadata.gz: 1682d9bd26db344a7e292b7682dcfc9c690c625059fbda7a0e9c23ab67409945f22a7deedaf78bf617b221ec9fc2c0a6939c62311a0208e3e3d1b8eeed07f3fe
+  data.tar.gz: 5c9f2ad9eec55148d473ec582ec7e34ab4e53a0fce946e23d65390f34e99a80957cdddb75c1557eb2c4bd4b7998030fa47f0396ffee8c1d73cd5ed336843302d

data/app/controllers/pubsubhubbub/subscriptions_controller.rb

@@ -3,6 +3,8 @@ require_dependency 'pubsubhubbub/application_controller'
 
 module Pubsubhubbub
   class SubscriptionsController < ApplicationController
+    include Pubsubhubbub::Utils
+
     rescue_from ValidationError do |msg|
       render plain: msg, status: :unprocessable_entity
     end
@@ -33,7 +35,7 @@ module Pubsubhubbub
       return Pubsubhubbub.verify_topic.call(@topic) if Pubsubhubbub.verify_topic.is_a?(Proc)
 
       uri      = Addressable::URI.parse(@topic)
-      response = HTTP.get(uri)
+      response = http_client.get(uri)
 
       if response['Link']
         link  = LinkHeader.parse(response['Link'].is_a?(Array) ? response['Link'].first : response['Link'])

data/app/jobs/pubsubhubbub/deliver_payload_job.rb

@@ -2,6 +2,8 @@
 
 module Pubsubhubbub
   class DeliverPayloadJob < ApplicationJob
+    include Pubsubhubbub::Utils
+
     queue_as :push
 
     def perform(hub_url, subscription_id, current_payload)
@@ -12,9 +14,7 @@ module Pubsubhubbub
       headers['Link']            = link.to_s
       headers['X-Hub-Signature'] = sign_payload(subscription.secret, current_payload) if subscription.secret
 
-      response = HTTP.timeout(:per_operation, write: 60, connect: 20, read: 60)
-                     .headers(headers)
-                     .post(subscription.callback, body: current_payload)
+      response = http_client.headers(headers).post(subscription.callback, body: current_payload)
 
       raise FailedDeliveryError unless response.code > 199 && response.code < 300
     end

data/app/jobs/pubsubhubbub/fetch_topic_job.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 module Pubsubhubbub
   class FetchTopicJob < ApplicationJob
+    include Pubsubhubbub::Utils
+
     queue_as :push
 
     def perform(hub_url, url)
@@ -9,7 +11,7 @@ module Pubsubhubbub
       current_payload = if Pubsubhubbub.render_topic.is_a?(Proc)
                           Pubsubhubbub.render_topic.call(url)
                         else
-                          HTTP.timeout(:per_operation, write: 60, connect: 20, read: 60).get(url).body.to_s
+                          http_client.get(url).body.to_s
                         end
 
       Subscription.where(topic: url).active.find_each do |subscription|

data/app/jobs/pubsubhubbub/verify_intent_job.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 module Pubsubhubbub
   class VerifyIntentJob < ApplicationJob
+    include Pubsubhubbub::Utils
+
     queue_as :push
 
     def perform(subscription_id)
@@ -18,7 +20,7 @@ module Pubsubhubbub
 
     def verify_intent(subscription)
       uri = Addressable::URI.parse(subscription.callback)
-      response = HTTP.timeout(:per_operation, write: 60, connect: 20, read: 60).get(uri, params: { 'hub.mode' => subscription.mode, 'hub.topic' => subscription.topic, 'hub.challenge' => subscription.challenge, 'hub.lease_seconds' => subscription.lease_seconds })
+      response = http_client.get(uri, params: { 'hub.mode' => subscription.mode, 'hub.topic' => subscription.topic, 'hub.challenge' => subscription.challenge, 'hub.lease_seconds' => subscription.lease_seconds })
       response.code > 199 && response.code < 300 && response.body.to_s == subscription.challenge
     end
   end

data/lib/pubsubhubbub.rb

@@ -4,7 +4,6 @@ require 'addressable/uri'
 require 'nokogiri'
 require 'http'
 require 'link_header'
-require 'httplog'
 
 module Pubsubhubbub
   XMLNS = 'http://www.w3.org/2005/Atom'
@@ -21,4 +20,11 @@ module Pubsubhubbub
   def self.publish(hub_url, topic_url)
     FetchTopicJob.perform_later(hub_url, topic_url)
   end
+
+  module Utils
+    def http_client
+      HTTP.timeout(:per_operation, write: 30, connect: 20, read: 30)
+          .headers(user_agent: "PubSubHubbub/#{Pubsubhubbub::VERSION}")
+    end
+  end
 end

data/lib/pubsubhubbub/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Pubsubhubbub
-  VERSION = '0.2.6'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pubsubhubbub-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Eugen Rochko