clientside 0.3 → 0.4

data/lib/clientside.rb

@@ -3,8 +3,11 @@ require 'faye/websocket'
 require 'rack/static'
 require 'securerandom'
 require 'ostruct'
+require 'erb'
 
 module Clientside
+  GEM_DIR = File.dirname(__FILE__)
+
   module Accessible
     class << self
       attr_accessor :cur_os
@@ -156,8 +159,8 @@ module Clientside
   class Middleware < NoResMiddleware
     def initialize(*args)
       super
-      dir = File.dirname(__FILE__)
-      @app = Rack::Static.new(@app, urls: ['/__clientside_res__'], root: dir)
+      @app = Rack::Static.new(
+        @app, urls: ['/__clientside_res__'], root: GEM_DIR)
     end
   end
 
@@ -166,22 +169,7 @@ module Clientside
       raise ArgumentError, "invalid var name" unless var =~ /\A[a-zA-Z_]\w*\Z/
     end
     cid = Middleware.add_pending objs.values
-    sock_var = '$__clientside_socket__'
-    js = ""
-    js << %Q(<script src="/__clientside_res__/promise.min.js"></script>\n)
-    js << %Q(<script src="/__clientside_res__/clientside.js"></script>\n)
-    js << %Q(<script>\n)
-    objs.each do |var, obj|
-      js << %Q(var #{var};\n)
-    end
-    js << %Q(var #{sock_var} = makeClientsideSocket("#{cid}");\n)
-    js << %Q(#{sock_var}.onopen = function() {\n)
-    objs.each do |var, obj|
-      json = JSON.dump obj
-      js << %Q(    #{var} = makeClientsideProxy(#{sock_var}, #{json});\n)
-    end
-    js << %Q(};\n)
-    js << %Q(</script>\n)
+    ERB.new(File.read(GEM_DIR + '/embed.erb'), nil, '-').result(binding)
   end
 end
 

data/lib/embed.erb

@@ -0,0 +1,19 @@
+<script src="/__clientside_res__/promise.min.js"></script>
+<script src="/__clientside_res__/clientside.js"></script>
+<script>
+var $__clientside_socket__ = makeClientsideSocket("<%= cid %>");
+<% objs.each do |var, obj| -%>
+var <%= var %>;
+<% end -%>
+function $__clientside_init__() {
+<% objs.each do |var, obj| -%>
+<% json = JSON.dump obj -%>
+    <%= var %> = makeClientsideProxy($__clientside_socket__, <%= json %>);
+<% end -%>
+}
+$__clientside_socket__.onopen = $__clientside_init__;
+if ($__clientside_socket__.readyState == 1 && !<%= objs.keys.first %>) {
+    $__clientside_init__();
+}
+</script>
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clientside
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -53,6 +53,7 @@ files:
 - lib/__clientside_res__/promise.min.js
 - lib/__clientside_res__/clientside.js
 - lib/clientside.rb
+- lib/embed.erb
 - examples/printer/views/printer.erb
 - examples/printer/config.ru
 - examples/printer/testapp.rb