mosca 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb5e5ed870c959777ce1d362f9d20d12df283979
-  data.tar.gz: b9cc31952645221be2a57aff70a0668622da5d04
+  metadata.gz: be37d740f97e3b761ff8d222716858cf9dfceaed
+  data.tar.gz: c0732450bb5002f2bde911257cc7bb7a9a910376
 SHA512:
-  metadata.gz: 2eea2347c5c2ea015ed02a99e8ecf51bb9cb685dc0565a506992bb7eff13511233213aa8b1b1b39a27a499169cf5194ab449c689e0a4185358e039773ea962d3
-  data.tar.gz: 4fa10abd1bc6c7cfed3f6419543ac35ceb7d7dd98c347d65d1e87e80af9f9705fdfc6a8b14f0e3fe2e92231df85faa2240cb7bbbe107fdb0f25f7553aa11ef7a
+  metadata.gz: 0c7bafbe52a95e3daa9a382a7b8d0db0ffaca2f6a2dba52e8b3475b28c09ecbaf513fa18e8063cfb5ffda55659385e309b4f7a5184b58cdfc90a6ad6e997ba08
+  data.tar.gz: 872e8bf2434bdd71bead8d3ae5a29b817b89778a8b21c46abf563ff3fa09254016e1cf9e8361fe090a523fda0fe2062070d326ddb27e056deb9d5aaf449a72a6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mosca (0.0.5)
+    mosca (0.0.6)
       json (~> 1.8.1)
       mqtt (~> 0.3.0)
 

data/README.md

@@ -42,6 +42,14 @@ The following environment variables are used when creating clients, so you can u
 ### New instance
 
 ```ruby
+  # Params (all optional)
+  # user
+  # pass
+  # broker
+  # topic_in
+  # topic_out
+  # topic_base (topics out and in are appended to this)
+
   client = Mosca::Client.new user: "username", pass: "password", topic_in: "readings", topic_out: "commands", topic_base: "/device/"
 ```
 

data/lib/mosca/client.rb

@@ -8,8 +8,8 @@ module Mosca
       attr_accessor :default_broker, :default_timeout
     end
 
-    self.default_broker = ENV["MOSCA_BROKER"] || "test.mosquitto.org"
-    self.default_timeout = 5 || ENV["MOSCA_TIMEOUT"]
+    self.default_broker  = ENV["MOSCA_BROKER"]  || "test.mosquitto.org"
+    self.default_timeout = ENV["MOSCA_TIMEOUT"] || 5
 
     attr_accessor :user, :pass, :topic_in, :topic_out, :broker, :topic_base, :client
 
@@ -58,6 +58,10 @@ module Mosca
       topic_base + topic_name
     end
 
+    def refresh_connection
+      connection
+    end
+
     private
 
       def client_options

data/lib/mosca/command_builder.rb

@@ -0,0 +1,36 @@
+require 'json'
+
+module Mosca
+  module CommandBuilder
+    def method_missing(method, *args)
+      json = full_hash(method, *args).to_json
+      client.publish json
+    end
+
+    protected
+
+    def default_hash
+      {}
+    end
+
+    def process_command command, args
+      {command: command}
+    end
+
+    private
+
+    def specific_hash method, args
+      hash = {}
+      if respond_to? "#{method}_hash"
+        hash.merge! send("#{method}_hash", args)
+      end
+      hash
+    end
+
+    def full_hash method, *args
+      command_default = process_command(method, *args)
+      command_specific = specific_hash(method, *args)
+      default_hash.merge(command_default).merge(command_specific)
+    end
+  end
+end

data/lib/mosca/version.rb

@@ -1,3 +1,3 @@
 module Mosca
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/spec/mosca_spec.rb

@@ -125,11 +125,15 @@ describe Mosca::Client do
       end
 
       it "publish returns nil" do
-        expect(mosca.publish).to be nil
+        expect(mosca.publish 123).to be nil
       end
 
       it "get! raises the timed out exception" do
-        expect(mosca.get!).to raise_error
+        expect{ mosca.get! }.to raise_error Timeout::Error
+      end
+
+      it "publish! raises the timed out exception" do
+        expect{ mosca.publish! 123 }.to raise_error Timeout::Error
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mosca
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Armando Andini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mqtt
@@ -106,9 +106,9 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
-- lib/command_builder.rb
 - lib/mosca.rb
 - lib/mosca/client.rb
+- lib/mosca/command_builder.rb
 - lib/mosca/exceptions.rb
 - lib/mosca/version.rb
 - mosca.gemspec

data/lib/command_builder.rb

@@ -1,38 +0,0 @@
-require 'json'
-
-module CommandBuilder
-  public
-
-  def method_missing(method, *args)
-    json = full_hash(method, *args).to_json
-    client.publish json
-  end
-
-  protected
-
-  def default_hash
-    {}
-  end
-
-  def process_command command, args
-    {command: command}
-  end
-
-  private
-
-  def specific_hash method, args
-    hash = {}
-    if respond_to? "#{method}_hash"
-      hash.merge! send("#{method}_hash", args)
-    end
-    hash
-  end
-
-  def full_hash method, *args
-    command_default = process_command(method, *args)
-    command_specific = specific_hash(method, *args)
-    default_hash.merge(command_default).merge(command_specific)
-  end
-
-
-end