magic_mirror 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99ae6ed2cd45562d4fe35027396c9fb97c71e35a
-  data.tar.gz: 9a94943f0ec1d9c6e59534a1653cef1aa5584dfc
+  metadata.gz: 5a1414e7bfa5467e60f05646f0370beeeb326f95
+  data.tar.gz: beaef4c2e0344799dbf286cfd0c3de8df32c98bf
 SHA512:
-  metadata.gz: b44cbc8caa075fd22f931bea1ca149b99c0bd2b8a95d5e7577998b71c714a5dde15ffa7fa7e3394a6259cd68949b5418e5a71e97c9a68fc2c5382e74de394298
-  data.tar.gz: 5b8b356d1117ef8d273a2c54d9747e079cad042afa0eda612d82643aef108e14c547a879174285bc86d1ff5430d1c427342150a80333aae0053a0c90c3aa0f08
+  metadata.gz: c1037e1c5af6c5d9922fff78f7b65cb339ad6e4be78b1c2d508c989f6112ba24b8f2ae02300e2045a00174d52d5714cf3d02408da6e332b758a38a6dbfa30054
+  data.tar.gz: 49eb5c2feba9d7a60bfbca86800e47c0bf3a5a6737ba48a36e066638a451a9affe57012756439917ce70c2648385c188867d78289a49ab1e71a0eb968e4407ba

data/changelog

@@ -5,8 +5,14 @@ future.
 	- Test against port in use problem.
 
   - How do you tell the host gem to just 'listen for commands' and idle there?
-    (so the reverse usage of trtl)
-    possible do a .join() on the sinatra thread?
+    > Call @magic_mirror.gaze_into to start event machine,
+      create a defered faye client,
+      make a subscription with said client
+      then block with EM.run
+
+      When a message is published to the subscribed channel, ruby can
+      respond accordingly, with full access to the gem and ruby landscape...
+      but ppl shouldn't directly eval the strings coming in over httpPost...
 
   - limitation:  Can only have one rendering display at a time *per computer*
       > Solution: Clean up the output and make ports random
@@ -20,14 +26,56 @@ future.
   - Think of other popular uses for rendering...
   - secure by making servers listen only on localhost
 
-  - Hide the STDOUT from starting the servers and print the
-    address of the listening http server in a pretty manor that links
+  - I noticed some missing parts to the tree...
+    > Oh... right when you load the page, you'll get
+        [command_cache] - [changes to command_cache since page load innitated]
+      so a small gap in commands will exist...
+        SOLUTION
+
+      * Architecturally:  add an index number to each message sent over faye
+      * Client-wise: Calculate
+        [Index of first faye message] - [length of the command cache] = [gap]
+      * request the gap from the server on receipt of first message from faye /gap?command_cache=95&first_faye=100
+
 
-  - Write wrapper for TkcOval, btw...
 
 Currently:
 
+  - The tree example takes forever to draw
+    > Cache commands before sending through websockets:
+      cache websockets commands and wait 0.1 seconds between each
+      message sent...
+      ... it's also just a hell of a lot of data...
+
+    > Compress the command_cache: if the commands can be condensed so they
+      take up fewer characters, performance will improve dramatically.
+      *
+      *
+
+    > Dynamically build the tree function in javascript and reduce the command
+      to 1 function definition plus an invocation...
+
+    > What if command_cache SVG data instead of function calls?
+
+  - The javascript chokes up... possibly because it's iterating over the command cache,
+    and also responding to the websocket requests at the same time?
+
+  - Use webworker??
+
+  - Small discrepencies in bigish trtl lines in the tree example
+
+
+  - Hmmm.... why don't I steam the command_cache over websockets?
+    > The reason this is good is that it allows the client to get the data
+      in incriments and then deal with the data, and then wait for more.
+      This way the data never exceedes more than several kilobytes in memory...
+
+  - EFFICIENTLY TRANSFER THE COMMAND_CACHE ARRAY:
+    * embedded in html
 
+    * embedded in html, but split into chunks!!! after each chunk is finished and
+      processed/ deleted, the next chunk is gotten to until all the chunks are
+      deleted!!!!!!!  !!!!!!!!!!!!!!!!!!!!
 
 Finished:
 

data/lib/magic_mirror/command_cache.rb

@@ -10,7 +10,26 @@ module MagicMirror
     def reset
       self.clear
       MagicMirror.mirror.speak_into("MagicMirror.clearCommandCache();")
+      self
     end
 
+
+    def to_embedded_javascript
+      string = ""
+
+      string += "<script>"
+      string += "window.command_cache = [];"
+
+      self.each_slice(100) do |a|
+        string += "z(#{a.to_json});"
+      end
+
+      string += "</script>"
+      string
+    end
+
+
+
+
   end
 end

data/lib/magic_mirror/mirror.rb

@@ -71,20 +71,22 @@ module MagicMirror
         Net::HTTP.post_form(uri, :message => message.to_json)
       rescue
         $stderr.puts "failed to send message to faye server and thus webclient"
+        return false
       end
-
+      true
     end
 
     def wait_until_faye_is_up
       require 'net/http'
       while(true) do
         begin
-          uri = URI.parse("http://localhost:#{FAYE_PORT}/")
-          response = Net::HTTP.get_response(uri)
+          message = {:channel => "/0001", :data => "booted"}
+          uri = URI.parse("http://localhost:#{FAYE_PORT}/faye")
+          response = Net::HTTP.post_form(uri, :message => message.to_json)
         rescue
-
         end
-        break if response and response.code == "404" and response.body == "Sure you're not looking for /faye ?"
+
+        break if response and response.code == "200" and response.body == "[{\"channel\":\"/0001\",\"successful\":true}]"
         sleep 0.1
       end
     end

data/lib/magic_mirror/sinatra_silver.rb

@@ -9,6 +9,7 @@ module SinatraSilver
     #set :public_folder, Proc.new { File.join(MagicMirror.sinatra_root, "lib", "views") }
     #set :logging, false
     set :logging, false
+    set :bind, '127.0.0.1'
 
     configure do
       disable :logging
@@ -16,7 +17,12 @@ module SinatraSilver
 
     get '/' do
       @command_cache = MagicMirror.command_cache.to_json
+      @command_cache_fast_evaluator = MagicMirror.command_cache.to_embedded_javascript
       erb :index # 'Hello world!'
     end
+
+    get '/webworker.js' do
+      erb :webworker
+    end
   end
 end

data/lib/magic_mirror/version.rb

@@ -1,3 +1,3 @@
 module MagicMirror
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/views/webworker.erb

@@ -0,0 +1 @@
+DEFINE YOUR WORKER IN YOUR OWN GEM, YOU'RE READING FROM MAGIC MIRROR'S lib/views/webworker.erb file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magic_mirror
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - TheNotary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -157,6 +157,7 @@ files:
 - lib/magic_mirror/sinatra_silver.rb
 - lib/magic_mirror/version.rb
 - lib/views/index.erb
+- lib/views/webworker.erb
 - magic_mirror.gemspec
 - rspec
 - talk.md