disposable 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 530dcd8e13e2d3eeb6a5ef859a3380f610454980
-  data.tar.gz: d6a2514c02e39f6bdd45d92c604f1ee332edb1f3
+SHA256:
+  metadata.gz: 0ee5b2f01534b1e0d6ce0390c3d7b082fcc9cf5ccbaea0bd554dcbb19d092e51
+  data.tar.gz: b905d21be9d1c94809b9de661698e4880a5a77d532473d7eacff000bca15befe
 SHA512:
-  metadata.gz: 7f78687f62314fc4dd51b2ed1a6cca4313c84db0f78e18d683131daf18acab106a1e5e031e0e27bf05e26111a68e8e5e67aeba431aa842ee7eff9889349f81d2
-  data.tar.gz: 5875a24195e83c063c8446dc9a06ad9642e861b52b1f2573ed1ac6884d2a4eaee0af82a7dc7de3fc6261797e51f02593ef6f9aa48d18d46221d1d0303b633e63
+  metadata.gz: e6a09f8afd4c405cd9e54f0581622bfdce3b4e5df0e5e958db01cb57a9d035acbb01ad67fb32cbe3ddb6f9dbc94155d08617ef8f77b686aafe0aa367bb887598
+  data.tar.gz: 555906bb352543b9f123cb891f8bfdb58ce98e9888a8b9f12333170cef13b56768c665272727d9f472f545a88f24b0d4561aea261acba18221b9aea31c8b52ea

data/.github/workflows/ci.yml

@@ -0,0 +1,29 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.5, 2.6]
+        active_record: [5.0, 5.2, 6.0]
+        dry_types: [0.13, 0.14, 0.15, 1.0, 1.1, 1.2]
+
+        include:
+          - ruby: 2.7
+            active_record: 6.1
+            dry_types: 1.5
+          # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
+          - ruby: '3.0'
+            active_record: 6.1
+            dry_types: 1.5
+
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        # bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - run: ACTIVERECORD=${{ matrix.active_record}} DRY_TYPES=${{ matrix.dry_types }} bundle install
+    - run: ACTIVERECORD=${{ matrix.active_record}} DRY_TYPES=${{ matrix.dry_types }} bundle exec rake

data/.gitignore

@@ -15,3 +15,4 @@ test/tmp
 test/version_tmp
 tmp
 Gemfile*.lock
+.rubocop*

data/CHANGES.md

@@ -1,3 +1,26 @@
+# 0.5.0
+
+* Upgrade `representable` to replace `Declarative::Option` with `Representable::Option` in order to support ruby-3 style of keyword arguments.
+
+# 0.4.7
+
+* Deprecation warning for nilify options for dry-v >= 1.x
+* Fix initializer struct when using `false` as value
+
+# 0.4.6
+
+* Remove deprecation warnings for newer versions of dry-types
+* Fix sqlite3 version to 1.3.x to avoid issue with AR 5.0
+* Raise an error if class is used as property name
+
+# 0.4.5
+
+* Use Gem::Version to detect version for dry-types
+
+# 0.4.4
+
+* Add support for Dry::Types version 0.13
+
 # 0.4.3
 
 * Fix `NoMethodError: private method `property' called for MyForm:Class in Reform.` by using `class_eval`.

data/Gemfile

@@ -1,17 +1,10 @@
 source "https://rubygems.org"
 gemspec
-
-# gem "representable", path: "../representable"
-# gem "representable", "3.0.0"
-# gem "representable", github: "apotonick/representable"
-# gem "declarative", path: "../declarative"
-# gem "declarative", github: "apotonick/declarative"
 gem "minitest-line"
 
-# gem "dry-struct"
-
+{ "dry-types" => ENV['DRY_TYPES'], "activerecord" => ENV['ACTIVERECORD']}.each do |gem_name, dependency|
+  next if dependency.nil?
+  gem gem_name, dependency
+end
 
-# gem "uber", path: "../uber"
-# gem "declarative-option", path: "../declarative-option"
-# gem "declarative-builder", path: "../declarative-builder"
-# gem "representable", path: "../representable"
+gem "sqlite3", ENV.fetch('ACTIVERECORD', '5.2').to_f >= 6 ? '~> 1.4' : '~> 1.3.0'

data/README.md

@@ -181,7 +181,7 @@ property :artist, twin: TwinArtist
 
 ## Unnest
 
-#todo: document
+# todo: document
 
 ## Features
 
@@ -206,7 +206,7 @@ class AlbumTwin < Disposable::Twin
   feature Coercion
   feature Setup::SkipSetter
 
-  property :id, type: Types::Form::Int
+  property :id, type: Types::Params::Integer
 ```
 
 The `:type` option defines the coercion type. You may incluce `Setup::SkipSetter`, too, as otherwise the coercion will happen at initialization time and in the setter.

data/disposable.gemspec

@@ -13,21 +13,18 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ["lib"]
 
   spec.add_dependency "uber", "< 0.2.0"
   spec.add_dependency "declarative",         ">= 0.0.9", "< 1.0.0"
-  spec.add_dependency "declarative-builder", "< 0.2.0"
-  spec.add_dependency "declarative-option",  "< 0.2.0"
-  spec.add_dependency "representable", ">= 2.4.0", "<= 3.1.0"
+  spec.add_dependency "declarative-builder", "~> 0.2.0"
+  spec.add_dependency "representable",       ">= 3.1.1", "< 3.2.0"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"#, "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
-  spec.add_development_dependency "activerecord", "4.2.5"
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "dry-types", "~> 0.6"
+  spec.add_development_dependency "activerecord"#, "4.2.5"
+  spec.add_development_dependency "dry-types"# "~> 0.6"
   # spec.add_development_dependency "database_cleaner"
 end

data/lib/disposable/rescheme.rb

@@ -30,9 +30,7 @@ class Disposable::Rescheme
 
 private
   def build_representer(options)
-    Class.new(options[:superclass]) do
-      include *options[:include]
-    end
+    Class.new(options[:superclass]) { include(*options[:include]) }
   end
 
   def build_definition!(options, source_dfn, representer, &block)

data/lib/disposable/twin.rb

@@ -9,6 +9,9 @@ require "representable/decorator"
 
 module Disposable
   class Twin
+    class InvalidPropertyNameError < StandardError; end
+    INVALID_PROPERTY_NAMES = %i[class].freeze
+
     extend Declarative::Schema
     def self.definition_class
       Definition
@@ -32,6 +35,10 @@ module Disposable
 
       # TODO: move to Declarative, as in Representable and Reform.
       def property(name, options={}, &block)
+        if INVALID_PROPERTY_NAMES.include?(name)
+          raise InvalidPropertyNameError.new("#{name} is used internally and cannot be used as property name")
+        end
+
         options[:private_name] ||= options.delete(:from) || name
         is_inherited = options.delete(:_inherited)
 

data/lib/disposable/twin/coercion.rb

@@ -2,9 +2,14 @@ require "dry-types"
 
 module Disposable::Twin::Coercion
   module Types
-    include Dry::Types.module
+    # NOTE: Use Dry.Types() instead. Beware, it exports strict types by default, for old behavior use Dry.Types(default: :nominal)
+    DRY_MODULE =  Gem::Version.new(Dry::Types::VERSION) < Gem::Version.new("0.15.0") ? Dry::Types.module : Dry.Types()
+    include DRY_MODULE
   end
 
+  DRY_TYPES_VERSION = Gem::Version.new(Dry::Types::VERSION)
+  DRY_TYPES_CONSTANT = DRY_TYPES_VERSION < Gem::Version.new("0.13.0") ? Types::Form : Types::Params
+
   module ClassMethods
     def property(name, options={}, &block)
       super(name, options, &block).tap do
@@ -13,11 +18,14 @@ module Disposable::Twin::Coercion
     end
 
     def coercing_setter!(name, type, nilify=false)
-     type = type ? (Types::Form::Nil | type) : Types::Form::Nil if nilify
+      # TODO: remove nilily with next release (0.5) for new dry-type versions
+      type = type ? (DRY_TYPES_CONSTANT::Nil | type) : DRY_TYPES_CONSTANT::Nil if nilify
+
+      warn "DEPRECATION WARNING [Disposable]: nilify is deprecated and it will be removed with the next release" if nilify && DRY_TYPES_VERSION >= Gem::Version.new("1.0.0")
 
       mod = Module.new do
         define_method("#{name}=") do |value|
-          super type.call(value)
+          super type.(value)
         end
       end
       include mod

data/lib/disposable/twin/default.rb

@@ -1,4 +1,4 @@
-require "declarative/option"
+require "representable/option"
 
 # TODO: allow default: -> for hashes, etc.
 module Disposable::Twin::Default
@@ -12,13 +12,13 @@ module Disposable::Twin::Default
     # TODO: introduce Null object in Declarative::Definition#[].
     # dfn[:default].(self) # dfn#[] should return a Null object here if empty.
     return unless dfn[:default]
-    dfn[:default].(self)
+    dfn[:default].(exec_context: self) # Representable::Option#call
   end
 
   module ClassMethods
   private
     def build_definition(name, options={}, &block)
-      options = options.merge(default: Declarative::Option(options[:default], instance_exec: true)) if options.has_key?(:default)
+      options = options.merge(default: ::Representable::Option(options[:default])) if options.has_key?(:default)
       super
     end
   end

data/lib/disposable/twin/property/struct.rb

@@ -6,7 +6,9 @@ class Disposable::Twin
     module Struct
       def read_value_for(dfn, options)
         name = dfn[:name]
-        @model[name.to_s] || @model[name.to_sym] # TODO: test sym vs. str.
+        # TODO: test sym vs. str.
+        return unless key_value = model.to_h.find { |k, _| k.to_sym == name.to_sym }
+        key_value.last
       end
 
       def sync_hash_representer # TODO: make this without representable, please.

data/lib/disposable/twin/setup.rb

@@ -23,7 +23,7 @@ module Disposable
       end
 
       def setup_property!(dfn, options)
-        if options.has_key?(name = dfn[:name].to_sym)
+        if options.has_key?(dfn[:name].to_sym)
           value = options[dfn[:name].to_sym]
           return setup_write!(dfn, value)
         end

data/lib/disposable/twin/sync.rb

@@ -22,7 +22,7 @@ class Disposable::Twin
     def self.hash_representer(twin_class, &block)
       Disposable::Rescheme.from(twin_class,
         recursive: false,
-        definitions_from: lambda { |twin_class| twin_class.definitions },
+        definitions_from: lambda { |twin_klass| twin_klass.definitions },
         superclass: Representable::Decorator,
         include: Representable::Hash,
         exclude_options: [:default], # TODO: TEST IN default_test.

data/lib/disposable/version.rb

@@ -1,3 +1,3 @@
 module Disposable
-  VERSION = "0.4.3"
+  VERSION = "0.5.0"
 end

data/test/callback_group_test.rb

@@ -1,6 +1,5 @@
 require "test_helper"
 require "disposable/callback"
-require "pp"
 
 class CallbackGroupTest < MiniTest::Spec
   class Group < Disposable::Callback::Group
@@ -56,7 +55,7 @@ class CallbackGroupTest < MiniTest::Spec
     album = Album.new(songs: [Song.new(title: "Dead To Me"), Song.new(title: "Diesel Boy")])
     twin  = AlbumTwin.new(album)
 
-    Group.new(twin).().invocations.must_equal [
+    expect(Group.new(twin).().invocations).must_equal [
       [:on_change, :change!, []],
       [:on_add, :notify_album!, []],
       [:on_add, :reset_song!, []],
@@ -77,7 +76,7 @@ class CallbackGroupTest < MiniTest::Spec
 
     group = Group.new(twin).(content: content)
 
-    group.invocations.must_equal [
+    expect(group.invocations).must_equal [
       [:on_change, :change!, [twin]],
       [:on_add, :notify_album!, [twin.songs[0], twin.songs[1]]],
       [:on_add, :reset_song!,   [twin.songs[0], twin.songs[1]]],
@@ -86,8 +85,8 @@ class CallbackGroupTest < MiniTest::Spec
       [:on_update, :expire_cache!, []],
     ]
 
-    content.must_equal "notify_album!notify_album!reset_song!reset_song!"
-    group.output.must_equal "Album has changed!"
+    expect(content).must_equal "notify_album!notify_album!reset_song!reset_song!"
+    expect(group.output).must_equal "Album has changed!"
   end
 
 
@@ -125,12 +124,12 @@ class CallbackGroupTest < MiniTest::Spec
 
     twin.name = "Dear Landlord"
 
-    group = Group.new(twin).(context: context = Operation.new, content: content)
+    group = Group.new(twin).(context: Operation.new, content: content)
     # Disposable::Callback::Dispatch.new(twin).on_change{ |twin| puts twin;puts }
 
     # pp group.invocations
 
-    group.invocations.must_equal [
+    expect(group.invocations).must_equal [
       [:on_change, :change!, [twin]],
       [:on_add, :notify_album!, [twin.songs[0]]],
       [:on_add, :reset_song!,   [twin.songs[0]]],
@@ -139,7 +138,7 @@ class CallbackGroupTest < MiniTest::Spec
       [:on_update, :expire_cache!, []],
     ]
 
-    content.must_equal "Op: changed! [CallbackGroupTest::Operation]Op: notify_album! [CallbackGroupTest::Operation]Op: reset_song! [CallbackGroupTest::Operation]"
+    expect(content).must_equal "Op: changed! [CallbackGroupTest::Operation]Op: notify_album! [CallbackGroupTest::Operation]Op: reset_song! [CallbackGroupTest::Operation]"
   end
 end
 
@@ -158,12 +157,12 @@ class CallbackGroupInheritanceTest < MiniTest::Spec
   end
 
   it do
-    Group.hooks.size.must_equal 4
-    Group.hooks[0].to_s.must_equal "[:on_change, :change!, {}]"
+    expect(Group.hooks.size).must_equal 4
+    expect(Group.hooks[0].to_s).must_equal "[:on_change, :change!, {}]"
     # Group.hooks[1][1][:nested].hooks.to_s.must_equal "[[:on_add, [:notify_album!]],[:on_add, [:reset_song!]]]"
-    Group.hooks[2].to_s.must_equal "[:on_change, :rehash_name!, {:property=>:title}]"
+    expect(Group.hooks[2].to_s).must_equal "[:on_change, :rehash_name!, {:property=>:title}]"
 
-    Group.definitions.get(Group.hooks[3][1])[:nested].hooks.to_s.must_equal "[[:on_change, :sing!, {}]]"
+    expect(Group.definitions.get(Group.hooks[3][1])[:nested].hooks.to_s).must_equal "[[:on_change, :sing!, {}]]"
   end
 
   class EmptyGroup < Group
@@ -172,7 +171,7 @@ class CallbackGroupInheritanceTest < MiniTest::Spec
 
 
   it do
-    EmptyGroup.hooks.size.must_equal 4
+    expect(EmptyGroup.hooks.size).must_equal 4
     # TODO:
   end
 
@@ -184,10 +183,10 @@ class CallbackGroupInheritanceTest < MiniTest::Spec
   end
 
   it do
-    Group.hooks.size.must_equal 4
-    pp EnhancedGroup.hooks
-    EnhancedGroup.hooks.size.must_equal 6
-    EnhancedGroup.definitions.get(EnhancedGroup.hooks[5][1])[:nested].hooks.to_s.must_equal "[[:on_add, :rewind!, {}]]"
+    expect(Group.hooks.size).must_equal 4
+    # pp EnhancedGroup.hooks
+    expect(EnhancedGroup.hooks.size).must_equal 6
+    expect(EnhancedGroup.definitions.get(EnhancedGroup.hooks[5][1])[:nested].hooks.to_s).must_equal "[[:on_add, :rewind!, {}]]"
   end
 
   class EnhancedWithInheritGroup < EnhancedGroup
@@ -200,13 +199,13 @@ class CallbackGroupInheritanceTest < MiniTest::Spec
   end
 
   it do
-    Group.hooks.size.must_equal 4
-    EnhancedGroup.hooks.size.must_equal 6
+    expect(Group.hooks.size).must_equal 4
+    expect(EnhancedGroup.hooks.size).must_equal 6
 
-    EnhancedGroup.definitions.get(EnhancedGroup.hooks[5][1])[:nested].hooks.to_s.must_equal "[[:on_add, :rewind!, {}]]"
-    EnhancedWithInheritGroup.hooks.size.must_equal 6
-    EnhancedWithInheritGroup.definitions.get(EnhancedWithInheritGroup.hooks[1][1])[:nested].hooks.to_s.must_equal "[[:on_add, :rewind!, {}], [:on_add, :eat!, {}]]"
-    EnhancedWithInheritGroup.definitions.get(EnhancedWithInheritGroup.hooks[3][1])[:nested].hooks.to_s.must_equal "[[:on_change, :sing!, {}], [:on_delete, :yell!, {}]]"
+    expect(EnhancedGroup.definitions.get(EnhancedGroup.hooks[5][1])[:nested].hooks.to_s).must_equal "[[:on_add, :rewind!, {}]]"
+    expect(EnhancedWithInheritGroup.hooks.size).must_equal 6
+    expect(EnhancedWithInheritGroup.definitions.get(EnhancedWithInheritGroup.hooks[1][1])[:nested].hooks.to_s).must_equal "[[:on_add, :rewind!, {}], [:on_add, :eat!, {}]]"
+    expect(EnhancedWithInheritGroup.definitions.get(EnhancedWithInheritGroup.hooks[3][1])[:nested].hooks.to_s).must_equal "[[:on_change, :sing!, {}], [:on_delete, :yell!, {}]]"
   end
 
   class RemovingInheritGroup < Group
@@ -227,10 +226,10 @@ class CallbackGroupInheritanceTest < MiniTest::Spec
   # TODO: object_id tests for all nested representers.
 
   it do
-    Group.hooks.size.must_equal 4
-    RemovingInheritGroup.hooks.size.must_equal 3
-    RemovingInheritGroup.definitions.get(RemovingInheritGroup.hooks[0][1])[:nested].hooks.to_s.must_equal "[[:on_add, :reset_song!, {}]]"
-    RemovingInheritGroup.definitions.get(RemovingInheritGroup.hooks[2][1])[:nested].hooks.to_s.must_equal "[[:on_change, :sing!, {}]]"
+    expect(Group.hooks.size).must_equal 4
+    expect(RemovingInheritGroup.hooks.size).must_equal 3
+    expect(RemovingInheritGroup.definitions.get(RemovingInheritGroup.hooks[0][1])[:nested].hooks.to_s).must_equal "[[:on_add, :reset_song!, {}]]"
+    expect(RemovingInheritGroup.definitions.get(RemovingInheritGroup.hooks[2][1])[:nested].hooks.to_s).must_equal "[[:on_change, :sing!, {}]]"
   end
 
   # Group::clone
@@ -240,7 +239,7 @@ class CallbackGroupInheritanceTest < MiniTest::Spec
   end
 
   it do
-    Group.hooks.size.must_equal 4
-    ClonedGroup.hooks.size.must_equal 3
+    expect(Group.hooks.size).must_equal 4
+    expect(ClonedGroup.hooks.size).must_equal 3
   end
-end
+end

data/test/callbacks_test.rb

@@ -46,7 +46,7 @@ class CallbacksTest < MiniTest::Spec
     it do
       invokes = []
       Callback.new(twin).on_create { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
     end
 
     # save, without any attributes changed.
@@ -55,7 +55,7 @@ class CallbacksTest < MiniTest::Spec
 
       invokes = []
       Callback.new(twin).on_create { |t| invokes << t }
-      invokes.must_equal [twin]
+      expect(invokes).must_equal [twin]
     end
 
     # before and after save, with attributes changed
@@ -64,28 +64,28 @@ class CallbacksTest < MiniTest::Spec
       twin.name = "Run For Cover"
       invokes = []
       Callback.new(twin).on_create { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
 
       twin.save
 
       Callback.new(twin).on_create { |t| invokes << t }
-      invokes.must_equal [twin]
+      expect(invokes).must_equal [twin]
     end
 
     # for collections.
     it do
-      album.songs << song1 = Song.new
+      album.songs << Song.new
       album.songs << Song.create(title: "Run For Cover")
-      album.songs << song2 = Song.new
+      album.songs << Song.new
       invokes = []
 
       Callback.new(twin.songs).on_create { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
 
       twin.save
 
       Callback.new(twin.songs).on_create { |t| invokes << t }
-      invokes.must_equal [twin.songs[0], twin.songs[2]]
+      expect(invokes).must_equal [twin.songs[0], twin.songs[2]]
     end
   end
 
@@ -96,7 +96,7 @@ class CallbacksTest < MiniTest::Spec
     it do
       invokes = []
       Callback.new(twin).on_update { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
     end
 
     # single twin.
@@ -106,85 +106,85 @@ class CallbacksTest < MiniTest::Spec
 
       invokes = []
       Callback.new(twin).on_update { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
 
       invokes = []
       twin.save
 
       Callback.new(twin).on_update { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
 
 
       # now with the persisted album.
       twin = AlbumTwin.new(album) # Album is persisted now.
 
       Callback.new(twin).on_update { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
 
       invokes = []
       twin.save
 
       # nothing has changed, yet.
       Callback.new(twin).on_update { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
 
       twin.name= "Corridors Of Power"
 
       # this will even trigger on_update before saving.
       Callback.new(twin).on_update { |t| invokes << t }
-      invokes.must_equal [twin]
+      expect(invokes).must_equal [twin]
 
       invokes = []
       twin.save
 
       # name changed.
       Callback.new(twin).on_update { |t| invokes << t }
-      invokes.must_equal [twin]
+      expect(invokes).must_equal [twin]
     end
 
     # for collections.
     it do
-      album.songs << song1 = Song.new
+      album.songs << Song.new
       album.songs << Song.create(title: "Run For Cover")
-      album.songs << song2 = Song.new
+      album.songs << Song.new
 
       invokes = []
       Callback.new(twin.songs).on_update { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
 
       invokes = []
       twin.save
 
       # initial save is no update.
       Callback.new(twin.songs).on_update { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
 
 
       # now with the persisted album.
       twin = AlbumTwin.new(album) # Album is persisted now.
 
       Callback.new(twin.songs).on_update { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
 
       invokes = []
       twin.save
 
       # nothing has changed, yet.
       Callback.new(twin.songs).on_update { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
 
       twin.songs[1].title= "After The War"
       twin.songs[2].title= "Run For Cover"
 
       # # this will even trigger on_update before saving.
       Callback.new(twin.songs).on_update { |t| invokes << t }
-      invokes.must_equal [twin.songs[1], twin.songs[2]]
+      expect(invokes).must_equal [twin.songs[1], twin.songs[2]]
 
       invokes = []
       twin.save
 
       Callback.new(twin.songs).on_update { |t| invokes << t }
-      invokes.must_equal [twin.songs[1], twin.songs[2]]
+      expect(invokes).must_equal [twin.songs[1], twin.songs[2]]
     end
     # it do
     #   album.songs << song1 = Song.new
@@ -210,7 +210,7 @@ class CallbacksTest < MiniTest::Spec
     it do
       invokes = []
       Callback.new(twin.songs).on_add { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
     end
 
     # collection present on initialize are not added.
@@ -220,7 +220,7 @@ class CallbacksTest < MiniTest::Spec
       album.songs = [ex_song, song]
 
       Callback.new(twin.songs).on_add { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
     end
 
     # items added after initialization are added.
@@ -232,14 +232,14 @@ class CallbacksTest < MiniTest::Spec
       twin.songs << song
 
       Callback.new(twin.songs).on_add { |t| invokes << t }
-      invokes.must_equal [twin.songs[1]]
+      expect(invokes).must_equal [twin.songs[1]]
 
       twin.save
 
       # still shows the added after save.
       invokes = []
       Callback.new(twin.songs).on_add { |t| invokes << t }
-      invokes.must_equal [twin.songs[1]]
+      expect(invokes).must_equal [twin.songs[1]]
     end
   end
 
@@ -250,7 +250,7 @@ class CallbacksTest < MiniTest::Spec
     it do
       invokes = []
       Callback.new(twin.songs).on_add(:created) { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
     end
 
     # collection present on initialize are not added.
@@ -260,7 +260,7 @@ class CallbacksTest < MiniTest::Spec
       album.songs = [ex_song, song]
 
       Callback.new(twin.songs).on_add(:created) { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
     end
 
     # items added after initialization are added.
@@ -273,14 +273,14 @@ class CallbacksTest < MiniTest::Spec
       twin.songs << ex_song # already created.
 
       Callback.new(twin.songs).on_add(:created) { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
 
       twin.save
 
       # still shows the added after save.
       invokes = []
       Callback.new(twin.songs).on_add(:created) { |t| invokes << t }
-      invokes.must_equal [twin.songs[1]] # only the created is invoked.
+      expect(invokes).must_equal [twin.songs[1]] # only the created is invoked.
     end
   end
 
@@ -291,7 +291,7 @@ class CallbacksTest < MiniTest::Spec
     it do
       invokes = []
       Callback.new(twin.songs).on_delete { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
     end
 
     # collection present but nothing deleted.
@@ -301,7 +301,7 @@ class CallbacksTest < MiniTest::Spec
       album.songs = [ex_song, song]
 
       Callback.new(twin.songs).on_delete { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
     end
 
     # items deleted.
@@ -313,14 +313,14 @@ class CallbacksTest < MiniTest::Spec
       twin.songs.delete(deleted = twin.songs[0])
 
       Callback.new(twin.songs).on_delete { |t| invokes << t }
-      invokes.must_equal [deleted]
+      expect(invokes).must_equal [deleted]
 
       twin.save
 
       # still shows the deleted after save.
       invokes = []
       Callback.new(twin.songs).on_delete { |t| invokes << t }
-      invokes.must_equal [deleted]
+      expect(invokes).must_equal [deleted]
     end
   end
 
@@ -331,7 +331,7 @@ class CallbacksTest < MiniTest::Spec
     it do
       invokes = []
       Callback.new(twin.songs).on_destroy { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
     end
 
     # collection present but nothing deleted.
@@ -341,7 +341,7 @@ class CallbacksTest < MiniTest::Spec
       album.songs = [ex_song, song]
 
       Callback.new(twin.songs).on_destroy { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
     end
 
     # items deleted, doesn't trigger on_destroy.
@@ -350,10 +350,10 @@ class CallbacksTest < MiniTest::Spec
       song    = Song.new
       album.songs = [ex_song, song]
 
-      twin.songs.delete(deleted = twin.songs[0])
+      twin.songs.delete(twin.songs[0])
 
       Callback.new(twin.songs).on_destroy { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
     end
 
     # items destroyed.
@@ -365,7 +365,7 @@ class CallbacksTest < MiniTest::Spec
       twin.songs.destroy(deleted = twin.songs[0])
 
       Callback.new(twin.songs).on_destroy { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
 
       twin.extend(Disposable::Twin::Collection::Semantics) # now #save will destroy.
       twin.save
@@ -373,7 +373,7 @@ class CallbacksTest < MiniTest::Spec
       # still shows the deleted after save.
       invokes = []
       Callback.new(twin.songs).on_destroy { |t| invokes << t }
-      invokes.must_equal [deleted]
+      expect(invokes).must_equal [deleted]
     end
   end
 
@@ -384,7 +384,7 @@ class CallbacksTest < MiniTest::Spec
     # after initialization
     it do
       Callback.new(twin).on_change { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
     end
 
     # save, without any attributes changed. unpersisted before.
@@ -394,7 +394,7 @@ class CallbacksTest < MiniTest::Spec
       twin.save
 
       Callback.new(twin).on_change { |t| invokes << t }
-      invokes.must_equal [] # nothing has changed, not even persisted?.
+      expect(invokes).must_equal [] # nothing has changed, not even persisted?.
     end
 
     # save, without any attributes changed. persisted before.
@@ -402,7 +402,7 @@ class CallbacksTest < MiniTest::Spec
       twin.save
 
       Callback.new(twin).on_change { |t| invokes << t }
-      invokes.must_equal [twin]
+      expect(invokes).must_equal [twin]
     end
 
     # before and after save, with attributes changed
@@ -411,24 +411,24 @@ class CallbacksTest < MiniTest::Spec
       twin.name = "Run For Cover"
       invokes = []
       Callback.new(twin).on_change { |t| invokes << t }
-      invokes.must_equal [twin]
+      expect(invokes).must_equal [twin]
 
       twin.save
 
       invokes = []
       Callback.new(twin).on_change { |t| invokes << t }
-      invokes.must_equal [twin]
+      expect(invokes).must_equal [twin]
     end
 
     # for scalars: on_change(:email).
     it do
       Callback.new(twin).on_change(property: :name) { |t| invokes << t }
-      invokes.must_equal []
+      expect(invokes).must_equal []
 
       twin.name = "Unforgiven"
 
       Callback.new(twin).on_change(property: :name) { |t| invokes << t }
-      invokes.must_equal [twin]
+      expect(invokes).must_equal [twin]
     end
 
     # for collections.
@@ -447,4 +447,4 @@ class CallbacksTest < MiniTest::Spec
     #   invokes.must_equal [twin.songs[0], twin.songs[2]]
     # end
   end
-end
+end