pubsubhubbub-rails 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e1e57ed25a60b5353d6a2a0be5383ec687f5348
-  data.tar.gz: fe069db3bb82d6b97c480d6081074190cb2ba4f5
+  metadata.gz: 6349db14daf275336a05ef0f3eb475254dffe6bc
+  data.tar.gz: c8ce75a29351f825b8d1c799dd33665c555ba063
 SHA512:
-  metadata.gz: 5495c78dc0562ff98871987caa3a4c0bfc4729e0fa981bf7ab58cb7b6440675dbfeb3527849205d614726dafbd10d3da2fe06fd9cbbbb3f0c34531ed2fef572c
-  data.tar.gz: 7d67a52dc39f8c60c093f45b90b9636bededbbcb6271e12e84a1594be2363bd496dd127cea21314bb8ae2edc05a64018504a61dfbe652411ebfaae70bccaceba
+  metadata.gz: 545bfa9f131ed04832b7ecea89f0ac91883de681f4aafec1b4ff8cb8f3f3557b5d5175bb095acd0abbabc4f82bd8688a0684466e9568174d3af0138249933a8f
+  data.tar.gz: 737998e5e77034a4875dffb4451306b7aa37abbda116423fc6894bf1e677657e5e25269f44f3de6aeb4fa7aea96596306031932f5d6211976ae6e3e2b0658f88

data/README.md

@@ -12,17 +12,17 @@ This is a mountable PubSubHubbub server conforming to the v0.4 of the spec.
 
 In `routes.rb`:
 
-    mount Pubsubhubbub::Engine => '/pubsubhubbub', as: :pubsubhubbub
+    mount Pubsubhubbub::Engine, at: 'pubsubhubbub', as: :pubsubhubbub
 
 In feed:
 
-    <link rel="hub" href="<%= pubsubhubbub_hub_url %>" />
+    <link rel="hub" href="<%= pubsubhubbub_url %>" />
 
 ## Installation
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'pubsubhubbub-rails'
+gem 'pubsubhubbub-rails', require: 'pubsubhubbub'
 ```
 
 And then execute:

data/app/controllers/pubsubhubbub/subscriptions_controller.rb

@@ -3,6 +3,10 @@ require_dependency 'pubsubhubbub/application_controller'
 
 module Pubsubhubbub
   class SubscriptionsController < ApplicationController
+    rescue_from ValidationError do |msg|
+      render plain: msg, status: :unprocessable_entity
+    end
+
     def index
       @callback      = params['hub.callback']
       @mode          = params['hub.mode']
@@ -19,13 +23,13 @@ module Pubsubhubbub
       when 'publish'
         publish
       else
-        render plain: 'Unknown mode', status: :unprocessable_entity
+        raise ValidationError, "Unknown mode: #{@mode}"
       end
     end
 
     private
 
-    def check_topic_hub
+    def check_topic_hub!
       uri      = Addressable::URI.parse(@topic)
       response = HTTP.get(uri)
 
@@ -34,7 +38,7 @@ module Pubsubhubbub
         hub   = link.find_link(%w(rel hub))
         topic = link.find_link(%w(rel self))
 
-        return true if hub&.href == hub_url && topic&.href == @topic
+        return if hub&.href&.chomp('\\') == hub_url.chomp('\\') && topic&.href&.chomp('\\') == @topic.chomp('\\')
       end
 
       xml = Nokogiri::XML(response.body)
@@ -43,13 +47,14 @@ module Pubsubhubbub
       link  = xml.at_xpath('//xmlns:link[@rel="hub"]', xmlns: XMLNS)
       topic = xml.at_xpath('//xmlns:link[@rel="self"]', xmlns: XMLNS)
 
-      link&.attribute('href')&.value == hub_url && topic&.attribute('href')&.value == @topic
+      raise ValidationError, "Topic advertises different hub: #{link&.attribute('href')&.value}"   if link&.attribute('href')&.value&.chomp('\\')  != hub_url.chomp('\\')
+      raise ValidationError, "Topic advertises different self: #{topic&.attribute('href')&.value}" if topic&.attribute('href')&.value&.chomp('\\') != @topic.chomp('\\')
     end
 
     def subscribe
-      render(plain: 'Missing callback URL', status: :unprocessable_entity) && return if @callback.blank?
-      render(plain: 'Missing topic URL', status: :unprocessable_entity) && return if @topic.blank?
-      render(plain: 'Topic advertises a different hub or topic URL', status: :unprocessable_entity) && return unless check_topic_hub
+      raise ValidationError, 'Missing callback URL' if @callback.blank?
+      raise ValidationError, 'Missing topic URL' if @topic.blank?
+      check_topic_hub!
 
       @subscription = Subscription.where(topic: @topic, callback: @callback).first_or_initialize(topic: @topic, callback: @callback, mode: @mode, secret: @secret)
       @subscription.lease_seconds = @lease_seconds
@@ -61,9 +66,9 @@ module Pubsubhubbub
     end
 
     def unsubscribe
-      render(plain: 'Missing callback URL', status: :unprocessable_entity) && return if @callback.blank?
-      render(plain: 'Missing topic URL', status: :unprocessable_entity) && return if @topic.blank?
-      render(plain: 'Topic advertises a different hub or topic URL', status: :unprocessable_entity) && return unless check_topic_hub
+      raise ValidationError, 'Missing callback URL' if @callback.blank?
+      raise ValidationError, 'Missing topic URL' if @topic.blank?
+      check_topic_hub!
 
       @subscription = Subscription.where(topic: @topic, callback: @callback).first
 
@@ -77,7 +82,7 @@ module Pubsubhubbub
     end
 
     def publish
-      render(plain: 'Missing URL', status: :unprocessable_entity) && return if @url.blank?
+      raise ValidationError, 'Missing URL' if @url.blank?
       FetchTopicJob.perform_later(hub_url, @url)
       head 202
     end

data/lib/pubsubhubbub.rb

@@ -11,4 +11,7 @@ module Pubsubhubbub
 
   class FailedDeliveryError < StandardError
   end
+
+  class ValidationError < StandardError
+  end
 end

data/lib/pubsubhubbub/version.rb

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

metadata

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