smart_properties 1.16.0 → 1.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76b840210991bfec855a2e1159426635bc29e3994269bf305b5f0a8fe40fb0cf
-  data.tar.gz: f10d37b213920338b36b8a2da7bbecc1e8e0caf1d6eecf66084b6cbb4914a95e
+  metadata.gz: 3d970dbdc63b4c78e01ec7f569bd00d9c37a61c672f97d084a5a01b205c80159
+  data.tar.gz: 0db3dca56f41fafc8c96cef4c2ebd54068ce505101a3f949549724522b88bf3f
 SHA512:
-  metadata.gz: 30f8ed85cd3db3e2c17ddc30b63f85cba5541d26d8c8747a92529320531c11a58ae20435f08175061faedc7edf8f3bad2899ff32f2aa36465d4de2a78c8ca75e
-  data.tar.gz: fb602a52c408989d44c9ef0dd232f5891c6bc96f64444d077d498bb06ed1f63dfa671712abfe9ab0680214fb442ee4b029b6e0e518df01a35860e5fc6c072151
+  metadata.gz: 186ffbca4f484bd2dcf39fef28bf49523323d195c515567266dfe1c1166b513a426b8da3548a350025d11ca4188984ad312302198ec8d365de00d120b93921a5
+  data.tar.gz: dffb5d926bc985cf751d654782d152acb38ef1a9b1febd9ccec9bb2589fb61e55b6f471d83d82f106d2f504b1276c2f00166ff18b2f3ea48fc550687d60cf5de

data/lib/smart_properties/property_collection.rb

@@ -11,9 +11,10 @@ module SmartProperties
           ancestor != SmartProperties
       end
 
-      parents.reduce(collection = new) do |previous, current|
-        current.properties.register(previous)
-        current.properties
+      collection = new
+
+      parents.reverse.each do |parent|
+        parent.properties.register(collection)
       end
 
       collection
@@ -75,7 +76,7 @@ module SmartProperties
     end
 
     def refresh(parent_collection)
-      @collection_with_parent_collection = parent_collection.merge(collection)
+      @collection_with_parent_collection.merge!(parent_collection)
       notify_children
       nil
     end

data/lib/smart_properties/version.rb

@@ -1,3 +1,3 @@
 module SmartProperties
-  VERSION = "1.16.0"
+  VERSION = "1.16.2"
 end

data/spec/inheritance_spec.rb

@@ -226,33 +226,67 @@ RSpec.describe SmartProperties, 'intheritance' do
     end
   end
 
-  it "supports multiple inheritance through modules" do
-    m = Module.new do
-      include SmartProperties
-      property :m, default: 1
+  context "through modules" do
+    let(:m) do
+      m = Module.new do
+        include SmartProperties
+        property :m, default: 1
+      end
     end
 
-    n = Module.new do
-      include SmartProperties
-      property :n, default: 2
+    let(:n) do
+      n = Module.new do
+        include SmartProperties
+        property :n, default: 2
+      end
     end
 
-    o = Module.new {}
+    it "is supported" do
+      n = self.n
+      m = self.m
+      o = Module.new {}
 
-    klass = Class.new do
-      include m
-      include o
-      include n
-    end
+      klass = Class.new do
+        include m
+        include o
+        include n
+      end
+
+      n.module_eval do
+        property :p, default: 3
+      end
+
+      instance = klass.new
+
+      expect(instance.m).to eq(1)
+      expect(instance.n).to eq(2)
+      expect(instance.p).to eq(3)
 
-    n.module_eval do
-      property :p, default: 3
+      expect { klass.new(m: 4, n: 5, p: 6) }.to_not raise_error
     end
 
-    instance = klass.new
+    it "yields properly ordered properties – child properties have higher precedence than parent properties" do
+      n = self.n
+      m = self.m
 
-    expect(instance.m).to eq(1)
-    expect(instance.n).to eq(2)
-    expect(instance.p).to eq(3)
+      parent = Class.new do
+        include m
+        include n
+      end
+      expect(parent.new.m).to eq(1)
+
+      child = Class.new(parent) do
+        property :m, default: 0
+      end
+      expect(child.new.m).to eq(0)
+
+      grandchild = Class.new(child)
+      expect(grandchild.new.m).to eq(0)
+
+      grandgrandchild = Class.new(grandchild) do
+        property :m, default: 1000
+      end
+      expect(grandgrandchild.new.m).to eq(1000)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_properties
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.16.2
 platform: ruby
 authors:
 - Konstantin Tennhard
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-18 00:00:00.000000000 Z
+date: 2021-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.20
 signing_key:
 specification_version: 4
 summary: SmartProperties – Ruby accessors on steroids