magic_mirror 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2680e984bec0cb5e027dbaf97c9a0261435bb90a
-  data.tar.gz: 56166179a96730b628b0c4bc8e38c501fcdf67a4
+  metadata.gz: 5fa360c7a0a4dafbfc28a7f72830b5704a9b996d
+  data.tar.gz: 7c1cc12e923f2cea40123bb08d8898f59d0c76be
 SHA512:
-  metadata.gz: af99477479b7398e6fcc14e2c73e23cfa07f4c14904c7760f92cbf123cff98f612b96b652fa29b7105f84b16293878d3726bc8f9f8f6cdc803ca82a3cb80b425
-  data.tar.gz: b0345ddff87ffc66df6f557a31800077ce75319f71415c06625253b285c5ff73c3d0f1f8e6fc0b46cbdef4186264ba6c4e847c0e5490f3750f2a418322ead494
+  metadata.gz: c445d1a4ab8baccab23055f4376dbe4422531cbe3e08659ba48370a3607da3afe8af77ad57f8b02fb8a3ef0d7b6ac17119162def83ed83332f32342905148c88
+  data.tar.gz: 307a258db0ffe82fe49f1e16605a22c5e4d14ee519202a348e2ccbb3d40f2f7b8a6b51f88751a6f87fbeaa10f1d2d7d7cfffb50214e73b21056958d3b4545e72

data/changelog

@@ -16,20 +16,17 @@
       > Solution: Make ports random?
       > Solution: Make 1 port, but make things accessible as /roots/myRoot
 
-
-  - Think of other popular uses for rendering...
-
-    - secure by making servers listen only on localhost for websockets
+  - secure by making servers listen only on localhost for websockets
 
 
 
 Currently:
 
-  - Small discrepencies in bigish trtl lines in the tree example
 
+Finished:
 
+	- CORE:  Introduced buffering when system is bogged down, tree draws in 3s
 
-Finished:
 
 ** 0.1.1 **
 

data/lib/magic_mirror/command_cache.rb

@@ -1,12 +1,38 @@
 module MagicMirror
 
   class CommandCache < Array
+    attr_accessor :buffer
+
+    def initialize
+      @buffer = []
+      @buffer_flush_point = 500
+      @last_command_at = Time.now
+
+      @mutex = Mutex.new
+
+      @timeout_thread = Thread.new {
+        while true
+          @mutex.synchronize {
+            MagicMirror.command_cache.transmit_buffer!
+          }
+          Thread.stop
+          sleep 0.2
+        end
+      }
+
+      super
+    end
+
     def <<(value)
-      #puts "you pushed"
-      MagicMirror.mirror.speak_into(value)
+      @buffer << value
+
+      transmit_buffer_if_ripe
+      queue_buffer_to_be_transmitted
+
       super
     end
 
+
     def reset
       self.clear
       MagicMirror.mirror.speak_into("MagicMirror.clearCommandCache();")
@@ -35,6 +61,37 @@ module MagicMirror
       string
     end
 
+    def transmit_buffer_if_ripe
+      if time_to_send_commands_through_mirror? or we_have_a_light_message_load?
+        transmit_buffer!
+      end
+      @last_command_at = Time.now
+    end
+
+    def transmit_buffer!
+      MagicMirror.mirror.speak_into(@buffer.join) if @buffer.length > 0
+      @buffer = []
+    end
+
+    def time_to_send_commands_through_mirror?
+      @buffer.length >= @buffer_flush_point
+    end
+
+    def we_have_a_light_message_load?
+       (Time.now - @last_command_at) > 0.10
+    end
+
+    # This method goes wrong because it can fire at the same time
+    # magic_mirror.speak_into may be firing....
+    def queue_buffer_to_be_transmitted
+      @timeout_thread.wakeup if @timeout_thread.status == "sleep"
+    end
+
+    def needs_flush?
+      @buffer.length >= 0
+    end
+
+
 
 
 

data/lib/magic_mirror/mirror.rb

@@ -69,8 +69,9 @@ module MagicMirror
       uri = URI.parse("http://localhost:#{FAYE_PORT}/faye")
       begin
         Net::HTTP.post_form(uri, :message => message.to_json)
-      rescue
+      rescue Exception => e
         $stderr.puts "failed to send message to faye server and thus webclient"
+        $stderr.puts e.message
         return false
       end
       true

data/lib/magic_mirror/version.rb

@@ -1,3 +1,3 @@
 module MagicMirror
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magic_mirror
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - TheNotary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra