glimmer-dsl-swt 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b097c051f15a0fd1a52677fd65d542a67532a2e1a51fc928fc22acd8e729953
-  data.tar.gz: 203b4cd8bad18d912e83067fce0175e5667f7db503cfa67bf9beac6e72752508
+  metadata.gz: 70cb97f3e5f058b49cb24ddbe87281e9db925f6708e03d9d520545878608a3e7
+  data.tar.gz: 73ad3cf16e2a30f4227135ce0eed679a40d3ca222780b1f9b998535274eed720
 SHA512:
-  metadata.gz: edb0568d6bcf252b89332050f2de545917bb6ce2bd687dae961e1aa1afb66d9a051420ea00745db028a93d3869ab5ca9229192d806daa3e0db652a5fffdc1df5
-  data.tar.gz: 745dae7d8a1999c0267b4d4e7a66a37209bb59c29e4c0f9c7ccf31dc87b2bcd0903eef7c2a0bc6cb46a498200468ce9bcb28d1b5752b54a5a0340be350793e0e
+  metadata.gz: 0f0842bb53f0f8703970924e6f21374d1e64c955fd7a7135b4c864d7158221285a5ef9c89b7e01508d1393a5130388d79659672ad0fa4e1c35b4363bb772c47a
+  data.tar.gz: 65c239a07dd7a216873fbe6f56842c5b2e15ea9d6aa3a77ac301b3e064f2c6521afcb07731ba0a5df20fe7ea877f25716581386621ac987c00a73c77da0988a3

data/README.md

@@ -1,10 +1,12 @@
-# <img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 /> Glimmer DSL for SWT 0.1.3 (Desktop GUI)
+# <img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 /> Glimmer DSL for SWT 0.2.0 (Desktop GUI)
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-swt.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-swt)
 [![Coverage Status](https://coveralls.io/repos/github/AndyObtiva/glimmer-dsl-swt/badge.svg?branch=master)](https://coveralls.io/github/AndyObtiva/glimmer-dsl-swt?branch=master)
 [![Join the chat at https://gitter.im/AndyObtiva/glimmer](https://badges.gitter.im/AndyObtiva/glimmer.svg)](https://gitter.im/AndyObtiva/glimmer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-[Glimmer](https://github.com/AndyObtiva/glimmer) DSL for SWT enables desktop development with Glimmer.
+[Glimmer](https://github.com/AndyObtiva/glimmer) DSL for [SWT](https://www.eclipse.org/swt/) enables desktop development with [Glimmer](https://github.com/AndyObtiva/glimmer).
+
+[Glimmer](https://github.com/AndyObtiva/glimmer) is a native-GUI 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 Eclipse SWT library. Glimmer additionally innovates by having built-in data-binding support to greatly facilitate synchronizing the GUI with domain models. As a result, that achieves true decoupling of object oriented components, enabling developers to solve business problems without worrying about GUI concerns, or alternatively drive development GUI-first, and then write clean business models test-first afterwards.
 
 You may find full setup/usage instructions at the main [Glimmer project page](https://github.com/AndyObtiva/glimmer).
 
@@ -13,6 +15,23 @@ Other Glimmer DSL gems:
 - [glimmer-dsl-xml](https://github.com/AndyObtiva/glimmer-dsl-xml): Glimmer DSL for XML (& HTML)
 - [glimmer-dsl-css](https://github.com/AndyObtiva/glimmer-dsl-css): Glimmer DSL for CSS (Cascading Style Sheets)
 
+## Example
+
+```ruby
+include Glimmer
+   
+shell {
+  text 'Glimmer'
+  label {
+    text 'Hello, World!'
+  }
+}.open
+```
+
+![Glimmer DSL for SWT Hello World](https://github.com/AndyObtiva/glimmer/blob/master/images/glimmer-hello-world.png)
+
+Learn more at the main [Glimmer project page](https://github.com/AndyObtiva/glimmer).
+
 ## Help
 
 ### Issues

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/lib/glimmer-dsl-swt.rb

@@ -2,9 +2,14 @@ $LOAD_PATH.unshift(File.expand_path('..', __FILE__))
 
 # External requires
 require 'java'
-require 'nested_inherited_jruby_include_package'
-require 'super_module'
-require 'glimmer'
+if ENV['BUNDLER_REQUIRE'].to_s.downcase == 'true'
+  require 'bundler'
+  Bundler.require
+else
+  require 'nested_inherited_jruby_include_package'
+  require 'super_module'
+  require 'glimmer'
+end
 
 # Internal requires
 require 'ext/glimmer/config'

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

@@ -0,0 +1,25 @@
+require 'glimmer/dsl/static_expression'
+require 'glimmer/swt/dnd_proxy'
+
+# TODO consider turning static keywords like bind into methods
+
+module Glimmer
+  module DSL
+    module SWT
+      # Responsible for returning DND constant values
+      #
+      # Named DndExpression (not DNDExpression) so that the DSL engine
+      # discovers quickly by convention
+      class DndExpression < StaticExpression
+        def can_interpret?(parent, keyword, *args, &block)
+          block.nil? &&
+            args.size > 0
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::DNDProxy[*args]
+        end
+      end
+    end
+  end
+end

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

@@ -14,10 +14,6 @@ module Glimmer
 
         include_package 'org.eclipse.swt.widgets'
 
-        def can_interpret?(parent, keyword, *args, &block)
-          keyword == 'message_box'
-        end
-
         def interpret(parent, keyword, *args, &block)
           potential_parent = args.first
           parent = args.shift if potential_parent.is_a?(Shell) || (potential_parent.respond_to?(:swt_widget) && potential_parent.swt_widget.is_a?(Shell))

data/lib/glimmer/swt/widget_proxy.rb

@@ -31,8 +31,8 @@ module Glimmer
         "list"        => [:border, :v_scroll],
         "button"      => [:push],
         "menu_item"   => [:push],
-        "drag_source" => DND::DROP_COPY,
-        "drop_target" => DND::DROP_COPY,
+        "drag_source" => [:drop_copy],
+        "drop_target" => [:drop_copy],
       }
 
       DEFAULT_INITIALIZERS = {
@@ -51,7 +51,7 @@ module Glimmer
         end,
       }
 
-      attr_reader :swt_widget
+      attr_reader :swt_widget, :drag_source_proxy, :drop_target_proxy, :drag_source_style, :drag_source_transfer, :drop_target_transfer
 
       # Initializes a new SWT Widget
       #
@@ -84,7 +84,7 @@ module Glimmer
         if widget_custom_attribute
           @swt_widget.respond_to?(widget_custom_attribute[:setter][:name])
         else
-          @swt_widget.respond_to?(attribute_setter(attribute_name), args)
+          @swt_widget.respond_to?(attribute_setter(attribute_name), args) || respond_to?(ruby_attribute_setter(attribute_name), args)
         end
       end
 
@@ -92,9 +92,11 @@ module Glimmer
         widget_custom_attribute = widget_custom_attribute_mapping[attribute_name.to_s]
         if widget_custom_attribute
           widget_custom_attribute[:setter][:invoker].call(@swt_widget, args)
-        else
+        elsif @swt_widget.respond_to?(attribute_setter(attribute_name), args)
           apply_property_type_converters(attribute_name, args)
           @swt_widget.send(attribute_setter(attribute_name), *args) unless @swt_widget.send(attribute_getter(attribute_name)) == args.first
+        else
+          send(ruby_attribute_setter(attribute_name), args)
         end
       end
 
@@ -285,6 +287,21 @@ module Glimmer
         # TODO consider implementing if remove_observer is needed (consumers can remove listener via SWT API)
       end
 
+      def ensure_drag_source_proxy(style=[])
+        @drag_source_proxy ||= self.class.new('drag_source', self, style).tap do |proxy|
+          proxy.set_attribute(:transfer, :text)
+        end
+      end
+      
+      def ensure_drop_target_proxy(style=[])
+        @drop_target_proxy ||= self.class.new('drop_target', self, style).tap do |proxy|
+          proxy.set_attribute(:transfer, :text)
+          proxy.on_drag_enter { |event|
+            event.detail = DNDProxy[:drop_copy]
+          }          
+        end
+      end
+      
       # TODO eliminate duplication in the following methods perhaps by relying on exceptions
 
       def can_handle_observation_request?(observation_request)
@@ -294,9 +311,31 @@ module Glimmer
           SWTProxy.has_constant?(constant_name)
         elsif observation_request.start_with?('on_')
           event = observation_request.sub(/^on_/, '')
-          can_add_listener?(event)
-        else
-          false
+          can_add_listener?(event) || can_handle_drag_observation_request?(observation_request) || can_handle_drop_observation_request?(observation_request)
+        end
+      end
+      
+      def can_handle_drag_observation_request?(observation_request)
+        return false unless swt_widget.is_a?(Control)
+        potential_drag_source = @drag_source_proxy.nil?
+        ensure_drag_source_proxy
+        @drag_source_proxy.can_handle_observation_request?(observation_request).tap do |result|
+          if potential_drag_source && !result
+            @drag_source_proxy.swt_widget.dispose
+            @drag_source_proxy = nil
+          end
+        end
+      end
+
+      def can_handle_drop_observation_request?(observation_request)
+        return false unless swt_widget.is_a?(Control)
+        potential_drop_target = @drop_target_proxy.nil?
+        ensure_drop_target_proxy
+        @drop_target_proxy.can_handle_observation_request?(observation_request).tap do |result|
+          if potential_drop_target && !result
+            @drop_target_proxy.swt_widget.dispose
+            @drop_target_proxy = nil
+          end
         end
       end
 
@@ -306,7 +345,14 @@ module Glimmer
           add_swt_event_listener(constant_name, &block)
         elsif observation_request.start_with?('on_')
           event = observation_request.sub(/^on_/, '')
-          add_listener(event, &block)
+          if can_add_listener?(event)
+            event = observation_request.sub(/^on_/, '')
+            add_listener(event, &block)
+          elsif can_handle_drag_observation_request?(observation_request)
+            @drag_source_proxy&.handle_observation_request(observation_request, &block)
+          elsif can_handle_drop_observation_request?(observation_request)
+            @drop_target_proxy&.handle_observation_request(observation_request, &block)
+          end
         end
       end
 
@@ -331,7 +377,11 @@ module Glimmer
 
       def default_style(underscored_widget_name)
         styles = DEFAULT_STYLES[underscored_widget_name] || [:none]
-        SWTProxy[styles]
+        SWTProxy[styles] rescue DNDProxy[styles]
+      end
+
+      def ruby_attribute_setter(attribute_name)
+        "#{attribute_name}="
       end
 
       def attribute_setter(attribute_name)
@@ -355,7 +405,7 @@ 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)        
         widget_listener_proxy = nil
-        safe_block = lambda { |event| block.call(event) unless @swt_widget.isDisposed }
+        safe_block = lambda { |event| block.call(event) unless @swt_widget.isDisposed }        
         listener = listener_class.new(listener_method => safe_block)
         @swt_widget.send(widget_add_listener_method, listener)
         widget_listener_proxy = WidgetListenerProxy.new(swt_widget: @swt_widget, swt_listener: listener, widget_add_listener_method: widget_add_listener_method, swt_listener_class: listener_class, swt_listener_method: listener_method)
@@ -432,6 +482,38 @@ module Glimmer
         }
       end
 
+      def drag_source_style=(style)
+        ensure_drag_source_proxy(style)
+      end
+
+      def drop_target_style=(style)
+        ensure_drop_target_proxy(style)
+      end
+
+      def drag_source_transfer=(args)
+        args = args.first if !args.empty? && args.first.is_a?(ArrayJavaProxy)
+        ensure_drag_source_proxy
+        @drag_source_proxy.set_attribute(:transfer, args)
+      end
+
+      def drop_target_transfer=(args)
+        args = args.first if !args.empty? && args.first.is_a?(ArrayJavaProxy)
+        ensure_drop_target_proxy
+        @drop_target_proxy.set_attribute(:transfer, args)
+      end
+
+      def drag_source_effect=(args)
+        args = args.first if args.is_a?(Array)
+        ensure_drag_source_proxy
+        @drag_source_proxy.set_attribute(:drag_source_effect, args)
+      end
+
+      def drop_target_effect=(args)
+        args = args.first if args.is_a?(Array)
+        ensure_drop_target_proxy
+        @drop_target_proxy.set_attribute(:drop_target_effect, args)
+      end
+
       def apply_property_type_converters(attribute_name, args)
         if args.count == 1
           value = args.first
@@ -495,6 +577,7 @@ module Glimmer
             end
           end,
           :transfer => lambda do |value|
+            value = value.first if value.is_a?(Array) && value.size == 1 && value.first.is_a?(Array)
             transfer_object_extrapolator = lambda do |transfer_name|
               transfer_type = "#{transfer_name.to_s.camelcase(:upper)}Transfer".to_sym
               transfer_type_alternative = "#{transfer_name.to_s.upcase}Transfer".to_sym

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-28 00:00:00.000000000 Z
+date: 2020-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -292,6 +292,7 @@ files:
 - lib/glimmer/dsl/swt/data_binding_expression.rb
 - lib/glimmer/dsl/swt/dialog_expression.rb
 - lib/glimmer/dsl/swt/display_expression.rb
+- lib/glimmer/dsl/swt/dnd_expression.rb
 - lib/glimmer/dsl/swt/dsl.rb
 - lib/glimmer/dsl/swt/exec_expression.rb
 - lib/glimmer/dsl/swt/layout_data_expression.rb