rack-superfeedr 0.4.3 → 0.4.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmNlOGUxM2U3N2Q4ZTEzZDlhYTkyOGFjYTA3Zjg4ODRlNDI4ZDlkYw==
+    MWZjMDczMTYyZWNhN2I4Zjg2NjA3NDg0YTdhNDBjZWMzMTBmNGUzMg==
   data.tar.gz: !binary |-
-    YWU4ZjlmZmQ1ZDI2ZGNkZmFkNjkwMDQ3MjA5ZjUxZTVkNjg3OTMwMg==
+    MDJhNjBlMDEwNzc3NWNhYzc5MWI4Yjc2NWYzNzY3NDNlYTJiM2U0ZA==
 SHA512:
   metadata.gz: !binary |-
-    M2UxM2E1Njc1NzlhZDRkZjZjNTIwZWIzNmM3NTBjYjk1ZTI0ODBlOTE4ZmJj
-    ZjI0NTdlY2IzZjc5ZmQ0Y2Y0MmE4N2JjNzNkNjg5MGU0YjYxNzgwNGUxZjEy
-    M2VmNzc2MmI0MTkwM2U5NGFiMDI4NWUwYzBlMDk2MTk2YjVhMGE=
+    NWI4MjQ3ODg1Y2YzZTI2MDAwZDI3ZjkwMzM3M2FhMThiNThlNGQ1YWI1NTA5
+    NGJiM2NiNWNhZWJhMzgwYjJkYjRlMTlhNTg3MzBmZDI1ZjRhYmQ3NDhmMjM5
+    ODJkOTdlMmZhZWMxYTQ5ZDMyOWU1YWY4ZGZmY2JkYzUyZWQ5OWM=
   data.tar.gz: !binary |-
-    MDAyM2ViZTExZWY4NGRlODVhM2ViYmYzODI4NjNlZTZiYzdkY2JmZjZhMWE1
-    NThkNGM0OTc0MDdjOTVlNDg4ZDYxYjdmOTc4ZDBiNmEyODVlNWUxMDRmMzNl
-    NmRhZDE0N2FjYWJkYzY2M2QyZDUzMmI2NTFiMzQ5OWY3ZDlmNmM=
+    MmJiYzMwMTQ0NzQxOTNlODhkYjMyMGFhNmE0OWZmOTMzODI3ZDgwMWI2Y2Y2
+    MGEyNGM5MGQ3YTc3YzFhYTQwNmViNzI2NzVjOGE5ZTZkMmNhOWVjMjI4OGYy
+    YjIxZDY5NjFmZTA1MDQ4MTdhNDVmNzcxNGE3OWY3NzBmZThmOWY=

data/README.rdoc

