superfeedr_engine 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c41a146f01127073bc4fb5b8a3761abcb57fd4e
-  data.tar.gz: 40cb80b21ebb748b7f5cbfa2494d1f8dd784c3b4
+  metadata.gz: bee7e6e4273eb2466ef9a69825b211bc2617811d
+  data.tar.gz: c4419381bc2e2fd73d54b3ebb6b963d2f698b47a
 SHA512:
-  metadata.gz: fe8a90c441db5ff74d41adfb62aa3863ea683b58ae2f99f26c76bbcf42b7bf87cfc165a9246b979a6a1ec3407d929bb075d1d98a431906208ed80d9ba972bd56
-  data.tar.gz: c542e203a3136570559ace72c24e9892e3c176edb3fcc8911b71a354bf37c94ded604b4b07e3bff6906a3f86d1b174e1f97feba25c9522935305cccab5f77037
+  metadata.gz: 7f7ae5a487f7f240957dfd37c26da685a713d8a9e0c75b4a11f726e0bcfae7f3d4d083a60d850d2e68bd65c394f0b02dcfa3011c4dca7a47c68c590cb1d1ac61
+  data.tar.gz: 4345fcaa94300d9f5fdfc719e796a986c8eecc53561b9865021e6225eb12359680e66aa956b5e69bd2cd03914970be7442e4ecb5d2e372e3288f19af361c9817

data/app/controllers/superfeedr_engine/pubsubhubbub_controller.rb

@@ -4,37 +4,45 @@ require_dependency "superfeedr_engine/application_controller"
 module SuperfeedrEngine
   class PubsubhubbubController < ApplicationController
 
-  	def notify
-  		signature = request.headers['HTTP_X_HUB_SIGNATURE']
-  		if !signature
-  			Rails.logger.error("Missing signature. Ignored payload for #{params[:feed_id]}. Use retrieve if missing.")
-  		else
-      	algo, hash = signature.split('=')
-      	if algo != "sha1"
-      		Rails.logger.error("Unknown signature mechanism #{algo}. Ignored paylod for #{params[:feed_id]}. Use retrieve if missing.")
-      	else
-      		feed = feed_klass.find(params[:feed_id])
-      		if !feed
-	      		Rails.logger.error("Unknown notification for #{params[:feed_id]}.")
-	      	else
+    def notify
+      signature = request.headers['HTTP_X_HUB_SIGNATURE']
+      if !signature
+        Rails.logger.error("Missing signature. Ignored payload for #{params[:feed_id]}. Use retrieve if missing.")
+      else
+        algo, hash = signature.split('=')
+        if algo != "sha1"
+          Rails.logger.error("Unknown signature mechanism #{algo}. Ignored paylod for #{params[:feed_id]}. Use retrieve if missing.")
+        else
+          feed = feed_klass.find(params[:feed_id])
+          if !feed
+            Rails.logger.error("Unknown notification for #{params[:feed_id]}.")
+          else
             digest  = OpenSSL::Digest.new(algo)
             computed = OpenSSL::HMAC.hexdigest(digest, feed.secret, request.raw_post)
-      			if computed == hash      				
-      				feed.notified(params)
-      			else
-      				Rails.logger.error("Non matching signature. Ignored paylod for #{params[:feed_id]}. Use retrieve if missing.")
-      			end
-	      	end
-      	end
+            if computed == hash
+              params.delete("pubsubhubbub")
+              params.delete("feed_id")
+              if !feed_klass.method_defined?(:notified)
+                Rails.logger.error("Please make sure your #{feed_klass} intances have a 'notified' method.")              
+              elsif feed.method(:notified).arity == 2
+                feed.notified(params, request.raw_post) 
+              elsif feed.method(:notified).arity == 1
+                feed.notified(params) 
+              end
+            else
+              Rails.logger.error("Non matching signature. Ignored paylod for #{params[:feed_id]}. Use retrieve if missing.")
+            end
+          end
+        end
       end
       render :text => "Thanks"
-  	end
+    end
 
-  	protected
+    protected
 
-  	def feed_klass
-  		SuperfeedrEngine::Engine.feed_class.constantize
-  	end
+    def feed_klass
+      SuperfeedrEngine::Engine.feed_class.constantize
+    end
 
   end
 end

data/lib/superfeedr_engine/version.rb

@@ -1,3 +1,3 @@
 module SuperfeedrEngine
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superfeedr_engine
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - superfeedr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails