shenmegui 0.2.1 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc6619aba89ab7ea20df38ca2ac5de628a9c543b
-  data.tar.gz: c3ae4650931f9496dac8559595c865bf0f908657
+  metadata.gz: 76f49e57833803f7d6359cefd0ede3e57f5c492a
+  data.tar.gz: 10ea23f6a66f9d535c7862a66e1b8df4de6aa57f
 SHA512:
-  metadata.gz: b16399a6fd8f540f6f7ab4bc2fd93a215e2cdad35a4a456fb17eeedc2889f124c4892b65ab621807b58ad999a175a6d7a0cad7557a8d5ee37543b5cd3fccf55b
-  data.tar.gz: c17d69a7269ccc136ae14371200b0849198230db52f511bbe2d2fb32b9d169657e2546176196e289a7c321919018517b55588661ddf8f79f688a26f66916f0a3
+  metadata.gz: 0d87c7220e9d410870899e94651ac8b8c3d74b7964a034770eec0d308378698ba303adc05bb8cb984d2cf91db8ca0629bfcf7733d55dbbf547b9aac24dfe0d62
+  data.tar.gz: 29c16632cd4ddde9e85c850944171737456e5a4ed6a04473db3cb3a0d0ef46e87cd04c095618ac75c657224506832965effa803b060d90190eadd6430d9ab44c

data/lib/shenmegui/controls.rb

@@ -5,12 +5,14 @@ module ShenmeGUI
     class Base
       attr_accessor :id, :properties, :events, :children, :parent
 
-      def hook(obj)
+      def add_hook(obj)
         case obj
           when String
             HookedString.new(obj, self)
           when Array
             HookedArray.new(obj, self)
+          when Hash
+            HookedHash.new(obj, self)
           else
             obj
         end
@@ -23,8 +25,7 @@ module ShenmeGUI
           end
 
           define_method("#{x}=") do |v|
-            v = hook v
-            @properties[x] = v
+            update_properties({x => v})
             sync
           end
         end
@@ -32,14 +33,13 @@ module ShenmeGUI
 
       def self.shortcut(prop)
         define_method(:initialize) do |x=nil, params={}|
-          x = hook x
           params.merge!({prop => x})
           super(params)
         end
 
       end
 
-      available_events = %w{click input dblclick mouseover mouseout blur focus mousedown mouseup change onselect}.collect(&:to_sym)
+      available_events = %w{click input dblclick mouseover mouseout blur focus mousedown mouseup change select}.collect(&:to_sym)
       available_events.each do |x|
         define_method("on#{x}") do |&block|
           return events[x] if block.nil?
@@ -60,19 +60,20 @@ module ShenmeGUI
         ShenmeGUI.socket.send(msg)
       end
 
-      def update(data)
-        data = Hash[data.keys.collect(&:to_sym).zip(data.values.collect{|x| hook(x)})]
+      def update_properties(data)
+        data = Hash[data.keys.collect(&:to_sym).zip(data.values.collect{|x| add_hook(x)})]
         @properties.update(data)
       end
 
-      def add_events
+      def sync_events
         data = @events.keys
         msg = "add_event:#{@id}->#{data.to_json}"
         ShenmeGUI.socket.send(msg)
       end
 
       def initialize(params={})
-        @properties = Hash[params.keys.collect(&:to_sym).zip(params.values.collect{|x| hook(x)})]
+        @properties = {}
+        update_properties(params)
         @id = ShenmeGUI.elements.size
         ShenmeGUI.elements << self
         @children = []
@@ -117,18 +118,27 @@ module ShenmeGUI
     end
 
     class Textline < Base
-      property :text, :selection_start, :selection_end
+      property :text, :selection
       shortcut :text
 
+      def text=(v)
+        update_properties({text: v, selection: [v.size]*2 })
+        sync
+      end
     end
 
     class Textarea < Base
-      property :text, :selection_start, :selection_end
+      property :text, :selection
       shortcut :text
 
       def <<(t)
         text << "\n#{t}"
       end
+
+      def text=(v)
+        update_properties({text: v, selection: [v.size]*2 })
+        sync
+      end
     end
 
     class Stack < Base
@@ -144,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

@@ -15,7 +15,7 @@ module ShenmeGUI
       data = JSON.parse(match_data[3]) if match_data[3]
       case command
         when :sync
-          target.update(data)
+          target.update_properties(data)
         else
           event_lambda = target.events[command]
           @this = @elements[id]
@@ -45,14 +45,14 @@ module ShenmeGUI
       FileDialog.get_save_file_name(params)
     end
     
-    def enable_debug
+    def enable_debugging
       Thread.new do
         ShenmeGUI.instance_eval do
           bind = binding
           while true
             begin
               command = $stdin.gets.chomp
-              result = eval command, bind
+              result = bind.eval command
               puts "=> #{result}"
             rescue
               puts "#{$!}"
@@ -69,7 +69,10 @@ module ShenmeGUI
           EM::WebSocket.run(:host => "0.0.0.0", :port => 80) do |ws|
             ws.onopen do
               puts "WebSocket connection open"
-              @elements.each { |e| e.add_events; e.sync }
+              @elements.each do |e|
+                e.sync_events
+                e.sync
+              end
             end
 
             ws.onclose { puts "Connection closed" }

data/lib/shenmegui/file_dialog.rb

@@ -37,8 +37,9 @@ module ShenmeGUI
       filter = params[:filter] ? "#{params[:filter]}\0#{params[:filter]}\0\0" : 0
       title = params[:title] || 0
       flags = 0x00880000
-      flags += 0x00000200 if params[:multiselect]
-      flags += 0x10000000 if params[:showhidden]
+      flags += 0x00000200 if params[:multi_select]
+      flags += 0x10000000 if params[:show_hidden]
+      initial_path = params[:initial_path] ? params[:initial_path] : 0
 
       path = "\0" * 1024
       ofn = Struct_OPENFILENAME.malloc
@@ -52,7 +53,7 @@ module ShenmeGUI
       ofn.nMaxFile = path.size
       ofn.lpstrFileTitle = 0
       ofn.nMaxFileTitle = 0
-      ofn.lpstrInitialDir = 0
+      ofn.lpstrInitialDir = initial_path
       ofn.lpstrTitle = title
       ofn.nFileOffset = 0
       ofn.nFileExtension = 0
@@ -85,3 +86,5 @@ module ShenmeGUI
 
   end
 end
+
+#ShenmeGUI::FileDialog.get_open_file_name(initial_path: 'C:\\')

data/lib/shenmegui/utils.rb

@@ -37,4 +37,23 @@ module ShenmeGUI
     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

@@ -25,8 +25,7 @@ var changeListeners = {
 		event: ['input','select'],
 		function: (function(){
 			this.properties.text = this.value;
-			this.properties.selection_start = this.selectionStart;
-			this.properties.selection_end = this.selectionEnd;
+			this.properties.selection = [this.selectionStart, this.selectionEnd];
 			sync(this);
 		})
 	},
@@ -35,8 +34,7 @@ var changeListeners = {
 		event: ['input','select'],
 		function: (function(){
 			this.properties.text = this.value;
-			this.properties.selection_start = this.selectionStart;
-			this.properties.selection_end = this.selectionEnd;
+			this.properties.selection = [this.selectionStart, this.selectionEnd];
 			sync(this);
 		})
 	},
@@ -119,10 +117,18 @@ var syncHandlers = {
 
 	textline: (function(target, data){
 		target.value = data.text;
+		if(data.selection){
+			target.selectionStart = data.selection[0];
+			target.selectionEnd = data.selection[1];
+		}
 	}),
 
 	textarea: (function(target, data){
 		target.value = data.text;
+		if(data.selection){
+			target.selectionStart = data.selection[0];
+			target.selectionEnd = data.selection[1];
+		}
 	}),
 
 	image: (function(target, data){

data/static/style.css

@@ -38,7 +38,6 @@ body {
       margin-right: 2px; }
 
 .button, .checkbox, .image, .progress, .radio, .select, .textarea, .textline, .label {
-  display: inline-block;
   margin-bottom: 0.5em;
   margin-right: 0.2em;
   max-width: 100%; }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shenmegui
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: '0.3'
 platform: ruby
 authors:
 - CicholGricenchos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket