glimmer-dsl-opal 0.12.0 → 0.16.0

data/lib/glimmer/config.rb

@@ -0,0 +1,11 @@
+module Glimmer
+  # Consumer Rails apps can set these attributes in their assets.rb file
+  module Config
+    class << self
+      # (server-side option) used to collect image paths for copying to assets & matching in Opal to download and use in Glimmer GUI
+      def gems_having_image_paths
+        @gems_having_image_paths ||= []
+      end
+    end
+  end
+end

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

@@ -87,8 +87,8 @@ module Glimmer
   
         def add_content(parent, keyword, *args, &block)
           return unless parent.is_a?(Glimmer::UI::CustomWidget)
-          # TODO consider avoiding source_location
-          if block.source_location == parent.content&.__getobj__.source_location
+          # TODO consider avoiding source_location since it does not work in Opal
+          if block.source_location && (block.source_location == parent.content&.__getobj__&.source_location)
             parent.content.call(parent) unless parent.content.called?
           else
             super

data/lib/glimmer/engine.rb

@@ -1,3 +1,24 @@
+# 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.
+
 module Glimmer
   class Engine < ::Rails::Engine
     isolate_namespace Glimmer

data/lib/glimmer/swt/composite_proxy.rb

@@ -1,3 +1,24 @@
+# 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.
+
 require 'glimmer/swt/grid_layout_proxy'
 require 'glimmer/swt/widget_proxy'
 
@@ -41,6 +62,19 @@ module Glimmer
         # TODO implement layout(changed = nil, all = nil) just as per SWT API
         @layout&.layout(self, changed)
       end
+      
+      # background image
+      def background_image
+        @background_image
+      end
+      
+      # background image is stretched by default
+      def background_image=(value)
+        @background_image = value
+        dom_element.css('background-image', "url(#{background_image})")
+        dom_element.css('background-repeat', 'no-repeat')
+        dom_element.css('background-size', 'cover')
+      end
             
     end
     

data/lib/glimmer/swt/label_proxy.rb

@@ -40,12 +40,12 @@ module Glimmer
         text&.gsub("\n", '<br />')
       end
       
-      def background_image=(*image_options)
+#       def background_image=(*image_options)
         # TODO consider if there is a difference between background_image and image in label and to have one reuse the other
         # TODO finish implementation
 #         @background_image = Glimmer::SWT::ImageProxy.create(*image_options)
 #         dom_element.css('background-image', @background_image.image_data.dom_element.src)
-      end
+#       end
       
       def image=(*image_options)
         # TODO finish implementation
@@ -53,6 +53,19 @@ module Glimmer
 #         dom_element.css('background-image', @image.image_data.dom_element.src)
       end
       
+      # background image
+      def background_image
+        @background_image
+      end
+      
+      # background image is stretched by default
+      def background_image=(value)
+        @background_image = value
+        dom_element.css('background-image', "url(#{background_image})")
+        dom_element.css('background-repeat', 'no-repeat')
+        dom_element.css('background-size', 'cover')
+      end
+      
       def element
         'label'
       end

data/lib/glimmer/swt/shell_proxy.rb

@@ -1,3 +1,24 @@
+# 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.
+
 require 'glimmer/swt/widget_proxy'
 require 'glimmer/swt/layout_proxy'
 require 'glimmer/swt/display_proxy'
@@ -71,6 +92,28 @@ module Glimmer
         Document.title = value
       end
       
+      # favicon
+      def image
+        @image
+      end
+      
+      def image=(value)
+        @image = value
+        # TODO consider moving this code to favicon_dom_element
+        if favicon_dom_element.empty?
+          favicon_element = Element.new(:link)
+          favicon_element.attr('rel', 'icon')
+          Document.find('head').append(favicon_element)
+        else
+          favicon_element = favicon_dom_element
+        end
+        favicon_element.attr('href', image)
+      end
+      
+      def favicon_dom_element
+        Document.find('link[rel=icon]')
+      end
+      
       def minimum_size=(width_or_minimum_size, height = nil)
         @minimum_size = height.nil? ? width_or_minimum_size : Point.new(width_or_minimum_size, height)
         return if @minimum_size.nil?

data/lib/glimmer/swt/table_item_proxy.rb

@@ -28,6 +28,9 @@ module Glimmer
         tr.table-item td {
           padding-bottom: 0;
         }
+        tr.table-item:nth-child(odd):not(.selected) {
+          background: white;
+        }
         tr.table-item:nth-child(even):not(.selected) {
           background: rgb(243, 244, 246);
         }

data/lib/glimmer/ui/custom_widget.rb

@@ -83,6 +83,16 @@ module Glimmer
           @after_body_blocks ||= []
           @after_body_blocks << block
         end
+        
+        def keyword
+          self.name.underscore.gsub('::', '__')
+        end
+        
+        # Returns shortcut keyword to use for this custom widget (keyword minus namespace)
+        def shortcut_keyword
+          self.name.underscore.gsub('::', '__').split('__').last
+        end
+        
       end
       
       class << self
@@ -143,7 +153,6 @@ module Glimmer
         def reset_custom_widget_namespaces
           @custom_widget_namespaces = Set[Object, Glimmer::UI]
         end
-
       end
       # <- end of class methods
       
@@ -259,7 +268,7 @@ module Glimmer
       # Otherwise, if a block is passed, it adds it as content to this custom widget
       def content(&block)
         if block_given?
-          body_root.content(&block)
+          Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Opal::CustomWidgetExpression.new, self.class.keyword, &block)
         else
           @content
         end

data/lib/net/http.rb

@@ -19,8 +19,6 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-# Missing Net module class methods TODO implement
-
 require_relative '../uri'
 
 module Net
@@ -30,11 +28,22 @@ module Net
   class HTTP
     class << self
       def post_form(uri, params)
-        response_body = nil
-        result = ::HTTP.post(uri, payload: params) do |response|
-           response_body = response.body
+        uri = "#{`window.location.protocol`}//#{File.join(uri)}" unless uri.start_with?('http:') || uri.start_with?('https:') # TODO refactor repetitive code
+        result = nil
+        ::HTTP.post(uri, {async: false, dataType: 'text', data: params}) do |response|
+          result = response.body if response.ok?
+        end
+        result
+      end
+      
+      def get(uri, path_and_params)
+        uri = File.join(uri, path_and_params)
+        uri = "#{`window.location.protocol`}//#{uri}" unless uri.start_with?('http:') || uri.start_with?('https:') # TODO refactor repetitive code
+        result = nil
+        ::HTTP.get(uri, {async: false, dataType: 'text'}) do |response|
+          result = response.body if response.ok?
         end
-        response_body
+        result
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.16.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-09 00:00:00.000000000 Z
+date: 2021-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -263,6 +263,10 @@ files:
 - app/assets/stylesheets/glimmer/jquery-ui.structure.css
 - app/assets/stylesheets/glimmer/jquery-ui.theme.css
 - app/assets/stylesheets/glimmer/jquery.ui.timepicker.css
+- app/controllers/glimmer/application_controller.rb
+- app/controllers/glimmer/image_paths_controller.rb
+- app/views/glimmer/image_paths/index.html.erb
+- config/routes.rb
 - lib/display.rb
 - lib/glimmer-dsl-opal.rb
 - lib/glimmer-dsl-opal/ext/class.rb
@@ -278,13 +282,13 @@ files:
 - lib/glimmer-dsl-opal/samples/elaborate/tic_tac_toe.rb
 - lib/glimmer-dsl-opal/samples/elaborate/tic_tac_toe/board.rb
 - lib/glimmer-dsl-opal/samples/elaborate/tic_tac_toe/cell.rb
+- lib/glimmer-dsl-opal/samples/elaborate/weather.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_browser.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_button.rb
 - 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_computed.rb
-- lib/glimmer-dsl-opal/samples/hello/hello_computed/contact.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_custom_shell.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_custom_widget.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_date_time.rb
@@ -299,6 +303,7 @@ files:
 - lib/glimmer-dsl-opal/samples/hello/hello_radio_group.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_tab.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_table.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_table/baseball_park.png
 - lib/glimmer-dsl-opal/samples/hello/hello_world.rb
 - lib/glimmer-dsl-opal/vendor/jquery-ui-timepicker/GPL-LICENSE.txt
 - lib/glimmer-dsl-opal/vendor/jquery-ui-timepicker/MIT-LICENSE.txt
@@ -319,6 +324,7 @@ files:
 - lib/glimmer-dsl-opal/vendor/jquery-ui/package.json
 - lib/glimmer-dsl-opal/vendor/jquery.js
 - lib/glimmer-dsl-swt.rb
+- lib/glimmer/config.rb
 - lib/glimmer/config/opal_logger.rb
 - lib/glimmer/data_binding/element_binding.rb
 - lib/glimmer/data_binding/list_selection_binding.rb