disposable 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea4f45b8a04706082c5f9beb78846b3a793f8e2502f7ad565e1195b175e9d361
-  data.tar.gz: dacb6857d1b1169882de3b9f143ea8956d854dcc01369757e573e09d21ad296d
+  metadata.gz: d646a66e2becc4ba68e55b942aafae4f91027b8d82469d56f23acba252a0951a
+  data.tar.gz: 29470df5d8c11e29b0b9659c14b07a527a3f59c08fdeb6210e4a792551d62aaf
 SHA512:
-  metadata.gz: 8ccd935e54655d8b342a8a8cd0d5db570914072aa49c6924cbe7bbf4266975c8a380da365e3b4f9e827e5a10ae9528ad1459ed35d18f353622413891c00f001e
-  data.tar.gz: 46866ebe376f6500c3f12c0389900f7df2eaceb0c6843aa1ed9c8fd9e1462c33e6f62b52cc5182e160c3ef39eedd7de586bc5611b8de9191c60fa274c640e425
+  metadata.gz: eadc7b6ac6dc8c9db6bb731ab0f612d3e4a23e624c8839b3369e80371776d563e5b7d110adf215c2e2b5469cf603e4e38ef6266a401eea65dbf9ea400ef90956
+  data.tar.gz: 90979ea1e087ba34aa42f8136d2e2c4569fda867ba5c22c563df1d2b26c66675e191bba4792eba3c41a1e2eb5aaa2abe0a9cf2b113802106a5d650f1ea953ba7

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/ci.yml

@@ -1,29 +1,38 @@
 name: CI
 on: [push, pull_request]
+
 jobs:
   test:
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.6]
-        active_record: [5.2, 6.0]
-        dry_types: [1.0, 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
+          - ruby: '3.3'
+            active_record: '8.0'
+            dry_types: '1.6'
+          - ruby: '3.3'
+            active_record: '8.1'
+            dry_types: '1.6'
+          - ruby: '3.4'
+            active_record: '8.0'
+            dry_types: '1.6'
+          - ruby: '3.4'
+            active_record: '8.1'
+            dry_types: '1.6'
+          - ruby: '4.0'
+            active_record: '8.0'
+            dry_types: '1.6'
+          - ruby: '4.0'
+            active_record: '8.1'
+            dry_types: '1.6'
+    env:
+      ACTIVERECORD: ${{ matrix.active_record }}
+      DRY_TYPES: ${{ matrix.dry_types }}
     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
+      - uses: actions/checkout@v6
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: bundle install
+      - run: bundle exec rake

data/CHANGES.md

@@ -1,3 +1,8 @@
+# 0.7.0
+
+* Support Ruby >= 3.3.
+* Remove `Ostruct` dependency.
+
 # 0.6.3
 
 * Loosen `representable` dependency to `< 4`.

data/Gemfile

@@ -1,12 +1,16 @@
 source "https://rubygems.org"
 gemspec
 gem "minitest-line"
+gem "trailblazer-core-utils"
 
-{ "dry-types" => ENV['DRY_TYPES'], "activerecord" => ENV['ACTIVERECORD']}.each do |gem_name, dependency|
-  next if dependency.nil?
-  gem gem_name, dependency
+if ENV['DRY_TYPES']
+  gem "dry-types", ENV['DRY_TYPES']
 end
 
-gem "sqlite3", ENV.fetch('ACTIVERECORD', '5.2').to_f >= 6 ? '~> 1.4' : '~> 1.3.0'
+if ENV['ACTIVERECORD']
+  gem "activerecord", "~> #{ENV['ACTIVERECORD']}.0"
+end
+
+gem "sqlite3", "~> 2.1"
 
 # gem "declarative-builder"

data/disposable.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Decorators on top of your ORM layer with change tracking, collection semantics and nesting.}
   spec.homepage      = "https://github.com/apotonick/disposable"
   spec.license       = "MIT"
+  spec.required_ruby_version = ">= 3.3.0"
 
   spec.files         = `git ls-files`.split($/)
   spec.test_files    = spec.files.grep(%r{^(test)/})

data/lib/disposable/twin/sync.rb

@@ -3,7 +3,6 @@
 #   2. call sync! on nested
 #
 # Note: #sync currently implicitly saves AR objects with collections
-require 'ostruct'
 class Disposable::Twin
   module Sync
     class Options < ::Hash
@@ -155,7 +154,9 @@ class Disposable::Twin
       end
 
       def nested_hash_source
-        OpenStruct.new(@fields)
+        names = schema.each.collect { |dfn| dfn[:name] }
+
+        Data.define(*names.map(&:to_sym)).new(*names.collect { |name| @fields[name] })
       end
     end
   end

data/lib/disposable/version.rb

@@ -1,3 +1,3 @@
 module Disposable
-  VERSION = "0.6.3"
+  VERSION = "0.7.0"
 end

data/test/api_semantics_test.rb

@@ -136,7 +136,7 @@
 
 
 
-# class ApiSemanticsTest < MiniTest::Spec
+# class ApiSemanticsTest < Minitest::Spec
 #   it "xxx" do
 #     album = Model::Album.new(1, "And So I Watch You From Afar", [Model::Song.new(2, "Solidarity"), Model::Song.new(0, "Tale That Wasn't Right")])
 
@@ -153,7 +153,7 @@
 
 # end
 
-# class RemoveFlagSetButNotEnabled < MiniTest::Spec
+# class RemoveFlagSetButNotEnabled < Minitest::Spec
 #   class AlbumDecorator < Representable::Decorator
 #     include Representable::Hash
 
@@ -183,7 +183,7 @@
 #   end
 # end
 
-# class UserCallableTest < MiniTest::Spec
+# class UserCallableTest < Minitest::Spec
 #   class MyOwnSemantic < Representable::Semantics::Semantic
 #     def self.call(model, fragment, index, options)
 #       if fragment["title"] =~ /Solidarity/
@@ -220,7 +220,7 @@
 # end
 
 
-# class ApiSemanticsWithUpdate < MiniTest::Spec
+# class ApiSemanticsWithUpdate < Minitest::Spec
 #   class AlbumDecorator < Representable::Decorator
 #     include Representable::Hash
 

data/test/callback_group_test.rb

@@ -1,7 +1,7 @@
 require "test_helper"
 require "disposable/callback"
 
-class CallbackGroupTest < MiniTest::Spec
+class CallbackGroupTest < Minitest::Spec
   class Group < Disposable::Callback::Group
     attr_reader :output
 
@@ -143,7 +143,7 @@ class CallbackGroupTest < MiniTest::Spec
 end
 
 
-class CallbackGroupInheritanceTest < MiniTest::Spec
+class CallbackGroupInheritanceTest < Minitest::Spec
   class Group < Disposable::Callback::Group
     on_change :change!
     collection :songs do
@@ -158,11 +158,11 @@ class CallbackGroupInheritanceTest < MiniTest::Spec
 
   it do
     expect(Group.hooks.size).must_equal 4
-    expect(Group.hooks[0].to_s).must_equal "[:on_change, :change!, {}]"
+    assert_equal "[:on_change, :change!, {}]", Trailblazer::Core::Utils.inspect(Group.hooks[0].to_s)
     # Group.hooks[1][1][:nested].hooks.to_s.must_equal "[[:on_add, [:notify_album!]],[:on_add, [:reset_song!]]]"
-    expect(Group.hooks[2].to_s).must_equal "[:on_change, :rehash_name!, {:property=>:title}]"
+    assert_equal "[:on_change, :rehash_name!, {:property=>:title}]", Trailblazer::Core::Utils.inspect(Group.hooks[2].to_s)
 
-    expect(Group.definitions.get(Group.hooks[3][1])[:nested].hooks.to_s).must_equal "[[:on_change, :sing!, {}]]"
+    assert_equal "[[:on_change, :sing!, {}]]", Trailblazer::Core::Utils.inspect(Group.definitions.get(Group.hooks[3][1])[:nested].hooks.to_s)
   end
 
   class EmptyGroup < Group

data/test/callbacks_test.rb

@@ -1,7 +1,7 @@
 require "test_helper"
 require "disposable/callback"
 
-class CallbacksTest < MiniTest::Spec
+class CallbacksTest < Minitest::Spec
   before do
     @invokes = []
   end

data/test/expose_test.rb

@@ -3,7 +3,7 @@ require "disposable/expose"
 require "disposable/composition"
 
 # Disposable::Expose.
-class ExposeTest < MiniTest::Spec
+class ExposeTest < Minitest::Spec
   module Model
     Album = Struct.new(:id, :name)
   end
@@ -45,7 +45,7 @@ end
 
 
 # Disposable::Composition.
-class ExposeCompositionTest < MiniTest::Spec
+class ExposeCompositionTest < Minitest::Spec
   module Model
     Band  = Struct.new(:id)
     Album = Struct.new(:id, :name)

data/test/persisted_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class PersistedTest < MiniTest::Spec
+class PersistedTest < Minitest::Spec
   class AlbumTwin < Disposable::Twin
     feature Sync, Save
     feature Persisted, Changed

data/test/rescheme_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class ReschemeTest < MiniTest::Spec
+class ReschemeTest < Minitest::Spec
   module Representer
     include Representable
 
@@ -40,19 +40,19 @@ class ReschemeTest < MiniTest::Spec
     expect(decorator.new(nil).hello).must_equal "hello"
     expect(decorator.new(nil).ciao).must_equal "ciao"
 
-    expect(decorator.representable_attrs.get(:id).inspect).must_equal "#<Representable::Definition ==>id @options={:name=>\"id\", :parse_filter=>[], :render_filter=>[]}>"
-    expect(decorator.representable_attrs.get(:title).inspect).must_equal "#<Representable::Definition ==>title @options={:writeable=>false, :deserializer=>{:skip_parse=>\"skip lambda\"}, :name=>\"title\", :parse_filter=>[], :render_filter=>[], :skip_parse=>\"skip lambda\"}>"
+    assert_equal "#<Representable::Definition ==>id @options={:name=>\"id\", :parse_filter=>[], :render_filter=>[]}>", Trailblazer::Core::Utils.inspect(decorator.representable_attrs.get(:id).inspect)
+    assert_equal "#<Representable::Definition ==>title @options={:writeable=>false, :deserializer=>{:skip_parse=>\"skip lambda\"}, :name=>\"title\", :parse_filter=>[], :render_filter=>[], :skip_parse=>\"skip lambda\"}>", Trailblazer::Core::Utils.inspect(decorator.representable_attrs.get(:title).inspect)
 
     songs = decorator.representable_attrs.get(:songs)
     options = songs.instance_variable_get(:@options)
     options[:nested].extend(Declarative::Inspect)
-    expect(options.inspect).must_equal "{:readable=>false, :deserializer=>{:skip_parse=>\"another lambda\", :music=>true, :writeable=>false}, :nested=>#<Class:>, :extend=>#<Class:>, :name=>\"songs\", :parse_filter=>[], :render_filter=>[], :skip_parse=>\"another lambda\", :music=>true, :writeable=>false}"
+    assert_equal "{:readable=>false, :deserializer=>{:skip_parse=>\"another lambda\", :music=>true, :writeable=>false}, :nested=>#<Class:>, :extend=>#<Class:>, :name=>\"songs\", :parse_filter=>[], :render_filter=>[], :skip_parse=>\"another lambda\", :music=>true, :writeable=>false}", Trailblazer::Core::Utils.inspect(options)
 
     # nested works.
     expect(options[:nested].new(nil).hello).must_equal "hello"
     expect(options[:nested].new(nil).ciao).must_equal "ciao"
 
-    expect(options[:nested].representable_attrs.get(:name).inspect).must_equal "#<Representable::Definition ==>name @options={:as=>\"Name\", :deserializer=>{:skip_parse=>\"a crazy cool instance method\"}, :name=>\"name\", :parse_filter=>[], :render_filter=>[], :skip_parse=>\"a crazy cool instance method\"}>"
+    assert_equal "#<Representable::Definition ==>name @options={:as=>\"Name\", :deserializer=>{:skip_parse=>\"a crazy cool instance method\"}, :name=>\"name\", :parse_filter=>[], :render_filter=>[], :skip_parse=>\"a crazy cool instance method\"}>", Trailblazer::Core::Utils.inspect(options[:nested].representable_attrs.get(:name).inspect)
   end
 
   # :options_from and :include is optional
@@ -61,8 +61,8 @@ class ReschemeTest < MiniTest::Spec
       definitions_from: lambda { |nested| nested.definitions }
     )
 
-    expect(decorator.representable_attrs.get(:id).inspect).must_equal "#<Representable::Definition ==>id @options={:name=>\"id\", :parse_filter=>[], :render_filter=>[]}>"
-    expect(decorator.representable_attrs.get(:title).inspect).must_equal "#<Representable::Definition ==>title @options={:writeable=>false, :deserializer=>{:skip_parse=>\"skip lambda\"}, :name=>\"title\", :parse_filter=>[], :render_filter=>[]}>"
+    assert_equal "#<Representable::Definition ==>id @options={:name=>\"id\", :parse_filter=>[], :render_filter=>[]}>", Trailblazer::Core::Utils.inspect(decorator.representable_attrs.get(:id).inspect)
+    assert_equal "#<Representable::Definition ==>title @options={:writeable=>false, :deserializer=>{:skip_parse=>\"skip lambda\"}, :name=>\"title\", :parse_filter=>[], :render_filter=>[]}>", Trailblazer::Core::Utils.inspect(decorator.representable_attrs.get(:title).inspect)
   end
 
 
@@ -73,9 +73,9 @@ class ReschemeTest < MiniTest::Spec
       exclude_options: [:deserializer]
     )
 
-    expect(decorator.representable_attrs.get(:id).inspect).must_equal "#<Representable::Definition ==>id @options={:name=>\"id\", :parse_filter=>[], :render_filter=>[]}>"
-    expect(decorator.representable_attrs.get(:title).inspect).must_equal "#<Representable::Definition ==>title @options={:writeable=>false, :name=>\"title\", :parse_filter=>[], :render_filter=>[]}>"
-    expect(decorator.representable_attrs.get(:songs).representer_module.representable_attrs.get(:name).inspect).must_equal "#<Representable::Definition ==>name @options={:as=>\"Name\", :name=>\"name\", :parse_filter=>[], :render_filter=>[]}>"
+    assert_equal "#<Representable::Definition ==>id @options={:name=>\"id\", :parse_filter=>[], :render_filter=>[]}>", Trailblazer::Core::Utils.inspect(decorator.representable_attrs.get(:id).inspect)
+    assert_equal "#<Representable::Definition ==>title @options={:writeable=>false, :name=>\"title\", :parse_filter=>[], :render_filter=>[]}>", Trailblazer::Core::Utils.inspect(decorator.representable_attrs.get(:title).inspect)
+    assert_equal "#<Representable::Definition ==>name @options={:as=>\"Name\", :name=>\"name\", :parse_filter=>[], :render_filter=>[]}>", Trailblazer::Core::Utils.inspect(decorator.representable_attrs.get(:songs).representer_module.representable_attrs.get(:name).inspect)
   end
 
 
@@ -85,8 +85,8 @@ class ReschemeTest < MiniTest::Spec
       definitions_from: lambda { |nested| nested.definitions },
     ) { |dfn| dfn.merge!(amazing: true) }
 
-    expect(decorator.representable_attrs.get(:id).inspect).must_equal "#<Representable::Definition ==>id @options={:name=>\"id\", :parse_filter=>[], :render_filter=>[], :amazing=>true}>"
-    expect(decorator.representable_attrs.get(:songs).representer_module.representable_attrs.get(:name).inspect).must_equal "#<Representable::Definition ==>name @options={:as=>\"Name\", :deserializer=>{:skip_parse=>\"a crazy cool instance method\"}, :name=>\"name\", :parse_filter=>[], :render_filter=>[], :amazing=>true}>"
+    assert_equal "#<Representable::Definition ==>id @options={:name=>\"id\", :parse_filter=>[], :render_filter=>[], :amazing=>true}>", Trailblazer::Core::Utils.inspect(decorator.representable_attrs.get(:id).inspect)
+    assert_equal "#<Representable::Definition ==>name @options={:as=>\"Name\", :deserializer=>{:skip_parse=>\"a crazy cool instance method\"}, :name=>\"name\", :parse_filter=>[], :render_filter=>[], :amazing=>true}>", Trailblazer::Core::Utils.inspect(decorator.representable_attrs.get(:songs).representer_module.representable_attrs.get(:name).inspect)
   end
 
   it "recursive: false only copies first level" do
@@ -97,8 +97,8 @@ class ReschemeTest < MiniTest::Spec
       exclude_options: [:deserializer]
     )
 
-    expect(decorator.representable_attrs.get(:title).inspect).must_equal "#<Representable::Definition ==>title @options={:writeable=>false, :name=>\"title\", :parse_filter=>[], :render_filter=>[]}>"
-    expect(decorator.representable_attrs.get(:songs).representer_module.representable_attrs.get(:name).inspect).must_equal "#<Representable::Definition ==>name @options={:as=>\"Name\", :deserializer=>{:skip_parse=>\"a crazy cool instance method\"}, :name=>\"name\", :parse_filter=>[], :render_filter=>[]}>"
+    assert_equal "#<Representable::Definition ==>title @options={:writeable=>false, :name=>\"title\", :parse_filter=>[], :render_filter=>[]}>", Trailblazer::Core::Utils.inspect(decorator.representable_attrs.get(:title).inspect)
+    assert_equal "#<Representable::Definition ==>name @options={:as=>\"Name\", :deserializer=>{:skip_parse=>\"a crazy cool instance method\"}, :name=>\"name\", :parse_filter=>[], :render_filter=>[]}>", Trailblazer::Core::Utils.inspect(decorator.representable_attrs.get(:songs).representer_module.representable_attrs.get(:name).inspect)
   end
 
   describe ":exclude_properties" do
@@ -128,7 +128,7 @@ class ReschemeTest < MiniTest::Spec
 end
 
 
-class TwinReschemeTest < MiniTest::Spec
+class TwinReschemeTest < Minitest::Spec
   class Artist < Disposable::Twin
     property :name
   end
@@ -145,8 +145,8 @@ class TwinReschemeTest < MiniTest::Spec
     artist = decorator.representable_attrs.get(:artist)
     options = artist.instance_variable_get(:@options)
     nested_extend = options[:nested]
-    expect(options.extend(Declarative::Inspect).inspect).must_equal "{:private_name=>:artist, :nested=>#<Class:>, :name=>\"artist\", :extend=>#<Class:>, :parse_filter=>[], :render_filter=>[]}"
+    assert_equal "{:private_name=>:artist, :nested=>#<Class:>, :name=>\"artist\", :extend=>#<Class:>, :parse_filter=>[], :render_filter=>[]}", Trailblazer::Core::Utils.inspect(options.extend(Declarative::Inspect).inspect)
     assert nested_extend < Representable::Decorator
-    expect(nested_extend.representable_attrs.get(:name).inspect).must_equal "#<Representable::Definition ==>name @options={:private_name=>:name, :name=>\"name\", :parse_filter=>[], :render_filter=>[]}>"
+    assert_equal "#<Representable::Definition ==>name @options={:private_name=>:name, :name=>\"name\", :parse_filter=>[], :render_filter=>[]}>", Trailblazer::Core::Utils.inspect(nested_extend.representable_attrs.get(:name).inspect)
   end
 end

data/test/skip_getter_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class SkipGetterTest < MiniTest::Spec
+class SkipGetterTest < Minitest::Spec
   Album  = Struct.new(:title, :artist)
   Artist = Struct.new(:name)
 
@@ -44,7 +44,7 @@ class SkipGetterTest < MiniTest::Spec
 end
 
 
-class SkipSetterTest < MiniTest::Spec
+class SkipSetterTest < Minitest::Spec
   Album  = Struct.new(:title, :artist)
   Artist = Struct.new(:name)
 
@@ -74,7 +74,7 @@ class SkipSetterTest < MiniTest::Spec
 end
 
 
-class SkipGetterAndSetterWithChangedTest < MiniTest::Spec
+class SkipGetterAndSetterWithChangedTest < Minitest::Spec
   Album  = Struct.new(:title, :artist)
   Artist = Struct.new(:name)
 

data/test/test_helper.rb

@@ -3,6 +3,7 @@ require "minitest/autorun"
 # require "representable/debug"
 # require "pp"
 require "declarative/testing"
+require "trailblazer/core"
 
 require "disposable/twin/coercion"
 DRY_TYPES_CONSTANT = Disposable::Twin::Coercion::DRY_TYPES_CONSTANT
@@ -78,4 +79,3 @@ module Disposable
     end
   end
 end
-

data/test/twin/benchmarking.rb

@@ -1,5 +1,4 @@
 require "disposable/twin"
-require 'ostruct'
 require 'benchmark'
 
 class Band < Disposable::Twin

data/test/twin/builder_test.rb

@@ -4,7 +4,7 @@ require "test_helper"
 
 require "disposable/twin/builder"
 
-class BuilderTest < MiniTest::Spec
+class BuilderTest < Minitest::Spec
   module Model
     Song = Struct.new(:id, :title)
     Hit = Struct.new(:id, :title)

data/test/twin/changed_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 # require 'reform/form/coercion'
 
-class ChangedWithSetupTest < MiniTest::Spec
+class ChangedWithSetupTest < Minitest::Spec
   module Model
     Song  = Struct.new(:title, :length, :composer)
     Album = Struct.new(:name, :songs, :artist)
@@ -107,7 +107,7 @@ end
 
 
 require "disposable/twin/coercion"
-class ChangedWithCoercionTest < MiniTest::Spec
+class ChangedWithCoercionTest < Minitest::Spec
   Song = Struct.new(:released)
 
   class SongTwin < Disposable::Twin

data/test/twin/coercion_test.rb

@@ -2,7 +2,13 @@ require "test_helper"
 
 require "disposable/twin/coercion"
 
-class CoercionTest < MiniTest::Spec
+class CoercionTest < Minitest::Spec
+  Album  = Struct.new(:id, :released_at, :hit, :band, keyword_init: true)
+  Hit    = Struct.new(:length, :good, keyword_init: true)
+  Band   = Struct.new(:label, keyword_init: true)
+  Label  = Struct.new(:value, keyword_init: true)
+  Person = Struct.new(:id, :date_of_birth, :date_of_death_by_unicorns, keyword_init: true)
+
   class TwinWithSkipSetter < Disposable::Twin
     feature Coercion
     feature Setup::SkipSetter
@@ -28,11 +34,11 @@ class CoercionTest < MiniTest::Spec
     end
 
     let (:album) {
-      OpenStruct.new(
+      Album.new(
         id: 1,
         :released_at => "31/03/1981",
-        :hit         => OpenStruct.new(:length => "312"),
-        :band        => OpenStruct.new(:label => OpenStruct.new(:value => "9999.99"))
+        :hit         => Hit.new(:length => "312"),
+        :band        => Band.new(:label => Label.new(:value => "9999.99"))
       )
     }
 
@@ -65,7 +71,7 @@ class CoercionTest < MiniTest::Spec
   describe "without Setup::SkipSetter" do
 
     subject do
-      TwinWithoutSkipSetter.new(OpenStruct.new(id: "1"))
+      TwinWithoutSkipSetter.new(Person.new(id: "1"))
     end
 
     it "coerce values in setup and when using a setter" do
@@ -95,9 +101,9 @@ class CoercionTest < MiniTest::Spec
 
   describe "with Nilify" do
     subject do
-      TwinWithNilify.new(OpenStruct.new(date_of_birth: '1990-01-12',
-                                        date_of_death_by_unicorns: '2037-02-18',
-                                        id: 1))
+      TwinWithNilify.new(Person.new(date_of_birth: '1990-01-12',
+                                    date_of_death_by_unicorns: '2037-02-18',
+                                    id: 1))
     end
 
     it "coerce values correctly" do
@@ -125,7 +131,7 @@ class CoercionTest < MiniTest::Spec
     let(:date_of_birth) { '1990-01-12' }
     subject do
       TwinWithoutTypeWithNilify.new(
-        OpenStruct.new(
+        Person.new(
           date_of_birth: date_of_birth,
           date_of_death_by_unicorns: '2037-02-18',
           id: 1
@@ -156,7 +162,7 @@ end
 # this converts "" to nil and then breaks because it's strict.
 # Types::Strict::String.constructor(Dry::Types::Params.method(:to_nil))
 
-class CoercionTypingTest < MiniTest::Spec
+class CoercionTypingTest < Minitest::Spec
   class Song < Disposable::Twin
     include Coercion
     include Setup::SkipSetter

data/test/twin/collection_test.rb

@@ -5,7 +5,7 @@ require 'test_helper'
 
 # TODO: eg "after delete hook (dynamic_delete)", after_add
 
-class TwinCollectionTest < MiniTest::Spec
+class TwinCollectionTest < Minitest::Spec
   module Model
     Song  = Struct.new(:id, :title, :album)
     Album = Struct.new(:id, :name, :songs, :artist)
@@ -54,7 +54,7 @@ end
 require "disposable/twin/sync"
 require "disposable/twin/save"
 
-class TwinCollectionActiveRecordTest < MiniTest::Spec
+class TwinCollectionActiveRecordTest < Minitest::Spec
   module Twin
     class Song < Disposable::Twin
       property :id # DISCUSS: needed for #save.
@@ -204,7 +204,7 @@ class TwinCollectionActiveRecordTest < MiniTest::Spec
 end
 
 
-class CollectionUnitTest < MiniTest::Spec
+class CollectionUnitTest < Minitest::Spec
   module Twin
     class Album < Disposable::Twin
     end
@@ -215,11 +215,12 @@ class CollectionUnitTest < MiniTest::Spec
   end
 
   module Model
+    Song  = Struct.new(:id, :title, :album)
     Album = Struct.new(:id, :name, :songs, :artist)
   end
 
   # THIS is why private tests suck!
-  let(:collection) { Disposable::Twin::Collection.new(Disposable::Twin::Twinner.new(Twin::Song.new(OpenStruct.new), Twin::Song.definitions.get(:album)), []) }
+  let(:collection) { Disposable::Twin::Collection.new(Disposable::Twin::Twinner.new(Twin::Song.new(Model::Song.new), Twin::Song.definitions.get(:album)), []) }
 
   # #insert(index, model)
   it do

data/test/twin/composition_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 # Disposable::Twin::Composition.
-class TwinCompositionTest < MiniTest::Spec
+class TwinCompositionTest < Minitest::Spec
   class Request < Disposable::Twin
     include Sync
     include Save

data/test/twin/expose_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 # Disposable::Twin::Expose.
-class TwinExposeTest < MiniTest::Spec
+class TwinExposeTest < Minitest::Spec
   class Request < Disposable::Twin
     feature Sync
     feature Save

data/test/twin/feature_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class FeatureTest < MiniTest::Spec
+class FeatureTest < Minitest::Spec
   Song  = Struct.new(:title, :album, :composer)
   Album = Struct.new(:name, :songs, :artist)
   Artist = Struct.new(:name)

data/test/twin/from_collection_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TwinFromCollectionDecoratorTest < MiniTest::Spec
+class TwinFromCollectionDecoratorTest < Minitest::Spec
   module Model
     Artist = Struct.new(:id, :name)
   end

data/test/twin/from_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class FromTest < MiniTest::Spec
+class FromTest < Minitest::Spec
   module Model
     Album = Struct.new(:name, :composer)
     Artist = Struct.new(:realname)

data/test/twin/hash_test.rb

@@ -1,7 +1,7 @@
 require "test_helper"
 require "disposable/twin/property/hash"
 
-class HashTest < MiniTest::Spec
+class HashTest < Minitest::Spec
   Model = Struct.new(:id, :content)
 
   class Song < Disposable::Twin
@@ -64,7 +64,7 @@ class HashTest < MiniTest::Spec
 
     song.sync
 
-    expect(model.inspect).must_equal "#<struct HashTest::Model id=nil, content={\"band\"=>{\"label\"=>{\"location\"=>\"San Francisco\"}}, \"releases\"=>[]}>"
+    assert_equal "#<struct HashTest::Model id=nil, content={\"band\"=>{\"label\"=>{\"location\"=>\"San Francisco\"}}, \"releases\"=>[]}>", Trailblazer::Core::Utils.inspect(model.inspect)
   end
 
   it "#appends to collections" do
@@ -76,7 +76,7 @@ class HashTest < MiniTest::Spec
 
     song.sync
 
-    expect(model.inspect).must_equal "#<struct HashTest::Model id=nil, content={\"band\"=>{\"label\"=>{}}, \"releases\"=>[{\"version\"=>1}]}>"
+    assert_equal "#<struct HashTest::Model id=nil, content={\"band\"=>{\"label\"=>{}}, \"releases\"=>[{\"version\"=>1}]}>", Trailblazer::Core::Utils.inspect(model.inspect)
   end
 
   it "doesn't erase existing, undeclared content" do
@@ -88,7 +88,7 @@ class HashTest < MiniTest::Spec
     # puts song.content.class.ancestors
     song.sync
 
-    expect(model.inspect).must_equal "#<struct HashTest::Model id=nil, content={\"artist\"=>{}, \"band\"=>{\"label\"=>{\"location\"=>\"San Francisco\"}}, \"releases\"=>[]}>"
+    assert_equal "#<struct HashTest::Model id=nil, content={\"artist\"=>{}, \"band\"=>{\"label\"=>{\"location\"=>\"San Francisco\"}}, \"releases\"=>[]}>", Trailblazer::Core::Utils.inspect(model.inspect)
   end
 
   it "doesn't erase existing, undeclared content in existing content" do
@@ -99,7 +99,7 @@ class HashTest < MiniTest::Spec
 
     song.sync
 
-    expect(model.inspect).must_equal "#<struct HashTest::Model id=nil, content={\"band\"=>{\"label\"=>{\"owner\"=>\"Brett Gurewitz\", \"location\"=>\"San Francisco\"}, \"genre\"=>\"Punkrock\"}, \"releases\"=>[]}>"
+    assert_equal "#<struct HashTest::Model id=nil, content={\"band\"=>{\"label\"=>{\"owner\"=>\"Brett Gurewitz\", \"location\"=>\"San Francisco\"}, \"genre\"=>\"Punkrock\"}, \"releases\"=>[]}>", Trailblazer::Core::Utils.inspect(model.inspect)
   end
 
 

data/test/twin/inherit_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class InheritTest < MiniTest::Spec
+class InheritTest < Minitest::Spec
   module Model
     Song  = Struct.new(:title, :album)
     Album = Struct.new(:name, :songs, :artist)
@@ -40,8 +40,8 @@ class InheritTest < MiniTest::Spec
 
   # definitions are not shared.
   it do
-    expect(Twin::Album.definitions.get(:name).extend(Declarative::Inspect).inspect).must_equal "#<Disposable::Twin::Definition: @options={:fromage=>:_name, :private_name=>:name, :name=>\"name\"}>"
-    expect(Twin::Compilation.definitions.get(:name).extend(Declarative::Inspect).inspect).must_equal "#<Disposable::Twin::Definition: @options={:fromage=>:_name, :private_name=>:name, :name=>\"name\", :writeable=>false}>" # FIXME: where did :inherit go?
+    assert_equal "#<Disposable::Twin::Definition: @options={:fromage=>:_name, :private_name=>:name, :name=>\"name\"}>", Trailblazer::Core::Utils.inspect(Twin::Album.definitions.get(:name).extend(Declarative::Inspect).inspect)
+    assert_equal "#<Disposable::Twin::Definition: @options={:fromage=>:_name, :private_name=>:name, :name=>\"name\", :writeable=>false}>", Trailblazer::Core::Utils.inspect(Twin::Compilation.definitions.get(:name).extend(Declarative::Inspect).inspect) # FIXME: where did :inherit go?
   end
 
 

data/test/twin/inheritance_test.rb

@@ -1,7 +1,7 @@
 require "test_helper"
 
 class InheritanceTest < Minitest::Spec
-  let (:song) { OpenStruct.new(id: 0) }
+  let (:song) { Struct.new(:id).new(0) }
 
   module Id
     def id

data/test/twin/parent_test.rb

@@ -1,7 +1,7 @@
 require "test_helper"
 require "disposable/twin/parent.rb"
 
-class TwinParentTest < MiniTest::Spec
+class TwinParentTest < Minitest::Spec
   module Model
     Album = Struct.new(:id, :artist, :songs)
     Artist = Struct.new(:name)

data/test/twin/process_inline_test.rb

@@ -1,6 +1,6 @@
 # require "test_helper"
 
-# class ProcessInlineTest < MiniTest::Spec
+# class ProcessInlineTest < Minitest::Spec
 #   Album = Struct.new(:artist, :composer, :recursive_composer)
 
 #   module InlineTwin

data/test/twin/readable_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ReadableTest < MiniTest::Spec
+class ReadableTest < Minitest::Spec
   Credentials = Struct.new(:password, :credit_card) do
     def password
       raise "don't call me!"

data/test/twin/save_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class SaveTest < MiniTest::Spec
+class SaveTest < Minitest::Spec
   module Model
     Song  = Struct.new(:title, :composer)
     Album = Struct.new(:name, :songs, :artist)
@@ -166,7 +166,7 @@ end
 
 # TODO: with block
 
-# class SaveWithDynamicOptionsTest < MiniTest::Spec
+# class SaveWithDynamicOptionsTest < Minitest::Spec
 #   Song = Struct.new(:id, :title, :length) do
 #     include Disposable::Saveable
 #   end

data/test/twin/setup_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class TwinSetupTest < MiniTest::Spec
+class TwinSetupTest < Minitest::Spec
   module Model
     Song  = Struct.new(:id, :title, :album, :composer)
     Album = Struct.new(:id, :name, :songs, :artist)
@@ -82,7 +82,7 @@ class TwinSetupTest < MiniTest::Spec
 end
 
 # test inline twin building and setup.
-class TwinSetupWithInlineTwinsTest < MiniTest::Spec
+class TwinSetupWithInlineTwinsTest < Minitest::Spec
   module Model
     Song  = Struct.new(:id, :composer)
     Album = Struct.new(:id, :name, :songs, :artist)
@@ -139,7 +139,7 @@ class TwinSetupWithInlineTwinsTest < MiniTest::Spec
 end
 
 # Twin.new(model, is_online: true)
-class TwinWithVirtualSetupTest < MiniTest::Spec
+class TwinWithVirtualSetupTest < Minitest::Spec
   Song = Struct.new(:id)
 
   class AlbumTwin < Disposable::Twin

data/test/twin/skip_unchanged_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class SkipUnchangedTest < MiniTest::Spec
+class SkipUnchangedTest < Minitest::Spec
   module Model
     Song  = Struct.new(:title, :composer)
     Album = Struct.new(:name, :songs, :artist)

data/test/twin/struct_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 
 require 'disposable/twin/struct'
 
-class TwinStructTest < MiniTest::Spec
+class TwinStructTest < Minitest::Spec
   class Song < Disposable::Twin
     include Property::Struct
     property :number#, default: 1 # FIXME: this should be :default_if_nil so it becomes clear with a model.
@@ -54,7 +54,7 @@ class TwinStructTest < MiniTest::Spec
 end
 
 
-class TwinWithNestedStructTest < MiniTest::Spec
+class TwinWithNestedStructTest < Minitest::Spec
   class Song < Disposable::Twin
     property :title
     include Sync
@@ -78,7 +78,11 @@ class TwinWithNestedStructTest < MiniTest::Spec
   end
 
   # FIXME: test with missing hash properties, e.g. without released and with released:false.
-  let (:model) { OpenStruct.new(title: "Seed of Fear and Anger", options: {recorded: true, released: 1,
+  Model = Struct.new(:title, :options, keyword_init: true) do
+    def save = true
+  end
+
+  let (:model) { Model.new(title: "Seed of Fear and Anger", options: {recorded: true, released: 1,
     preferences: {show_image: true, play_teaser: 2}, roles: [{name: "user"}]}) }
 
   # public "hash" reader
@@ -288,8 +292,10 @@ class CompositionWithStructTest < Minitest::Spec
     end
   end
 
+  Model = Struct.new(:content, keyword_init: true)
+
   let (:model) do
-    OpenStruct.new(
+    Model.new(
       content: {
         tags:  "#hashtag",
         notes: [

data/test/twin/sync_option_test.rb

@@ -1,7 +1,7 @@
 # require 'test_helper'
 # require "disposable/twin/changed"
 
-# class SyncOptionTest < MiniTest::Spec
+# class SyncOptionTest < Minitest::Spec
 #   module Model
 #     Song  = Struct.new(:title, :composer)
 #     Album = Struct.new(:id, :name, :songs, :artist)
@@ -78,7 +78,7 @@
 # end
 
 
-# class SyncWithDynamicOptionsTest < MiniTest::Spec
+# class SyncWithDynamicOptionsTest < Minitest::Spec
 #   module Model
 #     Song  = Struct.new(:title, :composer)
 #     Album = Struct.new(:id, :name, :songs, :artist)
@@ -152,7 +152,7 @@
 # end
 
 
-# class SyncWithOptionsAndSkipUnchangedTest < MiniTest::Spec
+# class SyncWithOptionsAndSkipUnchangedTest < Minitest::Spec
 #   module Model
 #     Song  = Struct.new(:title, :composer)
 #     Album = Struct.new(:id, :name, :songs, :artist)
@@ -200,7 +200,7 @@
 # end
 
 # # :virtual wins over :sync
-# # class SyncWithVirtualTest < MiniTest::Spec
+# # class SyncWithVirtualTest < Minitest::Spec
 # #   Song = Struct.new(:title, :image, :band)
 # #   Band = Struct.new(:name)
 

data/test/twin/sync_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class TwinSyncTest < MiniTest::Spec
+class TwinSyncTest < Minitest::Spec
   module Model
     Song  = Struct.new(:title, :composer)
     Album = Struct.new(:name, :songs, :artist)

data/test/twin/twin_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TwinTest < MiniTest::Spec
+class TwinTest < Minitest::Spec
   module Model
     Song  = Struct.new(:id, :title, :album)
     Album = Struct.new(:id, :name, :songs, :artist)
@@ -114,7 +114,7 @@ class OverridingAccessorsTest < TwinTest
 end
 
 
-class TwinAsTest < MiniTest::Spec
+class TwinAsTest < Minitest::Spec
   module Model
     Song  = Struct.new(:title, :album)
     Album = Struct.new(:name)

data/test/twin/unnest_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class UnnestTest < MiniTest::Spec
+class UnnestTest < Minitest::Spec
   class Twin < Disposable::Twin
     property :content do
       property :id, nice: "yes"
@@ -16,14 +16,17 @@ class UnnestTest < MiniTest::Spec
   end
 
   it "copies property option" do
-    expect(Twin.definitions.get(:id).extend(Declarative::Inspect).inspect).must_equal %{#<Disposable::Twin::Definition: @options={:nice=>\"yes\", :private_name=>:id, :name=>\"id\", :readable=>false, :writeable=>false}>}
-    expect(Twin.definitions.get(:ids).extend(Declarative::Inspect).inspect).must_equal %{#<Disposable::Twin::Definition: @options={:status=>\"healthy\", :collection=>true, :private_name=>:ids, :name=>\"ids\", :readable=>false, :writeable=>false}>}
+    assert_equal %{#<Disposable::Twin::Definition: @options={:nice=>\"yes\", :private_name=>:id, :name=>\"id\", :readable=>false, :writeable=>false}>}, Trailblazer::Core::Utils.inspect(Twin.definitions.get(:id).extend(Declarative::Inspect).inspect)
+    assert_equal %{#<Disposable::Twin::Definition: @options={:status=>\"healthy\", :collection=>true, :private_name=>:ids, :name=>\"ids\", :readable=>false, :writeable=>false}>}, Trailblazer::Core::Utils.inspect(Twin.definitions.get(:ids).extend(Declarative::Inspect).inspect)
     # also copies :nested.
-    expect(Twin.definitions.get(:email).extend(Declarative::Inspect).inspect).must_equal %{#<Disposable::Twin::Definition: @options={:private_name=>:email, :nested=>#<Class:>, :name=>\"email\", :readable=>false, :writeable=>false}>}
+    assert_equal %{#<Disposable::Twin::Definition: @options={:private_name=>:email, :nested=>#<Class:>, :name=>\"email\", :readable=>false, :writeable=>false}>}, Trailblazer::Core::Utils.inspect(Twin.definitions.get(:email).extend(Declarative::Inspect).inspect)
   end
 
+  Content = Struct.new(:id, :ids, :email)
+  Model   = Struct.new(:content)
+
   it "exposes accessors on top-level twin" do
-    twin = Twin.new(OpenStruct.new(content: OpenStruct.new()))
+    twin = Twin.new(Model.new(Content.new))
 
     expect(twin.email).must_be_nil
     twin.email= 2

data/test/twin/virtual_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class VirtualTest < MiniTest::Spec
+class VirtualTest < Minitest::Spec
   class CreditCardTwin < Disposable::Twin
     include Sync
     property :credit_card_number, virtual: true # no read, no write, it's virtual.

data/test/twin/writeable_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class WriteableTest < MiniTest::Spec
+class WriteableTest < Minitest::Spec
   Credentials = Struct.new(:password, :credit_card) do
     def password=(v)
       raise "don't call me!"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: disposable
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Nick Sutterer
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: declarative
@@ -127,6 +126,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - CHANGES.md
@@ -203,7 +203,6 @@ homepage: https://github.com/apotonick/disposable
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -211,15 +210,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 4.0.17
 specification_version: 4
 summary: Decorators on top of your ORM layer with change tracking, collection semantics
   and nesting.