pressure 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 775bae2a863792303d7952f3dfe74d32f9b8c018
-  data.tar.gz: f2ab633d2ffc408d87854db528ed601f473da24e
+  metadata.gz: cd6e71141b17678f5ab75a8c0bf0a3a9d7f941f6
+  data.tar.gz: 14755a2acc29d9f98d88106f64d3d6bf25400213
 SHA512:
-  metadata.gz: a9005a729187061da7674695bbb0b61c6286d6c4671790c7aaff946fc2b81ab6a68cbe11086a3d5e75360f99769096077c59672bfc70cc194344c277d3cbb2fe
-  data.tar.gz: 12db8e810c45acc7cca444cb6ff7830966ba74f624521b3fac207ab5800e887823b0fbc5ca654a798293e81f49ba83407e98f5ae0c19d6301ca77989627fee07
+  metadata.gz: 250a5644df53172206c4036900856b0252bf0a0b58888e3fd0478d3ebe80ff9b4c44b77b36f9bef97feba9bf258141249d5dcf9e4c0e2f1bc712fb0ef31e1ce3
+  data.tar.gz: b1ad93a30dc90bb495ee3909e67f7e2e7841e8eac945032178ff7a50e0e835034b5e9c286840c64cea50956e203465e7bf4df36f3be8cfcb119098715ac6c4aa

data/lib/pressure/version.rb

@@ -1,3 +1,3 @@
 class Pressure
-  VERSION = '0.1.1'
+  VERSION = '0.1.3'
 end

data/lib/pressure.rb

@@ -6,21 +6,22 @@ require 'json'
 class Pressure
   attr_accessor :wrapper_template
   attr_reader :sockets
-  attr_reader :options
 
   def initialize(options = {}, &data_source_block)
     @wrapper_template = {}
     @current_upstream = {}
     @send_queue = Queue.new
-    @options = options
     @sockets = []
     @websocket_worker_delay = options[:websocket_worker_delay] || (1.0 / 20.0)
+    @incoming_monitor_delay = options[:incoming_monitor_delay] || (1.0 / 20.0)
+    @no_wrap = options[:no_wrap] || false
     incoming_monitor(&data_source_block)
     websocket_worker_loop
   end
 
   def <<(socket)
     @sockets << socket
+    socket.send JSON.generate(@current_upstream)
   end
 
   def delete(socket)
@@ -28,12 +29,16 @@ class Pressure
   end
 
   def wrap_data(data)
-    @wrapper_template.merge(upstream_data: data.clone,
+    @wrapper_template.merge(upstream_data: Marshal.load(Marshal.dump(data)),
                             last_update_ts: Time.now.utc.to_i)
   end
 
   def data_changed?(current_data, previous_data)
-    current_data != previous_data
+    if current_data && previous_data
+      current_data != previous_data
+    else
+      true
+    end
   end
 
   def incoming_monitor(&data_source_block)
@@ -42,15 +47,16 @@ class Pressure
         data = {}
         loop do
           upstream_data = data_source_block.call
-          if data_changed?(data[:upstream_data], upstream_data)
+          if data_changed?(upstream_data, data[:upstream_data])
             data = wrap_data(upstream_data)
-            if @options[:no_wrap]
+            @current_upstream = data
+            if @no_wrap
               @send_queue << upstream_data
             else
               @send_queue << data
             end
           end
-          sleep(1.0 / 20.0)
+          sleep(@incoming_monitor_delay)
         end
       rescue => e
         puts "error #{e}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pressure
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Brian Davidson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler