glimmer-dsl-web 0.0.5 → 0.0.7

data/glimmer-dsl-web.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-dsl-web 0.0.5 ruby lib
+# stub: glimmer-dsl-web 0.0.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-web".freeze
-  s.version = "0.0.5".freeze
+  s.version = "0.0.7".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Andy Maleh".freeze]
-  s.date = "2023-12-30"
+  s.date = "2024-01-02"
   s.description = "Glimmer DSL for Web (Ruby in the Browser Web GUI Frontend Library) - Enables frontend GUI development with Ruby by adopting a DSL that follows web-like HTML syntax, enabling the transfer of HTML/CSS/JS skills to Ruby frontend development. This library relies on Opal Ruby.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -31,22 +31,28 @@ Gem::Specification.new do |s|
     "lib/glimmer-dsl-web/ext/date.rb",
     "lib/glimmer-dsl-web/ext/exception.rb",
     "lib/glimmer-dsl-web/samples/hello/hello_button.rb",
+    "lib/glimmer-dsl-web/samples/hello/hello_data_binding.rb",
     "lib/glimmer-dsl-web/samples/hello/hello_form.rb",
+    "lib/glimmer-dsl-web/samples/hello/hello_input_date_time.rb",
     "lib/glimmer-dsl-web/samples/hello/hello_world.rb",
     "lib/glimmer-dsl-web/vendor/jquery.js",
     "lib/glimmer/config/opal_logger.rb",
     "lib/glimmer/data_binding/element_binding.rb",
+    "lib/glimmer/dsl/web/bind_expression.rb",
+    "lib/glimmer/dsl/web/data_binding_expression.rb",
     "lib/glimmer/dsl/web/dsl.rb",
     "lib/glimmer/dsl/web/element_expression.rb",
+    "lib/glimmer/dsl/web/general_element_expression.rb",
     "lib/glimmer/dsl/web/listener_expression.rb",
     "lib/glimmer/dsl/web/p_expression.rb",
     "lib/glimmer/dsl/web/property_expression.rb",
+    "lib/glimmer/dsl/web/select_expression.rb",
+    "lib/glimmer/dsl/web/shine_data_binding_expression.rb",
     "lib/glimmer/util/proc_tracker.rb",
     "lib/glimmer/web.rb",
     "lib/glimmer/web/element_proxy.rb",
     "lib/glimmer/web/event_proxy.rb",
-    "lib/glimmer/web/listener_proxy.rb",
-    "lib/glimmer/web/property_owner.rb"
+    "lib/glimmer/web/listener_proxy.rb"
   ]
   s.homepage = "http://github.com/AndyObtiva/glimmer-dsl-web".freeze
   s.licenses = ["MIT".freeze]
@@ -60,7 +66,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<glimmer-dsl-css>.freeze, ["~> 1.2.2".freeze])
   s.add_runtime_dependency(%q<opal-async>.freeze, ["~> 1.4.0".freeze])
   s.add_runtime_dependency(%q<to_collection>.freeze, [">= 2.0.1".freeze, "< 3.0.0".freeze])
-  s.add_runtime_dependency(%q<pure-struct>.freeze, [">= 1.0.2".freeze, "< 2.0.0".freeze])
   s.add_development_dependency(%q<puts_debuggerer>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<rake>.freeze, [">= 10.1.0".freeze, "< 14.0.0".freeze])
   s.add_development_dependency(%q<rake-tui>.freeze, [">= 0".freeze])

data/lib/glimmer/data_binding/element_binding.rb

@@ -4,7 +4,6 @@ require 'glimmer/data_binding/observer'
 module Glimmer
   module DataBinding
     class ElementBinding
-      # TODO consider renaming to WidgetBinding since it's no longer dealing with elements directly yet widgets instead
       include Glimmer
       include Observable
       include Observer
@@ -15,7 +14,8 @@ module Glimmer
         @property = property
         @translator = translator || proc {|value| value}
 
-        # TODO see if this is needed in Opal
+        # TODO implement automatic cleanup upon calling element.remove
+        # Alternatively, have this be built into ElementProxy and remove this code
 #         if @element.respond_to?(:dispose)
 #           @element.on_widget_disposed do |dispose_event|
 #             unregister_all_observables
@@ -24,8 +24,8 @@ module Glimmer
       end
       
       def call(value)
-        converted_value = translated_value = @translator.call(value)
-        @element.set_attribute(@property, converted_value) unless evaluate_property == converted_value
+        converted_value = translated_value = @translator.call(value, evaluate_property)
+        @element.send("#{@property}=", converted_value) unless evaluate_property == converted_value
       end
       
       def evaluate_property

data/lib/glimmer/dsl/web/bind_expression.rb

@@ -0,0 +1,36 @@
+# Copyright (c) 2023-2024 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/dsl/static_expression'
+require 'glimmer/dsl/bind_expression'
+require 'glimmer/data_binding/model_binding'
+
+module Glimmer
+  module DSL
+    module Web
+      # Responsible for setting up the return value of the bind keyword (command symbol)
+      # as a ModelBinding. It is then used by other data-binding expressions
+      class BindExpression < StaticExpression
+        include Glimmer::DSL::BindExpression
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/web/data_binding_expression.rb

