disposable 0.4.7 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60b151f3e5bb984a08ae4631bb836caa4b08b62e64b57d260a93e156129c4729
-  data.tar.gz: f793d20d7b3fb398d07baddbaf9c835e1944b4f6bfe60f1fb36eb325bf6a5919
+  metadata.gz: 503eaa80c2c7e5c2808e22cfff709fa359fc3c582b8db5c7917800c406ec55db
+  data.tar.gz: 28b2091c2f06ff81e5ee2bbed56a496b91421753afd97782f3a2e3f298dbc53b
 SHA512:
-  metadata.gz: e8ab3254e28140e886dc65341cb8d3f8ae53328f7bb304cd8e0760869e894440c615cafaae1b2d5b2aab1bf721d86d5d659fc40ac1f7301bb6a39d1303cbea02
-  data.tar.gz: ac09aaa979ddc3de44d409740d3d8a1121d07b498c59ac2d77496091c799b692fcc22d7f495174886a75491d71f230e1544fb87ebc89713e0d97d5bf22db9d82
+  metadata.gz: 9ddecb0c8eaa4d66162d059c23fb2f495658fd67e5bc35aaf568cdf39bb9d21b4816703577a732daac330e279876b06cfec6a624eeb7c7a6da724d764e224c27
+  data.tar.gz: 9728842db88f5794ccf1e4729801d28badf5389cabdd0bda11c5391283ab41317275a5fe0aefa3cb259e2b63026de5174aba51e38bf6a87b06c968b0e50a6c22

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/CHANGES.md

@@ -1,3 +1,23 @@
+# 0.6.2
+
+* Remove `Forwardable` from `Unnest` and refrain from including it into the `Twin` class.
+    This may overwrite the same-named `ActiveSupport::delegate` method and breaks things.
+    Instead, do manual delegation and plan for 2023 to allow using `Forwardable.delegate(target, what, where)`.
+
+
+# 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

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 "sqlite3", '~> 1.4' # => , 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,11 +16,9 @@ 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"

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

@@ -1,11 +1,6 @@
-require "uber/delegates"
-
 module Disposable::Twin::Property
   module Unnest
     # TODO: test that nested properties options are "unnested", too, e.g. populator.
-    def self.included(includer)
-      includer.send(:include, Uber::Delegates)
-    end
 
     def unnest(name, options)
       from = options.delete(:from)
@@ -15,7 +10,15 @@ 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}=" # FIXME: this overwrites ActiveSupport#delegate in some cases.
+
+      define_method name do
+        send(from).send(name) # TODO: fix Forwardable in Ruby.
+      end
+
+      define_method "#{name}=" do |value|
+        send(from).send("#{name}=", value)
+      end
     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"
 
@@ -28,6 +28,10 @@ module Disposable
       Definition::Each.new(self.class.definitions) # TODO: change this interface.
     end
 
+    def self.schema
+      Definition::Each.new(definitions)
+    end
+
     class << self
       def default_nested_class
         Twin
@@ -140,7 +144,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.7"
+  VERSION = "0.6.2"
 end

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 require "disposable"
 require "minitest/autorun"
-require "representable/debug"
+# require "representable/debug"
 # require "pp"
 require "declarative/testing"
 

data/test/twin/builder_test.rb

@@ -1,5 +1,9 @@
+# BUNDLE_GEMFILE=Gemfile_builder_test.rb be rake test_builder
+
 require "test_helper"
 
+require "disposable/twin/builder"
+
 class BuilderTest < MiniTest::Spec
   module Model
     Song = Struct.new(:id, :title)

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: disposable
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.6.2
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-12 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: uber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: declarative
   requirement: !ruby/object:Gem::Requirement
@@ -44,54 +30,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: declarative-builder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: declarative-option
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: representable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
-    - - "<="
+        version: 3.1.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
-    - - "<="
+        version: 3.1.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -169,10 +127,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGES.md
 - Gemfile
+- Gemfile_builder_test.rb
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -259,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Decorators on top of your ORM layer with change tracking, collection semantics

data/.travis.yml

@@ -1,44 +0,0 @@
-language: ruby
-rvm:
-  - ruby-head
-  - 2.6
-  - 2.5
-  - 2.4
-env:
-  - "ACTIVERECORD=5.0 DRY_TYPES=0.13"
-  - "ACTIVERECORD=5.0 DRY_TYPES=0.14"
-  - "ACTIVERECORD=5.0 DRY_TYPES=0.15"
-  - "ACTIVERECORD=5.0 DRY_TYPES=1.0"
-  - "ACTIVERECORD=5.0 DRY_TYPES=1.1"
-  - "ACTIVERECORD=5.0 DRY_TYPES=1.2"
-  - "ACTIVERECORD=5.1 DRY_TYPES=0.13"
-  - "ACTIVERECORD=5.1 DRY_TYPES=0.14"
-  - "ACTIVERECORD=5.1 DRY_TYPES=0.15"
-  - "ACTIVERECORD=5.1 DRY_TYPES=1.0"
-  - "ACTIVERECORD=5.1 DRY_TYPES=1.1"
-  - "ACTIVERECORD=5.1 DRY_TYPES=1.2"
-  - "ACTIVERECORD=5.2 DRY_TYPES=0.13"
-  - "ACTIVERECORD=5.2 DRY_TYPES=0.14"
-  - "ACTIVERECORD=5.2 DRY_TYPES=0.15"
-  - "ACTIVERECORD=5.2 DRY_TYPES=1.0"
-  - "ACTIVERECORD=5.2 DRY_TYPES=1.1"
-  - "ACTIVERECORD=5.2 DRY_TYPES=1.2"
-  - "ACTIVERECORD=6.0 DRY_TYPES=0.13"
-  - "ACTIVERECORD=6.0 DRY_TYPES=0.14"
-  - "ACTIVERECORD=6.0 DRY_TYPES=0.15"
-  - "ACTIVERECORD=6.0 DRY_TYPES=1.0"
-  - "ACTIVERECORD=6.0 DRY_TYPES=1.1"
-  - "ACTIVERECORD=6.0 DRY_TYPES=1.2"
-gemfile:
-  - Gemfile
-matrix:
-  fast_finish: true
-  allow_failures:
-    - rvm: ruby-head
-  exclude:
-    - {rvm: 2.4, env: "ACTIVERECORD=6.0 DRY_TYPES=0.13"}
-    - {rvm: 2.4, env: "ACTIVERECORD=6.0 DRY_TYPES=0.14"}
-    - {rvm: 2.4, env: "ACTIVERECORD=6.0 DRY_TYPES=0.15"}
-    - {rvm: 2.4, env: "ACTIVERECORD=6.0 DRY_TYPES=1.0"}
-    - {rvm: 2.4, env: "ACTIVERECORD=6.0 DRY_TYPES=1.1"}
-    - {rvm: 2.4, env: "ACTIVERECORD=6.0 DRY_TYPES=1.2"}