alephant-publisher-queue 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc412e67c99e63afbd3b3047bd216b4a5e9cef36
-  data.tar.gz: 978ee2b929157c56427ea77075155d69ee22f810
+  metadata.gz: f4d98099bd45f4d2866ec8d2b3f3124469692f68
+  data.tar.gz: b8aa5f4a830eb1dc4b4461caf569216509dc368e
 SHA512:
-  metadata.gz: 447c80ff9b396c53ac1419a6138de9750d53269fd392796a85979d5581fc52dabe1e84380bb2fe96bdf38b7540323434f87ff90a1023fa349d478b9a0788d91a
-  data.tar.gz: 58dd8b9690b4b13f8bc567a450cde9fcd390c0698cbb69d72c6ba4303a171d215f30758d573c4f1c3773bc4621840eda737bd8df9079477ba2b1df03c6bb7f71
+  metadata.gz: 396d3b56069bf488e52b33f321dbef3e56eb64c9c0488b415074fd04d491749e24c9a6f31f3d40707e08f1c4a395d4d04a47499216747b18e30cdd09a4a88f7c
+  data.tar.gz: f20f7ace8b0b0027a781a3ce95dd357b3c2d8abf11e12277ba52a5f9fe7090493c580549dd33988fb2f8f3a7a4ceb6029b46bbd87b37a969490892621ba7bd80

data/lib/alephant/publisher/queue/options.rb

@@ -17,6 +17,7 @@ module Alephant
           :visibility_timeout,
           :aws_account_id,
           :log_archive_message,
+          :log_validator,
           :async_store
         ]
 

data/lib/alephant/publisher/queue/sqs_helper/archiver.rb

@@ -9,12 +9,13 @@ module Alephant
         class Archiver
           include Logger
 
-          attr_reader :cache, :async, :log_message_body
+          attr_reader :cache, :async, :log_message_body, :log_validator
 
           def initialize(cache, opts)
             @cache            = cache
             @async            = opts[:async_store]
             @log_message_body = opts[:log_archive_message]
+            @log_validator    = opts[:log_validator] || -> _ { true }
           end
 
           def see(message)
@@ -45,23 +46,10 @@ module Alephant
                 "event"       => "MessageStored",
                 "messageBody" => msg_body,
                 "method"      => "#{self.class}#store"
-              ) if newsbeat_uri? msg_body
+              ) if log_validator.(msg_body)
             end
           end
 
-          def newsbeat_uri?(msg_body)
-            jsb = ::JSON.parse(msg_body)
-            msg = ::JSON.parse(jsb["Message"]) if jsb["Message"]
-
-            true if verify_message_content msg
-          rescue ::JSON::ParserError
-            false
-          end
-
-          def verify_message_content(msg)
-            !msg.nil? && msg["uri"] && msg["uri"] =~ /content\/asset\/newsbeat/
-          end
-
           def store_item(message)
             cache.put(
               cache_key(message.id),

data/lib/alephant/publisher/queue/version.rb

@@ -1,7 +1,7 @@
 module Alephant
   module Publisher
     module Queue
-      VERSION = "2.0.3"
+      VERSION = "2.1.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alephant-publisher-queue
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - BBC News
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement