magic_mirror 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a1414e7bfa5467e60f05646f0370beeeb326f95
-  data.tar.gz: beaef4c2e0344799dbf286cfd0c3de8df32c98bf
+  metadata.gz: 2680e984bec0cb5e027dbaf97c9a0261435bb90a
+  data.tar.gz: 56166179a96730b628b0c4bc8e38c501fcdf67a4
 SHA512:
-  metadata.gz: c1037e1c5af6c5d9922fff78f7b65cb339ad6e4be78b1c2d508c989f6112ba24b8f2ae02300e2045a00174d52d5714cf3d02408da6e332b758a38a6dbfa30054
-  data.tar.gz: 49eb5c2feba9d7a60bfbca86800e47c0bf3a5a6737ba48a36e066638a451a9affe57012756439917ce70c2648385c188867d78289a49ab1e71a0eb968e4407ba
+  metadata.gz: af99477479b7398e6fcc14e2c73e23cfa07f4c14904c7760f92cbf123cff98f612b96b652fa29b7105f84b16293878d3726bc8f9f8f6cdc803ca82a3cb80b425
+  data.tar.gz: b0345ddff87ffc66df6f557a31800077ce75319f71415c06625253b285c5ff73c3d0f1f8e6fc0b46cbdef4186264ba6c4e847c0e5490f3750f2a418322ead494

data/changelog

@@ -1,6 +1,4 @@
 ** 0.0.x **
-  TODO:  List off what features you'll be including at some point in the
-future.
 
 	- Test against port in use problem.
 
@@ -15,67 +13,21 @@ future.
       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
+      > Solution: Make ports random?
+      > Solution: Make 1 port, but make things accessible as /roots/myRoot
 
-  - Bug:  If faye server goes offline for a second, and misses commands, then comes back online,
-    the command_cache variable will be out of sync with that of the server
-      > Solutions:  Javascript Function periodically checks in to see the
-        md5 checksum of server's command_cache and if the browser's is out of date
-        it performs a reset
 
   - Think of other popular uses for rendering...
-  - secure by making servers listen only on localhost
 
-  - 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
+    - secure by making servers listen only on localhost for websockets
 
 
 
 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

@@ -13,15 +13,22 @@ module MagicMirror
       self
     end
 
-
+    # what if I cached this value?...
     def to_embedded_javascript
       string = ""
 
       string += "<script>"
-      string += "window.command_cache = [];"
 
+      time_offset = 40
       self.each_slice(100) do |a|
+        string += "setTimeout(function(){"
         string += "z(#{a.to_json});"
+        if time_offset == 40
+          string += "}, #{0});"
+          time_offset+=5
+        else
+          string += "}, #{time_offset+=5});"
+        end
       end
 
       string += "</script>"

data/lib/magic_mirror/sinatra_silver.rb

@@ -4,10 +4,8 @@ module SinatraSilver
   class App < Sinatra::Base
     set :root, MagicMirror.sinatra_root
     # set :app_file, MagicMirror.sinatra_root
-    # set :views, MagicMirror.sinatra_root
     set :views, Proc.new { File.join(MagicMirror.sinatra_root, "lib", "views") }
     #set :public_folder, Proc.new { File.join(MagicMirror.sinatra_root, "lib", "views") }
-    #set :logging, false
     set :logging, false
     set :bind, '127.0.0.1'
 
@@ -17,12 +15,23 @@ module SinatraSilver
 
     get '/' do
       @command_cache = MagicMirror.command_cache.to_json
+      @command_cache_length = MagicMirror.command_cache.length
       @command_cache_fast_evaluator = MagicMirror.command_cache.to_embedded_javascript
-      erb :index # 'Hello world!'
+      erb :index
     end
 
     get '/webworker.js' do
       erb :webworker
     end
+
+    # There's a gap in the client's command cache, right after page load and
+    # right before faye is connected, you will be missing commands.
+    # This action is called when faye is connected to fill in the gap.
+    get '/missing_cache' do
+      l = params[:command_cache_length].to_i
+      start_index = l-1
+
+      MagicMirror.command_cache[start_index..-1].to_json
+    end
   end
 end

data/lib/magic_mirror/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magic_mirror
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - TheNotary