mosca 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8790d6fe2852f8a4486cbc47d9ed48c43e0c2e1b
-  data.tar.gz: e166ef25f408e8d7532eed8ee6690c705d98a5d3
+  metadata.gz: 2cb5540c23079a910c9ecaaae0552ca1215fce85
+  data.tar.gz: 2877f69002dd959ee86df6d3674f12e34349bc6d
 SHA512:
-  metadata.gz: 92d433566337cb9cc73eb153accd127d300857ad89967b3c0bdadc8670de0299bfc18471e6a0bd2763b6f2c8ed0d720792c4f95b03f4cd0f171d719ed3c94275
-  data.tar.gz: 530ba900c1cd6e483cbc4fd70fa27efd2cf3d3097eecaec2f351824417174a3f2f40d2652653032145cb7e7f923b34ecd484e600d6b0309a9dac716a1dd732fe
+  metadata.gz: 2d3ae4b8afd6a651a7b2d08b20898964b6c68fc95cbbb33e09535e25a20f80059362c638a9e52d2ed13e7644f46795717b5c19b0a8b13941e397e689ef1ef9ac
+  data.tar.gz: f7505d90646a7d672ca05cd0fe59b1e79052b75d8267c9059336292cff0c4042eb08cc7682357f4022ad603bd54f47784ab277db599ed003e71f586f6b108ad4

data/lib/mosca/version.rb

@@ -1,3 +1,3 @@
 module Mosca
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/mosca.rb

@@ -6,7 +6,7 @@ class Mosca
   @@default_timeout = 5
   @@debug = false
 
-  attr_accessor :user, :pass, :topic_in, :topic_out, :broker, :topic_base
+  attr_accessor :user, :pass, :topic_in, :topic_out, :broker, :topic_base, :client
 
   def initialize params = {}
     @user = params[:user]
@@ -20,7 +20,7 @@ class Mosca
 
   def publish json, params = {}
     connection do |c|
-      topic = params[:topic] || @topic_out
+      topic = params[:topic_out] || @topic_out
       debug "[start publish] " + timestamp
       c.subscribe(topic_base + topic_in) if params[:response]
       c.publish(topic_base + topic,json)
@@ -34,7 +34,7 @@ class Mosca
   def get params = {}
     response = {}
     connection(params) do |c|
-      topic = params[:topic] || @topic_in
+      topic = params[:topic_in] || @topic_in
       timeout = params[:timeout] || @@default_timeout
       begin
         Timeout.timeout(timeout) do
@@ -51,10 +51,6 @@ class Mosca
     response
   end
 
-  def get_with_connection
-
-  end
-
   def self.default_broker= param
     @@default_broker = param
   end

data/spec/client_double.rb

@@ -0,0 +1,25 @@
+class ClientDouble
+  def connect *args
+    yield self
+  end
+
+  def publish topic, payload
+
+  end
+
+  def get topic, *args
+
+    if topic == "json_in_topic"
+      response = '{"a":123}'
+
+    elsif topic == "json_array_in_topic"
+      response = '["a",1,2]'
+
+    else
+      response = "response"
+    end
+
+    yield topic, response
+  end
+
+end

data/spec/mosca_spec.rb

@@ -1,31 +1,51 @@
-require 'mosca'
+require 'spec_helper'
 
 describe Mosca do
+  OUT = "out_topic"
+  IN = "in_topic"
+  Mosca.default_timeout = 200
+
   before do
-    @client = Mosca.new
+    @client_double = ClientDouble.new
+    @mosca = Mosca.new topic_out: OUT, topic_in: IN, client: @client_double
+    @test_message = "something"
   end
 
   it "has a default broker" do
-    @client.broker.should eq("test.mosquitto.org")
+    @mosca.broker.should eq("test.mosquitto.org")
   end
 
-  it "uses topic_out to publish if it was specified" do
-
+  it "uses topic_out to publish if it was specified, and publishes the desired message" do
+    @client_double.should_receive(:publish).with(OUT,@test_message)
+    @mosca.publish @test_message
+  end
+  it "can take a topic_out as argument when publishing" do
+    new_out_topic = "other_out_topic"
+    @client_double.should_receive(:publish).with(new_out_topic,@test_message)
+    @mosca.publish @test_message, topic_out: new_out_topic
   end
 
   it "uses topic_in to get messages if it was specified" do
-
+    @client_double.should_receive(:get).with(IN)
+    @mosca.get
   end
 
-  it "publishes messages" do
-
+  it "can take a topic_in as argument when getting" do
+    new_in_topic = "other_in_topic"
+    @client_double.should_receive(:get).with(new_in_topic)
+    @mosca.get topic_in: new_in_topic
   end
 
-  it "gets messages" do
-
+  it "will receive the message with get" do
+    @mosca.get.should eq("response")
   end
 
-  it "gets a hash if the message was JSON" do
+  it "gets a hash if the message was a JSON object" do
+    @mosca.get(topic_in: "json_in_topic").should be_a(Hash)
+  end
 
+  it "gets an array if the message was a JSON array" do
+    @mosca.get(topic_in: "json_array_in_topic").should be_a(Array)
   end
+
 end

data/spec/spec_helper.rb

@@ -1 +1,4 @@
+require 'pry'
+require 'mosca'
 require 'json'
+require 'client_double'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mosca
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Armando Andini
@@ -48,6 +48,7 @@ files:
 - lib/mosca.rb
 - lib/mosca/version.rb
 - mosca.gemspec
+- spec/client_double.rb
 - spec/mosca_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/antico5/mosca
@@ -75,5 +76,6 @@ signing_key:
 specification_version: 4
 summary: MQTT messaging made easy
 test_files:
+- spec/client_double.rb
 - spec/mosca_spec.rb
 - spec/spec_helper.rb