glimmer 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d61c8e3da07109cf0edf0df46e0937a862b3e80007a12da8050c2415481cbb6e
-  data.tar.gz: c618e4c0b024a9da219fbe78c263a442981d3d0a40f8a13bb7639edf50310e09
+  metadata.gz: 35f985810a976094fb1e6e50371f6f48c71730ae8cfd4fad862734d8e319d71e
+  data.tar.gz: 78826cb87a5fcc16e609b3dd3065bea51a28a765c6d2b80341ee1cce1a57a23a
 SHA512:
-  metadata.gz: c1b3b5d7aa04427f0e1188e0cd7e3855d517c0adfb6c561160c465f043685c48a651df8fde9eb05e31b84578a1986182422e49bb329fd35b9f0cd623fac4bc77
-  data.tar.gz: 5b4177d4ae038eefd1c210e8054f92ebe716b1a7edb2b40e94466ee2ba35aaafced1320128e75603f156ed3a7cdc56db200fd4369916dc0862f44fbd7ac12760
+  metadata.gz: 6e3d5f3fd5b2fddb43b32fb8f8c47ce059cf424161453da590de1aba03b002a538ddd2107cfc099703878a5520a7bdaf45cc560cfd1e87ed564894fb324c94e8
+  data.tar.gz: d53be152046beb31ceef2ae20aad7aa2bd8d93e0c75c53ec7a0def995c8457461f26fd1294047413cc9961f8064ea5b939b5ea430d4e2b81e4e3e40ca0a30f6c

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 Related Change Logs:
 - [glimmer-dsl-swt/CHANGELOG.md](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/CHANGELOG.md)
 
+### 2.2.1
+
+- Have `ObservableHash` call `notify_observers(key)` upon performing all mutation operations (as expected): `delete`, `delete_if`, `filter!`, `select!`, `keep_if`, `reject!`, `merge!`, `replace`, `shift`, `transform_keys!`, `transform_values!`
+- Fix issue with `Glimmer::DataBinding::Observer.proc {|new_value| ...}.observe(array)` resulting in new_value coming across as `nil when the array is updated
+
 ### 2.2.0
 
 - New `Glimmer::DataBinding::ObservableHash` support for observing `hash[key]=value` mutations

data/README.md

@@ -210,7 +210,7 @@ end
 ### Setup
 
 Follow these steps to author a [Glimmer](https://rubygems.org/gems/glimmer) DSL:
-- Add `gem 'glimmer', '~> 2.2.0'` to `Gemfile` and run `bundle` or run `gem install glimmer -v2.2.0` and add `require 'glimmer'`
+- Add `gem 'glimmer', '~> 2.2.1'` to `Gemfile` and run `bundle` or run `gem install glimmer -v2.2.1` 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
 
@@ -1226,7 +1226,7 @@ These are the main classes concerning data-binding:
 - `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::ObservableHash`: Mixin module for any observable hash that automatically handles notifying observers upon performing hash mutation operations (e.g. `hash[key]=value`, `select!`, `merge!`)
 - `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 `<=`
 

data/VERSION

@@ -1 +1 @@
-2.2.0
+2.2.1

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.2.0 ruby lib
+# stub: glimmer 2.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer".freeze
-  s.version = "2.2.0"
+  s.version = "2.2.1"
 
   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-28"
+  s.date = "2021-10-03"
   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 = [
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/AndyObtiva/glimmer".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.2.22".freeze
+  s.rubygems_version = "3.2.28".freeze
   s.summary = "Glimmer - DSL Engine for Ruby GUI and More".freeze
 
   if s.respond_to? :specification_version then

data/lib/glimmer/data_binding/observable_array.rb

@@ -99,7 +99,7 @@ module Glimmer
       end
 
       def notify_observers
-        property_observer_list.to_a.each(&:call)
+        property_observer_list.to_a.each { |o| o.call(self) }
       end
       
       def <<(element)

data/lib/glimmer/data_binding/observable_hash.rb

@@ -115,7 +115,7 @@ module Glimmer
       
       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]) }
+        (key_observer_list(key).to_a - all_key_observer_list.to_a).each { |observer| observer.call(self[key], key) }
       end
 
       def add_key_writer_observer(key = nil)
@@ -176,6 +176,181 @@ module Glimmer
         @hash_object_observers[key] = ObservableModel::Notifier.new(self, key) unless @hash_object_observers.has_key?(key)
         @hash_object_observers[key]
       end
+      
+      def delete(key, &block)
+        old_value = self[key]
+        unless old_value.nil?
+          unregister_dependent_observers(key, old_value)
+          unregister_dependent_observers(nil, old_value)
+        end
+        super(key, &block).tap do
+          notify_observers(key) unless old_value.nil?
+        end
+      end
+      
+      def delete_if(&block)
+        if block_given?
+          old_hash = self.dup
+          super(&block).tap do |new_hash|
+            deleted_keys = old_hash.keys - new_hash.keys
+            deleted_keys.each do |deleted_key|
+              deleted_value = old_hash[deleted_key]
+              unless deleted_value.nil?
+                unregister_dependent_observers(deleted_key, deleted_value)
+                unregister_dependent_observers(nil, deleted_value)
+                notify_observers(deleted_key)
+              end
+            end
+          end
+        else
+          super
+        end
+      end
+      
+      def select!(&block)
+        if block_given?
+          old_hash = self.dup
+          super(&block).tap do |new_hash|
+            deleted_keys = old_hash.keys - new_hash.keys
+            deleted_keys.each do |deleted_key|
+              deleted_value = old_hash[deleted_key]
+              unless deleted_value.nil?
+                unregister_dependent_observers(deleted_key, deleted_value)
+                unregister_dependent_observers(nil, deleted_value)
+                notify_observers(deleted_key)
+              end
+            end
+          end
+        else
+          super
+        end
+      end
+      
+      def keep_if(&block)
+        if block_given?
+          old_hash = self.dup
+          super(&block).tap do |new_hash|
+            deleted_keys = old_hash.keys - new_hash.keys
+            deleted_keys.each do |deleted_key|
+              deleted_value = old_hash[deleted_key]
+              unless deleted_value.nil?
+                unregister_dependent_observers(deleted_key, deleted_value)
+                unregister_dependent_observers(nil, deleted_value)
+                notify_observers(deleted_key)
+              end
+            end
+          end
+        else
+          super
+        end
+      end
+      
+      def reject!(&block)
+        if block_given?
+          old_hash = self.dup
+          super(&block).tap do |new_hash|
+            deleted_keys = old_hash.keys - new_hash.keys
+            deleted_keys.each do |deleted_key|
+              deleted_value = old_hash[deleted_key]
+              unless deleted_value.nil?
+                unregister_dependent_observers(deleted_key, deleted_value)
+                unregister_dependent_observers(nil, deleted_value)
+                notify_observers(deleted_key)
+              end
+            end
+          end
+        else
+          super
+        end
+      end
+      
+      def shift
+        old_hash = self.dup
+        super.tap do
+          new_hash = self
+          deleted_keys = old_hash.keys - new_hash.keys
+          deleted_keys.each do |deleted_key|
+            deleted_value = old_hash[deleted_key]
+            unless deleted_value.nil?
+              unregister_dependent_observers(deleted_key, deleted_value)
+              unregister_dependent_observers(nil, deleted_value)
+              notify_observers(deleted_key)
+            end
+          end
+        end
+      end
+      
+      def merge!(*other_hashes, &block)
+        if other_hashes.empty?
+          super
+        else
+          old_hash = self.dup
+          super(*other_hashes, &block).tap do |new_hash|
+            changed_keys = other_hashes.map(&:keys).reduce(:+)
+            changed_keys.each do |changed_key|
+              old_value = old_hash[changed_key]
+              if new_hash[changed_key] != old_value
+                unregister_dependent_observers(changed_key, old_value)
+                unregister_dependent_observers(nil, old_value)
+                notify_observers(changed_key)
+              end
+            end
+          end
+        end
+      end
+      
+      def replace(other_hash)
+        old_hash = self.dup
+        super(other_hash).tap do |new_hash|
+          changed_keys = old_hash.keys + new_hash.keys
+          changed_keys.each do |changed_key|
+            old_value = old_hash[changed_key]
+            if new_hash[changed_key] != old_value
+              unregister_dependent_observers(changed_key, old_value)
+              unregister_dependent_observers(nil, old_value)
+              notify_observers(changed_key)
+            end
+          end
+        end
+      end
+      
+      def transform_keys!(hash2 = nil, &block)
+        if hash2.nil? && block.nil?
+          super
+        else
+          old_hash = self.dup
+          result = hash2.nil? ? super(&block) : super(hash2, &block)
+          result.tap do |new_hash|
+            changed_keys = old_hash.keys + new_hash.keys
+            changed_keys.each do |changed_key|
+              old_value = old_hash[changed_key]
+              if new_hash[changed_key] != old_value
+                unregister_dependent_observers(changed_key, old_value)
+                unregister_dependent_observers(nil, old_value)
+                notify_observers(changed_key)
+              end
+            end
+          end
+        end
+      end
+      
+      def transform_values!(&block)
+        if block_given?
+          old_hash = self.dup
+          super(&block).tap do |new_hash|
+            new_hash.keys.each do |changed_key|
+              old_value = old_hash[changed_key]
+              if new_hash[changed_key] != old_value
+                unregister_dependent_observers(changed_key, old_value)
+                unregister_dependent_observers(nil, old_value)
+                notify_observers(changed_key)
+              end
+            end
+          end
+        else
+          super
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2021-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_include_methods
@@ -263,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.28
 signing_key:
 specification_version: 4
 summary: Glimmer - DSL Engine for Ruby GUI and More