glimmer 0.6.0 → 0.7.0

data/lib/glimmer/swt/layout_data_proxy.rb

@@ -31,7 +31,7 @@ module Glimmer
         begin
           @swt_layout_data = swt_layout_data_class.new(*args)
         rescue => e
-          Glimmer.logger&.debug "#{e.message}\n#{e.backtrace.join("\n")}"
+          Glimmer::Config.logger&.debug "#{e.message}\n#{e.backtrace.join("\n")}"
           @swt_layout_data = args.first if args.count == 1
         end
         @widget_proxy.swt_widget.setLayoutData(@swt_layout_data)

data/lib/glimmer/swt/layout_proxy.rb

@@ -34,8 +34,8 @@ module Glimmer
           end
           swt_layout_class
         rescue => e
-          Glimmer.logger&.debug e.message
-          # Glimmer.logger&.debug "#{e.message}\n#{e.backtrace.join("\n")}"
+          Glimmer::Config.logger&.debug e.message
+          # Glimmer::Config.logger&.debug "#{e.message}\n#{e.backtrace.join("\n")}"
           raise e
         end
       end

data/lib/glimmer/swt/swt_proxy.rb

@@ -43,12 +43,12 @@ module Glimmer
           negative ? ~bit_value : bit_value
         rescue => e
           begin
-#             Glimmer.logger&.debug(e.full_message)
+#             Glimmer::Config.logger&.debug(e.full_message)
             alternative_swt_constant_symbol = SWT.constants.find {|c| c.to_s.upcase == swt_constant_symbol.to_s.upcase}
             bit_value = SWT.const_get(alternative_swt_constant_symbol)
             negative ? ~bit_value : bit_value
           rescue => e
-#             Glimmer.logger&.debug(e.full_message)
+#             Glimmer::Config.logger&.debug(e.full_message)
             bit_value = Glimmer::SWT::SWTProxy::EXTRA_STYLES[swt_constant_symbol]
             if bit_value
               negative ? ~bit_value : bit_value
@@ -88,7 +88,7 @@ module Glimmer
         def deconstruct(integer)
           SWT.constants.reduce([]) do |found, c|
             constant_value = SWT.const_get(c) rescue -1
-            is_found = constant_value.is_a?(Integer) && (constant_value & style) == constant_value
+            is_found = constant_value.is_a?(Integer) && (constant_value & integer) == constant_value
             is_found ? found += [c] : found
           end
         end

data/lib/glimmer/swt/widget_proxy.rb

@@ -191,17 +191,17 @@ module Glimmer
         swt_widget_name = underscored_widget_name.camelcase(:upper)
         swt_widget_class = eval(swt_widget_name)
         unless swt_widget_class.ancestors.include?(org.eclipse.swt.widgets.Widget)
-          Glimmer.logger&.debug("Class #{swt_widget_class} matching #{underscored_widget_name} is not a subclass of org.eclipse.swt.widgets.Widget")
+          Glimmer::Config.logger&.debug("Class #{swt_widget_class} matching #{underscored_widget_name} is not a subclass of org.eclipse.swt.widgets.Widget")
           return nil
         end
         swt_widget_class
       rescue NameError => e
-        Glimmer.logger&.debug e.message
-        # Glimmer.logger&.debug("#{e.message}\n#{e.backtrace.join("\n")}")
+        Glimmer::Config.logger&.debug e.message
+        # Glimmer::Config.logger&.debug("#{e.message}\n#{e.backtrace.join("\n")}")
         nil
       rescue => e
-        Glimmer.logger&.debug e.message
-        # Glimmer.logger&.debug("#{e.message}\n#{e.backtrace.join("\n")}")
+        Glimmer::Config.logger&.debug e.message
+        # Glimmer::Config.logger&.debug("#{e.message}\n#{e.backtrace.join("\n")}")
         nil
       end
 

data/lib/glimmer/ui/custom_widget.rb

@@ -36,15 +36,15 @@ module Glimmer
                 return constant if constant.ancestors.include?(Glimmer::UI::CustomWidget)
                 constant
               rescue => e