@@ -0,0 +1,30 @@
+require 'glimmer/dsl/expression'
+require 'glimmer/data_binding/model_binding'
+require 'glimmer/data_binding/element_binding'
+
+module Glimmer
+  module DSL
+    module Web
+      # Responsible for wiring two-way data-binding for text and selection properties
+      # on Text, Button, and Spinner elements.
+      # Does so by using the output of the bind(model, property) command in the form
+      # of a ModelBinding, which is then connected to an anonymous element observer
+      # (aka element_data_binder as per element_data_binders array)
+      #
+      # Depends on BindCommandHandler
+      class DataBindingExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          args.size == 1 and
+            args[0].is_a?(DataBinding::ModelBinding) and
+            parent.respond_to?(:data_bind)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          model_binding = args[0]
+          property = keyword
+          parent.data_bind(property, model_binding)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/web/dsl.rb

@@ -4,6 +4,10 @@ require 'glimmer/dsl/web/element_expression'
 require 'glimmer/dsl/web/listener_expression'
 require 'glimmer/dsl/web/property_expression'
 require 'glimmer/dsl/web/p_expression'
+require 'glimmer/dsl/web/select_expression'
+require 'glimmer/dsl/web/bind_expression'
+require 'glimmer/dsl/web/data_binding_expression'
+require 'glimmer/dsl/web/shine_data_binding_expression'
 
 module Glimmer
   module DSL
@@ -20,7 +24,9 @@ module Glimmer
        Web,
        %w[
          listener
+         data_binding
          property
+         shine_data_binding
          element
        ]
       )

data/lib/glimmer/dsl/web/element_expression.rb

@@ -1,35 +1,17 @@
 require 'glimmer/dsl/expression'
-require 'glimmer/dsl/parent_expression'
-require 'glimmer/web/element_proxy'
+require 'glimmer/dsl/web/general_element_expression'
 
 module Glimmer
   module DSL
     module Web
       class ElementExpression < Expression
-        include ParentExpression
+        include GeneralElementExpression
         
         def can_interpret?(parent, keyword, *args, &block)
           # TODO automatically pass parent option as element if not passed instead of rejecting elements without a paraent nor root
           # TODO raise a proper error if root is an element that is not found (maybe do this in model)
           !keyword.to_s.start_with?('on')
         end
-
-        def interpret(parent, keyword, *args, &block)
-          Glimmer::Web::ElementProxy.for(keyword, parent, args, block)
-        end
-        
-        def add_content(parent, keyword, *args, &block)
-          if parent.rendered? || parent.skip_content_on_render_blocks?
-            return_value = super(parent, keyword, *args, &block)
-            if return_value.is_a?(String) && parent.dom_element.text.to_s.empty?
-              parent.add_text_content(return_value)
-            end
-            parent.post_add_content
-            return_value
-          else
-            parent.add_content_on_render(&block)
-          end
-        end
       end
     end
   end

data/lib/glimmer/dsl/web/general_element_expression.rb

@@ -0,0 +1,29 @@
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/web/element_proxy'
+
+module Glimmer
+  module DSL
+    module Web
+      module GeneralElementExpression
+        include ParentExpression
+
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::Web::ElementProxy.for(keyword, parent, args, block)
+        end
+        
+        def add_content(parent, keyword, *args, &block)
+          if parent.rendered? || parent.skip_content_on_render_blocks?
+            return_value = super(parent, keyword, *args, &block)
+            if return_value.is_a?(String) && parent.dom_element.text.to_s.empty?
+              parent.add_text_content(return_value)
+            end
+            parent.post_add_content
+            return_value
+          else
+            parent.add_content_on_render(&block)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/web/p_expression.rb

@@ -1,30 +1,11 @@
 require 'glimmer/dsl/static_expression'
-require 'glimmer/dsl/parent_expression'
-
-require 'glimmer/web/element_proxy'
+require 'glimmer/dsl/web/general_element_expression'
 
 module Glimmer
   module DSL
     module Web
       class PExpression < StaticExpression
-        include ParentExpression
-
-        def interpret(parent, keyword, *args, &block)
-          Glimmer::Web::ElementProxy.for(keyword, parent, args, block)
-        end
-        
-        def add_content(parent, keyword, *args, &block)
-          if parent.rendered? || parent.skip_content_on_render_blocks?
-            return_value = super(parent, keyword, *args, &block)
-            if return_value.is_a?(String) && parent.dom_element.text.to_s.empty?
-              parent.add_text_content(return_value)
-            end
-            parent.post_add_content
-            return_value
-          else
-            parent.add_content_on_render(&block)
-          end
-        end
+        include GeneralElementExpression
       end
     end
   end

data/lib/glimmer/dsl/web/select_expression.rb

@@ -0,0 +1,12 @@
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/web/general_element_expression'
+
+module Glimmer
+  module DSL
+    module Web
+      class SelectExpression < StaticExpression
+        include GeneralElementExpression
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/web/shine_data_binding_expression.rb

@@ -0,0 +1,42 @@
+# Copyright (c) 2020-2022 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/dsl/expression'
+require 'glimmer/data_binding/model_binding'
+require 'glimmer/data_binding/shine'
+
+module Glimmer
+  module DSL
+    module Web
+      class ShineDataBindingExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          args.size == 0 and
+            block.nil? and
+            (parent.respond_to?("#{keyword}=") and parent.respond_to?(keyword))
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::DataBinding::Shine.new(parent, keyword)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/util/proc_tracker.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 Andy Maleh
+# Copyright (c) 2023-2024 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the