glimmer-dsl-swt 4.17.3.0 → 4.17.4.0

data/VERSION

@@ -1 +1 @@
-4.17.3.0
+4.17.4.0

data/glimmer-dsl-swt.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-dsl-swt 4.17.3.0 ruby lib
+# stub: glimmer-dsl-swt 4.17.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.17.3.0"
+  s.version = "4.17.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2020-10-18"
+  s.date = "2020-10-21"
   s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Library)".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer".freeze, "girb".freeze]
@@ -81,10 +81,10 @@ Gem::Specification.new do |s|
     "lib/glimmer/rake_task.rb",
     "lib/glimmer/rake_task/list.rb",
     "lib/glimmer/rake_task/package.rb",
-    "lib/glimmer/rake_task/sample.rb",
     "lib/glimmer/rake_task/scaffold.rb",
     "lib/glimmer/swt/color_proxy.rb",
     "lib/glimmer/swt/cursor_proxy.rb",
+    "lib/glimmer/swt/custom/code_text.rb",
     "lib/glimmer/swt/display_proxy.rb",
     "lib/glimmer/swt/dnd_proxy.rb",
     "lib/glimmer/swt/font_proxy.rb",
@@ -94,6 +94,7 @@ Gem::Specification.new do |s|
     "lib/glimmer/swt/menu_proxy.rb",
     "lib/glimmer/swt/message_box_proxy.rb",
     "lib/glimmer/swt/packages.rb",
+    "lib/glimmer/swt/sash_form_proxy.rb",
     "lib/glimmer/swt/scrolled_composite_proxy.rb",
     "lib/glimmer/swt/shell_proxy.rb",
     "lib/glimmer/swt/style_constantizable.rb",
@@ -112,6 +113,7 @@ Gem::Specification.new do |s|
     "samples/elaborate/contact_manager/contact_manager_presenter.rb",
     "samples/elaborate/contact_manager/contact_repository.rb",
     "samples/elaborate/login.rb",
+    "samples/elaborate/meta_sample.rb",
     "samples/elaborate/tic_tac_toe.rb",
     "samples/elaborate/tic_tac_toe/board.rb",
     "samples/elaborate/tic_tac_toe/cell.rb",
@@ -128,6 +130,7 @@ Gem::Specification.new do |s|
     "samples/hello/hello_menu_bar.rb",
     "samples/hello/hello_message_box.rb",
     "samples/hello/hello_pop_up_context_menu.rb",
+    "samples/hello/hello_sash_form.rb",
     "samples/hello/hello_tab.rb",
     "samples/hello/hello_world.rb",
     "vendor/swt/linux/swt.jar",
@@ -155,7 +158,7 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency(%q<os>.freeze, [">= 1.0.0", "< 2.0.0"])
     s.add_runtime_dependency(%q<rake>.freeze, [">= 10.1.0", "< 14.0.0"])
     s.add_runtime_dependency(%q<text-table>.freeze, [">= 1.2.4", "< 2.0.0"])
-    s.add_runtime_dependency(%q<tty-markdown>.freeze, [">= 0.6.0", "< 2.0.0"])
+    s.add_runtime_dependency(%q<rouge>.freeze, [">= 3.23.0", "< 4.0.0"])
     s.add_development_dependency(%q<juwelier>.freeze, [">= 2.4.9", "< 3.0.0"])
     s.add_development_dependency(%q<warbler>.freeze, [">= 2.0.5", "< 3.0.0"])
     s.add_development_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])
@@ -174,7 +177,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<os>.freeze, [">= 1.0.0", "< 2.0.0"])
     s.add_dependency(%q<rake>.freeze, [">= 10.1.0", "< 14.0.0"])
     s.add_dependency(%q<text-table>.freeze, [">= 1.2.4", "< 2.0.0"])
-    s.add_dependency(%q<tty-markdown>.freeze, [">= 0.6.0", "< 2.0.0"])
+    s.add_dependency(%q<rouge>.freeze, [">= 3.23.0", "< 4.0.0"])
     s.add_dependency(%q<juwelier>.freeze, [">= 2.4.9", "< 3.0.0"])
     s.add_dependency(%q<warbler>.freeze, [">= 2.0.5", "< 3.0.0"])
     s.add_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])