-                # Glimmer.logger&.debug "#{e.message}\n#{e.backtrace.join("\n")}"
+                # Glimmer::Config.logger&.debug "#{e.message}\n#{e.backtrace.join("\n")}"
                 result
               end
             end
           end
           raise "#{underscored_custom_widget_name} has no custom widget class!"
         rescue => e
-          Glimmer.logger&.debug e.message
-          Glimmer.logger&.debug "#{e.message}\n#{e.backtrace.join("\n")}"
+          Glimmer::Config.logger&.debug e.message
+          Glimmer::Config.logger&.debug "#{e.message}\n#{e.backtrace.join("\n")}"
           nil
         end
  

data/lib/glimmer/xml/node.rb

@@ -37,7 +37,7 @@ module Glimmer
               attribute.parent = nil #attributes do not usually have parents
             end
           end
-          Glimmer.logger&.debug(attributes)
+          Glimmer::Config.logger&.debug(attributes)
         end
       end
 

data/lib/glimmer/xml/xml_visitor.rb

@@ -50,8 +50,8 @@ module Glimmer
       end
 
       def append_attributes(node)
-        Glimmer.logger&.debug "Take 3"
-        Glimmer.logger&.debug(node.attributes)
+        Glimmer::Config.logger&.debug "Take 3"
+        Glimmer::Config.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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -97,31 +97,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-  name: filewatcher
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.4
-  name: clipboard
+        version: 2.3.9
+  name: jeweler
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 2.3.9
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -164,20 +150,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.9
-  name: jeweler
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.9
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -227,7 +199,6 @@ email: andy.am@gmail.com
 executables:
 - glimmer
 - girb
-- gladiator
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
@@ -235,12 +206,15 @@ extra_rdoc_files:
 files:
 - LICENSE.txt
 - README.markdown
+- RUBY_VERSION
+- VERSION
 - bin/girb
 - bin/girb_runner.rb
-- bin/gladiator
 - bin/glimmer
+- icons/scaffold_app.icns
 - lib/glimmer.rb
-- lib/glimmer/css/rule_set.rb
+- lib/glimmer/config.rb
+- lib/glimmer/css/rule.rb
 - lib/glimmer/css/style_sheet.rb
 - lib/glimmer/data_binding/list_selection_binding.rb
 - lib/glimmer/data_binding/model_binding.rb
@@ -255,9 +229,10 @@ files:
 - lib/glimmer/data_binding/widget_binding.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/dynamic_property_expression.rb
 - lib/glimmer/dsl/css/property_expression.rb
-- lib/glimmer/dsl/css/rule_set_expression.rb
+- lib/glimmer/dsl/css/pv_expression.rb
+- lib/glimmer/dsl/css/rule_expression.rb
 - lib/glimmer/dsl/css/s_expression.rb
 - lib/glimmer/dsl/engine.rb
 - lib/glimmer/dsl/expression.rb
@@ -306,6 +281,7 @@ files:
 - lib/glimmer/launcher.rb
 - lib/glimmer/package.rb
 - lib/glimmer/rake_task.rb
+- lib/glimmer/scaffold.rb
 - lib/glimmer/swt/color_proxy.rb
 - lib/glimmer/swt/display_proxy.rb
 - lib/glimmer/swt/font_proxy.rb
@@ -320,14 +296,12 @@ files:
 - lib/glimmer/swt/widget_proxy.rb
 - lib/glimmer/ui/custom_shell.rb
 - 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
 - vendor/swt/windows/swt.jar

data/bin/gladiator

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-
-require_relative '../lib/glimmer/launcher'
-
-gladiator = File.expand_path('../../samples/gladiator.rb', __FILE__)
-Glimmer::Launcher.new([gladiator, '-J-Xrs'] + ARGV).launch

data/lib/glimmer/dsl/css/p_expression.rb

@@ -1,25 +0,0 @@
-require 'glimmer/dsl/static_expression'
-require 'glimmer/css/style_sheet'
-require 'glimmer/css/rule_set'
-
-module Glimmer
-  module DSL
-    module CSS
-      class PExpression < StaticExpression
-        include ParentExpression
-
-        def can_interpret?(parent, keyword, *args, &block)
-          keyword == 'p' and
-            parent.is_a?(Glimmer::CSS::RuleSet) and
-            !block_given? and
-            !args.empty? and
-            args.size > 1
-        end
-
-        def interpret(parent, keyword, *args, &block)
-          parent.add_property(args[0], args[1])
-        end
-      end
-    end
-  end
-end

data/lib/glimmer/ui/video.rb

@@ -1,289 +0,0 @@
-require 'glimmer/ui/custom_widget'
-require 'glimmer/swt/color_proxy'
-
-module Glimmer
-  module UI
-    class Video
-      include Glimmer::UI::CustomWidget
-      include_package 'org.eclipse.swt.browser'
-
-      options :file, :url
-      option :autoplay, true
-      option :controls, true
-      option :looped, false
-      option :background, :white
-      option :fit_to_width, true
-      option :fit_to_height, true
-      option :offset_x, 0
-      option :offset_y, 0
-
-      alias autoplay? autoplay
-      alias controls? controls
-      alias looped? looped
-      alias fit_to_width? fit_to_width
-      alias fit_to_height? fit_to_height
-
-      body {
-        browser(:no_scroll) {
-          text html {
-            head {
-              style(id: "style") {
-                css {
-                  body {
-                    margin 0
-                    padding 0
-                    overflow :hidden
-                  }
-                }
-              }
-              style(id: "style-body-background") {
-                css {
-                  body {
-                    p 'background', browser_body_background
-                  }
-                }
-              }
-              style(id: "style-body-offset-x") {
-                css {
-                  body {
-                    margin_left "#{browser_body_offset_x}px"
-                  }
-                }
-              }
-              style(id: "style-body-offset-y") {
-                css {
-                  body {
-                    margin_top "#{browser_body_offset_y}px"
-                  }
-                }
-              }
-            }
-            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
-          }
-        }
-      }
-
-      def source
-        file_source = file
-        if file_source
-          if file_source.start_with?('uri:classloader')
-            file_path = file_source.split(/\/\//).last
-            file_name = File.basename(file_source)
-            # supporting windows ENV['temp'] or mac/unix /tmp
-            tmp_dir = ENV['temp'] ? File.expand_path(ENV['temp']) : '/tmp'
-            tmp_dir += '/glimmer/lib/glimmer/ui/video'
-            FileUtils.mkdir_p(tmp_dir)
-            tmp_file = File.join(tmp_dir, file_name)
-            file_content = File.binread(file_source) rescue File.binread(file_path)
-            File.binwrite(tmp_file, file_content)
-            "file://#{tmp_file}"
-          else
-            "file://#{file_source}"
-          end
-        else
-          url
-        end
-      end
-
-      def file=(a_file)
-        options[:file] = a_file
-        set_video_source
-      end
-
-      def url=(a_url)
-        options[:url] = a_url
-        set_video_source
-      end
-
-      def play
-        video_action('play')
-      end
-
-      def pause
-        video_action('pause')
-      end
-
-      def reload
-        video_action('load')
-      end
-
-      def paused?
-        video_attribute('paused')
-      end
-
-      def playing?
-        !paused?
-      end
-
-      def ended?
-        video_attribute('ended')
-      end
-
-      # Video fully loaded and ready for playback
-      def loaded?
-        !!@completed
-      end
-
-      def position
-        video_attribute('currentTime')
-      end
-
-      def position=(new_position)
-        video_attribute_set('currentTime', new_position)
-      end
-
-      def duration
-        video_attribute('duration')
-      end
-
-      def can_handle_observation_request?(observation_request)
-        result = false
-        if observation_request.start_with?('on_')
-          attribute = observation_request.sub(/^on_/, '')
-          result = OBSERVED_ATTRIBUTE_TO_PROPERTY_MAPPING.keys.include?(attribute)
-        end
-        result || super
-      end
-
-      def handle_observation_request(observation_request, &block)
-        if observation_request.start_with?('on_')
-          attribute = observation_request.sub(/^on_/, '')
-          if attribute == 'loaded' && !@completed
-            super('on_completed', &block)
-          elsif OBSERVED_ATTRIBUTE_TO_PROPERTY_MAPPING.keys.include?(attribute)
-            add_video_observer(block, OBSERVED_ATTRIBUTE_TO_PROPERTY_MAPPING[attribute])
-          else
-            super
-          end
-        end
-      end
-
-      private
-
-      class VideoObserverBrowserFunction < BrowserFunction
-        def initialize(video, observer_proc, attribute)
-          @observer_proc = observer_proc
-          @attribute = attribute
-          name = self.class.generate_name(@attribute)
-          super(video.swt_widget, name)
-        end
-
-        def function(arguments)
-          @observer_proc.call
-        rescue => e
-          Glimmer.logger&.error "#{e.message}\n#{e.backtrace.join("\n")}"
-        ensure
-          nil
-        end
-
-        private
-
-        class << self
-          def generate_name(attribute)
-            "video#{attribute}#{generate_attribute_id(attribute)}"
-          end
-
-          def generate_attribute_id(attribute)
-            attribute_max_ids[attribute] = attribute_max_id(attribute) + 1
-          end
-
-          def attribute_max_id(attribute)
-            attribute_max_ids[attribute] ||= 0
-          end
-
-          def attribute_max_ids
-            @attribute_max_ids ||= {}
-          end
-        end
-      end
-
-      OBSERVED_ATTRIBUTE_TO_PROPERTY_MAPPING = {
-        'playing' => 'play',
-        'paused' => 'pause',
-        'ended' => 'ended',
-        'loaded' => 'canplay',
-      }
-
-      def set_video_source
-        run_on_completed do
-          video_attribute_set('src', source)
-        end
-      end
-
-      def video_action(action)
-        run_on_completed do
-          swt_widget.execute("document.getElementById('video').#{action}()")
-        end
-      end
-
-      def video_attribute(attribute)
-        swt_widget.evaluate("return document.getElementById('video').#{attribute}") if @completed
-      end
-
-      def video_attribute_set(attribute, value)
-        value = "'#{value}'" if value.is_a?(String) || value.is_a?(Symbol)
-        run_on_completed do
-          swt_widget.execute("document.getElementById('video').#{attribute} = #{value}")
-        end
-      end
-
-      def add_video_observer(observer_proc, attribute)
-        run_on_completed do
-          video_observer_browser_function = VideoObserverBrowserFunction.new(self, observer_proc, attribute)
-          swt_widget.execute("document.getElementById('video').addEventListener('#{attribute}', function() {#{video_observer_browser_function.getName}()})")
-        end
-      end
-
-      def run_on_completed(&block)
-        if @completed
-          block.call
-        else
-          on_completed(&block)
-        end
-      end
-
-      def browser_video_autoplay
-        'autoplay' if autoplay?
-      end
-
-      def browser_video_controls
-        'controls' if controls?
-      end
-
-      def browser_video_loop
-        'loop' if looped?
-      end
-
-      def browser_video_width
-        "100%" if fit_to_width
-      end
-
-      def browser_video_height
-        "100%" if fit_to_height
-      end
-
-      def browser_body_background
-        color = background
-        if color.is_a?(Symbol) || color.is_a?(String)
-          color = SWT::ColorProxy.new(color).swt_color
-        elsif color.is_a?(SWT::ColorProxy)
-          color = color.swt_color
-        end
-        "rgba(#{color.getRed}, #{color.getGreen}, #{color.getBlue}, #{color.getAlpha})"
-      end
-
-      def browser_body_offset_x
-        offset_x
-      end
-
-      def browser_body_offset_y
-        offset_y
-      end
-    end
-  end
-end