glimmer 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a01513e043e5d19086d90cb571aa4043235a2753b3164413e680591073f6644
-  data.tar.gz: 56949c7c670c1864804e5ed28d33f7efddcdca7b0b50d465011b149ca7585969
+  metadata.gz: 0c305f675b946595a08012449c49518559acb8238f486c154b3720c0428b5c88
+  data.tar.gz: 3f5d4ece86f4c737f7d0ae9cb1f6f235fca33694653c6a760afe33fcc6117692
 SHA512:
-  metadata.gz: dce0753c615d6c148d7065741463dc3eb95fa3bd437082c757be5ec8569ae812af8ef993fa726a43cdda99e32b748f4201b709c46b10666f78866f27317809f7
-  data.tar.gz: 3a764178e11e57d1b8ac15b5089decdc4933846b3392b0e7904511114c2dab1ae0635f77ac6be644e3151723350caee7f248bc9c19ce36c018879deb302a7a38
+  metadata.gz: 42ea536ecec59e08a94f1dd561b614d6eb64f4d44c8c2ac9de8ef4170a3f6399659de613cd08acb52b2fea68524f65e28e578ecdfa64842f6faf8711efc3b076
+  data.tar.gz: 245ace0d9f7f92efc9071c86b96de8a64b2b624c8194ae5af85c9f74ea77db924028f5cc57505807c7f309d5d8688a0d072e5a50ad40e9e4d0c01ae62dc6b32c

data/README.markdown

@@ -1,4 +1,4 @@
-# Glimmer 0.5.0 Beta (JRuby Desktop UI DSL + Data-Binding)
+# Glimmer 0.5.2 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 native-UI cross-platform desktop development library written in Ruby. Glimmer's main innovation is a JRuby DSL that enables productive and efficient authoring of desktop application user-interfaces while relying on the robust platform-native Eclipse SWT library. Glimmer additionally innovates by having built-in 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 afterwards.
@@ -111,14 +111,14 @@ Please follow these instructions to make the `glimmer` command available on your
 
 Run this command to install directly:
 ```
-jgem install glimmer -v 0.5.0
+jgem install glimmer -v 0.5.2
 ```
 
 ### Option 2: Bundler
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer', '~> 0.5.0'
+gem 'glimmer', '~> 0.5.2'
 ```
 
 And, then run:
@@ -1188,6 +1188,36 @@ Last but not least, these are the available hooks:
 - `before_body`: takes a block that executes in the custom widget instance scope before calling `body`. Useful for initializing variables to later use in `body`
 - `after_body`: takes a block that executes in the custom widget instance scope after calling `body`. Useful for setting up observers on widgets built in `body` (set in instance variables) and linking to other shells.
 
+#### Gotcha
+
+Beware of defining a custom attribute that is a common SWT widget property name.
+For example, if you define `text=` and `text` methods to accept a custom text and then later you write this body:
+
+```ruby
+# ...
+def text
+  # ...
+end
+
+def text=(value)
+  # ...
+end
+
+body {
+  composite {
+    label {
+      text "Hello"
+    }
+    label {
+      text "World"
+    }
+  }
+}
+# ...
+```
+
+The `text` method invoked in the custom widget body will call the one you defined above it. To avoid this gotcha, simply name the text property above something else, like `custom_text`.
+
 ### Custom Shells
 
 Custom shells are a kind of custom widgets that have shells only as the body root. They can be self-contained applications that may be opened and hidden/closed independently of the main app.
@@ -1542,6 +1572,32 @@ Example:
 jruby -J-XstartOnFirstThread -J-classpath "path_to/swt.jar" -r glimmer -S application.rb
 ```
 
+## Packaging
+
+Glimmer apps may be packaged and distributed on the Mac, Windows, and Linux via these tools:
+- Warbler (https://github.com/jruby/warbler): Enables bundling a Glimmer app into a JAR file
+- javapackager (https://docs.oracle.com/javase/8/docs/technotes/tools/unix/javapackager.html): Enables packaging a JAR file as a DMG file on Mac, EXE on Windows, and multiple Linux supported formats on Linux.
+
+Glimmer simplifies the process for general packaging on the Mac by providing a rake task.
+
+- Create `Rakefile` in your app root directory
+- Add the following line to it: `require 'glimmer/rake_task'`
+
+Now, you can run the following command to package your app into a Mac DMG file (using both Warbler and javapackager):
+```
+rake glimmer:package
+```
+
+This will generate a JAR file under `./dist` directory and DMG file under `./packages/bundles`. Both will match your application local directory name (e.g. `MathBowling.jar` and `MathBowling-1.0.dmg` for `~/code/MathBowling`)
+
+By default, the package only includes these directories: app, config, db, lib, script, bin, images, sounds, videos
+
+After running once, you will find a `config/warble.rb` file. It has the JAR packaging configuration. You may adjust included directories in it if needed, and then rerun `rake glimmer:package` and it will pick up your custom configuration.
+
+Otherwise, you may find more advanced instructions for javapackager (https://docs.oracle.com/javase/8/docs/technotes/guides/deploy/self-contained-packaging.html#BCGICFDB) and (https://docs.oracle.com/javase/8/docs/technotes/guides/deploy/self-contained-packaging.html) in order to sign your Mac app and distribute on the App Store.
+
+Additionally, read their documentation on how to set an icon/assets for the application: https://docs.oracle.com/javase/8/docs/technotes/tools/unix/javapackager.html
+
 ## Resources
 
 * [Eclipse Zone Tutorial](http://eclipse.dzone.com/articles/an-introduction-glimmer)

data/lib/glimmer.rb

@@ -2,13 +2,13 @@
 # interfaces using the robust platform-independent Eclipse SWT library. Glimmer
 # comes with built-in data-binding support to greatly facilitate synchronizing
 # UI with domain models.
-
 require 'facets'
 require 'super_module'
 require 'logger'
 require 'java'
 require 'set'
 require 'nested_inherited_jruby_include_package'
+require 'fileutils'
 
 # Glimmer provides a JRuby Desktop UI DSL + Data-Binding functionality
 #

data/lib/glimmer/rake_task.rb

@@ -0,0 +1,24 @@
+namespace :glimmer do
+  desc 'Package app for distribution'
+  task :package do
+    project_name = File.basename(File.expand_path('.'))
+    if !File.exists?('config/warble.rb')
+      system('mkdir -p config')
+      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)')
+        end
+        if line.include?('config.autodeploy_dir =')
+          line = line.sub('# ', '')
+        end
+        output + "\n" + line
+      end
+      File.write('config/warble.rb', new_config)
+    end
+    system('mkdir -p dist')
+    system('warble')
+    puts("javapackager -deploy -native -outdir packages -outfile #{project_name} -srcdir dist -srcfiles #{project_name}.jar -appclass JarMain -name \"#{project_name}\" -title \"#{project_name}\" -BjvmOptions=-XstartOnFirstThread")
+    system("javapackager -deploy -native -outdir packages -outfile #{project_name} -srcdir dist -srcfiles #{project_name}.jar -appclass JarMain -name \"#{project_name}\" -title \"#{project_name}\" -BjvmOptions=-XstartOnFirstThread")
+  end
+end

data/lib/glimmer/swt/widget_proxy.rb

@@ -239,8 +239,8 @@ module Glimmer
 
       def add_listener(underscored_listener_name, &block)
         widget_add_listener_method, listener_class, listener_method = self.class.find_listener(@swt_widget.getClass, underscored_listener_name)
-        listener = listener_class.new(listener_method.getName => block)
-        @swt_widget.send(widget_add_listener_method.getName, listener)
+        listener = listener_class.new(listener_method => block)
+        @swt_widget.send(widget_add_listener_method, listener)
         WidgetListenerProxy.new(listener)
       end
 
@@ -257,7 +257,7 @@ module Glimmer
               widget_add_listener_method.getParameterTypes.each do |listener_type|
                 listener_type.getMethods.each do |listener_method|
                   if (listener_method.getName == listener_method_name)
-                    @listeners[listener_key] = [widget_add_listener_method, listener_class(listener_type), listener_method]
+                    @listeners[listener_key] = [widget_add_listener_method.getName, listener_class(listener_type), listener_method.getName]
                     return @listeners[listener_key]
                   end
                 end
@@ -329,6 +329,12 @@ module Glimmer
           :background => color_converter,
           :background_image => proc do |value|
             if value.is_a?(String)
+              if value.start_with?('uri:classloader')
+                value = value.sub(/^uri\:classloader\:\//, '')
+                object = java.lang.Object.new
+                value = object.java_class.resource_as_stream(value)
+                value = java.io.BufferedInputStream.new(value)
+              end
               image_data = ImageData.new(value)
               # TODO in the future, look into unregistering this listener when no longer needed
               on_event_Resize do |resize_event|

data/lib/glimmer/ui/video.rb

@@ -74,7 +74,25 @@ module Glimmer
       }
 
       def source
-        file ? "file://#{file}" : url
+        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 play

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-11 00:00:00.000000000 Z
+date: 2020-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
   name: facets
@@ -21,13 +21,13 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   name: os
@@ -35,13 +35,13 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
   name: super_module
@@ -49,13 +49,13 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
   name: nested_inherited_jruby_include_package
@@ -63,9 +63,37 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.5
+  name: warbler
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.5
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 10.0.0
+  name: rake
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 10.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -225,6 +253,7 @@ files:
 - lib/glimmer/error.rb
 - lib/glimmer/invalid_keyword_error.rb
 - lib/glimmer/launcher.rb
+- lib/glimmer/rake_task.rb
 - lib/glimmer/swt/color_proxy.rb
 - lib/glimmer/swt/display_proxy.rb
 - lib/glimmer/swt/font_proxy.rb