rack-superfeedr 0.1.6 → 0.2.0

data/Gemfile

@@ -3,8 +3,8 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 gem 'rack'
-gem 'nokogiri'
-gem 'typhoeus'
+gem 'nokogiri', ">=1.6.1"
+gem 'typhoeus', ">=0.6.7"
 
 
 # Add dependencies to develop your gem here.

data/Gemfile.lock

@@ -79,7 +79,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (>= 1.0.0)
   jeweler (>= 1.6.4)
-  nokogiri
+  nokogiri (>= 1.6.1)
   rack
   shoulda
-  typhoeus
+  typhoeus (>= 0.6.7)

data/README.rdoc

@@ -41,5 +41,5 @@ You can then access the Superfeedr object anywhere in your rails application wit
 
 == Copyright
 
-Copyright (c) 2012 Superfeedr. See LICENSE.txt for further details.
+Copyright (c) 2014 Superfeedr. See LICENSE.txt for further details.
 

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.2.0

data/examples/sinatra_app.rb

@@ -2,7 +2,7 @@ require 'sinatra'
 require(File.join(File.dirname(__FILE__), '..', 'lib', 'rack-superfeedr.rb'))
 
 
-use Rack::Superfeedr, { :host => "pstx.showoff.io", :login => "demo", :password => "demo", :format => "json", :async => false } do |superfeedr|
+use Rack::Superfeedr, { :host => "pstx.showoff.io", :login => "julien", :password => "f8054b405e68aa2067df25fb21665bab", :format => "json", :async => false } do |superfeedr|
   set :superfeedr, superfeedr # so that we can use `settings.superfeedr` to access the superfeedr object in our application.
 
   superfeedr.on_notification do |notification|
@@ -16,7 +16,7 @@ get '/hi' do
 end
 
 get '/subscribe' do
-  subscription = settings.superfeedr.subscribe("http://push-pub.appspot.com/feed")
+  subscription = settings.superfeedr.subscribe("http://push-pub.appspot.com/feed", 9999, { verbose: true, retrieve: true })
   if !subscription
     settings.superfeedr.error
   else

data/lib/rack-superfeedr.rb

@@ -28,6 +28,8 @@ module Rack
     # It returns true if the subscription was successful (or will be confirmed if you used async => true in the options), false otherwise.
     # You can also pass an opts third argument that will be merged with the options used in Typhoeus's Request (https://github.com/dbalatero/typhoeus)
     # A useful option is :verbose => true for example.
+    # If you supply a retrieve option, the content of the feed will be retrieved from Superfeedr as well and your on_notification callback will 
+    # will be called with the content of the feed.
     def subscribe(url, id = nil, opts = {}, &block)
       feed_id = "#{id ? id : Base64.urlsafe_encode64(url)}"
       if block
@@ -37,25 +39,55 @@ module Rack
       endpoint = opts[:hub] || SUPERFEEDR_ENDPOINT
       opts.delete(:hub)
 
+      retrieve = opts[:retrieve] || false
+      opts.delete(:retrieve)
+
+
       if endpoint == SUPERFEEDR_ENDPOINT
         opts[:userpwd] = "#{@params[:login]}:#{@params[:password]}"
       end
 
-      response = ::Typhoeus::Request.post(endpoint,
-      opts.merge({
+
+      opts = opts.merge({
         :params => {
           :'hub.mode' => 'subscribe',
-          :'hub.verify' => @params[:async] ? 'async' : 'sync',
           :'hub.topic' => url,
           :'hub.callback' =>  generate_callback(url, feed_id)
         },
         :headers => {
           :Accept => @params[:format] == "json" ? "application/json" : "application/atom+xml"
         }
-      }))
+      })
+
+      if retrieve
+        opts[:params][:retrieve] = true
+      end
+
+      opts[:params][:'hub.verify'] = @params[:async] ? 'async' : 'sync',
+
+      response = ::Typhoeus::Request.post(endpoint, opts)
 
       @error = response.body
