rack-superfeedr 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/rack-superfeedr.rb

@@ -4,69 +4,69 @@ require 'uri'
 
 module SuperfeedrAPI
 
-    @@superfeedr_endpoint = "https://push.superfeedr.com/"
-    @@port = 80
-    @@host = 'my-app.com'
-    @@base_path = '/superfeedr/feed/'
-    @@scheme = 'http'
-    @@login = nil
-    @@password = nil
-
-    def superfeedr_endpoint= _superfeedr_endpoint
-      @@superfeedr_endpoint = _superfeedr_endpoint
-    end
+  @@superfeedr_endpoint = "https://push.superfeedr.com/"
+  @@port = 80
+  @@host = 'my-app.com'
+  @@base_path = '/superfeedr/feed/'
+  @@scheme = 'http'
+  @@login = nil
+  @@password = nil
+
+  def superfeedr_endpoint= _superfeedr_endpoint
+    @@superfeedr_endpoint = _superfeedr_endpoint
+  end
 
-    def superfeedr_endpoint
-      @@superfeedr_endpoint
-    end
+  def superfeedr_endpoint
+    @@superfeedr_endpoint
+  end
 
-    def port= _port
-      @@port = _port
-    end
+  def port= _port
+    @@port = _port
+  end
 
-    def port
-      @@port
-    end
+  def port
+    @@port
+  end
 
-    def host= _host
-      @@host = _host
-    end
+  def host= _host
+    @@host = _host
+  end
 
-    def host
-      @@host
-    end
-    
-    def base_path= _base_path
-      @@base_path = _base_path
-    end
+  def host
+    @@host
+  end
 
-    def base_path
-      @@base_path
-    end
+  def base_path= _base_path
+    @@base_path = _base_path
+  end
 
-    def scheme= _scheme
-      @@scheme = _scheme
-    end
+  def base_path
+    @@base_path
+  end
 
-    def scheme
-      @@scheme
-    end
+  def scheme= _scheme
+    @@scheme = _scheme
+  end
 
-    def login= _login
-      @@login = _login
-    end
+  def scheme
+    @@scheme
+  end
 
-    def login
-      @@login
-    end
+  def login= _login
+    @@login = _login
+  end
 
-    def password= _password
-      @@password = _password
-    end
+  def login
+    @@login
+  end
 
-    def password
-      @@password
-    end
+  def password= _password
+    @@password = _password
+  end
+
+  def password
+    @@password
+  end
 
   ##
   # 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
@@ -104,7 +104,11 @@ module SuperfeedrAPI
 
     response = http_post(endpoint, request)
 
-    blk.call(response.body, opts[:async] && Integer(response.code) == 202 || Integer(response.code) == 204 || opts[:retrieve] && Integer(response.code) == 200, response) if blk
+    r = [response.body, opts[:async] && Integer(response.code) == 202 || Integer(response.code) == 204 || opts[:retrieve] && Integer(response.code) == 200, response]
+    if blk
+      blk.call(r) 
+    end
+    r
   end
 
   ##
@@ -136,11 +140,11 @@ module SuperfeedrAPI
 
     response = http_get(endpoint, request)
 
+    r = [response.body, Integer(response.code) == 200, response]
     if blk
-      blk.call(response.body, Integer(response.code) == 200, response) if blk
-    else
-      [response.body, Integer(response.code) == 200, response]
+      blk.call(r) 
     end
+    r
   end
 
   ##
@@ -167,7 +171,11 @@ module SuperfeedrAPI
 
     response = http_post(endpoint, request)
 
-    blk.call(response.body, opts[:async] && Integer(response.code) == 202 || Integer(response.code) == 204, response) if blk
+    r = response.body, opts[:async] && Integer(response.code) == 202 || Integer(response.code) == 204, response
+    if blk
+      blk.call(r) 
+    end
+    r
   end
 
   protected

data/rack-superfeedr.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rack-superfeedr"
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["julien51"]

data/test/test_rack-superfeedr.rb

@@ -56,36 +56,121 @@ Rack::Superfeedr.password = PASSWORD
 
 class TestRackSuperfeedr < Test::Unit::TestCase
 
-	context "Subscribing" do
+	context "Without Callbacks" do
 
-		should "yield true with a simple subscribe" do 
-			Rack::Superfeedr.subscribe('http://push-pub.appspot.com/feed', '12345') do |body, success, response|
+		context "Subscribing" do
+
+			should "yield true with a simple subscribe" do 
+				body, success, response = Rack::Superfeedr.subscribe('http://push-pub.appspot.com/feed', '12345')
 				success || flunk("Fail")
 			end
-		end
 
-		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|
+			should "support sync mode and call the verification callback before yielding true" do 
+				body, success, response =  Rack::Superfeedr.subscribe('http://push-pub.appspot.com/feed', 'accept-subscribe', {:sync => true}) 
 				success || flunk("Fail")
 			end
-		end
 
