glimmer-dsl-opal 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8072dfb955151aa374817c0f2f175bf9c7adfd115eca1bbd6df6c2c3b0725e4
-  data.tar.gz: 94304037d23dfe1719087fc93d3dc9056be7701f6fdac1044bfe2719e61e43b0
+  metadata.gz: e2ee052273513ff79b9d9ef0f351f30bfa0c4083f589429646b894b132afa4c3
+  data.tar.gz: f2a9113b2a92168046d19c3068d9b62df1000fdc1dd6c9ea5f168ffb89123fb4
 SHA512:
-  metadata.gz: 7f85477240562b1eb7c3bfb3e147577bf6ac7f265c54b6d5acad7ae295a65b1226ff41798eb2a8d41804d2c56d999992f6e6e98b64bde1bed5708c52c46862f0
-  data.tar.gz: 847b86e900e53586993c74982b37d68ede27f399982188187de524dec31b1d5ffdf0ffc31694da38510060f3e5224c71acc7ca85d75fdef398a8e42c287ca666
+  metadata.gz: 20edcc6d97dbee21a5b8b332bc649fb0f7d77f93e41d02095cdbbed43f0686f8c1dd5bf08972bd21511cb983f77caf247f61136ddde5de859f444ac92f31dbf2
+  data.tar.gz: ce7347775105f4b2af132cd68b4a805332b4afe910cb3ff91c0da083bd043e93cf067c693c9e4a54b506c2417d684248d23fa78aecccc264c741c38028b35b6e

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.16.1
+
+- Support GridLayout make_columns_equal_width, horizontal_spacing, and vertical_spacing attributes
+- Hello, Composite! sample
+
 ## 0.16.0
 
 - Support label widget background_image attribute

data/README.md

@@ -163,6 +163,7 @@ Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
     - [Hello Samples](#hello-samples)
       - [Hello, World!](#hello-world)
       - [Hello, Combo!](#hello-combo)
+      - [Hello, Composite!](#hello-composite)
       - [Hello, Computed!](#hello-computed)
       - [Hello, List Single Selection!](#hello-list-single-selection)
       - [Hello, List Multi Selection!](#hello-list-multi-selection)
@@ -223,7 +224,8 @@ Alternatively, web developers may directly use [Glimmer DSL for Opal](https://ru
 ## Pre-requisites
 
 - Rails 5: [https://github.com/rails/rails/tree/5-2-stable](https://github.com/rails/rails/tree/5-2-stable)
-- Opal 1: [https://github.com/opal/opal-rails](https://github.com/opal/opal-rails)
+- Opal 1.0.4: [https://github.com/opal/opal](https://github.com/opal/opal)
+- Opal-Rails 1.1.2: [https://github.com/opal/opal-rails](https://github.com/opal/opal-rails)
 - jQuery 3: [https://code.jquery.com/](https://code.jquery.com/) (jQuery 3.5.1 is included in the [glimmer-dsl-opal](https://rubygems.org/gems/glimmer-dsl-opal) gem)
 - jQuery-UI 1.12: [https://code.jquery.com/](https://jqueryui.com/) (jQuery-UI 1.12.1 is included in the [glimmer-dsl-opal](https://rubygems.org/gems/glimmer-dsl-opal) gem)
 - jQuery-UI Timepicker 0.3: [https://code.jquery.com/](https://fgelinas.com/code/timepicker/) (jQuery-UI Timepicker 0.3.3 is included in the [glimmer-dsl-opal](https://rubygems.org/gems/glimmer-dsl-opal) gem)
@@ -251,7 +253,8 @@ rails new glimmer_app_server
 Add the following to `Gemfile`:
 
 ```
-gem 'opal-rails', '~> 1.1.2'
+gem 'opal', '1.0.4'
+gem 'opal-rails', '1.1.2'
 gem 'opal-async', '~> 1.2.0'
 gem 'opal-jquery', '~> 0.4.4'
 gem 'glimmer-dsl-opal', '~> 0.16.0'
@@ -490,7 +493,7 @@ HelloCombo.launch
 ```
 Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
 
-![Glimmer DSL for SWT Hello Combo](https://github.com/AndyObtiva/glimmer/blob/master/images/glimmer-hello-combo.png)
+![Glimmer DSL for SWT Hello Combo](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/images/glimmer-hello-combo.png)
 
 Glimmer app on the web (using `glimmer-dsl-opal` gem):
 
@@ -505,6 +508,31 @@ You should see "Hello, Combo!"
 
 ![Glimmer DSL for Opal Hello Combo](images/glimmer-dsl-opal-hello-combo.png)
 
+#### Hello, Composite!
+
+Add the following require statement to `app/assets/javascripts/application.rb`
+
+```ruby
+require 'glimmer-dsl-opal/samples/hello/hello_composite'
+```
+
+Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
+
+![Glimmer DSL for SWT Hello Composite](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/images/glimmer-hello-composite.png)
+
+Glimmer app on the web (using `glimmer-dsl-opal` gem):
+
+Start the Rails server:
+```
+rails s
+```
+
+Visit `http://localhost:3000`
+
+You should see "Hello, Composite!"
+
+![Glimmer DSL for Opal Hello Composite](images/glimmer-dsl-opal-hello-composite.png)
+
 #### Hello, Computed!
 
 Add the following require statement to `app/assets/javascripts/application.rb`

data/VERSION

@@ -1 +1 @@
-0.16.0
+0.16.1

data/lib/glimmer-dsl-opal/samples/hello/hello_composite.rb

@@ -0,0 +1,69 @@
+# Copyright (c) 2020-2021 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.
+
+class HelloComposite
+  include Glimmer::UI::CustomShell
+  
+  body {
+    shell {
+      # shell (which is a composite) has fill_layout(:horizontal) by default with no margins
+      # we override below
+      fill_layout(:vertical)
+      text 'Hello, Composite!'
+      
+      composite { # composite simply contains widgets for visual organization via a layout
+        # it has grid_layout(1, false) as its default layout
+        label {
+          text "Field is above its text widget"
+        }
+        text {
+          layout_data :fill, :center, true, false # fill horizontally, align center vertically, grab remaining horizontal space, but not vertical
+        }
+      }
+      
+      composite { # composite simply contains widgets for visual organization via a layout
+        grid_layout 2, true
+        
+        label {
+          text "Field has equal width to its text widget's"
+        }
+        text {
+          layout_data :fill, :center, true, false # fill horizontally, align center vertically, grab remaining horizontal space, but not vertical
+        }
+      }
+      
+      composite { # composite simply contains widgets for visual organization via a layout
+        grid_layout 2, false
+        
+        label {
+          text "Field has inequal width"
+        }
+        
+        text {
+          layout_data :fill, :center, true, false # fill horizontally, align center vertically, grab remaining horizontal space, but not vertical
+        }
+      }
+    }
+  
+  }
+end
+
+HelloComposite.launch

data/lib/glimmer/swt/grid_layout_proxy.rb

@@ -16,44 +16,27 @@ module Glimmer
     
       def num_columns=(columns)
         @num_columns = columns
-        # TODO do the following instead of reapply
-#         @parent.add_css_class("num-columns-#{@num_columns}")
-        # reinitialize # TODO reimplement without using reinitialize
-        layout_css = <<~CSS
-          grid-template-columns: #{'auto ' * @num_columns.to_i};
-          grid-row-gap: #{@vertical_spacing}px;
-          grid-column-gap: #{@horizontal_spacing}px;
-        CSS
-        if @parent.css_classes.include?('grid-layout')
-          layout_css.split(";").map(&:strip).map {|l| l.split(':').map(&:strip)}.each do |key, value|
-            @parent.dom_element.css(key, value) unless key.nil?
-          end
-          if @parent.is_a?(GroupProxy)
-            @parent.dom_element.find('legend').css('grid-column-start', "span #{@num_columns.to_i}")
-          end
-        else
-          layout_css.split(";").map(&:strip).map {|l| l.split(':').map(&:strip)}.each do |key, value|
-            @parent.dom_element.css(key, 'initial') unless key.nil?
-          end
-        end
+        @parent.dom_element.css('grid-template-columns', 'auto ' * @num_columns.to_i)
+        @parent.dom_element.find('legend').css('grid-column-start', "span #{@num_columns.to_i}") if @parent.is_a?(GroupProxy)
       end
       
       def make_columns_equal_width=(equal_width)
         @make_columns_equal_width = equal_width
-#         @parent.add_css_class('make_columns_equal_width') if @make_columns_equal_width
-        # reinitialize # TODO reimplement without using reinitialize
+        if @make_columns_equal_width
+          @parent.dom_element.css('grid-template-columns', "#{100.0/@num_columns.to_f}% " * @num_columns.to_i)
+        else
+          @parent.dom_element.css('grid-template-columns', 'auto ' * @num_columns.to_i)
+        end
       end
       
       def horizontal_spacing=(spacing)
         @horizontal_spacing = spacing
-#         @parent.add_css_class("horizontal-spacing-#{@horizontal_spacing}")
-        # reinitialize # TODO reimplement without using reinitialize
+        @parent.dom_element.css('grid-column-gap', "#{@horizontal_spacing}px")
       end
 
       def vertical_spacing=(spacing)
         @vertical_spacing = spacing
-#         @parent.add_css_class("vertical-spacing-#{@vertical_spacing}")
-        # reinitialize # TODO reimplement without using reinitialize
+        @parent.dom_element.css('grid-row-gap', "#{@vertical_spacing}px")
       end
       
       def margin_width=(pixels)
@@ -79,7 +62,8 @@ module Glimmer
         self.vertical_spacing = 10
         self.margin_width = 15
         self.margin_height = 15
-        self.num_columns = @args.first || 1
+        self.num_columns = @args[0] || 1
+        self.make_columns_equal_width = @args[1] || false
       end
     end
   end

data/lib/glimmer/swt/layout_data_proxy.rb

@@ -92,7 +92,7 @@ module Glimmer
       def grab_excess_horizontal_space=(grab_excess_horizontal_space)
         @grab_excess_horizontal_space = grab_excess_horizontal_space
         @parent.dom_element.css('justify-self', @horizontal_alignment) if @grab_excess_horizontal_space && @horizontal_alignment != 'fill' && width_hint.nil?
-        @parent.parent.dom_element.css('justify-content', "normal") if @grab_excess_horizontal_space
+        @parent.parent.dom_element.css('justify-content', 'stretch') if @grab_excess_horizontal_space
 #         reapply
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: glimmer-dsl-xml
   requirement: !ruby/object:Gem::Requirement
@@ -288,6 +288,7 @@ files:
 - lib/glimmer-dsl-opal/samples/hello/hello_checkbox.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_checkbox_group.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_combo.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_composite.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_computed.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_custom_shell.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_custom_widget.rb
@@ -437,7 +438,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for Opal