-      @params[:async] && response.code == 202 || response.code == 204 # We return true to indicate the status.
+      if !retrieve
+        @params[:async] && response.code == 202 || response.code == 204 # We return true to indicate the status.
+      else
+
+        if  @params[:format] != "json"
+          content = Nokogiri.XML(response.body)
+        else
+          content = JSON.parse(response.body)
+
+        end
+        # Let's now send that data back to the user.
+        if defined? Hashie::Mash
+          info = Hashie::Mash.new(req: req, body: body)
+        end
+        if !@callback.call(content, feed_id, info)
+          # We need to unsubscribe the user
+        end
+
+        true
+      end
     end
 
     ##
@@ -159,7 +191,9 @@ module Rack
           content = Nokogiri.XML(body)
         end
         # Let's now send that data back to the user.
-        info = Hashie::Mash.new(req: req, body: body)
+        if defined? Hashie::Mash
+          info = Hashie::Mash.new(req: req, body: body)
+        end
         if !@callback.call(content, feed_id[1], info)
           # We need to unsubscribe the user
         end

data/rack-superfeedr.gemspec

@@ -2,15 +2,14 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: rack-superfeedr 0.1.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rack-superfeedr"
-  s.version = "0.1.6"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["julien51"]
-  s.date = "2014-01-28"
+  s.date = "2014-06-10"
   s.description = "A gem that provides a rack middleware to interract with Superfeedr's API. "
   s.email = "julien@superfeedr.com"
   s.extra_rdoc_files = [
@@ -34,31 +33,31 @@ Gem::Specification.new do |s|
   s.homepage = "http://rubygems.org/gems/rack-superfeedr"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.10"
+  s.rubygems_version = "1.8.25"
   s.summary = "A gem that provides a rack middleware to interract with Superfeedr's API."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 4
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, [">= 0"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
-      s.add_runtime_dependency(%q<typhoeus>, [">= 0"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 1.6.1"])
+      s.add_runtime_dependency(%q<typhoeus>, [">= 0.6.7"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 1.6.4"])
     else
       s.add_dependency(%q<rack>, [">= 0"])
-      s.add_dependency(%q<nokogiri>, [">= 0"])
-      s.add_dependency(%q<typhoeus>, [">= 0"])
+      s.add_dependency(%q<nokogiri>, [">= 1.6.1"])
+      s.add_dependency(%q<typhoeus>, [">= 0.6.7"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, [">= 1.6.4"])
     end
   else
     s.add_dependency(%q<rack>, [">= 0"])
-    s.add_dependency(%q<nokogiri>, [">= 0"])
-    s.add_dependency(%q<typhoeus>, [">= 0"])
+    s.add_dependency(%q<nokogiri>, [">= 1.6.1"])
+    s.add_dependency(%q<typhoeus>, [">= 0.6.7"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, [">= 1.6.4"])

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: rack-superfeedr
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
+  prerelease: 
 platform: ruby
 authors:
 - julien51
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,34 +30,39 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.7
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,25 +131,29 @@ files:
 homepage: http://rubygems.org/gems/rack-superfeedr
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1737679521327129604
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A gem that provides a rack middleware to interract with Superfeedr's API.
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjlhYzhjODNjMjUxZTE5MDhlZTdhOGQ5ZGVjZGQyMTNmYzJlMzQ1Nw==
-  data.tar.gz: !binary |-
-    ZGUxMGJkODE2NjIwYTk1Y2Q2MzI3NzRlNDJjNjViYmQwZGJjNGRlOA==
-SHA512:
-  metadata.gz: !binary |-
-    MzRjNzhiOWIzMWJlNzQ2Y2RiNjIyMTc0Y2MyZjg5NDg0NzZmMzM3Y2UzMTQz
-    ODJmZTBjZjMwMDM0YjU5ODE2Yzg4NDRkZjE0M2RiYzMyZjY5NTk2ZDAzZjZl
-    YTU0MDEwOTA3MTI3ZGNiZmFiMTc5MTQ1NTQ5Y2RiZWZmMDFjMDg=
-  data.tar.gz: !binary |-
-    Y2YzMmY2MWM3OTRhOWQ1MmI3ZjY0MmY4NjNhZDIwYzc2MmM0OWU3ZmVmMjQ4
-    YTU4YWNmNmFkZWFlMjc3MTkyYWQ2YmRlYTQ5OWI4MzUzZmY3ZGRlMzIzMTM3
-    ZjE0OTdiZWQ5NDg5N2Q1YjRlNzhkNmU4MTM0MGU4MzAzZjI3OGM=