smart_properties 1.16.0 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76b840210991bfec855a2e1159426635bc29e3994269bf305b5f0a8fe40fb0cf
-  data.tar.gz: f10d37b213920338b36b8a2da7bbecc1e8e0caf1d6eecf66084b6cbb4914a95e
+  metadata.gz: 7215ef47e61eb079f744d20ea8ee623fecd1efa03d2e66594c2191f376a1f694
+  data.tar.gz: 9775e8cb32223967f0970be9bf5132aef00d9082a395a900ca3c0767f9e069c5
 SHA512:
-  metadata.gz: 30f8ed85cd3db3e2c17ddc30b63f85cba5541d26d8c8747a92529320531c11a58ae20435f08175061faedc7edf8f3bad2899ff32f2aa36465d4de2a78c8ca75e
-  data.tar.gz: fb602a52c408989d44c9ef0dd232f5891c6bc96f64444d077d498bb06ed1f63dfa671712abfe9ab0680214fb442ee4b029b6e0e518df01a35860e5fc6c072151
+  metadata.gz: 0540c22c62ff52121aad4e4309ec92d53d7e8269212cd711e20aa094411f8072801ddf74fd1d88cb830eef2d1f3fab69da06343743cd95367d87ff8b92a90e84
+  data.tar.gz: 145ef1c96af37dc9e9c4b5134ef9e6f1a0b9595fe84c5b8fead3af06be5a9ed0b1518231d1e1e1699cdf42c5688a9e3b00fc8f4a78b5a099f5f713383ac08e0a

data/.github/workflows/testing.yml

@@ -2,23 +2,25 @@ name: Testing
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
   workflow_dispatch:
 
 jobs:
   test:
-
+    name: Ruby v${{ matrix.ruby_version}}
     runs-on: ubuntu-latest
-
+    strategy:
+      matrix:
+        ruby_version: [2.6.9, 2.7.5, 3.0.3]
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.6
-    - name: Install dependencies
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby_version }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake

data/.ruby-version

@@ -1 +1 @@
-2.6.6
+3.0.3

data/dev.yml

@@ -1,7 +1,7 @@
 ---
 name: smart-properties
 up:
-- ruby: 2.4.1
+- ruby: 3.0.3
 - bundler
 commands:
-  test: bundle exec rake test
+  test: bundle exec rake

data/lib/smart_properties/property.rb

@@ -10,11 +10,11 @@ module SmartProperties
     attr_reader :instance_variable_name
     attr_reader :writable
 
-    def self.define(scope, name, options = {})
-      new(name, options).tap { |p| p.define(scope) }
+    def self.define(scope, name, **options)
+      new(name, **options).tap { |p| p.define(scope) }
     end
 
-    def initialize(name, attrs = {})
+    def initialize(name, **attrs)
       attrs = attrs.dup
 
       @name      = name.to_sym

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

data/lib/smart_properties.rb

@@ -79,14 +79,14 @@ module SmartProperties
     #                           :default  => :de,
     #                           :required => true
     #
-    def property(name, options = {})
-      properties[name] = Property.define(self, name, options)
+    def property(name, **options)
+      properties[name] = Property.define(self, name, **options)
     end
     protected :property
 
-    def property!(name, options = {})
+    def property!(name, **options)
       options[:required] = true
-      property(name, options)
+      property(name, **options)
     end
     protected :property!
   end
@@ -109,7 +109,7 @@ module SmartProperties
     #
     def included(base)
       base.extend(ClassMethods)
-      base.extend(ModuleMethods) if base.is_a?(Module)
+      base.extend(ModuleMethods) unless base.is_a?(Class)
     end
   end
 

data/spec/inheritance_spec.rb

@@ -226,33 +226,85 @@ 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
+
+      n.module_eval do
+        property :p, default: 3
+      end
 
-    klass = Class.new do
-      include m
-      include o
-      include n
+      instance = klass.new
+
+      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
     end
 
-    n.module_eval do
-      property :p, default: 3
+    it "always extends module with ModuleMethods but never classes" do
+      n = self.n
+
+      klass = Class.new do
+        include n
+      end
+
+      module_singleton_class_ancestors = n.singleton_class.ancestors
+
+      expect(module_singleton_class_ancestors).to include(SmartProperties::ClassMethods)
+      expect(module_singleton_class_ancestors).to include(SmartProperties::ModuleMethods)
+
+      singleton_class_ancestors = klass.singleton_class.ancestors
+
+      expect(singleton_class_ancestors).to include(SmartProperties::ClassMethods)
+      expect(singleton_class_ancestors).not_to include(SmartProperties::ModuleMethods)
     end
 
-    instance = klass.new
+    it "yields properly ordered properties – child properties have higher precedence than parent properties" do
+      n = self.n
+      m = self.m
+
+      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)
 
-    expect(instance.m).to eq(1)
-    expect(instance.n).to eq(2)
-    expect(instance.p).to eq(3)
+      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.17.0
 platform: ruby
 authors:
 - Konstantin Tennhard
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-18 00:00:00.000000000 Z
+date: 2021-12-16 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.32
 signing_key:
 specification_version: 4
 summary: SmartProperties – Ruby accessors on steroids