shenmegui 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c26bdde10d6c5e4af49d747793ad84901e68926
-  data.tar.gz: c99bb367c9fb6579ce413d256ac315fb6263c743
+  metadata.gz: f35798115e8f6d3bec99dc45df4d48b48d2a18e5
+  data.tar.gz: 5c0c4d7f0c220f66785e1ba351827a1cd0a137ae
 SHA512:
-  metadata.gz: 5b30cf77e527c31e9faaa0d09e894025d5b0601f7fdc8c5e71c81e9147e20bec641af8184976e484e777cc3194d8241cb0130b7a272786e93f8768c164e31e45
-  data.tar.gz: 4ff794f652ee0e2ad765caab6f550f0aec228ed5a9c6c63d670bf1cb9b8e9f2e9e3ed41f708ac54d73f35bf6156ac80b6fb1fed5ffe8bfe0b73fe5c26754c880
+  metadata.gz: bc2f7b20adb10653c15dfe216a622b49552284d59be3bcc8d8962c9036593c5dcfaf56731e2fae56fc14864d3b12e893a87a2ba2c035dfc51f5d3c98ae5d5200
+  data.tar.gz: bddf3a53791f9434da210e46b27a851ba2bc49a6c67958da1658b8816d673473d13b3a0b4502413dcb61188833c27a7fa1c4e03e6670fe00ce551692d87994c4

data/lib/shenmegui/controls.rb

@@ -81,7 +81,7 @@ module ShenmeGUI
       end
 
       def render(material = {})
-        gem_path = $LOADED_FEATURES.grep(/.*\/lib\/shenmegui/)[0].match(/(.*)\/lib/)[1]
+        gem_path = __FILE__.match(/(.*)\/lib/)[1]
         template_path = gem_path + "/templates"
         type = self.class.name.match(/(?:.*::)(.+)/)[1].downcase
         template = ::ERB.new File.read("#{template_path}/#{type}.erb")
@@ -97,12 +97,12 @@ module ShenmeGUI
     end
 
     class Body < Base
-      def render
-        gem_path = $LOADED_FEATURES.grep(/.*\/lib\/shenmegui/)[0].match(/(.*)\/lib/)[1]
+      def render(material = {})
+        gem_path = __FILE__.match(/(.*)\/lib/)[1]
         static_path = gem_path + "/static"
         style = %w{style}.collect{|x| File.read("#{static_path}/#{x}.css")}.join("\n")
         script = File.read("#{static_path}/script.js")
-        super({style: style, script: script})
+        super({style: style, script: script}.merge(material))
       end
 
     end
@@ -154,7 +154,7 @@ module ShenmeGUI
 
     class Checkbox < Base
       property :options, :checked, :arrange
-      shortcut :options 
+      shortcut :options
     end
 
     class Progress < Base

data/lib/shenmegui/core.rb

@@ -1,3 +1,5 @@
+require 'socket'
+
 module ShenmeGUI
 
   @elements = []
@@ -28,7 +30,12 @@ module ShenmeGUI
 
     def app(params={}, &block)
       body(params, &block)
-      File.open('index.html', 'w'){ |f| f.write @elements[0].render }
+      #找一个空闲的端口，不太好看
+      temp_server = TCPServer.open('localhost', 0)
+      @port = temp_server.addr[1]
+      temp_server.close
+      app_dir = File.expand_path($PROGRAM_NAME).match(/(.+)\/.+/)[1]
+      File.open("#{app_dir}/index.html", 'w'){ |f| f.write @elements[0].render(port: @port) }
       nil
     end
 
@@ -44,7 +51,7 @@ module ShenmeGUI
     def get_save_file_name(params={})
       FileDialog.get_save_file_name(params)
     end
-    
+
     def enable_debugging
       Thread.new do
         ShenmeGUI.instance_eval do
@@ -66,7 +73,7 @@ module ShenmeGUI
     def start!
       ws_thread = Thread.new do
         EM.run do
-          EM::WebSocket.run(:host => "0.0.0.0", :port => 80) do |ws|
+          EM::WebSocket.run(:host => "0.0.0.0", :port => @port) do |ws|
             ws.onopen do
               puts "WebSocket connection open"
               @elements.each do |e|
@@ -81,22 +88,22 @@ module ShenmeGUI
               puts "Recieved message: #{msg}"
               handle msg
             end
-            
+
             @socket = ws
           end
         end
       end
-
       begin
-        index_path = "#{Dir.pwd}/index.html"
+        app_dir = File.expand_path($PROGRAM_NAME).match(/(.+)\/.+/)[1]
+        index_path = "#{app_dir}/index.html"
         `start file:///#{index_path}`
       rescue
       end
-      
+
       ws_thread.join
     rescue Interrupt
       puts 'bye~'
     end
 
   end
-end
+end

data/lib/shenmegui/file_dialog.rb

@@ -70,7 +70,7 @@ module ShenmeGUI
     def self.get_open_file_name(params={})
       ofn, path = construct_OPENFILENAME(params)
       GetOpenFileName(ofn)
