smart_properties 1.16.0 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76b840210991bfec855a2e1159426635bc29e3994269bf305b5f0a8fe40fb0cf
-  data.tar.gz: f10d37b213920338b36b8a2da7bbecc1e8e0caf1d6eecf66084b6cbb4914a95e
+  metadata.gz: 044a13ef450738b8342644983451e7659ba6e33116801be84206fa9197e42c94
+  data.tar.gz: 709f79b9de54975dc92c8b47bb68db67b81c14f20f60d21358098060b34629db
 SHA512:
-  metadata.gz: 30f8ed85cd3db3e2c17ddc30b63f85cba5541d26d8c8747a92529320531c11a58ae20435f08175061faedc7edf8f3bad2899ff32f2aa36465d4de2a78c8ca75e
-  data.tar.gz: fb602a52c408989d44c9ef0dd232f5891c6bc96f64444d077d498bb06ed1f63dfa671712abfe9ab0680214fb442ee4b029b6e0e518df01a35860e5fc6c072151
+  metadata.gz: 0a9d6e5383e26cc9143553fe54c5f030be3d40d1927b4613f0f87c751fb3fdf3741afb0aeaaf22336a229070f3e05a1bbe25751736b50e7f8cf3d4d1c8b74909
+  data.tar.gz: bf90c5eec8fa7059a044f14b810583492d3775f254c3a59c0cf1985b0a2343fa2830777a0c6e28b91b2e7eed5ca528189862f6effa8724d094775168cf17d0a8

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.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.1"
 end

data/spec/inheritance_spec.rb

@@ -254,5 +254,15 @@ RSpec.describe SmartProperties, 'intheritance' do
     expect(instance.m).to eq(1)
     expect(instance.n).to eq(2)
     expect(instance.p).to eq(3)
+
+    expect { klass.new(m: 4, n: 5, p: 6) }.to_not raise_error
+
+    klass2 = Class.new do
+      include n
+      include m
+    end
+
+    expect { klass.new(m: 4, n: 5, p: 6) }.to_not raise_error
+    expect { klass2.new(m: 4, n: 5, p: 6) }.to_not raise_error
   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.1
 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