osub 0.0.7 → 0.0.9

data/lib/osub/subscription.rb

@@ -9,11 +9,8 @@ module OSub
     attr_reader :callback_url
     attr_reader :topic_url
 
-    def initialize(callback_url, topic_url, secret = nil, token = nil)
+    def initialize(callback_url, topic_url, secret = nil)
       @tokens = []
-      if token != nil
-        @tokens << token
-      end
 
       secret = "" if secret == nil
       @secret = secret.to_s
@@ -28,30 +25,52 @@ module OSub
     end
 
     # Subscribe to the topic through the given hub.
-    def subscribe(hub_url, async = false, token = nil)
+    def subscribe(hub_url, token = nil)
       if token != nil
         @tokens << token.to_s
       end
-      change_subscription(:subscribe, hub_url, async, token)
+      change_subscription(:subscribe, hub_url, token)
     end
 
     # Unsubscribe to the topic through the given hub.
-    def unsubscribe(hub_url, async = false, token = nil)
+    def unsubscribe(hub_url, token = nil)
       if token != nil
         @tokens << token.to_s
       end
-      change_subscription(:unsubscribe, hub_url, async, token)
+      change_subscription(:unsubscribe, hub_url, token)
     end
 
-    def change_subscription(mode, hub_url, async, token)
-      res = Net::HTTP.post_form(URI.parse(hub_url),
-                                { 'hub.mode' => mode.to_s,
-                                  'hub.callback' => @callback_url,
-                                  'hub.verify' => async ? 'async' : 'sync',
-                                  'hub.verify_token' => token,
-                                  'hub.lease_seconds' => '',
-                                  'hub.secret' => @secret,
-                                  'hub.topic' => @topic_url})
+    def change_subscription(mode, hub_url, token, redirect_limit = 10)
+      hub_uri = URI.parse(hub_url)
+
+      req = Net::HTTP::Post.new(hub_uri.request_uri)
+      req.set_form_data({
+        'hub.mode' => mode.to_s,
+        'hub.callback' => @callback_url,
+        'hub.verify' => async ? 'async' : 'sync',
+        'hub.verify_token' => token,
+        'hub.lease_seconds' => '',
+        'hub.secret' => @secret,
+        'hub.topic' => @topic_url
+      })
+
+      http = Net::HTTP.new(hub_uri.hostname, hub_uri.port)
+      if hub_uri.scheme == 'https'
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      end
+
+      response = http.request(req)
+
+      if response.is_a?(Net::HTTPRedirection) && redirect_limit > 0
+        location = response['location']
+        self.change_subscription(mode, hub_url, token, redirect_limit - 1)
+      else
+        response
+      end
+
+    rescue OpenSSL::SSL::SSLError
+      return nil
     end
 
     def verify_subscription(token)

data/lib/osub/version.rb

@@ -1,3 +1,3 @@
 module OSub
-  VERSION = "0.0.7"
+  VERSION = "0.0.9"
 end

data/lib/osub.rb

@@ -1,2 +1,3 @@
+require_relative 'osub/subscriber'
 require_relative 'osub/subscription'
-require_relative 'osub/subscribers'
+

metadata

@@ -1,58 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: osub
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 7
-  version: 0.0.7
+version: !ruby/object:Gem::Version
+  version: 0.0.9
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Hackers of the Severed Hand
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-09 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-10-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ruby-hmac
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ostatus
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostatus
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This is a simple implementation of a subscriber in the PubSubHubbub protocol.
-email: 
+email:
 - hotsh@xomb.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -62,37 +59,28 @@ files:
 - lib/osub/subscription.rb
 - lib/osub/version.rb
 - osub.gemspec
-has_rdoc: true
 homepage: http://github.com/hotsh/osub
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: osub
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: This is a simple implementation of a subscriber in the PubSubHubbub protocol.
 test_files: []
-