data/lib/glimmer-dsl-swt.rb

@@ -34,6 +34,7 @@ require 'glimmer'
 require 'logging'
 require 'nested_inherited_jruby_include_package'
 require 'super_module'
+require 'rouge'
 
 # Internal requires
 require 'ext/glimmer/config'

data/lib/glimmer/dsl/swt/custom_widget_expression.rb

@@ -25,6 +25,7 @@ require 'glimmer/dsl/parent_expression'
 require 'glimmer/dsl/top_level_expression'
 require 'glimmer/ui/custom_widget'
 require 'glimmer/ui/custom_shell'
+require 'glimmer/swt/custom/code_text'
 
 module Glimmer
   module DSL

data/lib/glimmer/dsl/swt/widget_expression.rb

@@ -56,3 +56,4 @@ require 'glimmer/swt/scrolled_composite_proxy'
 require 'glimmer/swt/tree_proxy'
 require 'glimmer/swt/table_proxy'
 require 'glimmer/swt/table_column_proxy'
+require 'glimmer/swt/sash_form_proxy'

data/lib/glimmer/rake_task.rb

@@ -62,26 +62,9 @@ namespace :glimmer do
     end
   end
   
-  namespace :sample do
-    task :requires do      
-      require_relative 'rake_task/sample'      
-    end
-    
-    desc 'Runs a Glimmer internal sample [included in gem]. If no name is supplied, it runs all samples.'
-    task :run, [:name] => [:requires] do |t, args|
-      Glimmer::RakeTask::Sample.run(args[:name])
-    end
-    
-    desc 'Lists Glimmer internal samples [included in gem]. Filters by query if specified (query is optional)'
-    task :list, [:query] => [:requires] do |t, args|
-      Glimmer::RakeTask::Sample.list(args[:query])
-    end
-    
-    desc 'Outputs code for a Glimmer internal sample [included in gem] (name is required)'
-    task :code, [:name] => [:requires] do |t, args|
-      Glimmer::RakeTask::Sample.code(args[:name])
-    end
-    
+  desc 'Brings up the Glimmer Meta-Sample app to allow browsing, running, and viewing code of Glimmer samples'
+  task :samples do
+    Glimmer::Launcher.new([File.expand_path('../../../samples/elaborate/meta_sample.rb', __FILE__)]).launch
   end
 
   namespace :package do
@@ -95,7 +78,7 @@ namespace :glimmer do
       Glimmer::RakeTask::Package.gemspec
     end
 
-    desc 'Generate gem'
+    desc 'Generate gem under pkg directory'
     task :gem do
       Glimmer::RakeTask::Package.gem
     end

data/lib/glimmer/swt/custom/code_text.rb

@@ -0,0 +1,88 @@
+require 'glimmer/ui/custom_widget'
+
+module Glimmer
+  module SWT
+    module Custom
+      # CodeText is a customization of StyledText with support for Ruby Syntax Highlighting
+      class CodeText
+        include Glimmer::UI::CustomWidget
+        
+        SYNTAX_COLOR_MAP = {
+           Builtin:     [215,58,73], 
+           Class:       [3,47,98], 
+           Constant:    [0,92,197], 
+           Double:      [0,92,197],
+           Escape:      [:red],
+           Function:    [:blue], 
+           Instance:    [227,98,9], 
+           Integer:     [:blue], 
+           Interpol:    [:blue],
+           Keyword:     [:blue], 
+           Name:        [111,66,193], #purple
+           Operator:    [:red], 
+           Pseudo:      [:dark_red],
+           Punctuation: [:blue], 
+           Single:      [106,115,125], # Also, Comments
+           Symbol:      [:dark_green],
+           Text:        [75, 75, 75],
+        }
+        
+        # TODO support `option :language`
+        # TODO support auto language detection
+      
+        def text=(value)
+          swt_widget&.text = value
+        end
+        
+        def text
+          swt_widget&.text
+        end
+        
+        def syntax_highlighting
+          return [] if text.to_s.strip.empty?
+          code = text
+          lexer = Rouge::Lexer.find_fancy('ruby', code)
+          lex = lexer.lex(code).to_a
+          code_size = 0
+          lex_hashes = lex.map do |pair|
+            {token_type: pair.first, token_text: pair.last}
+          end.each do |hash|
+            hash[:token_index] = code_size
+            code_size += hash[:token_text].size
+          end
+          # TODO consider grouping by line to optimize performance for line get style listener
+        end
+        
+        before_body {
+          @swt_style = swt_style == 0 ? [:border, :multi, :v_scroll, :h_scroll] : swt_style
+        }
+        
+        body {
+          styled_text(swt_style) {
+            font name: 'Consolas', height: 15
+            foreground rgb(75, 75, 75)
+            left_margin 5
+            top_margin 5
+            right_margin 5
+            bottom_margin 5
+                  
+            on_line_get_style { |line_style_event|
+              styles = []
+              line_style_event.lineOffset
+              syntax_highlighting.each do |token_hash|
+                if token_hash[:token_index] >= line_style_event.lineOffset && token_hash[:token_index] < (line_style_event.lineOffset + line_style_event.lineText.size)
+                  start_index = token_hash[:token_index]
+                  size = token_hash[:token_text].size
+                  token_color = SYNTAX_COLOR_MAP[token_hash[:token_type].name] || [:black]
+                  token_color = color(*token_color).swt_color
+                  styles << StyleRange.new(start_index, size, token_color, nil)
+                end
+              end
+              line_style_event.styles = styles.to_java(StyleRange) unless styles.empty?
+            }            
+          }
+        }
+      end
+    end
+  end
+end

data/lib/glimmer/swt/message_box_proxy.rb

@@ -26,7 +26,7 @@ require 'glimmer/swt/shell_proxy'
 
 module Glimmer
   module SWT
-    # Proxy for org.eclipse.swt.widgets.Shell
+    # Proxy for org.eclipse.swt.widgets.MessageBox
     #
     # Follows the Proxy Design Pattern
     class MessageBoxProxy

data/lib/glimmer/swt/sash_form_proxy.rb

@@ -0,0 +1,53 @@
+# Copyright (c) 2007-2020 Andy Maleh
+# 
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.custom.SashForm
+    #
+    # Follows the Proxy Design Pattern
+    class SashFormProxy < WidgetProxy
+      def post_add_content
+        swt_widget.setWeights(@weights) unless @weights.nil?
+      end
+      
+      def set_attribute(attribute_name, *args)
+        if attribute_name.to_s == "weights"
+          @weights = args
+          @weights = @weights.first if @weights.first.is_a?(Array)
+        else
+          super(attribute_name, *args)
+        end
+      end
+ 
+      def get_attribute(attribute_name)
+        if attribute_name.to_s == "weights"
+          swt_widget.getWeights.to_a
+        else
+          super(attribute_name)
+        end
+      end
+      
+    end
+  end
+end

data/lib/glimmer/swt/widget_proxy.rb

@@ -55,7 +55,7 @@ module Glimmer
         "radio"               => [:radio],
         "scrolled_composite"  => [:border, :h_scroll, :v_scroll],
         "spinner"             => [:border],
-        "styled_text"         => [:border],
+        "styled_text"         => [:border, :multi, :v_scroll, :h_scroll],
         "table"               => [:virtual, :border, :full_selection],
         "text"                => [:border],
         "toggle"              => [:toggle],

data/samples/elaborate/meta_sample.rb

