glimmer 0.5.11 → 0.6.0

data/lib/glimmer/dsl/xml/meta_expression.rb

@@ -0,0 +1,23 @@
+require 'glimmer/dsl/xml/node_parent_expression'
+require 'glimmer/dsl/xml/xml_expression'
+require 'glimmer/dsl/static_expression'
+
+module Glimmer
+  module DSL
+    module XML
+      # This static html expression flips the DSL switch on for 
+      # XML DSL in Glimmer
+      class MetaExpression < StaticExpression
+        include NodeParentExpression
+
+        def interpret(parent, keyword, *args, &block)
+          xml_expression.interpret(parent, keyword, *args, &block)
+        end
+
+        def xml_expression
+          @xml_expression ||= XmlExpression.new
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/xml/name_space_expression.rb

@@ -0,0 +1,37 @@
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/xml/node'
+require 'glimmer/xml/depth_first_search_iterator'
+require 'glimmer/xml/name_space_visitor'
+
+module Glimmer
+  module DSL
+    module XML
+      class NameSpaceExpression < StaticExpression
+        include TopLevelExpression
+
+        def can_interpret?(parent, keyword, *args, &block)
+          (parent == nil or parent.is_a?(Glimmer::XML::Node)) and
+          (keyword.to_s == "name_space")
+          (args.size == 1) and
+          (args[0].is_a?(Symbol)) and
+          block
+        end
+
+        def interpret(parent, keyword, *args, &block)
+          node = block.call
+          unless node.is_a?(String)
+            name_space_visitor = Glimmer::XML::NameSpaceVisitor.new(args[0].to_s)
+            Glimmer::XML::DepthFirstSearchIterator.new(node, name_space_visitor).iterate
+            def node.process_block(block)
+              Glimmer.logger&.debug 'block'
+              #NOOP
+            end
+          end
+          parent.children << node if parent and !parent.children.include?(node)
+          node
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/xml/node_parent_expression.rb

@@ -0,0 +1,33 @@
+require 'glimmer'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/xml/node'
+
+module Glimmer
+  module DSL
+    module XML
+      module NodeParentExpression
+        include ParentExpression
+        include Glimmer
+
+        def add_content(parent, &block)
+          return_value = block.call(parent)      
+          if !return_value.is_a?(Glimmer::XML::Node) and !parent.children.include?(return_value)
+            text = return_value.to_s
+            first_match = text.match(/[#][^{]+[{][^}]+[}]/)
+            match = first_match
+            while (match)
+              instance_eval(parent.text_command(match.pre_match))
+              tag_text = match.to_s
+              instance_eval(parent.rubyize(tag_text))
+              text = tag_text
+              post_match = match.post_match
+              match = text.match(/[#]\w+[{]\w+[}]/)
+            end
+            instance_eval(parent.text_command(post_match)) if post_match
+            parent.children << return_value unless first_match
+          end
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/xml/tag_expression.rb

@@ -0,0 +1,29 @@
+require 'glimmer/dsl/xml/node_parent_expression'
+require 'glimmer/dsl/xml/xml_expression'
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/xml/node'
+
+module Glimmer
+  module DSL
+    module XML
+      class TagExpression < StaticExpression
+        include TopLevelExpression
+        include NodeParentExpression
+
+        def can_interpret?(parent, keyword, *args, &block)
+          (parent == nil or parent.is_a?(Glimmer::XML::Node)) and
+          (keyword.to_s == "tag") and
+            args[0].include?(:_name)
+        end
+
+        def interpret(parent, keyword, *args, &block)
+          attributes = args[0] if (args.size == 1)
+          tag_name = attributes[:_name]
+          attributes.delete(:_name)
+          Glimmer::XML::Node.new(parent, tag_name, attributes, &block)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/xml/text_expression.rb

@@ -0,0 +1,22 @@
+require 'glimmer/dsl/static_expression'
+require 'glimmer/xml/node'
+
+module Glimmer
+  module DSL
+    module XML
+      class TextExpression < StaticExpression
+        def can_interpret?(parent, keyword, *args, &block)
+          (parent == nil or parent.is_a?(Glimmer::XML::Node)) and
+          (keyword.to_s == "text") and
+          (args.size == 1) and
+          !block
+        end
+
+        def interpret(parent, keyword, *args, &block)
+          parent.children << args[0].to_s if parent
+          args[0].to_s
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/xml/xml_expression.rb

@@ -0,0 +1,21 @@
+require 'glimmer/dsl/xml/node_parent_expression'
+require 'glimmer/dsl/expression'
+require 'glimmer/xml/node'
+
+module Glimmer
+  module DSL
+    module XML
+      class XmlExpression < Expression
+        include NodeParentExpression
+
+        def can_interpret?(parent, keyword, *args, &block)
+          parent.is_a?(Glimmer::XML::Node)
+        end
+
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::XML::Node.new(parent, keyword.to_s, args, &block)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/rake_task.rb

@@ -11,7 +11,7 @@ namespace :glimmer do
         system('warble config')
         new_config = File.read('config/warble.rb').split("\n").inject('') do |output, line|
           if line.include?('config.dirs =')
-            line = line.sub('# ', '').sub(/=[^=\n]+$/, '= %w(app config db lib script bin images sounds videos)')
+            line = line.sub('# ', '').sub(/=[^=\n]+$/, '= %w(app config db lib script bin docs fonts images sounds videos)')
           end
           if line.include?('config.autodeploy_dir =')
             line = line.sub('# ', '')

data/lib/glimmer/swt/shell_proxy.rb

@@ -2,7 +2,6 @@ require 'glimmer/swt/swt_proxy'
 require 'glimmer/swt/widget_proxy'
 require 'glimmer/swt/display_proxy'
 require 'glimmer/swt/swt_proxy'
-require 'glimmer/dsl/shell_expression'
 
 module Glimmer
   module SWT
@@ -102,7 +101,7 @@ module Glimmer
       end
 
       def content(&block)
-        Glimmer::DSL::Engine.add_content(self, DSL::ShellExpression.new, &block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::ShellExpression.new, &block)
       end
 
       # (happens as part of `#open`)

data/lib/glimmer/swt/widget_proxy.rb

@@ -4,7 +4,6 @@ require 'glimmer/swt/color_proxy'
 require 'glimmer/swt/font_proxy'
 require 'glimmer/swt/swt_proxy'
 require 'glimmer/data_binding/observable_widget'
-require 'glimmer/dsl/widget_expression'
 
 module Glimmer
   module SWT
@@ -267,7 +266,7 @@ module Glimmer
       end
 
       def content(&block)
-        Glimmer::DSL::Engine.add_content(self, DSL::WidgetExpression.new, &block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::WidgetExpression.new, &block)
       end
 
       private
@@ -432,7 +431,11 @@ module Glimmer
             value.to_java :string
           end,
           :text => proc do |value|
-            value.to_s
+            if swt_widget.is_a?(Browser)
+              value.to_s
+            else
+              value.to_s
+            end
           end,
           :visible => proc do |value|
             !!value

data/lib/glimmer/ui/custom_widget.rb

@@ -109,7 +109,6 @@ module Glimmer
           @before_body_blocks << block
         end
 
-        # TODO rename to content as well as before and after blocks
         def body(&block)
           @body_block = block
         end
@@ -155,11 +154,11 @@ module Glimmer
       end
 
       def can_add_observer?(attribute_name)
-        respond_to?(attribute_name) || respond_to?("#{attribute_name}?") || @body_root.can_add_observer?(attribute_name)
+        has_instance_method?(attribute_name) || respond_to?("#{attribute_name}?") || @body_root.can_add_observer?(attribute_name)
       end
 
       def add_observer(observer, attribute_name)
-        if respond_to?(attribute_name)
+        if has_instance_method?(attribute_name)
           super
         else
           @body_root.add_observer(observer, attribute_name)
@@ -179,8 +178,13 @@ module Glimmer
         end
       end
 
+      # This method ensures it has an instance method not coming from Glimmer DSL
+      def has_instance_method?(method_name)
+        respond_to?(method_name) && !method(method_name)&.source_location&.first&.include?('glimmer/dsl/engine.rb')
+      end
+
       def get_attribute(attribute_name)
-        if respond_to?(attribute_name)
+        if has_instance_method?(attribute_name)
           send(attribute_name)
         else
           @body_root.get_attribute(attribute_name)

data/lib/glimmer/ui/video.rb

@@ -1,8 +1,6 @@
 require 'glimmer/ui/custom_widget'
 require 'glimmer/swt/color_proxy'
 
-#TODO consider the need to display a progress wheel while loading video as an option
-
 module Glimmer
   module UI
     class Video
@@ -27,38 +25,43 @@ module Glimmer
 
       body {
         browser(:no_scroll) {
-          text <<~HTML
-            <html>
-              <head>
-                <style id="style">
+          text html {
+            head {
+              style(id: "style") {
+                css {
                   body {
-                    margin: 0;
-                    padding: 0;
-                    overflow: hidden;
+                    margin 0
+                    padding 0
+                    overflow :hidden
                   }
-                </style>
-                <style id="style-body-background">
+                }
+              }
+              style(id: "style-body-background") {
+                css {
                   body {
-                    background: #{browser_body_background};
+                    p 'background', browser_body_background
                   }
-                </style>
-                <style id="style-body-offset-x">
+                }
+              }
+              style(id: "style-body-offset-x") {
+                css {
                   body {
-                    margin-left: #{browser_body_offset_x}px;
+                    margin_left "#{browser_body_offset_x}px"
                   }
-                </style>
-                <style id="style-body-offset-y">
+                }
+              }
+              style(id: "style-body-offset-y") {
+                css {
                   body {
-                    margin-top: #{browser_body_offset_y}px;
+                    margin_top "#{browser_body_offset_y}px"
                   }
-                </style>
-              </head>
-              <body>
-                <video id="video" src="#{source}" #{browser_video_width} #{browser_video_height} #{browser_video_loop} #{browser_video_controls} #{browser_video_autoplay}>
-                </video>
-              </body>
-            </html>
-          HTML
+                }
+              }
+            }
+            body {
+              video(browser_video_loop, browser_video_controls, browser_video_autoplay, id: 'video', src: source, width: browser_video_width, height: browser_video_height)
+            }
+          }
           on_completed {
             @completed = true
           }
@@ -257,11 +260,11 @@ module Glimmer
       end
 
       def browser_video_width
-        "width='100%'" if fit_to_width
+        "100%" if fit_to_width
       end
 
       def browser_video_height
-        "height='100%'" if fit_to_height
+        "100%" if fit_to_height
       end
 
       def browser_body_background

data/lib/glimmer/xml/depth_first_search_iterator.rb

@@ -0,0 +1,22 @@
+require 'glimmer/xml/node'
+
+module Glimmer
+  module XML
+    class DepthFirstSearchIterator
+      def initialize(node, node_visitor)
+        @node = node
+        @node_visitor = node_visitor
+      end
+
+      def iterate
+        process(@node)
+      end
+
+      def process(node)
+        @node_visitor.process_before_children(node)
+        node.children.each { |child| process(child) } if node.is_a?(Node)
+        @node_visitor.process_after_children(node)
+      end
+    end
+  end
+end

data/lib/glimmer/xml/name_space_visitor.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + "/node_visitor"
+
+module Glimmer
+  module XML
+    class NameSpaceVisitor < NodeVisitor
+
+      def initialize(name_space_name)
+        @name_space_name = name_space_name
+      end
+
+      def process_before_children(node)
+        return if node.is_a?(String)
+        node.name_space = Node.new(nil, @name_space_name, nil) if node and !node.name_space
+      end
+
+      def process_after_children(node)
+        #NOOP
+      end
+    end
+  end
+end

data/lib/glimmer/xml/node.rb

@@ -0,0 +1,75 @@
+require 'glimmer'
+require 'glimmer/xml/depth_first_search_iterator'
+require 'glimmer/xml/xml_visitor'
+
+module Glimmer
+  module XML
+    class Node
+      include Glimmer
+
+      attr_accessor :children, :name, :contents, :attributes, :is_name_space, :is_attribute, :name_space, :parent
+
+      def initialize(parent, name, attributes, &contents)
+        @is_name_space = false
+        @children = []
+        @parent = parent
+        if attributes.is_a?(Array)
+          attributes = attributes.compact
+          hash_attributes = attributes.last.is_a?(Hash) ? attributes.delete(attributes.last) : {}
+          hash_attributes = attributes.reduce(hash_attributes) do |hash, attribute|
+            hash.merge(attribute => nil)
+          end
+          attributes = hash_attributes
+        end
+        if (parent and parent.is_name_space)
+          @name_space = parent
+          @parent = @name_space.parent
+        end
+        @parent.children << self if @parent
+        @name = name
+        @contents = contents
+        @attributes = attributes
+        if @attributes
+          @attributes.each_key do |attribute|
+            if attribute.is_a?(Node)
+              attribute.is_attribute = true
+              attribute.parent.children.delete(attribute) if attribute.parent
+              attribute.parent = nil #attributes do not usually have parents
+            end
+          end
+          Glimmer.logger&.debug(attributes)
+        end
+      end
+
+      def method_missing(symbol, *args, &block)
+        @is_name_space = true
+        parent.children.delete(self) if parent
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::XML::HtmlExpression.new) {@tag = super}
+        @tag
+      end
+
+      def to_xml
+        xml_visitor = XmlVisitor.new
+        DepthFirstSearchIterator.new(self, xml_visitor).iterate
+        xml_visitor.document
+      end
+      alias to_html to_xml
+      alias to_s to_xml
+
+      def text_command(text)
+        "text \"#{text}\""
+      end
+
+      def rubyize(text)
+        text = text.gsub(/[}]/, '"}')
+        text = text.gsub(/[{]/, '{"')
+        text = text.gsub(/[#]/, '')
+      end
+
+      #override Object default id method and route it to Glimmer engine
+      def id
+        method_missing(:id)
+      end
+    end
+  end
+end