-      ofn = nil
+      Fiddle.free(ofn.to_i)
       path = path.split("\0")
       path = path[1..-1].collect{|x| "#{path[0]}\\#{x}"} if path.size > 1
       path.collect{|x| x.force_encoding('GBK').encode('UTF-8')}
@@ -80,7 +80,7 @@ module ShenmeGUI
     def self.get_save_file_name(params={})
       ofn, path = construct_OPENFILENAME(params)
       GetSaveFileName(ofn)
-      ofn = nil
+      Fiddle.free(ofn.to_i)
       path.force_encoding('GBK').encode('UTF-8')
     end
 

data/lib/shenmegui/utils.rb

@@ -1,59 +1,26 @@
 module ShenmeGUI
-  class HookedArray < Array 
-    
-    @unhook_methods = %i{<< []= clear collect! compact! concat delete delete_at delete_if fill flatten! replace insert keep_if map map! pop push reject! replace rotate! select! shift shuffle! slice! sort! sort_by! uniq! unshift}
-    @unhook_methods = Hash[@unhook_methods.collect{|x| [x, Array.instance_method(x)]}]
-
-    def initialize(arr, owner)
-      @owner = owner
-      super(arr)
-    end
-    
-    @unhook_methods.each do |k, v|
-      define_method(k) do |*arr, &block|
-        result = v.bind(self).call(*arr, &block)
-        @owner.sync
-        result
+  @unhook_methods = {
+    array: %i{<< []= clear collect! compact! concat delete delete_at delete_if fill flatten! replace insert keep_if map map! pop push reject! replace rotate! select! shift shuffle! slice! sort! sort_by! uniq! unshift},
+    string: %i{<< []= capitalize! chomp! chop! clear concat delete! downcase! encode! force_encoding gsub! insert lstrip! succ! next! prepend replace reverse! rstrip! slice! squeeze! strip! sub! swapcase! tr! tr_s! upcase!},
+    hash: %i{[]= clear delete delete_if keep_if merge! update rehash reject! replace select! shift}
+  }
+  @unhook_methods.each do |k, v|
+    const_set("Hooked#{k.to_s.capitalize}", Class.new(const_get(k.to_s.capitalize)))
+    const_get("Hooked#{k.to_s.capitalize}").class_eval do
+      def initialize(obj, owner)
+        @owner = owner
+        super(obj)
       end
-    end
-
-  end
-
-  class HookedString < String
-    @unhook_methods = %i{<< []= capitalize! chomp! chop! clear concat delete! downcase! encode! force_encoding gsub! insert lstrip! succ! next! prepend replace reverse! rstrip! slice! squeeze! strip! sub! swapcase! tr! tr_s! upcase!}
-    @unhook_methods = Hash[@unhook_methods.collect{|x| [x, String.instance_method(x)]}]
-    
-    def initialize(str, owner)
-      @owner = owner
-      super(str)
-    end
 
-    @unhook_methods.each do |k, v|
-      define_method(k) do |*arr, &block|
-        result = v.bind(self).call(*arr, &block)
-        @owner.sync
-        result
+      methods = Hash[v.collect{|x| [x, const_get(k.to_s.capitalize).instance_method(x)]}]
+      methods.each do |k, v|
+        define_method(k) do |*arr, &block|
+          result = v.bind(self).call(*arr, &block)
+          @owner.sync
+          result
+        end
       end
-    end
 
-  end
-
-  class HookedHash < Hash
-    @unhook_methods = %i{[]= clear delete delete_if keep_if merge! update rehash reject! replace select! shift}
-    @unhook_methods = Hash[@unhook_methods.collect{|x| [x, Hash.instance_method(x)]}]
-
-    def initialize(hsh, owner)
-      @owner = owner
-      super(hsh)
     end
-
-    @unhook_methods.each do |k, v|
-      define_method(k) do |*arr, &block|
-        result = v.bind(self).call(*arr, &block)
-        @owner.sync
-        result
-      end
-    end
-
   end
 end

data/static/script.js

@@ -1,6 +1,6 @@
-var websocket = 
+var websocket =
 (function configureWebSocket(){
-	var wsUrl = "ws://localhost/";
+	var wsUrl = "ws://localhost:" + wsPort + "/";
 
 	var websocket = new WebSocket(wsUrl);
 	websocket.onopen = function(evt){
@@ -166,7 +166,7 @@ var syncHandlers = {
 				}
 			}
 		}
-		
+
 	}),
 
 	radio: (function(target, data){
@@ -231,4 +231,4 @@ function handleMessage(msg){
 			target.focus();
 			break;
 	}
-}
+}

data/templates/body.erb

@@ -10,7 +10,8 @@
 <body id="item-<%= id %>" data-type="body">
 	<%= content %>
 	<script>
+		wsPort = <%= material[:port] %>;
 		<%= material[:script] %>
 	</script>
 </body>
-</html>
+</html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shenmegui
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - CicholGricenchos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
 description: a simple HTML GUI for Ruby
 email: cichol@live.cn
 executables: []