@@ -0,0 +1,166 @@
+class Sample
+  attr_accessor :sample_directory, :file, :selected
+  
+  def initialize(file, sample_directory: )
+    self.file = file
+    self.sample_directory = sample_directory
+  end
+  
+  def name
+    if @name.nil?
+      @name = File.basename(file, '.rb').split('_').map(&:capitalize).join(' ')    
+      if @name.start_with?('Hello')
+        name_parts = @name.split
+        name_parts[0] = name_parts.first + ','
+        name_parts[-1] = name_parts.last + '!'
+        @name = name_parts.join(' ')
+      end
+    end
+    @name
+  end
+  
+  def content
+    @content ||= File.read(file)
+  end
+    
+  def launch
+    load file
+  end
+end
+
+class SampleDirectory
+  class << self
+    attr_accessor :selected_sample
+    
+    def sample_directories
+      if @sample_directories.nil?
+        @sample_directories = Dir.glob(File.join(File.expand_path('..', __FILE__), '*')).
+            select { |file| File.directory?(file) }.
+            map { |file| SampleDirectory.new(file) }
+        glimmer_gems = Gem.find_latest_files("glimmer-*-*")
+        sample_directories = glimmer_gems.map do |lib| 
+          File.dirname(File.dirname(lib))
+        end.select do |gem| 
+          Dir.exist?(File.join(gem, 'samples'))
+        end.map do |gem| 
+          Dir.glob(File.join(gem, 'samples', '*')).select {|file_or_dir| Dir.exist?(file_or_dir)}
+        end.flatten.uniq.reverse
+        if Dir.exist?('samples')
+          Dir.glob(File.join('samples', '*')).to_a.reverse.each do |dir|
+            sample_directories << dir if Dir.exist?(dir)
+          end
+        end
+        sample_directories = sample_directories.uniq {|dir| File.basename(dir)}
+        @sample_directories = sample_directories.map { |file| SampleDirectory.new(file) }            
+      end
+      @sample_directories
+    end
+    
+    def all_samples
+      @all_samples ||= sample_directories.map(&:samples).reduce(:+)
+    end
+  end
+  
+  include Glimmer # used for observe syntax
+  
+  attr_accessor :file
+  
+  def initialize(file)
+    self.file = file
+  end
+  
+  def name
+    File.basename(file).split('_').map(&:capitalize).join(' ')
+  end
+  
+  def samples
+    if @samples.nil?
+      @samples = Dir.glob(File.join(file, '*')).
+          select { |file| File.file?(file) }.
+          map { |sample_file| Sample.new(sample_file, sample_directory: self) }.
+          sort_by(&:name)
+      
+      @samples.each do |sample|
+        observe(sample, :selected) do |new_selected_value|
+          if new_selected_value
+            self.class.all_samples.reject {|a_sample| a_sample.name == sample.name}.each do |other_sample|
+              other_sample.selected = false
+            end
+            self.class.selected_sample = sample
+          end
+        end
+      end
+    end
+    @samples
+  end  
+end
+
+class MetaSampleApplication
+  include Glimmer
+  
+  def launch
+    shell {
+      text 'Glimmer Meta-Sample (The Sample of Samples)'
+      
+      on_swt_show {
+        SampleDirectory.selected_sample = SampleDirectory.all_samples.first        
+      }
+      
+      sash_form {
+        composite {
+          grid_layout 1, false
+          
+          scrolled_composite {
+            layout_data(:fill, :fill, true, true)
+            
+            composite {
+              SampleDirectory.sample_directories.each { |sample_directory|
+                group {
+                  layout_data(:fill, :fill, true, true)
+                  grid_layout 2, false
+                  text sample_directory.name
+                  font height: 30
+                  
+                  sample_directory.samples.each { |sample|
+                    label_radio = radio {
+                      selection bind(sample, :selected)
+                    }
+                    label {
+                      text sample.name
+                      font height: 30
+                      
+                      on_mouse_up {
+                        sample.selected = true
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+          
+          button {
+            layout_data(:center, :center, false, false) {
+              height_hint 150
+            }
+            text 'Launch Sample'
+            font height: 45
+            on_widget_selected {
+              SampleDirectory.selected_sample.launch
+            }
+          }        
+        }
+            
+        code_text {
+          text bind(SampleDirectory, 'selected_sample.content')
+          editable false
+          caret nil
+        }
+        
+        weights 1, 2
+      }            
+    }.open
+  end
+end
+
+MetaSampleApplication.new.launch