mumukit-nuntius 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 631b1a56823a7ccf85d2b811838832f44b75e961
-  data.tar.gz: 9ce9b4d77f9f5f3e8929a5c81ab0f45435d31bb1
+  metadata.gz: 33fe9c17b07c6ecb0448c6801931db56e2888b93
+  data.tar.gz: 0e6f2cc0bc155a4d4a89856cc712872c7deb488a
 SHA512:
-  metadata.gz: ab9d4105761b671b67e4398a39ff9a1f617451d7fb6415dcd61920c035bee47f485b43ff84af60108ca0d790bd2e5a740cd02ad81a049b8bb511e6c8a0e24a8d
-  data.tar.gz: d8c9b9278b0f7732ab27f1ad550a854b58a72a888fd9ef552f6aa2cfdf35df6580044a44dc6bc84a6237c99171e914604dcc3ac26fbab0672ac0382519bca382
+  metadata.gz: abb65da0c0e1d064641772eabba73137d8d389da5d70e53f37eb7c3728b6b9ff612ad9dddcffb38360af892217414826f87c6473afc434832c97543ce02d5430
+  data.tar.gz: 9fff016bb3e11d44c41c5b7959d1feb292ca2aeb49c133af7e3726cc2810301372b3a32691094745ab1790710adb160d445ac2bdc48c5323c39b4c4ef02dc74d

data/lib/mumukit/nuntius.rb

@@ -1,4 +1,4 @@
-require 'active_support/all'
+require 'mumukit/core'
 
 require 'bunny'
 require 'logger'

data/lib/mumukit/nuntius/consumer.rb

@@ -23,17 +23,22 @@ module Mumukit::Nuntius::Consumer
     def subscribe(queue, channel, &block)
       Mumukit::Nuntius::Logger.debug "Subscribed to queue #{queue}"
 
-      queue.subscribe(:manual_ack => true, :block => true) do |delivery_info, properties, body|
+      queue.subscribe(manual_ack: true, block: true) do |delivery_info, properties, body|
         Mumukit::Nuntius::Logger.debug "Processing message #{body}"
-
-        begin
-          block.call delivery_info, properties, JSON.parse(body)
-          channel.ack(delivery_info.delivery_tag)
-        rescue => e
-          Mumukit::Nuntius::Logger.warn "Failed to read body: #{e.message} \n #{e.backtrace}"
-          channel.nack(delivery_info.delivery_tag, false, true)
-        end
+        handle_message channel, delivery_info, properties, body, &block
       end
     end
+
+    def handle_message(channel, delivery_info, properties, body, &block)
+      block.call delivery_info, properties, parse_body(body)
+      channel.ack delivery_info.delivery_tag
+    rescue => e
+      Mumukit::Nuntius::Logger.warn "Failed to read body: #{e.message} \n #{e.backtrace}"
+      channel.nack delivery_info.delivery_tag, false, true
+    end
+
+    def parse_body(body)
+      JSON.parse(body).with_indifferent_access
+    end
   end
 end

data/lib/mumukit/nuntius/event_consumer.rb

@@ -4,19 +4,22 @@ module Mumukit::Nuntius::EventConsumer
 
     def start(name)
       Mumukit::Nuntius::Consumer.start "#{name}-events", 'events' do |_delivery_info, properties, body|
-        next if body['sender'] == Mumukit::Nuntius.config.app_name
-        begin
-          choose_event(name, properties).execute!(body['data'])
-        rescue NoMethodError => e
-          log_exception(name, properties, e)
-        rescue NameError => e
-          log_unkown_event(name, properties)
-        rescue => e
-          log_exception(name, properties, e)
-        end
+        handle_event(name, properties, body)
       end
     end
 
+    def handle_event(name, properties, body)
+      return if body[:sender] == Mumukit::Nuntius.config.app_name
+
+      choose_event(name, properties).execute!(body[:data])
+    rescue NoMethodError => e
+      log_exception(name, properties, e)
+    rescue NameError => e
+      log_unknown_event(name, properties)
+    rescue => e
+      log_exception(name, properties, e)
+    end
+
     def choose_event(name, properties)
       event_name(name, properties).constantize
     end
@@ -25,7 +28,7 @@ module Mumukit::Nuntius::EventConsumer
       "#{name.capitalize}::Event::#{properties[:type]}"
     end
 
-    def log_unkown_event(name, properties)
+    def log_unknown_event(name, properties)
       Mumukit::Nuntius::Logger.error "#{event_name(name, properties)} does not exists."
     end
 

data/lib/mumukit/nuntius/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Nuntius
-    VERSION = '2.1.1'
+    VERSION = '2.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-nuntius
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Agustin Pina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-26 00:00:00.000000000 Z
+date: 2016-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: mumukit-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement