glimmer 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f82e6793a331105407650a919d3d973f360c9e0c5e6bd49d185bd44dd9ec745
-  data.tar.gz: 190ea8ddbe57f41100e9fa539f4e9465b9d621418e3f00e291b91103f04484ce
+  metadata.gz: 2e11298f6aa21de3c113c3c9169df23a9181b2501e7d33e7fc62e3d18dec37f8
+  data.tar.gz: eca26276e4afebd498174332cc7360044afffe71d48663ca3d95feb657b17b57
 SHA512:
-  metadata.gz: b57d3b3d4754fc2d5229c3ec2c2e7518336091b1d305a1d4c2d6b1b601a50245f75340ba2dc213168349408389f324afeeeb734ae81faa2045dd6d6e0e5d7da3
-  data.tar.gz: b2fd672bed1bf48b99c7e92ad8b82fb910c0d0330b78152fbf3cbe4a6c33e34dae4a0ed945ab2e646492af2daad1f9a224488ee5064a7d4f6650f6238882f86e
+  metadata.gz: cff2e454cdc6100893a100bdb5fd6e0b1b300f6c384f4c8a9722deb677d3cf83fd86f14462e7661b9523b06df43c93f6e1499bb5ab1ea77dfa0283a6c64537d2
+  data.tar.gz: 820f9b260ce6c068ccf69274c73074739b983047050c517b0c511d992d903ff66e904f283224a5b837d29da69cd03f5549e6d36434bbe8fe702edef67df5ea29

data/README.markdown

