rack-superfeedr 0.3.0 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/rack-superfeedr.rb

@@ -50,7 +50,7 @@ module Rack
     # Subscribe you to a url. id is optional but strongly recommanded has a unique identifier for this url. It will be used to help you identify which feed
     # is concerned by a notification.
     # A 3rd options argument can be supplied with
-    # - retrive => true if you want to retrieve the previous items in the feed
+    # - retrieve => true if you want to retrieve the previous items in the feed
     # - format => 'json' or 'atom' to specify the format of the notifications, defaults to atom
     # - secret => a secret string used to compyte HMAC signatures so you can check that the data is coming from Superfeedr
     # - sync => true (defaults to false) if you want to perfrom a verification of intent syncrhonously
@@ -85,6 +85,42 @@ module Rack
       blk.call(response.body, opts[:async] && Integer(response.code) == 202 || Integer(response.code) == 204 || opts[:retrieve] && Integer(response.code) == 200, response) if blk
     end
 
+    ##
+    # Retrieve the content of a resource at Superfeedr
+    # A 2nd options argument can be supplied with
+    # - format => 'json' or 'atom' to specify the format of the notifications, defaults to atom
+    # - count => Integer (number of items to retrieve)
+    # - before => The id of an entry in the feed. The response will only include entries published before this one.
+    # - after => The id of an entry in the feed. The response will only include entries published after this one.
+    # It yields 3 arguments to a block (if block is supplied. If not, just returns the triplet)
+    # - body of the response (useful if you used the retrieve option)
+    # - success flag 
+    # - response (useful to debug failed requests mostly)
+    def self.retrieve_by_topic_url(url, opts = {}, &blk)
+      endpoint = opts[:hub] || @@superfeedr_endpoint
+      request = prep_request(url, '', endpoint, opts)
+
+      if opts[:format] == "json"
+        request['format'] = "json"
+      end
+
+      if opts[:count]
+        request['count'] = opts[:count]
+      else
+        request['count'] = 10
+      end
+      
+      request['hub.mode'] = 'retrieve'
+
+      response = http_get(endpoint, request)
+
+      if blk
+        blk.call(response.body, Integer(response.code) == 200, response) if blk
+      else
+        [response.body, Integer(response.code) == 200, response]
+      end
+    end
+
     ##
     # Unsubscribes a url. If you used an id for the susbcription, you need to use _the same_.
     # The optional block will be called to let you confirm the subscription (or not). This is not applicable for if you use params[:async] => true
@@ -168,9 +204,6 @@ module Rack
     def call(env)
       req = Rack::Request.new(env)
       if env['REQUEST_METHOD'] == 'GET' && feed_id = env['PATH_INFO'].match(/#{@@base_path}(.*)/)
-        puts "----"
-        puts req.params['hub.mode'], feed_id[1], req.params['hub.topic']
-        puts "----"
         if @verification.call(req.params['hub.mode'], feed_id[1], req.params['hub.topic'], req)
           Rack::Response.new(req.params['hub.challenge'], 200).finish
         else
@@ -209,6 +242,16 @@ module Rack
       request
     end
 
+    def self.http_get(url, opts)
+      uri = URI.parse URI.encode(url)
+      uri.query = URI.encode_www_form opts || {}
+      uri.path=='/' if uri.path.empty?
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      request = Net::HTTP::Get.new uri.request_uri
+      http.request(request)
+    end
+
     def self.http_post(url, opts)
       uri = URI.parse URI.encode(url)
       uri.path=='/' if uri.path.empty?

data/rack-superfeedr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rack-superfeedr"
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["julien51"]
-  s.date = "2014-07-29"
+  s.date = "2015-04-15"
   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

@@ -1,8 +1,9 @@
+require 'json'
 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 = '37cb3f2fe113.a.passageway.io'
+HOST = '5f83728c358.b.passageway.io'
 PORT = 80
 # Also, we need superfeedr credentials.
 LOGIN = 'demo'
@@ -11,13 +12,12 @@ PASSWORD = '8ac38a53cc32f71a6445e880f76fc865'
 
 class MyRackApp
 	def call(env)
-		puts env.inspect
 		[ 200, {'Content-Type' => 'text/plain'}, ['hello world'] ]
 	end
 end
 
 def notified(url, feed_id, details)
-	puts url, feed_id, details
+	# puts url, feed_id, details
 end
 
 # Run an app in a thread
@@ -39,7 +39,7 @@ Thread.new do
 	end	
 
 
-	end, :Port => 4567) 
+	end, :Port => 4567, Logger: WEBrick::Log.new("/dev/null"), AccessLog: [],) 
 end
 sleep 3
 
@@ -61,7 +61,6 @@ class TestRackSuperfeedr < Test::Unit::TestCase
 
 		should "support sync mode and call the verification callback before yielding true" do 
 			Rack::Superfeedr.subscribe('http://push-pub.appspot.com/feed', 'accept-subscribe', {:sync => true}) do |body, success, response|
-				puts body
 				success || flunk("Fail")
 			end
 		end
@@ -122,6 +121,30 @@ class TestRackSuperfeedr < Test::Unit::TestCase
 		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 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
+
 	context "Notifications" do
 		should 'handle json notifications' 
 		should 'handle atom notifications'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-superfeedr
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -159,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1778305000862886852
+      hash: 3582772756696706427
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: