glimmer 0.5.11 → 0.6.0

data/lib/glimmer/xml/node_visitor.rb

@@ -0,0 +1,13 @@
+module Glimmer
+  module XML
+    class NodeVisitor
+      def process_before_children
+        raise "must be implemented by a class"
+      end
+
+      def process_after_children
+        raise "must be implemented by a class"
+      end
+    end
+  end
+end

data/lib/glimmer/xml/xml_visitor.rb

@@ -0,0 +1,65 @@
+require File.dirname(__FILE__) + "/node_visitor"
+require File.dirname(__FILE__) + "/node"
+
+module Glimmer
+  module XML
+    class XmlVisitor < NodeVisitor
+
+      attr_reader :document
+
+      def initialize
+        @document = ""
+      end
+
+      def process_before_children(node)
+        if (!node.is_a?(Glimmer::XML::Node))          
+          @document << node.to_s
+          return
+        end
+        begin_open_tag(node)
+        append_attributes(node) if node.attributes
+        end_open_tag(node)
+      end
+
+      def process_after_children(node)
+        return if (!node.is_a?(Glimmer::XML::Node))
+        append_close_tag(node)
+      end
+
+      def begin_open_tag(node)
+        @document << "<"
+        @document << "#{node.name_space.name}:" if node.name_space
+        @document << node.name
+      end
+
+      def end_open_tag(node)
+        if (node.contents)
+          @document << ">"
+        else
+          @document << " " if node.attributes.keys.size > 0
+          @document << "/>"
+        end
+      end
+
+      def append_close_tag(node)
+        if (node.contents)
+          @document << "</"
+          @document << "#{node.name_space.name}:" if node.name_space
+          @document << "#{node.name}>"
+        end
+      end
+
+      def append_attributes(node)
+        Glimmer.logger&.debug "Take 3"
+        Glimmer.logger&.debug(node.attributes)
+        node.attributes.each do |attribute, value|
+          attribute_name = attribute
+          attribute_name = "#{attribute.name_space.name}:#{attribute.name}" if attribute.is_a?(Node)
+          @document << " #{attribute_name}"
+          @document << "=\"#{value}\"" unless value.nil?
+        end
+      end
+
+    end
+  end
+end

data/samples/gladiator.rb

@@ -10,9 +10,19 @@ class Gladiator
   include Glimmer
 
   class Dir
+    include Glimmer
+
     class << self
       def local_dir
-        @local_dir ||= new(ENV['LOCAL_DIR'] || '.')
+        @local_dir ||= new(ENV['LOCAL_DIR'] || '.').tap do |dir|
+          dir.refresh
+          @filewatcher = Filewatcher.new(dir.path)
+          @thread = Thread.new(@filewatcher) do |fw| 
+            fw.watch do |filename, event|
+              dir.refresh if filename != dir.selected_child_path
+            end
+          end
+        end
       end
     end
 
@@ -25,9 +35,26 @@ class Gladiator
     end
 
     def children
+      @children ||= retrieve_children
+    end
+
+    def retrieve_children
       ::Dir.glob(::File.join(@path, '*')).map {|p| ::File.file?(p) ? Gladiator::File.new(p) : Gladiator::Dir.new(p)}.sort_by {|c| c.path.to_s.downcase }.sort_by {|c| c.class.name }
     end
 
+    def refresh
+      new_all_children = retrieve_all_children
+      new_children = retrieve_children
+      async_exec do
+        @all_children = new_all_children
+        @children ||= []
+        @children.clear
+        new_children.each do |child|
+          @children << child
+        end
+      end
+    end
+
     def filter=(value)
       if value.to_s.empty?
         @filter = nil 
@@ -41,16 +68,20 @@ class Gladiator
       return if filter.nil?
       all_children_files.select do |child| 
         child.path.downcase.include?(filter.downcase) ||
-          child.path.downcase.gsub('_', '').include?(filter.downcase)
+          child.path.downcase.gsub(/[_\/]/, '').include?(filter.downcase)
       end.sort_by {|c| c.path.to_s.downcase}
     end
 
     def all_children
-      @all_children ||= ::Dir.glob(::File.join(@path, '**', '*')).map {|p| ::File.file?(p) ? Gladiator::File.new(p) : Gladiator::Dir.new(p)}
+      @all_children ||= retrieve_all_children
+    end
+
+    def retrieve_all_children
+      ::Dir.glob(::File.join(@path, '**', '*')).map {|p| ::File.file?(p) ? Gladiator::File.new(p) : Gladiator::Dir.new(p)}
     end
 
     def all_children_files
-      @all_children_files ||= all_children.select {|child| child.is_a?(Gladiator::File) }
+      all_children.select {|child| child.is_a?(Gladiator::File) }
     end
 
     def selected_child_path=(selected_path)
@@ -142,6 +173,10 @@ class Gladiator
       ::File.write(path, dirty_content) if ::File.exists?(path) && dirty_content.to_s.strip.size > 0
     end
 
+    def write_raw_dirty_content
+      ::File.write(path, dirty_content) if ::File.exists?(path) && dirty_content.to_s.strip.size > 0
+    end
+
     def comment_line!
       old_lines = lines
       return if old_lines.size < 1
@@ -298,7 +333,7 @@ class Gladiator
 
     def ensure_find_next
       return if find_text.to_s.empty? || dirty_content.to_s.strip.size < 1
-      find_next unless dirty_content[caret_position, find_text.size] == find_text
+      find_next unless dirty_content[caret_position.to_i, find_text.to_s.size] == find_text
     end
 
     def replace_next!
@@ -507,7 +542,7 @@ class Gladiator
         @filter_text = text {
           layout_data :fill, :center, true, false
           text bind(Gladiator::Dir.local_dir, 'filter')
-    	   on_key_pressed { |key_event|
+    	    on_key_pressed { |key_event|
             if key_event.keyCode == swt(:tab) || 
                 key_event.keyCode == swt(:cr) || 
                 key_event.keyCode == swt(:lf) ||
@@ -546,6 +581,12 @@ class Gladiator
             on_widget_selected {
               Gladiator::Dir.local_dir.selected_child_path = @tree.swt_widget.getSelection.first.getText
             }
+            on_key_pressed { |key_event|
+              if Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :cr) || Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :lf)
+                Gladiator::Dir.local_dir.selected_child_path = @tree.swt_widget.getSelection.first.getText
+                @text.swt_widget.setFocus
+              end
+            }
             on_paint_control {
               root_item = @tree.swt_widget.getItems.first
               if root_item && !root_item.getExpanded
@@ -580,7 +621,7 @@ class Gladiator
           }
           @line_number_text = text {
             layout_data(:fill, :fill, true, false) {
-              minimum_width 200
+              minimum_width 300
             }
             text bind(Gladiator::Dir.local_dir, 'selected_child.line_number', on_read: :to_s, on_write: :to_i)
     	     on_key_pressed { |key_event|
@@ -715,11 +756,10 @@ class Gladiator
   end
 end
 
-include Glimmer
+@gladiator = Gladiator.new
+
 at_exit do
-  async_exec do
-    Gladiator::Dir.local_dir.selected_child&.write_dirty_content
-  end
+  Gladiator::Dir.local_dir.selected_child&.write_raw_dirty_content
 end
 
-Gladiator.new.launch
+@gladiator.launch

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.6.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-26 00:00:00.000000000 Z
+date: 2020-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -220,9 +220,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
-description: JRuby Desktop UI DSL + Data-Binding cross-platform library that enables
-  productive and efficient authoring of desktop user-interfaces using the robust platform-native
-  Eclipse SWT library
+description: JRuby Desktop UI DSL + Data-Binding native-UI cross-platform library
+  that enables productive and efficient authoring of desktop user-interfaces using
+  the robust Eclipse SWT library
 email: andy.am@gmail.com
 executables:
 - glimmer
@@ -240,6 +240,8 @@ files:
 - bin/gladiator
 - bin/glimmer
 - lib/glimmer.rb
+- lib/glimmer/css/rule_set.rb
+- lib/glimmer/css/style_sheet.rb
 - lib/glimmer/data_binding/list_selection_binding.rb
 - lib/glimmer/data_binding/model_binding.rb
 - lib/glimmer/data_binding/observable.rb
@@ -251,37 +253,54 @@ files:
 - lib/glimmer/data_binding/table_items_binding.rb
 - lib/glimmer/data_binding/tree_items_binding.rb
 - lib/glimmer/data_binding/widget_binding.rb
-- lib/glimmer/dsl.rb
-- lib/glimmer/dsl/async_exec_expression.rb
-- lib/glimmer/dsl/bind_expression.rb
-- lib/glimmer/dsl/color_expression.rb
-- lib/glimmer/dsl/column_properties_expression.rb
-- lib/glimmer/dsl/combo_selection_data_binding_expression.rb
-- lib/glimmer/dsl/custom_widget_expression.rb
-- lib/glimmer/dsl/data_binding_expression.rb
-- lib/glimmer/dsl/display_expression.rb
+- lib/glimmer/dsl/css/css_expression.rb
+- lib/glimmer/dsl/css/dsl.rb
+- lib/glimmer/dsl/css/p_expression.rb
+- lib/glimmer/dsl/css/property_expression.rb
+- lib/glimmer/dsl/css/rule_set_expression.rb
+- lib/glimmer/dsl/css/s_expression.rb
 - lib/glimmer/dsl/engine.rb
-- lib/glimmer/dsl/exec_expression.rb
 - lib/glimmer/dsl/expression.rb
 - lib/glimmer/dsl/expression_handler.rb
-- lib/glimmer/dsl/layout_data_expression.rb
-- lib/glimmer/dsl/layout_expression.rb
-- lib/glimmer/dsl/list_selection_data_binding_expression.rb
-- lib/glimmer/dsl/menu_bar_expression.rb
-- lib/glimmer/dsl/menu_expression.rb
-- lib/glimmer/dsl/observe_expression.rb
 - lib/glimmer/dsl/parent_expression.rb
-- lib/glimmer/dsl/property_expression.rb
-- lib/glimmer/dsl/shell_expression.rb
 - lib/glimmer/dsl/static_expression.rb
-- lib/glimmer/dsl/swt_expression.rb
-- lib/glimmer/dsl/sync_exec_expression.rb
-- lib/glimmer/dsl/tab_item_expression.rb
-- lib/glimmer/dsl/table_items_data_binding_expression.rb
-- lib/glimmer/dsl/tree_items_data_binding_expression.rb
-- lib/glimmer/dsl/tree_properties_expression.rb
-- lib/glimmer/dsl/widget_expression.rb
-- lib/glimmer/dsl/widget_listener_expression.rb
+- lib/glimmer/dsl/swt/async_exec_expression.rb
+- lib/glimmer/dsl/swt/bind_expression.rb
+- lib/glimmer/dsl/swt/color_expression.rb
+- lib/glimmer/dsl/swt/column_properties_expression.rb
+- lib/glimmer/dsl/swt/combo_selection_data_binding_expression.rb
+- lib/glimmer/dsl/swt/custom_widget_expression.rb
+- lib/glimmer/dsl/swt/data_binding_expression.rb
+- lib/glimmer/dsl/swt/display_expression.rb
+- lib/glimmer/dsl/swt/dsl.rb
+- lib/glimmer/dsl/swt/exec_expression.rb
+- lib/glimmer/dsl/swt/layout_data_expression.rb
+- lib/glimmer/dsl/swt/layout_expression.rb
+- lib/glimmer/dsl/swt/list_selection_data_binding_expression.rb
+- lib/glimmer/dsl/swt/menu_bar_expression.rb
+- lib/glimmer/dsl/swt/menu_expression.rb
+- lib/glimmer/dsl/swt/observe_expression.rb
+- lib/glimmer/dsl/swt/property_expression.rb
+- lib/glimmer/dsl/swt/rgb_expression.rb
+- lib/glimmer/dsl/swt/rgba_expression.rb
+- lib/glimmer/dsl/swt/shell_expression.rb
+- lib/glimmer/dsl/swt/swt_expression.rb
+- lib/glimmer/dsl/swt/sync_exec_expression.rb
+- lib/glimmer/dsl/swt/tab_item_expression.rb
+- lib/glimmer/dsl/swt/table_items_data_binding_expression.rb
+- lib/glimmer/dsl/swt/tree_items_data_binding_expression.rb
+- lib/glimmer/dsl/swt/tree_properties_expression.rb
+- lib/glimmer/dsl/swt/widget_expression.rb
+- lib/glimmer/dsl/swt/widget_listener_expression.rb
+- lib/glimmer/dsl/top_level_expression.rb
+- lib/glimmer/dsl/xml/dsl.rb
+- lib/glimmer/dsl/xml/html_expression.rb
+- lib/glimmer/dsl/xml/meta_expression.rb
+- lib/glimmer/dsl/xml/name_space_expression.rb
+- lib/glimmer/dsl/xml/node_parent_expression.rb
+- lib/glimmer/dsl/xml/tag_expression.rb
+- lib/glimmer/dsl/xml/text_expression.rb
+- lib/glimmer/dsl/xml/xml_expression.rb
 - lib/glimmer/error.rb
 - lib/glimmer/invalid_keyword_error.rb
 - lib/glimmer/launcher.rb
@@ -303,6 +322,11 @@ files:
 - lib/glimmer/ui/custom_widget.rb
 - lib/glimmer/ui/video.rb
 - lib/glimmer/util/proc_tracker.rb
+- lib/glimmer/xml/depth_first_search_iterator.rb
+- lib/glimmer/xml/name_space_visitor.rb
+- lib/glimmer/xml/node.rb
+- lib/glimmer/xml/node_visitor.rb
+- lib/glimmer/xml/xml_visitor.rb
 - samples/gladiator.rb
 - vendor/swt/linux/swt.jar
 - vendor/swt/mac/swt.jar

data/lib/glimmer/dsl.rb

@@ -1,26 +0,0 @@
-require 'glimmer/dsl/engine'
-
-module Glimmer
-  # Glimmer DSL expression configuration module
-  #
-  # When DSL engine interprets an expression, it attempts to handle
-  # with expressions listed here in the order specified.
-  module DSL
-    # Every expression has a corresponding AbstractExpression subclass
-    # in glimmer/dsl
-    # TODO rename to dynamic_expressions in the future when supporting static expressions
-    Engine.dynamic_expressions = %w[
-      layout
-      widget_listener
-      combo_selection_data_binding
-      list_selection_data_binding
-      tree_items_data_binding
-      table_items_data_binding
-      data_binding
-      color
-      property
-      widget
-      custom_widget
-    ]
-  end
-end

data/lib/glimmer/dsl/async_exec_expression.rb

@@ -1,12 +0,0 @@
-require 'glimmer/dsl/static_expression'
-require 'glimmer/dsl/exec_expression'
-
-module Glimmer
-  module DSL
-    # Asynchronously executes code block against the SWT Event Loop
-    # to manipulate SWT UI objects on the UI thread safely
-    class AsyncExecExpression < StaticExpression
-      include ExecExpression
-    end
-  end
-end

data/lib/glimmer/dsl/bind_expression.rb

@@ -1,35 +0,0 @@
-require 'glimmer/dsl/static_expression'
-require 'glimmer/data_binding/model_binding'
-
-module Glimmer
-  module DSL
-    # Responsible for setting up the return value of the bind keyword (command symbol)
-    # as a ModelBinding. It is then used by another command handler like
-    # DataBindingCommandHandler for text and selection properties on Text and Spinner
-    # or TableItemsDataBindingCommandHandler for items in a Table
-    class BindExpression < StaticExpression
-      def can_interpret?(parent, keyword, *args, &block)
-        (
-          keyword == 'bind' and
-            (
-              (
-                (args.size == 2) and
-                  textual?(args[1])
-              ) ||
-                (
-                  (args.size == 3) and
-                    textual?(args[1]) and
-                    (args[2].is_a?(Hash))
-                )
-            )
-        )
-      end
-
-      def interpret(parent, keyword, *args, &block)
-        binding_options = args[2] || {}
-        binding_options[:on_read] = binding_options.delete(:on_read) || binding_options.delete('on_read') || block
-        DataBinding::ModelBinding.new(args[0], args[1].to_s, binding_options)
-      end
-    end
-  end
-end

data/lib/glimmer/dsl/color_expression.rb

@@ -1,22 +0,0 @@
-require 'glimmer/dsl/expression'
-require 'glimmer/swt/color_proxy'
-require 'glimmer/swt/display_proxy'
-
-# TODO consider turning in static expressions rgb/rgba/color
-
-module Glimmer
-  module DSL
-    class ColorExpression < Expression
-      include_package 'org.eclipse.swt.widgets'
-
-      def can_interpret?(parent, keyword, *args, &block)
-        ['color', 'rgba', 'rgb'].include?(keyword) and
-          (1..4).include?(args.count)
-      end
-
-      def interpret(parent, keyword, *args, &block)
-        SWT::ColorProxy.new(*args)
-      end
-    end
-  end
-end

data/lib/glimmer/dsl/column_properties_expression.rb

@@ -1,22 +0,0 @@
-require 'glimmer/dsl/static_expression'
-
-module Glimmer
-  module DSL
-    # Responsible for providing a readable keyword (command symbol) to capture
-    # and return column properties for use in TreeItemsDataBindingCommandHandler
-    class ColumnPropertiesExpression < StaticExpression
-      include_package 'org.eclipse.swt.widgets'
-
-      def can_interpret?(parent, keyword, *args, &block)
-        keyword == 'column_properties' and
-          block.nil? and
-          widget?(parent) and
-          parent.swt_widget.is_a?(Table)
-      end
-
-      def interpret(parent, keyword, *args, &block)
-        args
-      end
-    end
-  end
-end