@@ -3,7 +3,7 @@
 A gem that provides a rack middleware to interact with {Superfeedr}[http://superfeedr.com/]'s PubSubHubbub API. It let you *subscribe*, *unsubscribe* and *receive* incoming feed notifications.
 This should work with any Rack-compatible framework, as well as fully managed platforms like {Heroku}[http://www.heroku.com/].
 
-Warning : version 0.3 (July 2014) introduces a lot of breaking changes compared to previous versions. Upgrade carefully!
+If you're looking to integrate into a Rails application, we suggest you check this {Rails Engine}[https://rubygems.org/gems/superfeedr_engine], which is more suited and will handle a lot more things on your behalf!
 
 == Installing
 
@@ -19,16 +19,6 @@ You first need a {subscriber account}[http://superfeedr.com/subscriber] with Sup
 
 See the {example}[https://github.com/superfeedr/rack-superfeedr/blob/master/examples/sinatra_app.rb]... and {check the docs}[http://rubydoc.info/github/superfeedr/rack-superfeedr/master/Rack/Superfeedr] for more details. 
 
-=== Rails
-
-Tested with Rails 3.2, but should work with any Rails version that supports Rack.
-
-Install the gem (using bundle), and then in <code>config/application.rb</code>, inside the <code>class Application < Rails::Application</code> block, just add the following line.
-
-  config.middleware.use Rack::Superfeedr do |superfeedr|
-  ...
-  end
-
 
 == Contributing
  
@@ -41,5 +31,5 @@ Install the gem (using bundle), and then in <code>config/application.rb</code>,
 
 == Copyright
 
-Copyright (c) 2014 Superfeedr. See LICENSE.txt for further details.
+Copyright (c) 2015 Superfeedr. See LICENSE.txt for further details.
 

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/rack-superfeedr.rb

@@ -197,7 +197,11 @@ module SuperfeedrAPI
       request['search'] = opts[:search]
     end
     
-    request['authorization'] = Base64.encode64( "#{@@login}:#{@@password}" ).chomp
+    if opts[:login] && opts[:password]
+      request['authorization'] = Base64.encode64( "#{opts[:login]}:#{opts[:password]}" ).chomp
+    else
+      request['authorization'] = Base64.encode64( "#{@@login}:#{@@password}" ).chomp
+    end
 
     response = http_get(endpoint, request)
 
@@ -206,7 +210,34 @@ module SuperfeedrAPI
       blk.call(r) 
     end
     r
+  end
+
+  def search(query, opts = {}, &blk)
+    endpoint = @@superfeedr_endpoint
+    request = {
+      'hub.mode' => 'search',
+      'detailed' => true
+    }
+
+    if opts[:format] == "json"
+      request['format'] = "json"
+    end
 
+    if opts[:login] && opts[:password]
+      request['authorization'] = Base64.encode64( "#{opts[:login]}:#{opts[:password]}" ).chomp
+    else
+      request['authorization'] = Base64.encode64( "#{@@login}:#{@@password}" ).chomp
+    end
+
+    request['query'] = query
+
+    response = http_post(endpoint, request)
+
+    r = [response.body, Integer(response.code) == 200, response]
+    if blk
+      blk.call(r) 
+    end
+    r
   end
 
   protected
@@ -219,7 +250,9 @@ module SuperfeedrAPI
       'hub.callback' =>  generate_callback(url, feed_id)
     }
 
-    if endpoint == @@superfeedr_endpoint && @@login && @@password
+    if opts[:login] && opts[:password]
+      request['authorization'] = Base64.encode64( "#{opts[:login]}:#{opts[:password]}" ).chomp
+    elsif @@login && @@password
       request['authorization'] = Base64.encode64( "#{@@login}:#{@@password}" ).chomp
     end
 

data/rack-superfeedr.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: rack-superfeedr 0.4.3 ruby lib
+# stub: rack-superfeedr 0.4.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rack-superfeedr"
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["julien51"]
-  s.date = "2015-04-17"
+  s.date = "2015-04-23"
   s.description = "A gem that provides a rack middleware to interract with Superfeedr's API. "
   s.email = "julien@superfeedr.com"
   s.extra_rdoc_files = [

data/test/test_rack-superfeedr.rb

@@ -3,7 +3,7 @@ require 'rack'
 require_relative 'helper.rb'
 
 # To run tests locally, we're using runscope's passageway which proxies requests inside the firewall. (make sure you bind to port 4567)
-HOST = '39fbb9eba21.b.passageway.io'
+HOST = '4da832710d5.b.passageway.io'
 PORT = 80
 # Also, we need superfeedr credentials.
 LOGIN = 'demo'
@@ -28,20 +28,20 @@ Thread.new do
 		AccessLog: []
 	}
 	Rack::Handler::WEBrick.run(Rack::Superfeedr.new(MyRackApp.new) do |superfeedr|
-	
-	superfeedr.on_verification do |mode, feed_id, url, request|
-		if mode == 'subscribe' && feed_id == 'accept-subscribe'
-			true
-		elsif mode == 'unsubscribe' && feed_id == 'accept-unsubscribe'
-			true
-		else
-			false
-		end
-	end	
 
-	superfeedr.on_notification do |url, feed_id, details|
-		notified(url, feed_id, details)
-	end	
+		superfeedr.on_verification do |mode, feed_id, url, request|
+			if mode == 'subscribe' && feed_id == 'accept-subscribe'
+				true
+			elsif mode == 'unsubscribe' && feed_id == 'accept-unsubscribe'
+				true
+			else
+				false
+			end
+		end	
+
+		superfeedr.on_notification do |url, feed_id, details|
+			notified(url, feed_id, details)
+		end	
 
 
 	end, opts) 
@@ -148,6 +148,21 @@ class TestRackSuperfeedr < Test::Unit::TestCase
 				hash['items'].length == 3 || flunk("Not the right number of items")
 			end			
 		end
+
+		context "Searching" do
+			should 'yield content from Superfeedr in Atom when asking for no specific format' do
+				body, success, response = Rack::Superfeedr.search('superfeedr', {:login => 'tracker', :password => 'a0234221feebbd9c1ee30d33a49c505d'})
+				success || flunk("Fail")
+			end			
+
+			should 'yield content from Superfeedr in JSON when asking for JSON' do
+				body, success, response = Rack::Superfeedr.search('superfeedr', {:login => 'tracker', :password => 'a0234221feebbd9c1ee30d33a49c505d', :format => 'json'})
+				success || flunk("Fail")
+				hash = JSON.parse body
+				hash['status'] || flunk("Not JSON")
+			end			
+
+		end
 	end
 
 	context "With Callbacks" do
@@ -182,70 +197,70 @@ class TestRackSuperfeedr < Test::Unit::TestCase
 				Rack::Superfeedr.subscribe('http://push-pub.appspot.com/feed', '1234', {:retrieve => true}) do |body, success, response|
 					assert_equal "application/atom+xml", response['Content-Type']
 					success || flunk("Fail")
-				assert body # Some XML
+					assert body 
+				end
 			end
-		end
 
-		should "return the content of Json subscriptions with retrieve" do 
-			response = Rack::Superfeedr.subscribe('http://push-pub.appspot.com/feed', '1234', {:format => "json", :retrieve => true})  do |body, success, response|
-				assert_equal "application/json; charset=utf-8", response['Content-Type']
-				success || flunk("Fail")
-				assert body
+			should "return the content of Json subscriptions with retrieve" do 
+				response = Rack::Superfeedr.subscribe('http://push-pub.appspot.com/feed', '1234', {:format => "json", :retrieve => true})  do |body, success, response|
+					assert_equal "application/json; charset=utf-8", response['Content-Type']
+					success || flunk("Fail")
+					assert body
+				end
 			end
-		end
 
-	end
+		end
 
-	context "Unsubscribing" do
-		should 'successfully unsubscribe with 204 when not using sync nor asyc' do
-			Rack::Superfeedr.unsubscribe('http://push-pub.appspot.com/feed', '12345') do |body, success, response|
-				success || flunk("Fail")
+		context "Unsubscribing" do
+			should 'successfully unsubscribe with 204 when not using sync nor asyc' do
+				Rack::Superfeedr.unsubscribe('http://push-pub.appspot.com/feed', '12345') do |body, success, response|
+					success || flunk("Fail")
+				end
 			end
-		end
 
-		should 'successfully unsubscribe with 204 when using sync when verification yields true' do
-			Rack::Superfeedr.unsubscribe('http://push-pub.appspot.com/feed', 'accept-unsubscribe', {:sync => true}) do |body, success, response|
-				success || flunk("Fail")
+			should 'successfully unsubscribe with 204 when using sync when verification yields true' do
+				Rack::Superfeedr.unsubscribe('http://push-pub.appspot.com/feed', 'accept-unsubscribe', {:sync => true}) do |body, success, response|
+					success || flunk("Fail")
+				end
 			end
-		end
 
-		should 'fail to unsubscribe with 204 when using sync when verification yields false'  do
-			Rack::Superfeedr.unsubscribe('http://push-pub.appspot.com/feed', 'refuse-unsubscribe', {:sync => true}) do |body, success, response|
-				!success || flunk('Fail')
+			should 'fail to unsubscribe with 204 when using sync when verification yields false'  do
+				Rack::Superfeedr.unsubscribe('http://push-pub.appspot.com/feed', 'refuse-unsubscribe', {:sync => true}) do |body, success, response|
+					!success || flunk('Fail')
+				end
 			end
-		end
 
-		should 'return 202 when using async' do
-			Rack::Superfeedr.unsubscribe('http://push-pub.appspot.com/feed', 'accept-unsubscribe', {:async => true}) do |body, success, response|
-				success || flunk("Fail")
+			should 'return 202 when using async' do
+				Rack::Superfeedr.unsubscribe('http://push-pub.appspot.com/feed', 'accept-unsubscribe', {:async => true}) do |body, success, response|
+					success || flunk("Fail")
+				end
 			end
 		end
-	end
 
-	context "Retrieving" do
-		should 'yield content from Superfeedr in Atom when asking for no specific format' do
-			Rack::Superfeedr.retrieve_by_topic_url('http://push-pub.appspot.com/feed') do |body, success, response|
-				success || flunk("Fail")
-			end			
-		end
+		context "Retrieving" do
+			should 'yield content from Superfeedr in Atom when asking for no specific format' do
+				Rack::Superfeedr.retrieve_by_topic_url('http://push-pub.appspot.com/feed') do |body, success, response|
+					success || flunk("Fail")
+				end			
+			end
 
-		should 'yield content from Superfeedr in JSON when asking for JSON' do
-			Rack::Superfeedr.retrieve_by_topic_url('http://push-pub.appspot.com/feed', {:format => 'json'}) do |body, success, response|
-				success || flunk("Fail")
-				hash = JSON.parse body
-				hash['status'] || flunk("Not JSON")
-			end			
-		end
+			should 'yield content from Superfeedr in JSON when asking for JSON' do
+				Rack::Superfeedr.retrieve_by_topic_url('http://push-pub.appspot.com/feed', {:format => 'json'}) do |body, success, response|
+					success || flunk("Fail")
+					hash = JSON.parse body
+					hash['status'] || flunk("Not JSON")
+				end			
+			end
 
-		should 'yield content from Superfeedr in JSON when asking for JSON and only yield the right number of items' do
-			Rack::Superfeedr.retrieve_by_topic_url('http://push-pub.appspot.com/feed', {:format => 'json', :count => 3}) do |body, success, response|
-				success || flunk("Fail")
-				hash = JSON.parse body
-				hash['items'].length == 3 || flunk("Not the right number of items")
-			end			
+			should 'yield content from Superfeedr in JSON when asking for JSON and only yield the right number of items' do
+				Rack::Superfeedr.retrieve_by_topic_url('http://push-pub.appspot.com/feed', {:format => 'json', :count => 3}) do |body, success, response|
+					success || flunk("Fail")
+					hash = JSON.parse body
+					hash['items'].length == 3 || flunk("Not the right number of items")
+				end			
+			end
 		end
 	end
-end
 
 	context "Notifications" do
 		should 'handle json notifications' 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-superfeedr
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - julien51
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack