mosca 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15f35eb8f69221fc5b332d47f9a7d16d2bc89298
-  data.tar.gz: 0e69fc6153e88456cdb09a62e2e367fb2f9be624
+  metadata.gz: d27a9cc149fcd2c3204b832ece96c66329c7448d
+  data.tar.gz: 6219f4bb5be919658a32364dc5b755b93d7b6b9e
 SHA512:
-  metadata.gz: a71f4cc939b000d437113a0c51b53e19fca2f8921e02ffaff04aa2f1459ac95225992b1f781c1fa9be0e597ef904dbf9e3f95ef23886899604ca9dc6785c6e1b
-  data.tar.gz: 8132b4d0bb719cb28ef9e28d2a39cc4afa38031361a1761532940842c34c7a1c2e9693665fda5137da3d06c060e97f4cc63ed0c63ee60cbfe12d2d2db1801693
+  metadata.gz: 6463fdf1b45ac1fdfdb5a3e323ec7ec205ff773ae97c72b0e2ef5c31782da9d742fbc144a95306b9b06d8309dece9000df4b89b98ed2747fa99d1d167a837b60
+  data.tar.gz: 18696c8ff48bf8232fe1874524670e49d0ba2fda9729ea5fe364ba5d79efe8ebf7fa8c76492366a04f9a0334d90b6d7488c2e9ee5c93393b9f10e7a32e13d8a2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mosca (0.0.8)
+    mosca (0.1.0)
       json (~> 1.8.1)
       mqtt (~> 0.3, >= 0.3.1)
 
@@ -13,7 +13,7 @@ GEM
     coderay (1.1.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    json (1.8.1)
+    json (1.8.2)
     method_source (0.8.2)
     mqtt (0.3.1)
     multi_json (1.10.1)

data/lib/mosca/client.rb

@@ -7,28 +7,33 @@ module Mosca
   class Client
     extend Forwardable
 
-    DEFAULT_KEEP_ALIVE = 10
     KEEP_ALIVE_MARGIN = 5
 
+    # class attributes
     class << self
       attr_accessor :default_broker, :default_timeout
     end
 
-    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, :keep_alive, :port, :time_out
 
-    attr_accessor :user, :pass, :topic_in, :topic_out, :broker, :topic_base, :client
     def_delegators :connection, :subscribe
 
     def initialize args = {}
-      @user = args[:user] || ENV["MOSCA_USER"]
-      @pass = args[:user] || ENV["MOSCA_PASS"]
-      @topic_in = args[:topic_in]
-      @topic_out = args[:topic_out]
-      @topic_base = args[:topic_base] || ""
-      @broker = args[:broker] || ENV["MOSCA_BROKER"] || self.class.default_broker
-      @client = args[:client] || MQTT::Client
-      @keep_alive = args[:keep_alive] || DEFAULT_KEEP_ALIVE
+      default_attributes.merge(args).each do |k,v|
+        self.send("#{k}=", v)
+      end
+    end
+
+    def default_attributes
+      { user: ENV["MOSCA_USER"],
+        pass: ENV["MOSCA_PASS"],
+        topic_base: "",
+        broker: ENV["MOSCA_BROKER"] || self.class.default_broker || "test.mosquitto.org",
+        client: MQTT::Client,
+        keep_alive: 10,
+        time_out: (ENV["MOSCA_TIMEOUT"] || self.class.default_timeout || 5).to_i
+      }
     end
 
     def publish! message, params = {}
@@ -77,7 +82,7 @@ module Mosca
     private
 
       def client_options
-        {remote_host: @broker, username: @user, password: @pass}
+        {remote_host: @broker, remote_port: @port, username: @user, password: @pass}
       end
 
       def connection
@@ -96,9 +101,9 @@ module Mosca
           response
       end
 
-      def timeout params
-        timeout = params[:timeout] || ENV["MOSCA_TIMEOUT"].to_i || self.class.default_timeout
-        Timeout.timeout(timeout) do
+      def timeout params, &b
+        seconds = params[:timeout] || time_out
+        Timeout.timeout(seconds) do
           yield
         end
       end

data/lib/mosca/version.rb

@@ -1,3 +1,3 @@
 module Mosca
-  VERSION = '0.0.9'
+  VERSION = '0.1.0'
 end

data/spec/mosca_spec.rb

@@ -11,7 +11,7 @@ describe Mosca::Client do
   }
 
   let (:mosca) {
-    mosca = Mosca::Client.new topic_out: OUT, topic_in: IN, client: client, keep_alive: KEEP_ALIVE
+    mosca = Mosca::Client.new topic_out: OUT, topic_in: IN, client: client, keep_alive: KEEP_ALIVE, port: "port"
   }
 
   it "has a default broker" do
@@ -38,7 +38,8 @@ describe Mosca::Client do
     end
 
     it "should wait for a response on topic_in if it's specified" do
-      expect(client).to receive(:connect).once.and_call_original
+      expect(client).to receive(:connect).with(hash_including(remote_port: "port"))
+        .once.and_call_original
       expect(mosca.publish(MESSAGE, response: true)).to eq("response")
     end
   end
@@ -109,12 +110,12 @@ describe Mosca::Client do
 
   describe "Timeout" do
     it "has a default timeout of 5 seconds" do
-      expect(Mosca::Client.default_timeout).to eq(5)
+      expect(described_class.new.time_out).to eq(5)
     end
 
     it "can set a default timeout" do
       described_class.default_timeout = 1
-      expect(described_class.default_timeout).to eq 1
+      expect(described_class.new.time_out).to eq 1
     end
 
     it "calls timeout when getting a message" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mosca
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Armando Andini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mqtt