mqtt_pipe 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93caadb951ff60325a712d56794e4431adbcf621
-  data.tar.gz: b9a8f6b3b8a31d2925601444bad95bb054e00c5e
+  metadata.gz: 69a8164675982ac052fefb772507fd26f96eac61
+  data.tar.gz: 6d001fffc5f2007191349ff736d4c3309e716813
 SHA512:
-  metadata.gz: bf62b6c097b52d0770b64b5bf63dc299a399120a525eb4682b03a92f74d74ce3734fe6221c6008c9620774d4c3c28e009b4196d1a0492f822886fbe83b53e645
-  data.tar.gz: 9e8cf7c06b4e8a625bff2944337bbf90bb8b180f16e898d1127417a47fc34641f030baec5fb0f0e860023eed030f268bfde664a318ed4de36695843efc30e292
+  metadata.gz: 7e530f0ca6aa01fd40858e35993b038b9daa552ef7eb510bff04c9dde3b7b9150b6201bef7d5131183e1bfe369c2fa527348c90e94af38cd0d948b57e576ce79
+  data.tar.gz: 908eb4630804e017663dd91d2cfc299433fcbcc9f026a6284e023b0cb95ca3f1856fc297a34b5d50470c0b57f805fb369d6a66484d51fb4d71da35ccfdc36151

data/examples/receiver.rb

@@ -4,6 +4,6 @@ pipe = MQTTPipe.create do
   on 'hello/world/#' do |message, id|
     p message, id
   end
-end
-
-pipe.open 'test.mosquitto.org', port: 1883
+  
+  open 'test.mosquitto.org', port: 1883
+end

data/examples/sender.rb

@@ -2,6 +2,10 @@ require 'mqtt_pipe'
 
 pipe = MQTTPipe.create
 
+pipe.on 'hello/world/5' do
+  puts 'received 5'
+end
+
 pipe.open 'test.mosquitto.org', port: 1883 do
   counter = 0
   loop do

data/lib/mqtt_pipe/pipe.rb

@@ -10,10 +10,35 @@ module MQTTPipe
     
     class ConnectionError < StandardError; end
     
+    ##
+    # Create a new pipe and optionally yield to a block
+    
+    def initialize &block
+      @listeners = []      
+      instance_eval &block unless block.nil?
+    end
+    
+    ##
+    # Subscribe to a topic and attatch an action that will
+    # be called once a message with a matching topic is 
+    # received.
+    
+    def on topic, &action
+      raise ArgumentError, 'No block given' if action.nil?
+      @listeners << Listener.new(topic, &action)
+    end
+    
+    ##
+    # Subscribe to all topics
+    
+    def on_anything &action
+      on '#', &action
+    end
+    
+    alias_method :on_everything, :on_anything
     
-    def initialize &block      
-      @config = Config.new  
-      @config.instance_eval &block unless block.nil?
+    def topics
+      @listeners.map{|listener| listener.topic }
     end
     
     ##
@@ -23,16 +48,15 @@ module MQTTPipe
       MQTT::Client.connect host: host, port: port do |client|
   
         # Subscribe
-        topics = @config.listeners.map{|listener| listener.topic }
         listener_thread = nil
         
-        unless topics.empty?
+        unless @listeners.empty?
           listener_thread = Thread.new do
             client.get do |topic, data|
               begin
                 unpacked_data = Packer.unpack data
                 
-                @config.listeners.each do |listener|
+                @listeners.each do |listener|
                   if m = listener.match(topic)
                     listener.call unpacked_data, *m
                   end

data/lib/mqtt_pipe/version.rb

@@ -1,3 +1,3 @@
 module MQTTPipe
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/mqtt_pipe.rb

@@ -3,7 +3,6 @@ require 'mqtt'
 require 'mqtt_pipe/version'
 require 'mqtt_pipe/types'
 require 'mqtt_pipe/packer'
-require 'mqtt_pipe/config'
 require 'mqtt_pipe/listener'
 require 'mqtt_pipe/pipe'
 

data/spec/mqtt_pipe_spec.rb

@@ -0,0 +1,9 @@
+require 'mqtt_pipe'
+
+describe MQTTPipe do
+  describe '#create' do
+    it 'returns a pipe' do
+      expect(MQTTPipe.create).to be_a MQTTPipe::Pipe
+    end
+  end
+end

data/spec/pipe_spec.rb

@@ -1,9 +1,54 @@
 require 'mqtt_pipe'
 
-describe MQTTPipe do
-  describe '#create' do
-    it 'returns a pipe' do
-      expect(MQTTPipe.create).to be_a MQTTPipe::Pipe
+describe MQTTPipe::Pipe do
+  let(:klass) { MQTTPipe::Pipe }
+  
+  describe '#new' do
+    it 'accepts a block that evaluates within the context of the pipe' do
+      tester = self
+      pipe_inside = nil
+      pipe_outside = MQTTPipe::Pipe.new do
+        tester.expect(self).to tester.be_a tester.klass       
+        pipe_inside = self
+      end
+      
+      expect(pipe_inside).to be pipe_outside
+    end
+  end
+  
+  context 'using a pipe' do
+    before :each do 
+      @pipe = klass.new
+    end
+    
+    describe '#on' do
+      it 'requires one argument and a block' do
+        expect{@pipe.on}.to raise_error ArgumentError
+        expect{@pipe.on 'test'}.to raise_error ArgumentError
+        expect{@pipe.on('test') {}}.not_to raise_error
+      end
+    end
+    
+    describe '#on_anything' do
+      it 'does not accept a topic' do
+        expect{@pipe.on_anything('test') {}}.to raise_error ArgumentError
+      end
+    end
+    
+    describe '#topics' do
+      it 'stores the topics that have beed subscribed to' do
+        expect(@pipe.topics.empty?).to be true
+        
+        @pipe.on('test/1') {}
+        
+        expect(@pipe.topics.length).to be 1
+        expect(@pipe.topics.first).to eq 'test/1'
+        
+        @pipe.on_anything {}
+        
+        expect(@pipe.topics.length).to be 2
+        expect(@pipe.topics.last).to eq '#'
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mqtt_pipe
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Sebastian Lindberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mqtt
@@ -82,7 +82,6 @@ files:
 - examples/receiver.rb
 - examples/sender.rb
 - lib/mqtt_pipe.rb
-- lib/mqtt_pipe/config.rb
 - lib/mqtt_pipe/listener.rb
 - lib/mqtt_pipe/packer.rb
 - lib/mqtt_pipe/pipe.rb
@@ -100,8 +99,8 @@ files:
 - lib/mqtt_pipe/types/type.rb
 - lib/mqtt_pipe/version.rb
 - mqtt_pipe.gemspec
-- spec/config_spec.rb
 - spec/listener_spec.rb
+- spec/mqtt_pipe_spec.rb
 - spec/packer_spec.rb
 - spec/pipe_spec.rb
 homepage: https://github.com/seblindberg/ruby-mqtt-pipe
@@ -129,7 +128,7 @@ signing_key:
 specification_version: 4
 summary: A gem for sending a small set of objects via MQTT.
 test_files:
-- spec/config_spec.rb
 - spec/listener_spec.rb
+- spec/mqtt_pipe_spec.rb
 - spec/packer_spec.rb
 - spec/pipe_spec.rb

data/lib/mqtt_pipe/config.rb

@@ -1,31 +0,0 @@
-module MQTTPipe
-  
-  ##
-  # An instance of Config is used as the context in which
-  # the pipe is configured.
-  
-  class Config
-    attr_reader :listeners
-    
-    def initialize
-      @listeners = []
-    end
-
-    ##
-    # Subscribe to a topic and attatch an action that will
-    # be called once a message with a matching topic is 
-    # received.
-
-    def on topic, &action
-      raise ArgumentError, 'No block given' if action.nil?
-      @listeners << Listener.new(topic, &action)
-    end
-    
-    ##
-    # Subscribe to all topics
-    
-    def on_anything &action
-      on '#', &action
-    end
-  end
-end

data/spec/config_spec.rb

@@ -1,27 +0,0 @@
-require 'mqtt_pipe'
-
-describe MQTTPipe::Config do
-  let(:klass) { MQTTPipe::Config }
-  
-  before :each do 
-    @config = klass.new
-  end
-    
-  describe '#on' do    
-    it 'requires one argument and a block' do
-      expect{@config.on}.to raise_error(ArgumentError)
-      expect{@config.on 'test'}.to raise_error(ArgumentError)
-      expect{@config.on('test') {}}.not_to raise_error
-    end
-    
-    it 'stores the listener' do
-      expect(@config.listeners.length).to eq(0)
-      
-      @config.on('test') {}
-      
-      expect(@config.listeners.length).to eq(1)
-    end
-  end
-
-
-end