disposable 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95a247503e136210bf70026ebbf2a093de735bcc
-  data.tar.gz: d6f1d87dc8408223b808d6fa57c4286673393fb4
+  metadata.gz: 1a74d3e306a9301f6e9ab4b6aea20395df6eae38
+  data.tar.gz: a24e79ec0ade0a96579b0a25f520deea856e4e02
 SHA512:
-  metadata.gz: 40be1a5438aa2bf43fb992bb413dc2c503e3ead6f3698e0c91077af418704be339fa9e85d544926241eb2191a0d6226485b60534ec4ef51d2ef7c44b004d8e0b
-  data.tar.gz: 4f7e86c71d723b08ff766360816239973955f98220c4ed0b1c93ef10c0372a56279c0a175a373f5ae4dade28c09a758e490713fe4773064bedc394a2f7dc85a9
+  metadata.gz: f83c3a2ae0a3a85a5114afe05dec55ca9ceab8949b5472c3eb5324951f84a6251617b34611ecf185d9153bc954e216f415d48881e72b6ec0a69b8240f906fe09
+  data.tar.gz: 0bba9cf7c8603f36a0c2e005215fbd66a0b2ed833002eba606df4bcd94292c421540e8f7d3c581f92ba08e72dbc0e854d47bf5b8a75cceab62aecd7abca903dc

data/CHANGES.md

@@ -1,3 +1,8 @@
+# 0.4.1
+
+* Allow `false` as a `:default` value.
+* Use `Declarative::Builder` instead of `Uber::Builder`.
+
 # 0.4.0
 
 * In `#sync {}` with block, `nil` values will now be included in the nested hash, resulting in a hash as follows.

data/Gemfile

@@ -2,10 +2,16 @@ source "https://rubygems.org"
 gemspec
 
 # gem "representable", path: "../representable"
-gem "representable", "3.0.0"
+# gem "representable", "3.0.0"
 # gem "representable", github: "apotonick/representable"
 # gem "declarative", path: "../declarative"
 # gem "declarative", github: "apotonick/declarative"
 gem "minitest-line"
 
-gem "activerecord", "< 5.0.0"
+# gem "dry-struct"
+
+
+# gem "uber", path: "../uber"
+# gem "declarative-option", path: "../declarative-option"
+# gem "declarative-builder", path: "../declarative-builder"
+# gem "representable", path: "../representable"

data/disposable.gemspec

@@ -17,14 +17,16 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "uber"
-  spec.add_dependency "declarative", ">= 0.0.8", "< 1.0.0"
+  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_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
-  spec.add_development_dependency "activerecord"
+  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 "database_cleaner"

data/lib/disposable/twin/builder.rb

@@ -1,4 +1,4 @@
-require "uber/builder"
+require "declarative/builder"
 
 module Disposable
   class Twin
@@ -16,13 +16,13 @@ module Disposable
     module Builder
       def self.included(base)
         base.class_eval do
-          include Uber::Builder
+          include Declarative::Builder
 
           def self.build(model, options={}) # semi-public.
-            class_builder.call(model, options).new(model, options) # Uber::Builder::class_builder.
+            build!(self, model, options).new(model, options) # Declarative::Builder::build!.
           end
         end
       end
     end
   end
-end
+end

data/lib/disposable/twin/default.rb

@@ -1,3 +1,5 @@
+require "declarative/option"
+
 # TODO: allow default: -> for hashes, etc.
 module Disposable::Twin::Default
   def setup_value_for(dfn, options)
@@ -16,7 +18,7 @@ module Disposable::Twin::Default
   module ClassMethods
   private
     def build_definition(name, options={}, &block)
-      options = options.merge(default: Uber::Options::Value.new(options[:default])) if options[:default]
+      options = options.merge(default: Declarative::Option(options[:default], instance_exec: true)) if options.has_key?(:default)
       super
     end
   end

data/lib/disposable/twin/struct.rb

@@ -3,7 +3,7 @@ require "disposable/twin/property/struct"
 class Disposable::Twin
   module Struct
     def self.included(includer)
-      warn "[Disposable] The Struct module is deprecated, please use Property::Hash."
+      warn "[Disposable] The Struct module is deprecated, please use Property::Struct."
       includer.send(:include, Property::Struct)
     end
   end

data/lib/disposable/version.rb

@@ -1,3 +1,3 @@
 module Disposable
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/test/twin/coercion_test.rb

@@ -116,3 +116,77 @@ class CoercionTest < MiniTest::Spec
     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))
+
+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: Types::Strict::String.optional # this is the behavior of the "DB" data twin. this is NOT the form.
+
+    # property :name, type: Types::Form::String
+  end
+
+  it do
+    twin = Song.new(Struct.new(:title, :name).new)
+
+    # with type: Dry::Types::Strict::String
+    # assert_raises(Dry::Types::ConstraintError) { twin.title = nil }
+    twin.title = nil
+    twin.title.must_be_nil
+
+    twin.title = "Yo"
+    twin.title.must_equal "Yo"
+
+    twin.title = ""
+    twin.title.must_equal ""
+
+    assert_raises(Dry::Types::ConstraintError) { twin.title = :bla }
+    assert_raises(Dry::Types::ConstraintError) { twin.title = 1 }
+  end
+
+  # Form
+  class Form < 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: 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 :name, type: Types::Form::String
+
+    property :enabled, type: Types::Form::Bool
+    # property :enabled, Bool.constructor(:trim!)
+  end
+  it do
+    twin =Form.new(Struct.new(:title, :enabled).new)
+
+    # assert_raises(Dry::Types::ConstraintError) { twin.title = nil } # in form, we either have a blank string or the key's not present at all.
+    twin.title = nil
+    twin.title.must_be_nil
+
+    twin.title = "" # nilify blank strings
+    twin.title.must_be_nil
+
+    twin.title = "Yo"
+    twin.title.must_equal "Yo"
+
+    twin.enabled = " TRUE"
+    twin.enabled.must_equal true
+  end
+end
+
+
+# def title=(String value) # allow obj.title = "bla"
+# def title=(Nil)          # allow obj.title = nil
+
+
+
+# active = " TRUE HACK"
+# how to test/validate if active is boolean?
+

data/test/twin/default_test.rb

@@ -1,7 +1,7 @@
 require "test_helper"
 
 class DefaultTest < Minitest::Spec
-  Song     = Struct.new(:title, :genre, :composer)
+  Song     = Struct.new(:title, :new_album, :published, :genre, :composer)
   Composer = Struct.new(:name)
 
   class Twin < Disposable::Twin
@@ -12,14 +12,18 @@ class DefaultTest < Minitest::Spec
     property :composer, default: Composer.new do
       property :name, default: "NOFX"
     end
+    property :published, default: false
+    property :new_album, default: true
   end
 
   # all given.
   it do
-    twin = Twin.new(Song.new("Anarchy Camp", "Punk", Composer.new("Nofx")))
+    twin = Twin.new(Song.new("Anarchy Camp", false, true, "Punk", Composer.new("Nofx")))
     twin.title.must_equal "Anarchy Camp"
     twin.genre.must_equal "Punk"
     twin.composer.name.must_equal "Nofx"
+    twin.published.must_equal true
+    twin.new_album.must_equal false
   end
 
   # defaults, please.
@@ -28,12 +32,15 @@ class DefaultTest < Minitest::Spec
     twin.title.must_equal "Medio-Core"
     twin.composer.name.must_equal "NOFX"
     twin.genre.must_equal "Punk Rock DefaultTest::Song"
+    twin.published.must_equal false
+    twin.new_album.must_equal true
   end
 
   # false value is not defaulted.
   it do
-    twin = Twin.new(Song.new(false))
+    twin = Twin.new(Song.new(false, false))
     twin.title.must_equal false
+    twin.new_album.must_equal false
   end
 
   describe "inheritance" do

metadata

@@ -1,36 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: disposable
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2017-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: declarative
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.9
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -40,10 +40,38 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.9
     - - "<"
       - !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
@@ -110,16 +138,16 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.5
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -249,7 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Decorators on top of your ORM layer with change tracking, collection semantics