glimmer 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7759feb8da21bb9e696870708163b9aebdecab3c15181a28e86fb8255c4fe4c
-  data.tar.gz: ee5f7b55fbd6b4cf24ef28df0956b9fcbfa33b0544f81470d8bc2072c97479d2
+  metadata.gz: d61c8e3da07109cf0edf0df46e0937a862b3e80007a12da8050c2415481cbb6e
+  data.tar.gz: c618e4c0b024a9da219fbe78c263a442981d3d0a40f8a13bb7639edf50310e09
 SHA512:
-  metadata.gz: 2c56a1347768269d1af90d1bd44a39f8bf5d1b3252da9140334a8a342e5855d49528e7b9b5c9a4f80464b91febcd2d59c6c350b148fbb7662167e32f9c818c55
-  data.tar.gz: d8436f12a3c54baa44692ce5d1d07ea544cd59efedea4ec76b01737b68d90ba2ebae8fe4621960b6c7fb6d792444b3a8e6fab3fc57600b027da20419b14cc5e9
+  metadata.gz: c1b3b5d7aa04427f0e1188e0cd7e3855d517c0adfb6c561160c465f043685c48a651df8fde9eb05e31b84578a1986182422e49bb329fd35b9f0cd623fac4bc77
+  data.tar.gz: 5b4177d4ae038eefd1c210e8054f92ebe716b1a7edb2b40e94466ee2ba35aaafced1320128e75603f156ed3a7cdc56db200fd4369916dc0862f44fbd7ac12760

data/CHANGELOG.md

@@ -3,6 +3,25 @@
 Related Change Logs:
 - [glimmer-dsl-swt/CHANGELOG.md](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/CHANGELOG.md)
 
+### 2.2.0
+
+- New `Glimmer::DataBinding::ObservableHash` support for observing `hash[key]=value` mutations
+- Ensure observed ObservableHash values are enhanced with ObservableHash if they were of type Hash
+- Ensure observed ObservableModel values are enhanced with ObservableHash if they were of type Hash
+
+### 2.1.5
+
+- Upgrade array_include_methods gem to version 1.4.0 (and fix minor version)
+- Update API usage of `Array#include_all?` in `Glimmer::DataBinding::ObservableArray` to splat array (now required)
+
+### 2.1.4
+
+- Upgrade array_include_methods gem to version 1.2.0
+
+### 2.1.3
+
+- Upgrade array_include_methods gem to version 1.1.0
+
 ### 2.1.2
 
 - Fix issue with irrelevent error message showing up for ENV['GLIMMER_LOGGER_LEVEL'] being empty (it is not a true error)

data/README.md

@@ -35,6 +35,7 @@ Start by checking out Glimmer's original GUI DSL, which got extracted into its o
 - [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
 - [glimmer-dsl-tk](https://github.com/AndyObtiva/glimmer-dsl-tk): Glimmer DSL for Tk (MRI Ruby Desktop Development GUI Library)
+- [glimmer-dsl-libui](https://github.com/AndyObtiva/glimmer-dsl-libui): Glimmer DSL for LibUI (Prerequisite-Free Ruby Desktop Development GUI Library)
 
 ## Table of Contents
 
@@ -49,6 +50,7 @@ Start by checking out Glimmer's original GUI DSL, which got extracted into its o
       - [Glimmer DSL for XML (& HTML)](#glimmer-dsl-for-xml--html)
       - [Glimmer DSL for CSS](#glimmer-dsl-for-css)
       - [Glimmer DSL for Tk (MRI Ruby Desktop Development GUI Library)](#glimmer-dsl-for-tk-mri-ruby-desktop-development-gui-library)
+      - [Glimmer DSL for LibUI (Prerequisite-Free Ruby Desktop Development GUI Library)](#glimmer-dsl-for-libui-prerequisite-free-ruby-desktop-development-gui-library)
   - [Data-Binding Library](#data-binding-library)
   - [Glimmer Process](#glimmer-process)
   - [Resources](#resources)
@@ -208,7 +210,7 @@ end
 ### Setup
 
 Follow these steps to author a [Glimmer](https://rubygems.org/gems/glimmer) DSL:
-- Add `gem 'glimmer', '~> 2.1.2'` to `Gemfile` and run `bundle` or run `gem install glimmer -v2.1.2` and add `require 'glimmer'`
+- Add `gem 'glimmer', '~> 2.2.0'` to `Gemfile` and run `bundle` or run `gem install glimmer -v2.2.0` and add `require 'glimmer'`
 - Create `glimmer/dsl/[dsl_name]/dsl.rb`, which requires and adds all dynamic expressions for the [dsl_name] Glimmer DSL module as per the code shown in the previous section (or [Official DSLs](#official-dsls) as examples)
 - Create `glimmer/dsl/[dsl_name]/[expresion_name]_expresion.rb` for every [expresion_name] expression needed, whether dynamic or static
 
@@ -926,6 +928,291 @@ Glimmer app:
 ![glimmer dsl tk screenshot sample hello combo](https://raw.githubusercontent.com/AndyObtiva/glimmer-dsl-tk/master/images/glimmer-dsl-tk-screenshot-sample-hello-combo.png)
 ![glimmer dsl tk screenshot sample hello combo dropdown](https://raw.githubusercontent.com/AndyObtiva/glimmer-dsl-tk/master/images/glimmer-dsl-tk-screenshot-sample-hello-combo-dropdown.png)
 
+#### Glimmer DSL for LibUI (Prerequisite-Free Ruby Desktop Development GUI Library)
+
+[Glimmer DSL for LibUI](https://github.com/AndyObtiva/glimmer-dsl-libui) is a prerequisite-free Ruby desktop development GUI library. No need to pre-install any prerequisites. Just install the gem and have platform-independent native GUI that just works!
+
+[LibUI](https://github.com/kojix2/LibUI) is a thin [Ruby](https://www.ruby-lang.org/en/) wrapper around [libui](https://github.com/andlabs/libui), a relatively new C GUI library that renders native controls on every platform (similar to [SWT](https://www.eclipse.org/swt/), but without the heavy weight of the [Java Virtual Machine](https://www.java.com/en/)).
+
+The main trade-off in using [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) as opposed to [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) or [Glimmer DSL for Tk](https://github.com/AndyObtiva/glimmer-dsl-tk) is the fact that [SWT](https://www.eclipse.org/swt/) and [Tk](https://www.tcl.tk/) are more mature than mid-alpha [libui](https://github.com/andlabs/libui) as GUI toolkits. Still, if there is only a need to build a small simple application, [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) could be a good convenient choice due to having zero prerequisites beyond the dependencies included in the [Ruby gem](https://rubygems.org/gems/glimmer-dsl-libui). Also, just like [Glimmer DSL for Tk](https://github.com/AndyObtiva/glimmer-dsl-tk), its apps start instantly and have a small memory footprint. [LibUI](https://github.com/kojix2/LibUI) is a promising new GUI toolkit that might prove quite worthy in the future.
+
+[Glimmer DSL for LibUI](https://github.com/AndyObtiva/glimmer-dsl-libui) aims to provide a DSL similar to the [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) to enable more productive desktop development in Ruby with:
+- Declarative DSL syntax that visually maps to the GUI widget hierarchy
+- Convention over configuration via smart defaults and automation of low-level details
+- Requiring the least amount of syntax possible to build GUI
+- Bidirectional Data-Binding to declaratively wire and automatically synchronize GUI with Business Models
+- Custom Widget support
+- Scaffolding for new custom widgets, apps, and gems
+- Native-Executable packaging on Mac, Windows, and Linux
+
+##### Glimmer DSL for LibUI Samples
+
+###### Hello, World!
+
+```ruby
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('hello world').show
+```
+
+Mac
+
+![glimmer-dsl-libui-mac-basic-window.png](https://raw.githubusercontent.com/AndyObtiva/glimmer-dsl-libui/master/images/glimmer-dsl-libui-mac-basic-window.png)
+
+Linux
+
+![glimmer-dsl-libui-linux-basic-window.png](https://raw.githubusercontent.com/AndyObtiva/glimmer-dsl-libui/master/images/glimmer-dsl-libui-linux-basic-window.png)
+
+###### Basic Button
+
+```ruby
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('hello world', 300, 200) { |w|
+  button('Button') {
+    on_clicked do
+      msg_box(w, 'Information', 'You clicked the button')
+    end
+  }
+  
+  on_closing do
+    puts 'Bye Bye'
+  end
+}.show
+```
+
+Mac
+
+![glimmer-dsl-libui-mac-basic-button.png](https://raw.githubusercontent.com/AndyObtiva/glimmer-dsl-libui/master/images/glimmer-dsl-libui-mac-basic-button.png)
+![glimmer-dsl-libui-mac-basic-button-msg-box.png](https://raw.githubusercontent.com/AndyObtiva/glimmer-dsl-libui/master/images/glimmer-dsl-libui-mac-basic-button-msg-box.png)
+
+Linux
+
+![glimmer-dsl-libui-linux-basic-button.png](https://raw.githubusercontent.com/AndyObtiva/glimmer-dsl-libui/master/images/glimmer-dsl-libui-linux-basic-button.png)
+![glimmer-dsl-libui-linux-basic-button-msg-box.png](https://raw.githubusercontent.com/AndyObtiva/glimmer-dsl-libui/master/images/glimmer-dsl-libui-linux-basic-button-msg-box.png)
+
+###### Control Gallery
+
+```ruby
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+menu('File') {
+  menu_item('Open') {
+    on_clicked do
+      file = open_file(MAIN_WINDOW)
+      puts file unless file.nil?
+    end
+  }
+
+  menu_item('Save') {
+    on_clicked do
+      file = save_file(MAIN_WINDOW)
+      puts file unless file.nil?
+    end
+  }
+  
+  quit_menu_item {
+    on_clicked do
+      puts 'Bye Bye'
+    end
+  }
+  
+  preferences_menu_item # Can optionally contain an on_clicked listener
+}
+
+menu('Edit') {
+  check_menu_item('Checkable Item_')
+  separator_menu_item
+  menu_item('Disabled Item_') {
+    enabled false
+  }
+}
+
+menu('Help') {
+  menu_item('Help')
+  
+  about_menu_item # Can optionally contain an on_clicked listener
+}
+
+MAIN_WINDOW = window('Control Gallery', 600, 500) {
+  margined true
+  
+  on_closing do
+    puts 'Bye Bye'
+  end
+  
+  vertical_box {
+    horizontal_box {
+      group('Basic Controls') {
+        vertical_box {
+          button('Button') {
+            stretchy false
+
+            on_clicked do
+              msg_box(MAIN_WINDOW, 'Information', 'You clicked the button')
+            end
+          }
+
+          checkbox('Checkbox') {
+            stretchy false
+
+            on_toggled do |c|
+              checked = c.checked == 1
+              MAIN_WINDOW.title = "Checkbox is #{checked}"
+              c.text = "I am the checkbox (#{checked})"
+            end
+          }
+
+          label('Label') { stretchy false }
+
+          horizontal_separator { stretchy false }
+
+          date_picker { stretchy false }
+
+          time_picker { stretchy false }
+
+          date_time_picker { stretchy false }
+
+          font_button { stretchy false }
+
+          color_button { stretchy false }
+        }
+      }
+
+      vertical_box {
+        group('Numbers') {
+          stretchy false
+
+          vertical_box {
+            spinbox(0, 100) {
+              stretchy false
+              value 42
+
+              on_changed do |s|
+                puts "New Spinbox value: #{s.value}"
+              end
+            }
+
+            slider(0, 100) {
+              stretchy false
+
+              on_changed do |s|
+                v = s.value
+                puts "New Slider value: #{v}"
+                @progress_bar.value = v
+              end
+            }
+
+            @progress_bar = progress_bar { stretchy false }
+          }
+        }
+
+        group('Lists') {
+          stretchy false
+
+          vertical_box {
+            combobox {
+              stretchy false
+              items 'combobox Item 1', 'combobox Item 2', 'combobox Item 3' # also accepts a single array argument
+
+              on_selected do |c|
+                puts "New combobox selection: #{c.selected}"
+              end
+            }
+
+            editable_combobox {
+              stretchy false
+              items 'Editable Item 1', 'Editable Item 2', 'Editable Item 3' # also accepts a single array argument
+            }
+
+            radio_buttons {
+              items 'Radio Button 1', 'Radio Button 2', 'Radio Button 3' # also accepts a single array argument
+            }
+          }
+        }
+
+        tab {
+          tab_item('Page 1') {
+            horizontal_box {
+              entry {
+                text 'Please enter your feelings'
+
+                on_changed do |e|
+                  puts "Current textbox data: '#{e.text}'"
+                end
+              }
+            }
+          }
+          
+          tab_item('Page 2') {
+            horizontal_box
+          }
+          
+          tab_item('Page 3') {
+            horizontal_box
+          }
+        }
+      }
+    }
+  }
+}
+
+MAIN_WINDOW.show
+```
+
+Mac
+
+![glimmer-dsl-libui-mac-control-gallery.png](https://raw.githubusercontent.com/AndyObtiva/glimmer-dsl-libui/master/images/glimmer-dsl-libui-mac-control-gallery.png)
+
+Linux
+
+![glimmer-dsl-libui-linux-control-gallery.png](https://raw.githubusercontent.com/AndyObtiva/glimmer-dsl-libui/master/images/glimmer-dsl-libui-linux-control-gallery.png)
+
+###### Basic Table
+
+```ruby
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+data = [
+  %w[cat meow],
+  %w[dog woof],
+  %w[chicken cock-a-doodle-doo],
+  %w[hourse neigh],
+  %w[cow moo]
+]
+
+window('Animal sounds', 300, 200) {
+  horizontal_box {
+    table {
+      text_column('Animal')
+      text_column('Description')
+
+      cell_rows data
+    }
+  }
+  
+  on_closing do
+    puts 'Bye Bye'
+  end
+}.show
+```
+
+Mac
+
+![glimmer-dsl-libui-mac-basic-table.png](https://raw.githubusercontent.com/AndyObtiva/glimmer-dsl-libui/master/images/glimmer-dsl-libui-mac-basic-table.png)
+
+Linux
+
+![glimmer-dsl-libui-linux-basic-table.png](https://raw.githubusercontent.com/AndyObtiva/glimmer-dsl-libui/master/images/glimmer-dsl-libui-linux-basic-table.png)
+
 ## Data-Binding Library
 
 Data-Binding enables mapping GUI properties (like text and color) to Model attributes (like name and age) for bidirectional or unidirectional synchronization and conversion as needed.
@@ -935,12 +1222,13 @@ Glimmer enhances observed models automatically (including array operations like
 This relies mainly on the Observer Design Pattern and the MVP (Model-View-Presenter) Architectural Pattern (a variation on MVC)
 
 These are the main classes concerning data-binding:
-- `Observer`: Provides general observer support including unique registration and deregistration for cleanup and prevention of memory leaks. Main methods concerned are: `call`, `register` (alias: `observe`), and `unregister` (alias: `unobserve` or `deregister`)
-- `Observable`: General super-module for all observables. Main methods concerned are: `add_observer` and `remove_observer`
-- `ObservableModel`: Mixin module for any observable model with observable attributes. In addition to `Observable` methods, it has a `notify_observers` method to be called when changes occur. It automatically enhances all attribute setters (ending with `=`) to notify observers on changes. Also, it automatically handles observing array attributes using `ObservableArray` appropriately so they would notify observers upon array mutation changes.
-- `ObservableArray`: Mixin module for any observable array collection that automatically handles notifying observers upon performing array mutation operations (e.g. `push` or `delete`)
-- `ModelBinding`: a higher-level abstraction that relies on all the other observer/observable classes to support basic data-binding, nested data-binding, and computed data-binding
-- `Shine`: enables highly intuitive and visually expressive syntax to perform bidirectional (two-way) data-binding with `<=>` and unidirectional (one-way) data-binding with `<=`
+- `Glimmer::DataBinding::Observer`: Provides general observer support including unique registration and deregistration for cleanup and prevention of memory leaks. Main methods concerned are: `call`, `register` (alias: `observe`), and `unregister` (alias: `unobserve` or `deregister`)
+- `Glimmer::DataBinding::Observable`: General super-module for all observables. Main methods concerned are: `add_observer` and `remove_observer`
+- `Glimmer::DataBinding::ObservableModel`: Mixin module for any observable model with observable attributes. In addition to `Observable` methods, it has a `notify_observers` method to be called when changes occur. It automatically enhances all attribute setters (ending with `=`) to notify observers on changes. Also, it automatically handles observing array attributes using `ObservableArray` appropriately so they would notify observers upon array mutation changes.
+- `Glimmer::DataBinding::ObservableArray`: Mixin module for any observable array collection that automatically handles notifying observers upon performing array mutation operations (e.g. `push`, `select!`, or `delete`)
+- `Glimmer::DataBinding::ObservableHash`: Mixin module for any observable hash that automatically handles notifying observers upon performing array mutation operation (e.g. `hash[key]=value`)
+- `Glimmer::DataBinding::ModelBinding`: a higher-level abstraction that relies on all the other observer/observable classes to support basic data-binding, nested data-binding, and computed data-binding
+- `Glimmer::DataBinding::Shine`: enables highly intuitive and visually expressive syntax to perform bidirectional (two-way) data-binding with `<=>` and unidirectional (one-way) data-binding with `<=`
 
 You may learn more from [Data-Binding](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#data-binding) and [Observer](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#observer) usage in [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt)
 

data/VERSION

@@ -1 +1 @@
-2.1.2
+2.2.0

data/glimmer.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 2.1.2 ruby lib
+# stub: glimmer 2.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer".freeze
-  s.version = "2.1.2"
+  s.version = "2.2.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 = "2021-09-14"
+  s.date = "2021-09-28"
   s.description = "Glimmer is a Ruby DSL Framework for Ruby GUI and More, consisting of a DSL Engine and an Observable/Observer/Data-Binding Library. Used in the Glimmer DSL for SWT (JRuby Desktop Development GUI Framework), the Glimmer DSL for Tk (Ruby Desktop Development GUI Library), the Glimmer DSL for Opal (Pure Ruby Web GUI and Auto-Webifier of Desktop Apps), the Glimmer DSL for XML (& HTML), and the Glimmer DSL for CSS.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "lib/glimmer/data_binding/model_binding.rb",
     "lib/glimmer/data_binding/observable.rb",
     "lib/glimmer/data_binding/observable_array.rb",
+    "lib/glimmer/data_binding/observable_hash.rb",
     "lib/glimmer/data_binding/observable_model.rb",
     "lib/glimmer/data_binding/observer.rb",
     "lib/glimmer/data_binding/shine.rb",
@@ -58,7 +59,7 @@ Gem::Specification.new do |s|
   end
 
   if s.respond_to? :add_runtime_dependency then
-    s.add_runtime_dependency(%q<array_include_methods>.freeze, [">= 1.0.4", "< 2.0.0"])
+    s.add_runtime_dependency(%q<array_include_methods>.freeze, ["~> 1.4.0"])
     s.add_runtime_dependency(%q<facets>.freeze, [">= 3.1.0", "< 4.0.0"])
     s.add_development_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])
     s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
@@ -71,7 +72,7 @@ Gem::Specification.new do |s|
     s.add_development_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
     s.add_development_dependency(%q<rake-tui>.freeze, [">= 0"])
   else
-    s.add_dependency(%q<array_include_methods>.freeze, [">= 1.0.4", "< 2.0.0"])
+    s.add_dependency(%q<array_include_methods>.freeze, ["~> 1.4.0"])
     s.add_dependency(%q<facets>.freeze, [">= 3.1.0", "< 4.0.0"])
     s.add_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])
     s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])

data/lib/glimmer/data_binding/model_binding.rb

@@ -198,7 +198,7 @@ module Glimmer
         end
       end
 
-      def call(value)
+      def call(value, *extra_args)
         return if model.nil?
         converted_value = value
         invoke_property_writer(model, "#{property_name}=", converted_value) unless converted_value == evaluate_property

data/lib/glimmer/data_binding/observable_array.rb

@@ -83,7 +83,7 @@ module Glimmer
       end
       
       def has_observer_element_properties?(observer, element_properties)
-        element_properties_for(observer).to_a.include_all?(element_properties)
+        element_properties_for(observer).to_a.include_all?(*element_properties)
       end
 
       def property_observer_list

data/lib/glimmer/data_binding/observable_hash.rb

@@ -0,0 +1,181 @@
+# Copyright (c) 2007-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/data_binding/observable'
+require 'glimmer/data_binding/observer'
+
+module Glimmer
+  module DataBinding
+    module ObservableHash
+      include Observable
+
+      class Notifier
+        include Observer
+        
+        def initialize(observable_model, key)
+          @observable_model = observable_model
+          @key = key
+        end
+        
+        def call(new_value=nil, *extra_args)
+          @observable_model.notify_observers(@key)
+        end
+      end
+      
+      OBSERVED_STORE_METHOD = lambda do |key, value|
+        if key_observer_list(key).empty?
+          if all_key_observer_list.empty?
+            self.send('__original__store', key, value)
+          else
+            old_value = self[key]
+            unregister_dependent_observers(nil, old_value) # remove dependent observers previously installed in ensure_array_object_observer and ensure_hash_object_observer
+            self.send('__original__store', key, value)
+            notify_observers(key)
+            ensure_array_object_observer(nil, value, old_value)
+            ensure_hash_object_observer(nil, value, old_value)
+          end
+        else
+          old_value = self[key]
+          unregister_dependent_observers(key, old_value) # remove dependent observers previously installed in ensure_array_object_observer and ensure_hash_object_observer
+          self.send('__original__store', key, value)
+          notify_observers(key)
+          ensure_array_object_observer(key, value, old_value)
+          ensure_hash_object_observer(key, value, old_value)
+        end
+      end
+
+      def add_observer(observer, key = nil)
+        return observer if has_observer?(observer, key)
+        key_observer_list(key) << observer
+        add_key_writer_observer(key)
+        observer
+      end
+
+      def remove_observer(observer, key = nil)
+        if has_observer?(observer, key)
+          key_observer_list(key).delete(observer)
+          observer.unobserve(self, key)
+        end
+      end
+
+      def remove_observers(key)
+        key_observer_hash[key].each do |observer|
+          remove_observer(observer, key)
+        end
+        key_observer_hash.delete(key)
+      end
+
+      def remove_all_observers
+        all_observers = key_observer_hash.clone
+        key_observer_hash.keys.each do |key|
+          remove_observers(key)
+        end
+        key_observer_hash.clear
+        all_observers
+      end
+
+      def has_observer?(observer, key = nil)
+        key_observer_list(key).include?(observer)
+      end
+
+      def has_observer_for_any_key?(observer)
+        key_observer_hash.values.map(&:to_a).reduce(:+).include?(observer)
+      end
+
+      def key_observer_hash
+        @key_observers ||= Hash.new
+      end
+
+      def key_observer_list(key)
+        key_observer_hash[key] = Concurrent::Set.new unless key_observer_hash[key]
+        key_observer_hash[key]
+      end
+      
+      def all_key_observer_list
+        key_observer_list(nil)
+      end
+      
+      def notify_observers(key)
+        all_key_observer_list.to_a.each { |observer| observer.call(self[key], key) }
+        (key_observer_list(key).to_a - all_key_observer_list.to_a).each { |observer| observer.call(self[key]) }
+      end
+
+      def add_key_writer_observer(key = nil)
+        ensure_array_object_observer(key, self[key])
+        ensure_hash_object_observer(key, self[key])
+        begin
+          method('__original__store')
+        rescue
+          define_singleton_method('__original__store', store_method)
+          define_singleton_method('[]=', &OBSERVED_STORE_METHOD)
+        end
+      rescue => e
+        #ignore writing if no key writer exists
+        Glimmer::Config.logger.debug {"No need to observe store method: '[]='\n#{e.message}\n#{e.backtrace.join("\n")}"}
+      end
+      
+      def store_method
+        self.class.instance_method('[]=') rescue self.method('[]=')
+      end
+
+      def unregister_dependent_observers(key, old_value)
+        # TODO look into optimizing this
+        return unless old_value.is_a?(ObservableModel) || old_value.is_a?(ObservableArray) || old_value.is_a?(ObservableHash)
+        key_observer_list(key).each { |observer| observer.unregister_dependents_with_observable(observer.registration_for(self, key), old_value) }
+      end
+      alias deregister_dependent_observers unregister_dependent_observers
+
+      def ensure_array_object_observer(key, object, old_object = nil)
+        return unless object&.is_a?(Array)
+        array_object_observer = array_object_observer_for(key)
+        array_observer_registration = array_object_observer.observe(object)
+        key_observer_list(key).each do |observer|
+          my_registration = observer.registration_for(self, key) # TODO eliminate repetition
+          observer.add_dependent(my_registration => array_observer_registration)
+        end
+        array_object_observer_for(key).unregister(old_object) if old_object.is_a?(ObservableArray)
+      end
+
+      def array_object_observer_for(key)
+        @array_object_observers ||= Concurrent::Hash.new
+        @array_object_observers[key] = ObservableModel::Notifier.new(self, key) unless @array_object_observers.has_key?(key)
+        @array_object_observers[key]
+      end
+      
+      def ensure_hash_object_observer(key, object, old_object = nil)
+        return unless object&.is_a?(Hash)
+        hash_object_observer = hash_object_observer_for(key)
+        hash_observer_registration = hash_object_observer.observe(object)
+        key_observer_list(key).each do |observer|
+          my_registration = observer.registration_for(self, key) # TODO eliminate repetition
+          observer.add_dependent(my_registration => hash_observer_registration)
+        end
+        hash_object_observer_for(key).unregister(old_object) if old_object.is_a?(ObservableHash)
+      end
+
+      def hash_object_observer_for(key)
+        @hash_object_observers ||= Concurrent::Hash.new
+        @hash_object_observers[key] = ObservableModel::Notifier.new(self, key) unless @hash_object_observers.has_key?(key)
+        @hash_object_observers[key]
+      end
+    end
+  end
+end

data/lib/glimmer/data_binding/observable_model.rb

@@ -35,7 +35,7 @@ module Glimmer
           @property_name = property_name
         end
         
-        def call(new_value=nil)
+        def call(new_value=nil, *extra_args)
           @observable_model.notify_observers(@property_name)
         end
       end
@@ -44,10 +44,11 @@ module Glimmer
         property_writer_name = "#{property_name}="
         lambda do |value|
           old_value = self.send(property_name)
-          unregister_dependent_observers(property_name, old_value)
+          unregister_dependent_observers(property_name, old_value) # remove dependent observers previously installed in ensure_array_object_observer and ensure_hash_object_observer
           self.send("__original__#{property_writer_name}", value)
           notify_observers(property_name)
           ensure_array_object_observer(property_name, value, old_value)
+          ensure_hash_object_observer(property_name, value, old_value)
         end
       end
 
@@ -106,6 +107,7 @@ module Glimmer
         property_writer_name = "#{property_name}="
         method(property_writer_name)
         ensure_array_object_observer(property_name, send(property_name))
+        ensure_hash_object_observer(property_name, send(property_name))
         begin
           method("__original__#{property_writer_name}")
         rescue
@@ -144,6 +146,23 @@ module Glimmer
         @array_object_observers[property_name] = ObservableModel::Notifier.new(self, property_name) unless @array_object_observers.has_key?(property_name)
         @array_object_observers[property_name]
       end
+      
+      def ensure_hash_object_observer(property_name, object, old_object = nil)
+        return unless object&.is_a?(Hash)
+        hash_object_observer = hash_object_observer_for(property_name)
+        hash_observer_registration = hash_object_observer.observe(object)
+        property_observer_list(property_name).each do |observer|
+          my_registration = observer.registration_for(self, property_name) # TODO eliminate repetition
+          observer.add_dependent(my_registration => hash_observer_registration)
+        end
+        hash_object_observer_for(property_name).unregister(old_object) if old_object.is_a?(ObservableHash)
+      end
+
+      def hash_object_observer_for(property_name)
+        @hash_object_observers ||= Concurrent::Hash.new
+        @hash_object_observers[property_name] = ObservableModel::Notifier.new(self, property_name) unless @hash_object_observers.has_key?(property_name)
+        @hash_object_observers[property_name]
+      end
     end
   end
 end

data/lib/glimmer/data_binding/observer.rb

@@ -41,8 +41,8 @@ module Glimmer
         end
 
         # Called by observables once updates occur sending in the new_value if any
-        def call(new_value=nil)
-          @observer_block.call(new_value)
+        def call(new_value=nil, *extra_args)
+          @observer_block.call(new_value, *extra_args)
         end
       end
 
@@ -86,6 +86,8 @@ module Glimmer
           # TODO refactor code to be more smart/polymorphic/automated and honor open/closed principle
           if observable.is_a?(Array)
             observable.extend(ObservableArray)
+          elsif observable.is_a?(Hash)
+            observable.extend(ObservableHash)
           else
             observable.extend(ObservableModel)
           end
@@ -141,7 +143,7 @@ module Glimmer
         dependents_for(registration).delete(dependent)
       end
 
-      def call(new_value)
+      def call(new_value = nil, *extra_args)
         raise Error, 'Not implemented!'
       end
     end
@@ -150,3 +152,4 @@ end
 
 require 'glimmer/data_binding/observable_model'
 require 'glimmer/data_binding/observable_array'
+require 'glimmer/data_binding/observable_hash'

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-14 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_include_methods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: facets
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +228,7 @@ files:
 - lib/glimmer/data_binding/model_binding.rb
 - lib/glimmer/data_binding/observable.rb
 - lib/glimmer/data_binding/observable_array.rb
+- lib/glimmer/data_binding/observable_hash.rb
 - lib/glimmer/data_binding/observable_model.rb
 - lib/glimmer/data_binding/observer.rb
 - lib/glimmer/data_binding/shine.rb