@@ -1,4 +1,4 @@
-# Glimmer 0.4.7 Beta (JRuby Desktop UI DSL + Data-Binding)
+# Glimmer 0.4.8 Beta (JRuby Desktop UI DSL + Data-Binding)
 [![Coverage Status](https://coveralls.io/repos/github/AndyObtiva/glimmer/badge.svg?branch=master)](https://coveralls.io/github/AndyObtiva/glimmer?branch=master)
 
 Glimmer is a cross-platform Ruby desktop development library. Glimmer's main innovation is a JRuby DSL that enables easy and efficient authoring of desktop application user-interfaces while relying on the robust platform-independent Eclipse SWT library. Glimmer additionally innovates by having built-in desktop UI data-binding support to greatly facilitate synchronizing the UI with domain models. As a result, that achieves true decoupling of object oriented components, enabling developers to solve business problems without worrying about UI concerns, or alternatively drive development UI-first, and then write clean business components test-first afterward.
@@ -26,13 +26,14 @@ glimmer samples/hello_world.rb
 
 Glimmer app:
 
-![Hello World](https://github.com/AndyObtiva/glimmer/raw/master/images/glimmer-hello-world.png)
+![Hello World](images/glimmer-hello-world.png)
 
 ### Tic Tac Toe
 
 Glimmer code (from `samples/tictactoe/tic_tac_toe.rb`):
 
 ```ruby
+# ...
 shell {
   text "Tic-Tac-Toe"
   composite {
@@ -51,6 +52,7 @@ shell {
     }
   }
 }
+# ...
 ```
 
 Run:
@@ -61,7 +63,7 @@ glimmer samples/tictactoe/tic_tac_toe.rb
 
 Glimmer app:
 
-![Tic Tac Toe](https://github.com/AndyObtiva/glimmer/raw/master/images/glimmer-tic-tac-toe.png)
+![Tic Tac Toe](images/glimmer-tic-tac-toe.png)
 
 NOTE: Glimmer is in beta mode. Please help make better by adopting for small or low risk projects and providing feedback.
 
@@ -105,14 +107,14 @@ Please follow these instructions to make the `glimmer` command available on your
 
 Run this command to install directly:
 ```
-jgem install glimmer -v 0.4.7
+jgem install glimmer -v 0.4.8
 ```
 
 ### Option 2: Bundler
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer', '~> 0.4.7'
+gem 'glimmer', '~> 0.4.8'
 ```
 
 And, then run:
@@ -120,7 +122,7 @@ And, then run:
 bundle install
 ```
 
-## Glimmer command
+## Glimmer Command
 
 Usage:
 ```
@@ -132,10 +134,14 @@ the glimmer ruby gem and SWT jar dependency.
 
 Example:
 ```
-glimmer hello_world.rb
+glimmer samples/hello_world.rb
 ```
 This runs the Glimmer application hello_world.rb
 
+## Girb (Glimmer irb) Command
+
+With Glimmer installed, you may want to run `girb` instead of standard `irb` to have SWT preloaded and the Glimmer library required and included for quick Glimmer coding/testing.
+
 ## Glimmer DSL Syntax
 
 ### Widgets
@@ -146,7 +152,7 @@ https://www.eclipse.org/swt/widgets/
 
 This screenshot taken from the link above should give a glimpse of how SWT widgets look and feel:
 
-![SWT Widgets](https://github.com/AndyObtiva/glimmer/raw/master/images/glimmer-swt-widgets.png)
+![SWT Widgets](images/glimmer-swt-widgets.png)
 
 In Glimmer DSL, widgets are declared with lowercase underscored names mirroring their SWT names minus the package name:
 
@@ -165,11 +171,9 @@ In Glimmer DSL, widgets are declared with lowercase underscored names mirroring
 
 A **widget** name is followed by a Ruby block that contains the widget **properties** and **content**. Optionally, an SWT **style** ***argument*** may also be passed (see [next section](#widget-styles) for details).
 
-For example, if we were to revisit `hello_world.rb` above:
+For example, if we were to revisit `samples/hello_world.rb` above:
 
 ```ruby
-include Glimmer
-
 shell {
   text "Glimmer"
   label {
@@ -183,10 +187,12 @@ Note that `shell` instantiates the outer shell **widget**, in other words, the w
 `shell` is then followed by a ***block*** that contains
 
 ```ruby
-text "Glimmer" # text property of shell
-label { # label widget declaration
-  text "Hello World!" # text property of label
-}
+# ...
+  text "Glimmer" # text property of shell
+  label { # label widget declaration
+    text "Hello World!" # text property of label
+  }
+# ...
 ```
 
 The first line declares a **property** called `text`, which sets the title of the shell (window) to `"Glimmer"`. **Properties** always have ***arguments***, such as the text `"Glimmer"` in this case, and do **NOT** have a ***block***.
@@ -200,19 +206,20 @@ After it is declared, a `shell` must be opened with the `#open` method, which ca
 ```ruby
 @shell = shell {
   # properties and content
+  # ...
 }
 @shell.open
 ```
 
 It is centered upon initial display and has a minimum width of 130 (can be re-centered when needed with `@shell.center` method after capturing `shell` in a `@shell` variable as per samples)
 
-Check out the [samples](https://github.com/AndyObtiva/glimmer/tree/master/samples) directory for more examples.
+Check out the [samples](samples) directory for more examples.
 
-Example from [hello_tab.rb](https://github.com/AndyObtiva/glimmer/blob/master/samples/hello_tab.rb) sample:
+Example from [hello_tab.rb](samples/hello_tab.rb) sample:
 
-![Hello Tab 1](https://github.com/AndyObtiva/glimmer/raw/master/images/glimmer-hello-tab1.png)
+![Hello Tab 1](images/glimmer-hello-tab1.png)
 
-![Hello Tab 2](https://github.com/AndyObtiva/glimmer/raw/master/images/glimmer-hello-tab2.png)
+![Hello Tab 2](images/glimmer-hello-tab2.png)
 
 ```ruby
 shell {
@@ -234,7 +241,46 @@ shell {
 }.open
 ```
 
-**Browser Widget**
+#### Video Widget
+
+![Video Widget](images/glimmer-video-widget.png)
+
+Glimmer comes with a video widget not in SWT. It comes with very basic video functionality at the moment, such as autoplay by default, displaying controls, looping, and setting background.
+
+Attributes (passed in an options hash as arguments to video widget):
+- `autoplay` (true [default] or false): plays video automatically as soon as loaded
+- `controls` (true [default] or false): displays controls
+- `looped` (true or false [default]): plays video in looped mode
+- `background` (Glimmer color [default: white]): sets background color just like with any other widget
+- `fit_to_width` (true [default] or false): fits video width to widget allotted width regardless of video's original size. Maintains video aspect ratio.
+- `fit_to_height` (true [default] or false): fits video height to widget allotted height regardless of video's original size. Maintains video aspect ratio.
+- `offset_x` (integer [default: 0]): offset from left border. Could be a negative number if you want to show only an area of the video. Useful when fit_to_width is false to pick an area of the video to display.
+- `offset_y` (integer [default: 0]): offset from top border. Could be a negative number if you want to show only an area of the video. Useful when fit_to_height is false to pick an area of the video to display.
+
+Methods:
+- `play`: plays video
+- `pause`: pauses video
+
+Example ([samples/video/hello_video.rb](samples/video/hello_video.rb)):
+
+```ruby
+# ...
+shell {
+  video(file: video_file)
+}.open
+```
+
+Example ([samples/video/hello_looped_video_with_black_background.rb](samples/video/hello_looped_video_with_black_background.rb)):
+
+```ruby
+# ...
+shell {
+  minimum_size 1024, 640
+  video(file: video_file, looped: true, background: :black)
+}.open
+```
+
+#### Browser Widget
 
 Glimmer supports SWT Browser widget, which can load URLs (including media) or render HTML (useful in embedding videos). It can even be instrumented with JavaScript when needed (though highly discouraged except for rare cases when leveraging a pre-existing web codebase in a desktop app).
 
@@ -242,10 +288,11 @@ Example loading a URL:
 
 ```ruby
 shell {
+  minimum_size 1024, 860
   browser {
-    url 'http://www.google.com'
+    url 'http://brightonresort.com/about'
   }
-}
+}.open
 ```
 
 Example rendering HTML with an embedded video:
@@ -258,7 +305,7 @@ shell {
         <head>
         </head>
         <body>
-          <video id="bowling-video" width="100%" height="100%">
+          <video id="video" width="100%" height="100%">
             <source src="file://#{video_file}" type="video/mp4">
           Your browser does not support the video tag.
           </video>
@@ -266,10 +313,10 @@ shell {
       </html>
     HTML
     on_completed { # on load of the page execute this JavaScript
-      @browser.widget.execute("document.getElementById('bowling-video').play()")
+      @browser.widget.execute("document.getElementById('video').play()")
     }
   }
-}
+}.open
 ```
 
 ### Widget Styles
@@ -320,13 +367,13 @@ You may check out all available `SWT` styles here:
 
 https://help.eclipse.org/2019-12/nftopic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/SWT.html
 
-**Advanced case outside of standard Glimmer DSL**
+#### Advanced case outside of standard Glimmer DSL
 
 When building a widget-related SWT object manually (e.g. `GridData.new(...)`), you are expected to use `SWT::CONSTANT` directly or BIT-OR a few SWT constants together like `SWT::BORDER | SWT::V_SCROLL`.
 
 Glimmer facilitates that with `GSWT` class by allowing you to pass multiple styles as an argument array of symbols instead of dealing with BIT-OR. For example: `GSWT[:border, :v_scroll]`
 
-**Non-resizable Window**
+#### Non-resizable Window
 
 SWT Shell widget by default is resizable. To make it non-resizable, one must pass a complicated style bit concoction like `GSWT[:shell_trim] & (~GSWT[:resize]) & (~GSWT[:max])`.
 
@@ -460,7 +507,7 @@ composite {
 }
 ```
 
-Here is a more sophisticated example taken from [hello_computed.rb](https://github.com/AndyObtiva/glimmer/blob/master/samples/hellocomputed/hello_computed.rb) sample:
+Here is a more sophisticated example taken from [hello_computed.rb](samples/hellocomputed/hello_computed.rb) sample:
 ```ruby
 shell {
   text "Hello Computed"
@@ -617,11 +664,11 @@ The 5th example demonstrates computed value data binding whereby the value of `n
 
 The 6th example demonstrates nested indexed computed value data binding whereby the value of `profiles[0].name` depends on changes to both nested `profiles[0].first_name` and `profiles[0].last_name`.
 
-Example from [hello_combo.rb](https://github.com/AndyObtiva/glimmer/blob/master/samples/hello_combo.rb) sample:
+Example from [hello_combo.rb](samples/hello_combo.rb) sample:
 
-![Hello Combo](https://github.com/AndyObtiva/glimmer/raw/master/images/glimmer-hello-combo.png)
+![Hello Combo](images/glimmer-hello-combo.png)
 
-![Hello Combo](https://github.com/AndyObtiva/glimmer/raw/master/images/glimmer-hello-combo-expanded.png)
+![Hello Combo](images/glimmer-hello-combo-expanded.png)
 
 ```ruby
 class Person
@@ -662,9 +709,9 @@ HelloCombo.new.launch
 
 `combo` widget is data-bound to the country of a person. Note that it expects `person` object to have `:country` attribute and `:country_options` attribute containing all available countries.
 
-Example from [hello_list_single_selection.rb](https://github.com/AndyObtiva/glimmer/blob/master/samples/hello_list_single_selection.rb) sample:
+Example from [hello_list_single_selection.rb](samples/hello_list_single_selection.rb) sample:
 
-![Hello List Single Selection](https://github.com/AndyObtiva/glimmer/raw/master/images/glimmer-hello-list-single-selection.png)
+![Hello List Single Selection](images/glimmer-hello-list-single-selection.png)
 
 ```ruby
 shell {
@@ -686,7 +733,7 @@ shell {
 
 Nonetheless, in the next example, a multi-selection list is declared instead allowing data-binding of multiple selection values to the bindable attribute on the model.
 
-![Hello List Multi Selection](https://github.com/AndyObtiva/glimmer/raw/master/images/glimmer-hello-list-multi-selection.png)
+![Hello List Multi Selection](images/glimmer-hello-list-multi-selection.png)
 
 ```ruby
 class Person
@@ -739,7 +786,7 @@ The Glimmer code is not much different from above except for passing the `:multi
 
 Note that in all the data-binding examples above, there was also an observer attached to the `button` widget to trigger an action on the model, which in turn triggers a data-binding update on the `list` or `combo`. Observers will be discussed in more details in the [next section](#observer).
 
-You may learn more about Glimmer's data-binding syntax by reading the [Eclipse Zone Tutorial](http://eclipse.dzone.com/articles/an-introduction-glimmer) mentioned in resources and opening up the samples under the [samples](https://github.com/AndyObtiva/glimmer/tree/master/samples) directory.
+You may learn more about Glimmer's data-binding syntax by reading the [Eclipse Zone Tutorial](http://eclipse.dzone.com/articles/an-introduction-glimmer) mentioned in resources and opening up the samples under the [samples](samples) directory.
 
 ### Observer
 
@@ -869,6 +916,7 @@ Definition:
 ```ruby
 class RedLabel
   include Glimmer::SWT::CustomWidget
+
   def body
     label(swt_style) {
       background :red
@@ -895,6 +943,7 @@ Definition:
 module Red
   class Composite
     include Glimmer::SWT::CustomWidget
+
     def body
       composite(swt_style) {
         background :red
@@ -917,12 +966,16 @@ shell {
 
 Notice how `Red::Composite` became `red__composite` with double-underscore, which is how Glimmer Custom Widgets signify namespaces by convention.
 
-Custom Widgets have the following attributes available to call from inside the `#body` method:
+Custom Widgets have the following attributes (attribute readers) available to call from inside the `#body` method:
 - `#parent`: Glimmer object parenting custom widget
 - `#swt_style`: SWT style integer. Can be useful if you want to allow consumers to customize a widget inside the custom widget body
-- `#options`: a hash of options passed in parentheses when declaring a custom widget (useful for passing in model data) (e.g. `calendar(events: events)`). Custom widget class can declare option names (array) with `.options` method as shown below (not to be confused with `#options` instance method for retrieving options hash containing names & values)
+- `#options`: a hash of options passed in parentheses when declaring a custom widget (useful for passing in model data) (e.g. `calendar(events: events)`). Custom widget class can declare option names (array) with `.options` method as shown below, which generates attribute readers for every option (not to be confused with `#options` instance method for retrieving options hash containing names & values)
 - `#content`: nested block underneath custom widget. It will be automatically called at the end of processing the custom widget body. Alternatively, the custom widget body may call `content.call` at the place where the content is needed to show up as shown in the following example.
 
+Additionally, custom widgets can call the following class methods:
+- `.options`: declares a list of options by taking an option name array (symbols/strings). This generates option attribute readers (e.g. `options :orientation, :bg_color` generates `#orientation` and `#bg_color` attribute readers)
+- `.option`: declares a single option taking option name and default value as arguments (also generates an attribute reader just like `.options`)
+
 **Content/Options Example:**
 
 Definition:
@@ -931,6 +984,7 @@ class Sandwich
   include Glimmer::SWT::CustomWidget
 
   options :orientation, :bg_color
+  option :fg_color, :black
 
   def body
     composite(swt_style) { # gets custom widget style
@@ -968,7 +1022,7 @@ The following additional attributes may be called from outside a custom widget i
 
 ## Samples
 
-Check the [samples](https://github.com/AndyObtiva/glimmer/tree/master/samples) directory for examples on how to write Glimmer applications. To run a sample, make sure to install the `glimmer` gem first and then use the `glimmer` command to run it (alternatively, you may clone the repo, follow [CONTRIBUTING.md](https://github.com/AndyObtiva/glimmer/blob/master/CONTRIBUTING.md) instructions, and run samples locally with development glimmer command: `bin/glimmer --dev`).
+Check the [samples](samples) directory for examples on how to write Glimmer applications. To run a sample, make sure to install the `glimmer` gem first and then use the `glimmer` command to run it (alternatively, you may clone the repo, follow [CONTRIBUTING.md](CONTRIBUTING.md) instructions, and run samples locally with development glimmer command: `bin/glimmer --dev`).
 
 Examples:
 
@@ -1029,10 +1083,6 @@ This allows you to call SWT Java classes from Ruby without mentioning package na
 
 For example, after imports, `org.eclipse.swt.graphics.Color` can be referenced by just `Color`
 
-## Girb (Glimmer irb)
-
-With Glimmer installed, you may run want to run `girb` instead of standard `irb` to have SWT preloaded and the Glimmer library required and included for quick Glimmer coding/testing.
-
 ## Logging
 
 Glimmer comes with a Ruby Logger accessible via `Glimmer.logger`
@@ -1095,15 +1145,15 @@ jruby -J-XstartOnFirstThread -J-classpath "path_to/swt.jar" -r glimmer -S applic
 
 These features have been suggested. You might see them in a future version of Glimmer. You are welcome to contribute more feature suggestions.
 
-[TODO.md](https://github.com/AndyObtiva/glimmer/blob/master/TODO.md)
+[TODO.md](TODO.md)
 
 ## Change Log
 
-[CHANGELOG.md](https://github.com/AndyObtiva/glimmer/blob/master/CHANGELOG.md)
+[CHANGELOG.md](CHANGELOG.md)
 
 ## Contributing
 
-[CONTRIBUTING.md](https://github.com/AndyObtiva/glimmer/blob/master/CONTRIBUTING.md)
+[CONTRIBUTING.md](CONTRIBUTING.md)
 
 ## Contributors
 

data/bin/girb

@@ -2,4 +2,5 @@
 
 require_relative '../lib/glimmer/launcher'
 
-Glimmer::Launcher.new(['irb'] + ARGV).launch
+girb_runner = File.expand_path('../girb_runner.rb', __FILE__)
+Glimmer::Launcher.new(["irb -r #{girb_runner}"] + ARGV).launch

data/bin/girb_runner.rb

@@ -0,0 +1 @@
+include Glimmer

data/lib/glimmer.rb

@@ -11,9 +11,11 @@ require "java"
 require_relative "glimmer/parent"
 require_relative "glimmer/swt_packages" #TODO move into SWT namespace
 require_relative "glimmer/swt/custom_widget"
+require_relative 'glimmer/swt/video' # TODO offload to a custom widget directory
 require_relative "glimmer/ext/module"
 
 module Glimmer
+  REGEX_METHODS_EXCLUDED = /^(to_|\[)/
    #TODO make it configurable to include or not include
   include SwtPackages
   def self.included(klass)
@@ -30,12 +32,21 @@ module Glimmer
     @@logger
   end
 
+  # TODO calling original method_missing after aliasing for cases where method_missing is not needed, like known excluded symbols
+
+  alias method_missing_without_glimmer method_missing
   def self.method_missing(method_symbol, *args, &block)
+    if method_symbol.to_s.match(REGEX_METHODS_EXCLUDED)
+      return method_missing_without_glimmer(method_symbol, *args, &block)
+    end
     Glimmer.logger.debug "method: " + method_symbol.to_s + " and args: " + args.to_s
     command_handler_chain = CommandHandlerChainFactory.chain
     return_value = command_handler_chain.handle(@@parent_stack.last, method_symbol, *args, &block)
     add_contents(return_value, &block)
     return return_value
+  # rescue => e
+    # Glimmer.logger.error e.message
+    # method_missing_without_glimmer(method_symbol, *args, &block)
   end
 
   # TODO come up with a better public name for this and put on gwidgets directly

data/lib/glimmer/command_handler_chain_link.rb

@@ -14,8 +14,10 @@ module Glimmer
         return @next_chain_link.handle(parent, command_symbol, *args, &block)
       else
         # TODO see if we need a better response here (e.g. dev mode error raising vs production mode silent failure)
-        Glimmer.logger.error "Command: #{command_symbol} cannot be handled!"
-        return nil
+        # Glimmer.logger.error "Command: #{command_symbol} cannot be handled!"
+        Glimmer.logger.debug "Command: #{command_symbol} cannot be handled!"
+        # raise "Command: #{command_symbol} cannot be handled!"
+        nil
       end
     end
   end

data/lib/glimmer/swt/command_handlers/custom_widget_command_handler.rb

@@ -14,7 +14,7 @@ module Glimmer
         end
 
         def do_handle(parent, command_symbol, *args, &block)
-          options = args.pop if args.last.is_a?(Hash)
+          options = args.last.is_a?(Hash) ? args.pop : {}
           Glimmer.logger.debug "Custom widget #{command_symbol} styles are: [" + args.inspect + "] and options are: #{options}"
           CustomWidget.for(command_symbol).new(parent, *args, options, &block)
         end

data/lib/glimmer/swt/custom_widget.rb

@@ -1,5 +1,3 @@
-require 'set'
-
 require_relative 'proc_tracker'
 require_relative 'observable_model'
 
@@ -34,17 +32,25 @@ module Glimmer
         # Can be called multiple times to set more options additively.
         # When passed no arguments, it returns list of all option names captured so far
         def options(*new_options)
-          new_options = new_options.compact.map(&:to_s)
+          new_options = new_options.compact.map(&:to_s).map(&:to_sym)
           if new_options.empty?
-            @options ||= Set.new # class options array
+            @options ||= {} # maps options to defaults
           else
-            options |= Set[*new_options]
+            new_options = new_options.reduce({}) {|new_options, new_option| new_options.merge(new_option => nil)}
+            @options = options.merge(new_options)
             def_option_attr_readers(new_options)
           end
         end
 
+        def option(new_option, new_option_default = nil)
+          new_option = new_option.to_s.to_sym
+          new_options = {new_option => new_option_default}
+          @options = options.merge(new_options)
+          def_option_attr_readers(new_options)
+        end
+
         def def_option_attr_readers(new_options)
-          new_options.each do |option|
+          new_options.each do |option, default|
             class_eval <<-end_eval, __FILE__, __LINE__
               def #{option}
                 options[:#{option}]
@@ -59,7 +65,8 @@ module Glimmer
       def initialize(parent, *swt_constants, options, &content)
         @parent = parent
         @swt_style = GSWT[*swt_constants]
-        @options = options # instance options hash
+        options ||= {}
+        @options = self.class.options.merge(options)
         @content = ProcTracker.new(content) if content
         @body_root = body
         @widget = @body_root.widget
@@ -75,12 +82,18 @@ module Glimmer
         @body_root.can_add_listener?(underscored_listener_name)
       end
 
+      # TODO clean up difference between add_listener and add_observer
+
       def add_listener(underscored_listener_name, &block)
         @body_root.add_listener(underscored_listener_name, &block)
       end
 
       def add_observer(observer, attribute_name)
-        @body_root.add_observer(observer, attribute_name)
+        if respond_to?(attribute_name)
+          super
+        else
+          @body_root.add_observer(observer, attribute_name)
+        end
       end
 
       def has_attribute?(attribute_name, *args)

data/lib/glimmer/swt/g_color.rb

@@ -11,6 +11,8 @@ module Glimmer
       class << self
         include_package 'org.eclipse.swt'
 
+        # TODO consider refactoring to simply for and returning GColor instead for consistency
+
         def color_for(display = nil, standard_color)
           standard_color = "color_#{standard_color}".to_sym unless standard_color.to_s.include?('color_')
           display ||= GDisplay.instance.display

data/lib/glimmer/swt/g_shell.rb

@@ -40,6 +40,10 @@ module Glimmer
         @widget.pack
         center
         @widget.open
+        start_event_loop
+      end
+
+      def start_event_loop
         until @widget.isDisposed
           @display.sleep unless @display.readAndDispatch
         end

data/lib/glimmer/swt/model_binding.rb

@@ -160,8 +160,13 @@ module Glimmer
               nested_property_observer.observe(model)
               parent_observer.add_dependent([parent_model, parent_property_name] => [nested_property_observer, model, nil])
             else
+              # pd property_name, announcer: '[NESTED]', header: true
+              # pd model, announcer: '[NESTED]'
+              # pd nested_property_observer, announcer: '[NESTED]'
               nested_property_observer.observe(model, property_name)
+              # pd 'DONE ADDING OBSERVER', announcer: '[NESTED]'
               parent_observer.add_dependent([parent_model, parent_property_name] => [nested_property_observer, model, property_name])
+              # pd 'DONE ADDING DEPENDENT', announcer: '[NESTED]'
             end
           end
         end

data/lib/glimmer/swt/observable_model.rb

@@ -21,6 +21,9 @@ module Glimmer
       end
 
       def add_observer(observer, property_name)
+        # pd property_name, announcer: '[ADD_OBSERVER]'
+        # pd observer, announcer: '[ADD_OBSERVER]'
+        # pd has_observer?(observer, property_name)
         return observer if has_observer?(observer, property_name)
         property_observer_list(property_name) << observer
         add_property_writer_observers(property_name)

data/lib/glimmer/swt/observer.rb

@@ -52,15 +52,24 @@ module Glimmer
       # registers observer in an observable on a property (optional)
       # observer maintains registration list to unregister later
       def register(observable, property = nil)
+        # pd property, announcer: '[OBSERVE]', header: true
+        # pd observable, announcer: '[OBSERVE]'
+        # pd self, announcer: '[OBSERVE]'
         unless observable.is_a?(Observable)
+          # pd 'not an observable'
           # TODO refactor code to be more smart/polymorphic/automated and honor open/closed principle
           if observable.is_a?(Array)
+            # pd 'array'
             observable.extend(ObservableArray)
           else
+            # pd 'not array'
             observable.extend(ObservableModel)
           end
         end
+        # pd 'adding observer', announcer: '[OBSERVE]'
+        # pd [self, property], announcer: '[OBSERVE]'
         observable.add_observer(*[self, property].compact)
+        # pd 'adding registration', announcer: '[OBSERVE]'
         [observable, property].tap do |registration|
           self.registrations << registration
         end

data/lib/glimmer/swt/video.rb

@@ -0,0 +1,133 @@
+require_relative 'custom_widget'
+require_relative 'g_color'
+
+#TODO display progress wheel while loading video
+
+module Glimmer
+  module SWT
+    class Video
+      PROPERTIES_OBSERVED = [
+        'playing',
+        'paused',
+        'ended',
+        'started',
+        'remaining',
+        'current_time',
+      ]
+
+      include_package 'org.eclipse.swt.browser'
+
+      include Glimmer::SWT::CustomWidget
+
+      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
+
+      def body
+        browser {
+          text <<~HTML
+            <html>
+              <head>
+                <style id="style">
+                  body {
+                    margin: 0;
+                    padding: 0;
+                  }
+                </style>
+                <style id="style-body-background">
+                  body {
+                    background: #{browser_body_background};
+                  }
+                </style>
+                <style id="style-body-offset-x">
+                  body {
+                    margin-left: #{browser_body_offset_x}px;
+                  }
+                </style>
+                <style id="style-body-offset-y">
+                  body {
+                    margin-top: #{browser_body_offset_y}px;
+                  }
+                </style>
+              </head>
+              <body>
+                <video id="video" #{browser_video_width} #{browser_video_height} #{browser_video_loop} #{browser_video_controls} #{browser_video_autoplay}>
+                  <source id="source" src="#{source}" type="video/mp4">
+                Your browser does not support the video tag.
+                </video>
+              </body>
+            </html>
+          HTML
+        }
+      end
+
+      def source
+        file ? "file://#{file}" : url
+      end
+
+      def play
+        video_action('play')
+      end
+
+      def pause
+        video_action('pause')
+      end
+
+      private
+
+      def video_action(action)
+        widget.execute("document.getElementById('video').#{action}()")
+      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
+        "width='100%'" if fit_to_width
+      end
+
+      def browser_video_height
+        "height='100%'" if fit_to_height
+      end
+
+      def browser_body_background
+        color = background
+        if color.is_a?(Symbol) || color.is_a?(String)
+          color = GColor.color_for(parent.widget.getDisplay, color)
+        elsif color.is_a?(GColor)
+          color = color.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2020-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
   name: super_module
   type: :runtime
   prerelease: false
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -164,6 +164,7 @@ files:
 - LICENSE.txt
 - README.markdown
 - bin/girb
+- bin/girb_runner.rb
 - bin/glimmer
 - lib/glimmer.rb
 - lib/glimmer/command_handler.rb
@@ -213,6 +214,7 @@ files:
 - lib/glimmer/swt/proc_tracker.rb
 - lib/glimmer/swt/table_items_binding.rb
 - lib/glimmer/swt/tree_items_binding.rb
+- lib/glimmer/swt/video.rb
 - lib/glimmer/swt/widget_binding.rb
 - lib/glimmer/swt_packages.rb
 - lib/glimmer/xml/command_handlers/html_command_handler.rb