pubsubhubbub-rails 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03e9b6b69ab33bb77de497c4f4ab2390c07e042a
-  data.tar.gz: cd017828e6c4251cdad04a1bf1a567d19b892004
+  metadata.gz: 2e1e57ed25a60b5353d6a2a0be5383ec687f5348
+  data.tar.gz: fe069db3bb82d6b97c480d6081074190cb2ba4f5
 SHA512:
-  metadata.gz: f479aa3bcbdb92e5f6ca7b0f63360d2c6b678b7f65d3f8f0831076264e90151cafcc77717581fd92d5cfeeb2f6f61ed2fc935ee8cc5be00bb2cf9454b76cd974
-  data.tar.gz: 70e2f01dc594db5732642cc78c9fd50f81c94a8abd54b44556cba23e7030c36159c5d25416230be3919b4a5b2de861d7d96586379a3c804ee3b619207214f249
+  metadata.gz: 5495c78dc0562ff98871987caa3a4c0bfc4729e0fa981bf7ab58cb7b6440675dbfeb3527849205d614726dafbd10d3da2fe06fd9cbbbb3f0c34531ed2fef572c
+  data.tar.gz: 7d67a52dc39f8c60c093f45b90b9636bededbbcb6271e12e84a1594be2363bd496dd127cea21314bb8ae2edc05a64018504a61dfbe652411ebfaae70bccaceba

data/README.md

@@ -1,5 +1,11 @@
 # Pubsubhubbub
 
+[![Gem Version](http://img.shields.io/gem/v/pubsubhubbub-rails.svg)][gem]
+[![Dependency Status](http://img.shields.io/gemnasium/Gargron/pubsubhubbub.svg)][gemnasium]
+
+[gem]: https://rubygems.org/gems/pubsubhubbub-rails
+[gemnasium]: https://gemnasium.com/Gargron/pubsubhubbub
+
 This is a mountable PubSubHubbub server conforming to the v0.4 of the spec.
 
 ## Usage

data/Rakefile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require 'bundler/setup'
 rescue LoadError
@@ -14,24 +15,9 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
 load 'rails/tasks/engine.rake'
 
-
 load 'rails/tasks/statistics.rake'
 
-
-
 require 'bundler/gem_tasks'
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-
-task default: :test

data/app/controllers/pubsubhubbub/subscriptions_controller.rb

@@ -40,10 +40,10 @@ module Pubsubhubbub
       xml = Nokogiri::XML(response.body)
       xml.encoding = 'utf-8'
 
-      link  = xml.at_xpath('//xmlns:link[@rel="hub"]')
-      topic = xml.at_xpath('//xmlns:link[@rel="self"]')
+      link  = xml.at_xpath('//xmlns:link[@rel="hub"]', xmlns: XMLNS)
+      topic = xml.at_xpath('//xmlns:link[@rel="self"]', xmlns: XMLNS)
 
-      link['href'] == hub_url && topic['href'] == @topic
+      link&.attribute('href')&.value == hub_url && topic&.attribute('href')&.value == @topic
     end
 
     def subscribe

data/app/jobs/pubsubhubbub/deliver_payload_job.rb

@@ -9,7 +9,7 @@ module Pubsubhubbub
       link         = LinkHeader.new([[hub_url, [%w(rel hub)]], [subscription.topic, [%w(rel self)]]])
       headers      = {}
 
-      headers['Link']            = link
+      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)

data/app/models/pubsubhubbub/subscription.rb

@@ -14,11 +14,16 @@ module Pubsubhubbub
     end
 
     before_validation :generate_challenge
+    before_validation :set_min_expiration
 
     private
 
     def generate_challenge
       self.challenge = SecureRandom.hex
     end
+
+    def set_min_expiration
+      self.lease_seconds = 0 unless expires_at
+    end
   end
 end

data/db/migrate/20161126203748_create_pubsubhubbub_subscriptions.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CreatePubsubhubbubSubscriptions < ActiveRecord::Migration[5.0]
   def change
     create_table :pubsubhubbub_subscriptions do |t|

data/lib/pubsubhubbub.rb

@@ -7,6 +7,8 @@ require 'link_header'
 require 'httplog'
 
 module Pubsubhubbub
+  XMLNS = 'http://www.w3.org/2005/Atom'
+
   class FailedDeliveryError < StandardError
   end
 end

data/lib/pubsubhubbub/engine.rb

@@ -2,5 +2,9 @@
 module Pubsubhubbub
   class Engine < ::Rails::Engine
     isolate_namespace Pubsubhubbub
+
+    config.generators do |g|
+      g.test_framework :rspec, fixture: false
+    end
   end
 end

data/lib/pubsubhubbub/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubsubhubbub-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Eugen Rochko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-26 00:00:00.000000000 Z
+date: 2016-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,48 +86,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: httplog
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A PubSubHubbub server conforming to the v0.4 spec, mountable from a Rails
   app
 email: