disposable 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 530dcd8e13e2d3eeb6a5ef859a3380f610454980
-  data.tar.gz: d6a2514c02e39f6bdd45d92c604f1ee332edb1f3
+  metadata.gz: c909813e9e956a7fc7f01053b0be5984ccfb8ca9
+  data.tar.gz: dfa602431c42bb639e696eaf07e5822ad2f89e58
 SHA512:
-  metadata.gz: 7f78687f62314fc4dd51b2ed1a6cca4313c84db0f78e18d683131daf18acab106a1e5e031e0e27bf05e26111a68e8e5e67aeba431aa842ee7eff9889349f81d2
-  data.tar.gz: 5875a24195e83c063c8446dc9a06ad9642e861b52b1f2573ed1ac6884d2a4eaee0af82a7dc7de3fc6261797e51f02593ef6f9aa48d18d46221d1d0303b633e63
+  metadata.gz: 8fdf6d50142307f1dad082e3ab73639888e1fe37c482fa49e3379d5751e39e83ba3d60e6f00699083d402f4ca56eb21be111ccbc069f2e0ee28f573838953d18
+  data.tar.gz: 99b5c357dbb03d0870ae9934732cc7786e37d728abdcfc6e7430b0cb6ba7de8fb47fd4d589edd501b14528bda26831fced5939814198e7e6906b397907f5bf93

data/.travis.yml

@@ -1,13 +1,31 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.4.0
-  - 2.3.0
+  - ruby-head
+  - 2.5
+  - 2.4
+  - 2.3
   - 2.2
-  - 2.1
-  # - 2.0
+env:
+  - "DRY_TYPES=0.13"
+  - "DRY_TYPES=0.12"
+  - "ACTIVERECORD=5.0"
+  - "ACTIVERECORD=5.1"
+  - "ACTIVERECORD=5.2"
 gemfile:
   - Gemfile
 matrix:
+  fast_finish: true
+  include:
+    - { rvm: 2.3, env: ACTIVERECORD=4.2  }
+    - { rvm: 2.2, env: ACTIVERECORD=4.2  }
+    - { rvm: 2.3, env: ACTIVERECORD=4.1  }
+    - { rvm: 2.2, env: ACTIVERECORD=4.1  }
+    - rvm: 2.1
+      env:
+        - ACTIVERECORD=4.1
+        - DRY_TYPES=0.10
   allow_failures:
-    - rvm: 2.4.0
+    - rvm: ruby-head
+    - env: ACTIVERECORD=4.1
+    - rvm: 2.1

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 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

@@ -8,6 +8,11 @@ gemspec
 # gem "declarative", github: "apotonick/declarative"
 gem "minitest-line"
 
+{ "dry-types" => ENV['DRY_TYPES'], "activerecord" => ENV['ACTIVERECORD']}.each do |gem_name, dependency|
+  next if dependency.nil?
+  gem gem_name, dependency
+end
+
 # gem "dry-struct"
 
 

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

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
   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 "activerecord"#, "4.2.5"
   spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "dry-types", "~> 0.6"
+  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/coercion.rb

@@ -5,6 +5,9 @@ module Disposable::Twin::Coercion
     include Dry::Types.module
   end
 
+  DRY_TYPES_VERSION = Integer(Dry::Types::VERSION.split('.')[-2])
+  DRY_TYPES_CONSTANT = DRY_TYPES_VERSION < 13 ? Types::Form : Types::Params
+
   module ClassMethods
     def property(name, options={}, &block)
       super(name, options, &block).tap do
@@ -13,11 +16,11 @@ module Disposable::Twin::Coercion
     end
 
     def coercing_setter!(name, type, nilify=false)
-     type = type ? (Types::Form::Nil | type) : Types::Form::Nil if nilify
+     type = type ? (DRY_TYPES_CONSTANT::Nil | type) : DRY_TYPES_CONSTANT::Nil if nilify
 
       mod = Module.new do
         define_method("#{name}=") do |value|
-          super type.call(value)
+          super type.(value)
         end
       end
       include mod

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.4.4"
 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
@@ -125,7 +124,7 @@ 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
@@ -185,7 +184,7 @@ class CallbackGroupInheritanceTest < MiniTest::Spec
 
   it do
     Group.hooks.size.must_equal 4
-    pp EnhancedGroup.hooks
+    # 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!, {}]]"
   end

data/test/callbacks_test.rb

@@ -74,9 +74,9 @@ class CallbacksTest < MiniTest::Spec
 
     # 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 }
@@ -144,9 +144,9 @@ class CallbacksTest < MiniTest::Spec
 
     # 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 }
@@ -350,7 +350,7 @@ 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 []

data/test/test_helper.rb

@@ -1,9 +1,13 @@
 require "disposable"
 require "minitest/autorun"
-require "pp"
 require "representable/debug"
+# require "pp"
 require "declarative/testing"
 
+require "disposable/twin/coercion"
+DRY_TYPES_CONSTANT = Disposable::Twin::Coercion::DRY_TYPES_CONSTANT
+DRY_TYPES_INT_CONSTANT = Disposable::Twin::Coercion::DRY_TYPES_VERSION < 13 ? 'Int' : 'Integer'
+
 class Track
   def initialize(options={})
     @title = options[:title]
@@ -12,7 +16,6 @@ class Track
   attr_reader :title
 end
 
-
 # require 'active_record'
 # require 'database_cleaner'
 # DatabaseCleaner.strategy = :truncation
@@ -39,18 +42,18 @@ ActiveRecord::Base.establish_connection(
 ActiveRecord::Schema.define do
   create_table :artists do |table|
     table.column :name, :string
-    table.timestamps
+    table.timestamps null: false
   end
   create_table :songs do |table|
     table.column :title, :string
     table.column :artist_id, :integer
     table.column :album_id, :integer
-    table.timestamps
+    table.timestamps null: false
   end
   create_table :albums do |table|
     table.column :name, :string
     table.column :artist_id, :integer
-    table.timestamps
+    table.timestamps null: false
   end
 end
 
@@ -71,7 +74,7 @@ module Disposable
     end
 
     def saved?
-      @saved
+      defined?(@saved) ? @saved : nil
     end
   end
 end

data/test/twin/changed_test.rb

@@ -114,7 +114,7 @@ class ChangedWithCoercionTest < MiniTest::Spec
     include Changed
     include Coercion
 
-    property :released, type: Types::Form::Bool
+    property :released, type: DRY_TYPES_CONSTANT::Bool
   end
 
   it do

data/test/twin/coercion_test.rb

@@ -3,16 +3,15 @@ require "test_helper"
 require "disposable/twin/coercion"
 
 class CoercionTest < MiniTest::Spec
-
   class TwinWithSkipSetter < Disposable::Twin
     feature Coercion
     feature Setup::SkipSetter
 
     property :id
-    property :released_at, type: Types::Form::DateTime
+    property :released_at, type: DRY_TYPES_CONSTANT::DateTime
 
     property :hit do
-      property :length, type: Types::Coercible::Int
+      property :length, type: const_get("Types::Coercible::#{DRY_TYPES_INT_CONSTANT}")
       property :good,   type: Types::Bool
     end
 
@@ -24,7 +23,6 @@ class CoercionTest < MiniTest::Spec
   end
 
   describe "with Setup::SkipSetter" do
-
     subject do
       TwinWithSkipSetter.new(album)
     end
@@ -54,14 +52,14 @@ class CoercionTest < MiniTest::Spec
       subject.released_at.must_be_kind_of DateTime
       subject.released_at.must_equal DateTime.parse("30/03/1981")
       subject.hit.length.must_equal 312
-      subject.hit.good.must_equal nil
+      subject.hit.good.must_be_nil
       subject.band.label.value.must_equal 9999.99
     end
   end
 
   class TwinWithoutSkipSetter < Disposable::Twin
     feature Coercion
-    property :id, type: Types::Coercible::Int
+    property :id, type: const_get("Types::Coercible::#{DRY_TYPES_INT_CONSTANT}")
   end
 
   describe "without Setup::SkipSetter" do
@@ -81,9 +79,9 @@ class CoercionTest < MiniTest::Spec
     feature Coercion
 
     property :date_of_birth,
-             type: Types::Form::Date, nilify: true
+             type: DRY_TYPES_CONSTANT::Date, nilify: true
     property :date_of_death_by_unicorns,
-             type: Types::Form::Nil | Types::Form::Date
+             type: DRY_TYPES_CONSTANT::Nil | DRY_TYPES_CONSTANT::Date
     property :id, nilify: true
   end
 
@@ -102,33 +100,33 @@ class CoercionTest < MiniTest::Spec
 
     it "coerce empty values to nil when using option nilify: true" do
       subject.date_of_birth = ""
-      subject.date_of_birth.must_equal nil
+      subject.date_of_birth.must_be_nil
     end
 
     it "coerce empty values to nil when using dry-types | operator" do
       subject.date_of_death_by_unicorns = ""
-      subject.date_of_death_by_unicorns.must_equal nil
+      subject.date_of_death_by_unicorns.must_be_nil
     end
 
     it "converts blank string to nil, without :type option" do
       subject.id = ""
-      subject.id.must_equal nil
+      subject.id.must_be_nil
     end
   end
 end
 
 # this converts "" to nil and then breaks because it's strict.
-# Types::Strict::String.constructor(Dry::Types::Coercions::Form.method(:to_nil))
+# Types::Strict::String.constructor(Dry::Types::Params.method(:to_nil))
 
 class CoercionTypingTest < MiniTest::Spec
   class Song < Disposable::Twin
     include Coercion
     include Setup::SkipSetter
 
-    # property :title, type: Dry::Types::Strict::String.constructor(Dry::Types::Coercions::Form.method(:to_nil))
+    # property :title, type: Dry::Types::Strict::String.constructor(Dry::Types::Params.method(:to_nil))
     property :title, type: Types::Strict::String.optional # this is the behavior of the "DB" data twin. this is NOT the form.
 
-    # property :name, type: Types::Form::String
+    # property :name, type: Types::Params::String
   end
 
   it do
@@ -155,12 +153,14 @@ class CoercionTypingTest < MiniTest::Spec
     include Setup::SkipSetter
 
 
-    # property :title, type: Dry::Types::Strict::String.constructor(Dry::Types::Coercions::Form.method(:to_nil))
-    property :title, type: Types::Strict::String.optional.constructor(Dry::Types::Coercions::Form.method(:to_nil)) # this is the behavior of the "DB" data twin. this is NOT the form.
+    # property :title, type: Dry::Types::Strict::String.constructor(Dry::Types::Params.method(:to_nil))
+
+    constructor = Disposable::Twin::Coercion::DRY_TYPES_VERSION < 13 ? 'form.nil' : 'params.nil'
+    property :title, type: Types::Strict::String.optional.constructor(Dry::Types[constructor]) # this is the behavior of the "DB" data twin. this is NOT the form.
 
-    # property :name, type: Types::Form::String
+    # property :name, type: Types::Params::String
 
-    property :enabled, type: Types::Form::Bool
+    property :enabled, type: DRY_TYPES_CONSTANT::Bool
     # property :enabled, Bool.constructor(:trim!)
   end
   it do

data/test/twin/collection_test.rb

@@ -44,7 +44,7 @@ class TwinCollectionTest < MiniTest::Spec
     let (:album) { Model::Album.new(1, "The Rest Is Silence", [Model::Song.new(3), Model::Song.new(4)]) }
     let (:twin) { Twin::Album.new(album) }
 
-    it { twin.songs.find_by(id: 1).must_equal nil }
+    it { twin.songs.find_by(id: 1).must_be_nil }
     it { twin.songs.find_by(id: 3).must_equal twin.songs[0] }
     it { twin.songs.find_by(id: 4).must_equal twin.songs[1] }
     it { twin.songs.find_by(id: "4").must_equal twin.songs[1] }
@@ -172,7 +172,7 @@ class TwinCollectionActiveRecordTest < MiniTest::Spec
       twin.songs.added.must_equal []
       twin.songs << song2
       twin.songs.added.must_equal [twin.songs[1]]
-      twin.songs.insert(2, song3 = Song.new)
+      twin.songs.insert(2, Song.new)
       twin.songs.added.must_equal [twin.songs[1], twin.songs[2]]
 
       # TODO: what to do if we override an item (insert)?
@@ -180,7 +180,7 @@ class TwinCollectionActiveRecordTest < MiniTest::Spec
   end
 
   describe "#deleted" do
-    let (:album) { Album.create(name: "The Rest Is Silence", songs: [song1, song2, song3 = Song.new]) }
+    let (:album) { Album.create(name: "The Rest Is Silence", songs: [song1, song2, Song.new]) }
 
     it do
       twin = Twin::Album.new(album)

data/test/twin/hash_test.rb

@@ -33,9 +33,9 @@ class HashTest < MiniTest::Spec
 
     song = Song.new(model)
     song.id.must_equal 1
-    song.content.title.must_equal nil
-    song.content.band.name.must_equal nil
-    song.content.band.label.location.must_equal nil
+    song.content.title.must_be_nil
+    song.content.band.name.must_be_nil
+    song.content.band.label.location.must_be_nil
     song.content.releases.must_equal []
 
     # model's hash hasn't changed.
@@ -48,9 +48,9 @@ class HashTest < MiniTest::Spec
 
     song = Song.new(model)
     song.id.must_equal 1
-    song.content.title.must_equal nil
-    song.content.band.name.must_equal nil
-    song.content.band.label.location.must_equal nil
+    song.content.title.must_be_nil
+    song.content.band.name.must_be_nil
+    song.content.band.label.location.must_be_nil
 
     # model's hash hasn't changed.
     model.inspect.must_equal "#<struct HashTest::Model id=1, content=nil>"
@@ -137,7 +137,7 @@ class HashTest < MiniTest::Spec
       include Property::Hash
       feature Coercion
 
-      property :id, type: Types::Coercible::Int
+      property :id, type: const_get("Types::Coercible::#{DRY_TYPES_INT_CONSTANT}")
       property :content, field: :hash do
         property :title
         property :band do
@@ -161,7 +161,7 @@ class HashTest < MiniTest::Spec
       include Property::Hash
 
       property :id
-      content=property :content, field: :hash do
+      property :content, field: :hash do
         property :title
         property :band do
           property :name
@@ -198,12 +198,59 @@ class HashTest < MiniTest::Spec
       song.content.title.must_equal "Notorious"
 
       # singular nested accessors
-      song.band.name.must_equal nil
-      song.content.band.name.must_equal nil
+      song.band.name.must_be_nil
+      song.content.band.name.must_be_nil
       song.band.name = "Duran Duran"
       song.band.name.must_equal "Duran Duran"
     end
   end
+
+  describe 'collection schema' do
+    AlbumModel = Struct.new(:id, :songs)
+    class Album < Disposable::Twin
+      feature Sync
+      feature Property::Hash
+
+      property :id
+      collection :songs, field: :hash do
+        property :title
+        property :band do
+          property :name
+
+          property :label do
+            property :location
+          end
+        end
+
+        collection :featured_artists do
+          property :name
+        end
+      end
+    end
+
+    it "exposes reader and writer" do
+      model = AlbumModel.new(1, [
+        { title: "Sherry", band: { name: 'The Four Seasons', label: { location: 'US' } }, featured_artists: [{ name: 'Frankie Valli' }, { name: 'The Variatones' }] },
+        { title: "Walk Like a Man", band: { name: 'The Four Seasons', label: { location: 'US' } }, featured_artists: [{ name: 'Frankie Valli' }] }
+      ])
+      contract = Album.new(model)
+
+      song1 = contract.songs[0]
+
+      song1.title.must_equal "Sherry"
+      song1.band.name.must_equal 'The Four Seasons'
+      song1.band.label.location.must_equal 'US'
+      song1.featured_artists[0].name.must_equal 'Frankie Valli'
+      song1.featured_artists[1].name.must_equal 'The Variatones'
+
+      song2 = contract.songs[1]
+
+      song2.title.must_equal "Walk Like a Man"
+      song2.band.name.must_equal 'The Four Seasons'
+      song2.band.label.location.must_equal 'US'
+      song2.featured_artists[0].name.must_equal 'Frankie Valli'
+    end
+  end
 end
 
 # fixme: make sure default hash is different for every invocation, and not created at compile time.

data/test/twin/option_test.rb

@@ -28,7 +28,7 @@
 #   # option is not delegated to model.
 #   it { twin.preview?.must_equal false }
 #   # not passing option means zero.
-#   it { twin.current_user.must_equal nil }
+#   it { twin.current_user.must_be_nil }
 
 #   describe "passing all options" do
 #     let (:twin) { Song.new(song, :preview? => false, current_user: Object) }

data/test/twin/parent_test.rb

@@ -27,14 +27,14 @@ class TwinParentTest < MiniTest::Spec
 
   let (:album) { Album.new(Model::Album.new(1, Model::Artist.new("Helloween"), [Model::Song.new("I'm Alive", Model::Artist.new("Kai Hansen"))])) }
 
-  it { album.parent.must_equal nil }
+  it { album.parent.must_be_nil }
   it { album.artist.parent.must_equal album }
   it { album.songs[0].parent.must_equal album }
   it { album.songs[0].composer.parent.must_equal album.songs[0] }
 
   describe "Collection#append" do
     it do
-      album.songs.append(song = Model::Song.new)
+      album.songs.append(Model::Song.new)
       album.songs[1].parent.must_equal album
     end
   end

data/test/twin/property_processor_test.rb

@@ -5,7 +5,7 @@ class PropertyProcessorTest < Minitest::Spec
 	Artist = Struct.new(:name)
 	Song   = Struct.new(:id)
 
- 	class AlbumTwin < Disposable::Twin
+  class AlbumTwin < Disposable::Twin
     property :title
 
     property :artist do
@@ -35,7 +35,7 @@ class PropertyProcessorTest < Minitest::Spec
 
   	it "allows nil collection" do
   		twin   = AlbumTwin.new(Album.new("Live!", Artist.new, nil))
-	    
+
 	    called = []
 	    Disposable::Twin::PropertyProcessor.new(twin.class.definitions.get(:songs), twin).() { |v, i| called << [v.model, i] }
 

data/test/twin/readable_test.rb

@@ -30,9 +30,9 @@ class ReadableTest < MiniTest::Spec
   let (:twin) { PasswordForm.new(cred) }
 
   it {
-    twin.password.must_equal nil            # not readable.
+    twin.password.must_be_nil            # not readable.
     twin.credit_card.name.must_equal "Jonny"
-    twin.credit_card.number.must_equal nil  # not readable.
+    twin.credit_card.number.must_be_nil  # not readable.
 
     # manual setting on the twin works.
     twin.password = "123"

data/test/twin/save_test.rb

@@ -88,19 +88,19 @@ class SaveTest < MiniTest::Spec
     nested_hash.must_equal({"name"=>"Live And Dangerous", "songs"=>[{"title"=>"Southbound", "composer"=>nil}, {"title"=>"The Boys Are Back In Town", "composer"=>{"name"=>"Lynott"}}], "artist"=>{"name"=>"Thin Lizzy"}})
 
     # nothing written to model.
-    album.name.must_equal nil
-    album.songs[0].title.must_equal nil
-    album.songs[1].title.must_equal nil
-    album.songs[1].composer.name.must_equal nil
-    album.artist.name.must_equal nil
+    album.name.must_be_nil
+    album.songs[0].title.must_be_nil
+    album.songs[1].title.must_be_nil
+    album.songs[1].composer.name.must_be_nil
+    album.artist.name.must_be_nil
 
     # nothing saved.
     # saved?
-    album.saved?.must_equal nil
-    album.songs[0].saved?.must_equal nil
-    album.songs[1].saved?.must_equal nil
-    album.songs[1].composer.saved?.must_equal nil
-    album.artist.saved?.must_equal nil
+    album.saved?.must_be_nil
+    album.songs[0].saved?.must_be_nil
+    album.songs[1].saved?.must_be_nil
+    album.songs[1].composer.saved?.must_be_nil
+    album.artist.saved?.must_be_nil
   end
 
 
@@ -148,9 +148,9 @@ class SaveTest < MiniTest::Spec
 
     # saved?
     album.saved?.must_equal true
-    album.songs[0].saved?.must_equal nil
-    album.songs[1].saved?.must_equal nil
-    album.songs[1].composer.saved?.must_equal nil # doesn't get saved.
+    album.songs[0].saved?.must_be_nil
+    album.songs[1].saved?.must_be_nil
+    album.songs[1].composer.saved?.must_be_nil # doesn't get saved.
     album.artist.saved?.must_equal true
   end
 
@@ -186,7 +186,7 @@ end
 #     form.save(length: lambda { |value, options| form.model.id = "#{value}: #{length_seconds}" })
 
 #     song.title.must_equal "A Poor Man's Memory"
-#     song.length.must_equal nil
+#     song.length.must_be_nil
 #     song.id.must_equal "10: 120"
 #   end
 # end

data/test/twin/struct/coercion_test.rb

@@ -0,0 +1,36 @@
+require "test_helper"
+require "disposable/twin/coercion"
+require "disposable/twin/property/struct"
+
+class StructCoercionTest < Minitest::Spec
+  ExpenseModel = Struct.new(:content)
+
+  class Expense < Disposable::Twin
+    feature Property::Struct
+    feature Coercion
+
+    property :content do
+      property :amount, type: DRY_TYPES_CONSTANT::Float
+    end
+
+    unnest :amount, from: :content
+  end
+
+
+  it do
+    twin = Expense.new( ExpenseModel.new({}) )
+
+    #- direct access, without unnest
+    twin.content.amount.must_be_nil
+    twin.content.amount = "1.8"
+    twin.content.amount.must_equal 1.8
+  end
+
+  it "via unnest" do
+    twin = Expense.new( ExpenseModel.new({}) )
+
+    twin.amount.must_be_nil
+    twin.amount = "1.8"
+    twin.amount.must_equal 1.8
+  end
+end

data/test/twin/struct_test.rb

@@ -12,7 +12,7 @@ class TwinStructTest < MiniTest::Spec
 
   # empty hash
   # it { Song.new({}).number.must_equal 1 }
-  it { Song.new({}).number.must_equal nil } # TODO: implement default.
+  it { Song.new({}).number.must_be_nil } # TODO: implement default.
 
   # model hash
   it { Song.new(number: 2).number.must_equal 2 }
@@ -179,7 +179,7 @@ class StructReadableWriteableTest < Minitest::Spec
   it "ignores readable: false" do
     song = Song.new(length: 123, id: 1)
     song.length.must_equal 123
-    song.id.must_equal nil
+    song.id.must_be_nil
   end
 
   it "ignores writeable: false" do

data/test/twin/sync_option_test.rb

@@ -58,7 +58,7 @@
 #       # Album#name :sync was called, first case.
 #       album.name.must_equal "processed+Run For Cover"
 #       # Song#title :sync called but returns nil.
-#       song.title.must_equal nil
+#       song.title.must_be_nil
 #       # Song#title :sync called and processed, first case.
 #       song_with_composer.title.must_equal "++Empty Rooms"
 
@@ -139,7 +139,7 @@
 #       # Album#name :sync was called, first case.
 #       album.name.must_equal "processed+Run For Cover"
 #       # Song#title :sync called but returns nil.
-#       song.title.must_equal nil
+#       song.title.must_be_nil
 #       # Song#title :sync called and processed, first case.
 #      #### song_with_composer.title.must_equal "++Empty Rooms"
 

data/test/twin/sync_test.rb

@@ -47,11 +47,11 @@ class TwinSyncTest < MiniTest::Spec
       fill_out!(twin)
 
       # not written to model, yet.
-      album.name.must_equal nil
-      album.songs[0].title.must_equal nil
-      album.songs[1].title.must_equal nil
-      album.songs[1].composer.name.must_equal nil
-      album.artist.name.must_equal nil
+      album.name.must_be_nil
+      album.songs[0].title.must_be_nil
+      album.songs[1].title.must_be_nil
+      album.songs[1].composer.name.must_be_nil
+      album.artist.name.must_be_nil
 
       twin.sync
 
@@ -82,9 +82,9 @@ class TwinSyncTest < MiniTest::Spec
       twin.songs[1].composer.name = "Lynott"
 
       # not written to model, yet.
-      album.name.must_equal nil
+      album.name.must_be_nil
       album.songs.must_equal []
-      album.artist.must_equal nil
+      album.artist.must_be_nil
 
       twin.sync # this assigns a new collection via #songs=.
 
@@ -110,11 +110,11 @@ class TwinSyncTest < MiniTest::Spec
         nested_hash.must_equal({"name"=>"Live And Dangerous", "songs"=>[{"title"=>"Southbound", "composer"=>nil}, {"title"=>"The Boys Are Back In Town", "composer"=>{"name"=>"Lynott"}}], "artist"=>{"name"=>"Thin Lizzy"}})
 
         # nothing written to model.
-        album.name.must_equal nil
-        album.songs[0].title.must_equal nil
-        album.songs[1].title.must_equal nil
-        album.songs[1].composer.name.must_equal nil
-        album.artist.name.must_equal nil
+        album.name.must_be_nil
+        album.songs[0].title.must_be_nil
+        album.songs[1].title.must_be_nil
+        album.songs[1].composer.name.must_be_nil
+        album.artist.name.must_be_nil
       end
 
       describe "nil values" do

data/test/twin/twin_test.rb

@@ -75,12 +75,12 @@ class TwinTest < MiniTest::Spec
 
     describe "deleting" do
       it "allows overwriting nested twin with nil" do
-        album = Model::Album.new(1, "Uncertain Terms", [], artist=Model::Artist.new("Greg Howe"))
+        album = Model::Album.new(1, "Uncertain Terms", [], Model::Artist.new("Greg Howe"))
         twin = Twin::Album.new(album)
         twin.artist.id.must_equal "Greg Howe"
 
         twin.artist = nil
-        twin.artist.must_equal nil
+        twin.artist.must_be_nil
       end
     end
 

data/test/twin/unnest_test.rb

@@ -25,12 +25,12 @@ class UnnestTest < MiniTest::Spec
   it "exposes accessors on top-level twin" do
     twin = Twin.new(OpenStruct.new(content: OpenStruct.new()))
 
-    twin.email.must_equal nil
+    twin.email.must_be_nil
     twin.email= 2
     twin.email.model.must_equal 2
 
 
-    twin.id.must_equal nil
+    twin.id.must_be_nil
     twin.id = 1
     twin.id.must_equal 1
   end

data/test/twin/virtual_test.rb

@@ -33,7 +33,7 @@ class VirtualTest < MiniTest::Spec
     end
 
     it "what" do
-      Raising.new(Object.new).id.must_equal nil
+      Raising.new(Object.new).id.must_be_nil
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disposable
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2018-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber
@@ -138,16 +138,16 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -166,16 +166,16 @@ dependencies:
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
 description: Decorators on top of your ORM layer.
 email:
 - apotonick@gmail.com
@@ -251,6 +251,7 @@ files:
 - test/twin/save_test.rb
 - test/twin/setup_test.rb
 - test/twin/skip_unchanged_test.rb
+- test/twin/struct/coercion_test.rb
 - test/twin/struct_test.rb
 - test/twin/sync_option_test.rb
 - test/twin/sync_test.rb
@@ -278,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Decorators on top of your ORM layer with change tracking, collection semantics
@@ -315,6 +316,7 @@ test_files:
 - test/twin/save_test.rb
 - test/twin/setup_test.rb
 - test/twin/skip_unchanged_test.rb
+- test/twin/struct/coercion_test.rb
 - test/twin/struct_test.rb
 - test/twin/sync_option_test.rb
 - test/twin/sync_test.rb