-		should "support sync mode and call the verification callback before yielding false if verification fails" do 
-			Rack::Superfeedr.subscribe('http://push-pub.appspot.com/feed', 'refuse-subscribe', {:sync => true}) do |body, success, response|
+			should "support sync mode and call the verification callback before yielding false if verification fails" do 
+				body, success, response = Rack::Superfeedr.subscribe('http://push-pub.appspot.com/feed', 'refuse-subscribe', {:sync => true})
 				!success || flunk('Fail')
 			end
+
+			should "support async mode and yield true" do 
+				body, success, response = Rack::Superfeedr.subscribe('http://push-pub.appspot.com/feed', 'refuse-subscribe', {:async => true})
+				success || flunk("Fail")
+			end
+
+			should "return the content of Atom subscriptions with retrieve" do 
+				body, success, response = Rack::Superfeedr.subscribe('http://push-pub.appspot.com/feed', '1234', {:retrieve => true})
+				assert_equal "application/atom+xml", response['Content-Type']
+				success || flunk("Fail")
+				assert body 
+			end
+
+			should "return the content of Json subscriptions with retrieve" do 
+				body, success, response = Rack::Superfeedr.subscribe('http://push-pub.appspot.com/feed', '1234', {:format => "json", :retrieve => true})
+				assert_equal "application/json; charset=utf-8", response['Content-Type']
+				success || flunk("Fail")
+				assert body
+			end
 		end
 
-		should "support async mode and yield true" do 
-			Rack::Superfeedr.subscribe('http://push-pub.appspot.com/feed', 'refuse-subscribe', {:async => true}) do |body, success, response|
+		context "Unsubscribing" do
+			should 'successfully unsubscribe with 204 when not using sync nor asyc' do
+				body, success, response = Rack::Superfeedr.unsubscribe('http://push-pub.appspot.com/feed', '12345')
+				success || flunk("Fail")
+			end
+
+			should 'successfully unsubscribe with 204 when using sync when verification yields true' do
+				body, success, response = Rack::Superfeedr.unsubscribe('http://push-pub.appspot.com/feed', 'accept-unsubscribe', {:sync => true})
+				success || flunk("Fail")
+			end
+
+			should 'fail to unsubscribe with 204 when using sync when verification yields false'  do
+				body, success, response = Rack::Superfeedr.unsubscribe('http://push-pub.appspot.com/feed', 'refuse-unsubscribe', {:sync => true}) 
+				!success || flunk('Fail')
+			end
+
+			should 'return 202 when using async' do
+				body, success, response = Rack::Superfeedr.unsubscribe('http://push-pub.appspot.com/feed', 'accept-unsubscribe', {:async => true})
 				success || flunk("Fail")
 			end
 		end
 
-		should "return the content of Atom subscriptions with retrieve" do 
-			Rack::Superfeedr.subscribe('http://push-pub.appspot.com/feed', '1234', {:retrieve => true}) do |body, success, response|
-				assert_equal "application/atom+xml", response['Content-Type']
+		context "Retrieving" do
+			should 'yield content from Superfeedr in Atom when asking for no specific format' do
+				body, success, response = Rack::Superfeedr.retrieve_by_topic_url('http://push-pub.appspot.com/feed')
 				success || flunk("Fail")
+			end			
+
+			should 'yield content from Superfeedr in JSON when asking for JSON' do
+				body, success, response = Rack::Superfeedr.retrieve_by_topic_url('http://push-pub.appspot.com/feed', {:format => 'json'})
+				success || flunk("Fail")
+				hash = JSON.parse body
+				hash['status'] || flunk("Not JSON")
+			end			
+
+			should 'yield content from Superfeedr in JSON when asking for JSON and only yield the right number of items' do
+				body, success, response = Rack::Superfeedr.retrieve_by_topic_url('http://push-pub.appspot.com/feed', {:format => 'json', :count => 3}) 
+				success || flunk("Fail")
+				hash = JSON.parse body
+				hash['items'].length == 3 || flunk("Not the right number of items")
+			end			
+		end
+	end
+
+	context "With Callbacks" do
+
+		context "Subscribing" do
+
+			should "yield true with a simple subscribe" do 
+				Rack::Superfeedr.subscribe('http://push-pub.appspot.com/feed', '12345') do |body, success, response|
+					success || flunk("Fail")
+				end
+			end
+
+			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|
+					success || flunk("Fail")
+				end
+			end
+
+			should "support sync mode and call the verification callback before yielding false if verification fails" do 
+				Rack::Superfeedr.subscribe('http://push-pub.appspot.com/feed', 'refuse-subscribe', {:sync => true}) do |body, success, response|
+					!success || flunk('Fail')
+				end
+			end
+
+			should "support async mode and yield true" do 
+				Rack::Superfeedr.subscribe('http://push-pub.appspot.com/feed', 'refuse-subscribe', {:async => true}) do |body, success, response|
+					success || flunk("Fail")
+				end
+			end
+
+			should "return the content of Atom subscriptions with retrieve" do 
+				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
 			end
 		end
@@ -149,6 +234,7 @@ class TestRackSuperfeedr < Test::Unit::TestCase
 			end			
 		end
 	end
+end
 
 	context "Notifications" do
 		should 'handle json notifications' 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-superfeedr
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -159,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1123161724621889271
+      hash: 4382464025338648913
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: