nutella_lib 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c203e2ff5acf5006c468393e19b96b03ba216e9f
-  data.tar.gz: bf51aea50d65157cb8c1159fde7737a756ce7295
+  metadata.gz: 607bc8f43c55bdddc4a0496c48cde8f7ff26aa50
+  data.tar.gz: 075da6ca64d50df6ac3b49e48eb818618483c96a
 SHA512:
-  metadata.gz: 03379fc72d47b4189cfbcbeb136873a2217f24b9be1877f4a9e5de16613309909d9714a50b5b21ed93864557718eb126ee18abd8eca2e427341f9797c7bc6129
-  data.tar.gz: 9529f13cb612c3eb71ada78fccbc36b80e8d00a32eb9c6156e8a4ff02e5e2a7b417e221409ee78c74847077803add5360d65ee4c2756d264142a12128f55bdac
+  metadata.gz: fd598f8a12fa7d9ed398a5458d7c9ea642506a3376b968363ca9abcbcfedb18ad22d8f58353b4eab3174dc1bfe11db10c2d7454dbc013b052d464640450384d7
+  data.tar.gz: 83fa75629fe26f0358b6d369d33d3566589cacdf5ffe64be982450ebc537f97329ebdb9acd3cd9b6db5c13cf92828c9a6b551337d26703357d475740ec1c53f8

data/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'simple_ruby_mqtt_client', '~> 0.3.0', '>= 0.3.0'
+gem 'simple_ruby_mqtt_client', '~> 0.3.1', '>= 0.3.1'
 
 group :development do
   gem 'shoulda', '~> 3', '>= 3'

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/nutella_lib/net.rb

@@ -11,15 +11,35 @@ module Nutella
       # Pad the channel
       new_channel = Nutella.run_id + '/' + channel
       # Subscribe
-      Nutella.mqtt.subscribe(new_channel, lambda do |message|
-        # Make sure the message is JSON, if not drop the message
-        begin
-          message_hash = JSON.parse(message)
-          callback.call(message_hash)
-        rescue
-          return
-        end
-      end)
+      # Depending on what type of channel we are subscribing to (wildcard or simple)
+      # register a different kind of callback
+      if Nutella.mqtt.is_channel_wildcard?(channel)
+        Nutella.mqtt.subscribe(
+            new_channel,
+            lambda do |message, channel|
+              # Make sure the message is JSON, if not drop the message
+              begin
+                message_hash = JSON.parse(message)
+                callback.call(message_hash, channel)
+              rescue
+                return
+              end
+            end
+        )
+      else
+        Nutella.mqtt.subscribe(
+            new_channel,
+            lambda do |message|
+              # Make sure the message is JSON, if not drop the message
+              begin
+                message_hash = JSON.parse(message)
+                callback.call(message_hash)
+              rescue
+                return
+              end
+            end
+        )
+      end
     end
 
     # Unsubscribe from a channel

data/nutella_lib.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: nutella_lib 0.2.1 ruby lib
+# stub: nutella_lib 0.2.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "nutella_lib"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Alessandro Gnoli"]
-  s.date = "2014-11-14"
+  s.date = "2014-11-17"
   s.description = "Implements the nutella protocol and exposes it natively to ruby developers"
   s.email = "tebemis@gmail.com"
   s.extra_rdoc_files = [
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<simple_ruby_mqtt_client>, [">= 0.3.0", "~> 0.3.0"])
+      s.add_runtime_dependency(%q<simple_ruby_mqtt_client>, [">= 0.3.1", "~> 0.3.1"])
       s.add_development_dependency(%q<shoulda>, [">= 3", "~> 3"])
       s.add_development_dependency(%q<minitest>, [">= 5", "~> 5.4"])
       s.add_development_dependency(%q<yard>, [">= 0.8.7", "~> 0.8"])
@@ -54,7 +54,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, [">= 2.0.1", "~> 2.0.1"])
       s.add_development_dependency(%q<simplecov>, [">= 0", "~> 0"])
     else
-      s.add_dependency(%q<simple_ruby_mqtt_client>, [">= 0.3.0", "~> 0.3.0"])
+      s.add_dependency(%q<simple_ruby_mqtt_client>, [">= 0.3.1", "~> 0.3.1"])
       s.add_dependency(%q<shoulda>, [">= 3", "~> 3"])
       s.add_dependency(%q<minitest>, [">= 5", "~> 5.4"])
       s.add_dependency(%q<yard>, [">= 0.8.7", "~> 0.8"])
@@ -64,7 +64,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, [">= 0", "~> 0"])
     end
   else
-    s.add_dependency(%q<simple_ruby_mqtt_client>, [">= 0.3.0", "~> 0.3.0"])
+    s.add_dependency(%q<simple_ruby_mqtt_client>, [">= 0.3.1", "~> 0.3.1"])
     s.add_dependency(%q<shoulda>, [">= 3", "~> 3"])
     s.add_dependency(%q<minitest>, [">= 5", "~> 5.4"])
     s.add_dependency(%q<yard>, [">= 0.8.7", "~> 0.8"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nutella_lib
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Alessandro Gnoli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_ruby_mqtt_client
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement