smart_properties 1.15.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0466754454ac7feba9fa836c5b84ffaf04d2502084d6b385b6756f44cb119b34
-  data.tar.gz: 47c46bfcce7352943062ac9be2f25a04ce1c3adbeb86d251a5b0aa20f012ddfa
+  metadata.gz: 76b840210991bfec855a2e1159426635bc29e3994269bf305b5f0a8fe40fb0cf
+  data.tar.gz: f10d37b213920338b36b8a2da7bbecc1e8e0caf1d6eecf66084b6cbb4914a95e
 SHA512:
-  metadata.gz: 38f90027d577a4f7eca3e799980408aa6cb179af1d221f9b7c3212ba4385fa636057cfd620e4908c2f3c116c0475f04d9763a3fc00d2fd7a5349468b517f0095
-  data.tar.gz: 3c4feb78a07b067ce593822861afa858ea29003354b8427c8bab12a2782de51f54a5027393b51c1817785a6b8ba57a2afa5dac54381dc58e7756d10e3bd7a3ad
+  metadata.gz: 30f8ed85cd3db3e2c17ddc30b63f85cba5541d26d8c8747a92529320531c11a58ae20435f08175061faedc7edf8f3bad2899ff32f2aa36465d4de2a78c8ca75e
+  data.tar.gz: fb602a52c408989d44c9ef0dd232f5891c6bc96f64444d077d498bb06ed1f63dfa671712abfe9ab0680214fb442ee4b029b6e0e518df01a35860e5fc6c072151

data/.github/workflows/testing.yml

@@ -0,0 +1,24 @@
+name: Testing
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+  workflow_dispatch:
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    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

data/.ruby-version

@@ -1 +1 @@
-2.6.2
+2.6.6

data/README.md

@@ -177,7 +177,7 @@ often. These validations can be found in the `SmartProperties::Validations` modu
 
 ```ruby
 class Article
-  property :view_count, accepts: Ancestor.must_be(Number)
+  property :view_count, accepts: Ancestor.must_be(type: Number)
 end
 ```
 

data/lib/smart_properties.rb

@@ -91,6 +91,13 @@ module SmartProperties
     protected :property!
   end
 
+  module ModuleMethods
+    def included(target)
+      super
+      target.include(SmartProperties)
+    end
+  end
+
   class << self
     private
 
@@ -102,6 +109,7 @@ module SmartProperties
     #
     def included(base)
       base.extend(ClassMethods)
+      base.extend(ModuleMethods) if base.is_a?(Module)
     end
   end
 

data/lib/smart_properties/property.rb

@@ -1,7 +1,7 @@
 module SmartProperties
   class Property
     MODULE_REFERENCE = :"@_smart_properties_method_scope"
-    ALLOWED_DEFAULT_CLASSES = [Proc, Numeric, String, Range, TrueClass, FalseClass, NilClass, Symbol].freeze
+    ALLOWED_DEFAULT_CLASSES = [Proc, Numeric, String, Range, TrueClass, FalseClass, NilClass, Symbol, Module].freeze
 
     attr_reader :name
     attr_reader :converter
@@ -157,12 +157,19 @@ module SmartProperties
     rescue NoMethodError => error
       # BasicObject does not respond to #nil? by default, so we need to double
       # check if somebody implemented it and it fails internally or if the
-      # error occured because the method is actually not present. In the former
-      # case, we want to raise the exception because there is something wrong
-      # with the implementation of object#nil?. In the latter case we treat the
-      # object as truthy because we don't know better.
-      raise error if (class << object; self; end).public_instance_methods.include?(:nil?)
-      false
+      # error occured because the method is actually not present.
+      
+      # This is a workaround for the fact that #singleton_class is defined on Object, but not BasicObject.
+      the_singleton_class = (class << object; self; end)
+      
+      if the_singleton_class.public_instance_methods.include?(:nil?)
+        # object defines #nil?, but it raised NoMethodError,
+        # something is wrong with the implementation, so raise the exception.
+        raise error 
+      else
+        # treat the object as truthy because we don't know better.
+        false 
+      end
     end
   end
 end

data/lib/smart_properties/property_collection.rb

@@ -5,18 +5,18 @@ module SmartProperties
     attr_reader :parent
 
     def self.for(scope)
-      parent = scope.ancestors[1..-1].find do |ancestor|
+      parents = scope.ancestors[1..-1].select do |ancestor|
         ancestor.ancestors.include?(SmartProperties) &&
           ancestor != scope &&
           ancestor != SmartProperties
       end
 
-      if parent.nil?
-        new
-      else
-        parent.properties.register(collection = new)
-        collection
+      parents.reduce(collection = new) do |previous, current|
+        current.properties.register(previous)
+        current.properties
       end
+
+      collection
     end
 
     def initialize

data/lib/smart_properties/version.rb

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

data/smart_properties.gemspec

@@ -12,6 +12,10 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{SmartProperties – Ruby accessors on steroids}
   gem.homepage      = ""
 
+  gem.metadata = {
+    "source_code_uri" => "https://github.com/t6d/smart_properties"
+  }
+
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
@@ -20,6 +24,6 @@ Gem::Specification.new do |gem|
   gem.version       = SmartProperties::VERSION
 
   gem.add_development_dependency "rspec", "~> 3.0"
-  gem.add_development_dependency "rake", "~> 10.0"
+  gem.add_development_dependency "rake", "~> 13.0"
   gem.add_development_dependency "pry"
 end

data/spec/configuration_error_spec.rb

@@ -14,6 +14,25 @@ RSpec.describe SmartProperties, 'configuration error' do
       expect(&invalid_property_definition).to raise_error(SmartProperties::ConfigurationError, "SmartProperties do not support the following configuration options: invalid_option_1, invalid_option_2, invalid_option_3.")
     end
 
+    it "should accept default values that can't be mutated" do
+      valid_property_definition = lambda do
+        klass.class_eval do
+          property :proc, default: -> { }
+          property :numeric_float, default: 1.23
+          property :numeric_int, default: 456
+          property :string, default: "abc"
+          property :range, default: 123...456
+          property :bool_true, default: true
+          property :bool_false, default: false
+          property :nil, default: nil
+          property :symbol, default: :abc
+          property :module, default: Integer
+        end
+      end
+
+      expect(&valid_property_definition).not_to raise_error
+    end
+
     it "should not accept default values that may be mutated" do
       invalid_property_definition = lambda do
         klass.class_eval do

data/spec/inheritance_spec.rb

@@ -225,4 +225,34 @@ RSpec.describe SmartProperties, 'intheritance' do
       end
     end
   end
+
+  it "supports multiple inheritance through modules" do
+    m = Module.new do
+      include SmartProperties
+      property :m, default: 1
+    end
+
+    n = Module.new do
+      include SmartProperties
+      property :n, default: 2
+    end
+
+    o = Module.new {}
+
+    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)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_properties
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.16.0
 platform: ruby
 authors:
 - Konstantin Tennhard
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-02 00:00:00.000000000 Z
+date: 2021-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -62,6 +62,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/testing.yml"
 - ".gitignore"
 - ".ruby-version"
 - ".yardopts"
@@ -95,8 +96,9 @@ files:
 - spec/writable_spec.rb
 homepage: ''
 licenses: []
-metadata: {}
-post_install_message: 
+metadata:
+  source_code_uri: https://github.com/t6d/smart_properties
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -111,8 +113,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: SmartProperties – Ruby accessors on steroids
 test_files: