disposable 0.4.6 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d17fbfc73eb6b25b90136d515733b694ac2631ad3861f47d62dde5517ec394b
-  data.tar.gz: be69f4aaed8fda60749dcb3dc3188bb57def014cd91715198baab0eebd801386
+  metadata.gz: e381c394b04f502f9af8ba27192e898d4e1f1214e85e441b50182f5f353e1137
+  data.tar.gz: 4a6b6a0e270c0229f5bed96d51d2b4a41bd1a66bd2b80293a61e1cab74803d52
 SHA512:
-  metadata.gz: eb4b2eca60ed3001be80d50eff19fe008abf68030a99101eb0282b5fe65d091c21d62537a3dcbfafb32484e985d4e670377d701413de25832b8195f0ff08cdeb
-  data.tar.gz: b95131034f38c0907672943108c0633164817981ba0107c508e618467b69f0c7f2e914c91d1152219b3488e6432cd1a9839e394704a1465e1792ef540140613e
+  metadata.gz: dfeeff838ca34e37a5741cb7ac7829a7be52248b8b5a8fe16c7d7dbef32e13dffe7d543e668bc1cfb674daeeb75d7d144bab1b5caf15d892b4a427b1dedf7e44
+  data.tar.gz: 154949ab53a0508659db1d47acc9b9f797870724d554c2935fb92764e6156308ab00c5d5ec33629b8f3c37204c5fda4cb2bae879b5f87cd3b6d879889bf39ecb

data/.github/workflows/ci.yml

@@ -0,0 +1,29 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  test:
+    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
+    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,21 @@
+# 0.6.1
+
+* Remove `**options` argument from `#property` as it's inconsistent with underlying gems.
+
+# 0.6.0
+
+* Remove `uber` gem.
+* Remove `declarative-builder` dependency and make it optional. Add `gem "declarative-builder"` to your `Gemfile` should you need this feature.
+
+# 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

data/Gemfile

@@ -7,4 +7,6 @@ gem "minitest-line"
   gem gem_name, dependency
 end
 
+gem "sqlite3", ENV.fetch('ACTIVERECORD', '5.2').to_f >= 6 ? '~> 1.4' : '~> 1.3.0'
 
+# gem "declarative-builder"

data/Gemfile_builder_test.rb

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+gemspec
+gem "minitest-line"
+gem "sqlite3"
+
+gem "declarative-builder", "0.2.0"

data/README.md

@@ -640,3 +640,7 @@ Note that this will internally add a `parent` property.
 
 * [Reform](https://github.com/apotonick/reform) forms are based on twins and add a little bit of form decoration on top. Every nested form is a twin.
 * [Trailblazer](https://github.com/apotonick/trailblazer) uses twins as decorators and callbacks in operations to structure business logic.
+
+## Development
+
+* `rake test` runs all tests without `builder_test.rb`. For the latter, run `BUNDLE_GEMFILE=Gemfile_builder_test.rb bundle exec rake test_builder`

data/Rakefile

@@ -4,6 +4,12 @@ require "rake/testtask"
 task :default => [:test]
 Rake::TestTask.new(:test) do |test|
   test.libs << 'test'
-  test.test_files = FileList['test/**/*_test.rb']
+  test.test_files = FileList['test/**/*_test.rb'] - ["test/twin/builder_test.rb"]
   test.verbose = true
-end
+end
+
+Rake::TestTask.new(:test_builder) do |test|
+  test.libs << 'test'
+  test.test_files = FileList["test/twin/builder_test.rb"]
+  test.verbose = true
+end

data/disposable.gemspec

@@ -16,17 +16,14 @@ Gem::Specification.new do |spec|
   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 "rake"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "activerecord"#, "4.2.5"
-  spec.add_development_dependency "sqlite3", '~> 1.3.0'
   spec.add_development_dependency "dry-types"# "~> 0.6"
   # spec.add_development_dependency "database_cleaner"
 end

data/lib/disposable/twin/builder.rb

@@ -1,3 +1,4 @@
+gem "declarative-builder", "0.2.0"
 require "declarative/builder"
 
 module Disposable

data/lib/disposable/twin/coercion.rb

@@ -18,7 +18,10 @@ module Disposable::Twin::Coercion
     end
 
     def coercing_setter!(name, type, nilify=false)
-     type = type ? (DRY_TYPES_CONSTANT::Nil | type) : DRY_TYPES_CONSTANT::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|

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/property/unnest.rb

@@ -1,10 +1,11 @@
-require "uber/delegates"
+require "forwardable"
 
 module Disposable::Twin::Property
   module Unnest
+    extend Forwardable
     # TODO: test that nested properties options are "unnested", too, e.g. populator.
     def self.included(includer)
-      includer.send(:include, Uber::Delegates)
+      includer.send(:include, Forwardable)
     end
 
     def unnest(name, options)
@@ -15,7 +16,7 @@ module Disposable::Twin::Property
       options = options.merge(virtual: true, _inherited: true, private_name: nil)
 
       property(name, options)
-      delegates from, name, "#{name}="
+      def_delegators from, name, "#{name}="
     end
   end
 end

data/lib/disposable/twin.rb

@@ -1,4 +1,4 @@
-require "uber/inheritable_attr"
+# require "uber/inheritable_attr"
 require "declarative/schema"
 require "representable/decorator"
 
@@ -140,7 +140,7 @@ require "disposable/twin/definitions"
 require "disposable/twin/collection"
 require "disposable/twin/sync"
 require "disposable/twin/save"
-require "disposable/twin/builder"
+# require "disposable/twin/builder"
 require "disposable/twin/changed"
 require "disposable/twin/property_processor"
 require "disposable/twin/persisted"

data/lib/disposable/version.rb

@@ -1,3 +1,3 @@
 module Disposable
-  VERSION = "0.4.6"
+  VERSION = "0.6.1"
 end

data/test/callback_group_test.rb

@@ -55,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!, []],
@@ -76,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]]],
@@ -85,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
 
 
@@ -129,7 +129,7 @@ class CallbackGroupTest < MiniTest::Spec
 
     # 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]]],
@@ -138,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
 
@@ -157,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
@@ -171,7 +171,7 @@ class CallbackGroupInheritanceTest < MiniTest::Spec
 
 
   it do
-    EmptyGroup.hooks.size.must_equal 4
+    expect(EmptyGroup.hooks.size).must_equal 4
     # TODO:
   end
 
@@ -183,10 +183,10 @@ class CallbackGroupInheritanceTest < MiniTest::Spec
   end
 
   it do
-    Group.hooks.size.must_equal 4
+    expect(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(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
@@ -199,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
@@ -226,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
@@ -239,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