disposable 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 671f773f835c6eba43f53ee846d24f4ac5b72d2b
-  data.tar.gz: 0742d9831fb0bcd7d5e66e7352f829d787250cb2
+  metadata.gz: ac8377b25f70507f4f8864eeb8305ece5340f560
+  data.tar.gz: 14c1b2c3dfd514fb4d0fdd26e827dfea2cecfb83
 SHA512:
-  metadata.gz: fd89e067485d519c4cdd4ce66a3e02c6850bd78950c0854b11bdfa687d4847575cefad700b8a819fbd526279b3261c8e7c969124d43c31eb4d2d5e41c2e1aa9f
-  data.tar.gz: a1ebbb97af16dc427b484eaa311f47f0a4168cbfc27b77800f69384f4eae71124d6bf8b07829739efeb59352f76e3e07f8eef8a17b75b2818a474b273cda770e
+  metadata.gz: 5102f0279af1bed8b3a614833dc066b2e29e1ddff062896dfa2519bf31c67709119461399b8a6d03bf27b277428e503290e5e7f58d70d645e3c2ea14803a3af7
+  data.tar.gz: 3a752d1130a9f3b391534d968bdffe5661d362ca40db1e1b3adf018948003c805b56b6b5ef34efb29c874ee9b559ba5af501f446f3eb74e43126ac60ef7a8a6e

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.2.0
-  - 2.1.2
-  - 2.0.0
-  - 1.9.3
+  - 2.3.0 # why?
+  - 2.2
+  - 2.1
+  - 2.0
 gemfile:
   - Gemfile

data/CHANGES.md

@@ -1,3 +1,8 @@
+# 0.3.0
+
+* Use [dry-types](https://github.com/dry-rb/dry-types) as a replacement for the deprecated virtus. You have to change to dry-types' constants.
+* Add `:nilify` option to avoid processing blank strings.
+
 # 0.2.6
 
 * Manual accessors are no longer overridden when inheriting twin classes.

data/README.md

@@ -193,14 +193,16 @@ class AlbumTwin < Disposable::Twin
 
 ## Coercion
 
-Twins can use [Virtus](https://github.com/solnic/virtus) coercion. This will override the setter in your twin, coerce the incoming value, and call the original setter. _Nothing more_ will happen.
+Twins can use [dry-types](https://github.com/dry-rb/dry-types) coercion. This will override the setter in your twin, coerce the incoming value, and call the original setter. _Nothing more_ will happen.
+
+Disposable already defines a module `Disposable::Twin::Coercion::Types` with all the Dry::Types built-in types. So you can use any of the types documented in http://dry-rb.org/gems/dry-types/built-in-types/.
 
 ```ruby
 class AlbumTwin < Disposable::Twin
   feature Coercion
   feature Setup::SkipSetter
 
-  property :id, type: Integer
+  property :id, type: Types::Form::Int
 ```
 
 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.
@@ -212,7 +214,6 @@ twin.id #=> 1
 
 Again, coercion only happens in the setter.
 
-
 ## Defaults
 
 Default values can be set via `:default`.

data/disposable.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "activerecord"
   spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "virtus"
+  spec.add_development_dependency "dry-types", "~> 0.6"
   # spec.add_development_dependency "database_cleaner"
 end

data/lib/disposable/twin/coercion.rb

@@ -1,17 +1,24 @@
-require "virtus"
+require "dry-types"
 
-# confession: i love virtus' coercion.
 module Disposable::Twin::Coercion
+  module Types
+    include Dry::Types.module
+  end
+
   module ClassMethods
     def property(name, options={}, &block)
       super(name, options, &block).tap do
-        coercing_setter!(name, options[:type])  # define coercing setter after twin.
+        coercing_setter!(name, options[:type], options[:nilify]) if options[:type] || options[:nilify]
       end
     end
 
-    def coercing_setter!(name, type)
+    def coercing_setter!(name, type, nilify=false)
+     type = type ? (Types::Form::Nil | type) : Types::Form::Nil if nilify
+
       mod = Module.new do
-        define_method("#{name}=") { |value| super Virtus::Attribute.build(type).coerce(value) }
+        define_method("#{name}=") do |value|
+          super type.call(value)
+        end
       end
       include mod
     end

data/lib/disposable/version.rb

@@ -1,3 +1,3 @@
 module Disposable
-  VERSION = "0.2.6"
+  VERSION = "0.3.0"
 end

data/test/twin/changed_test.rb

@@ -114,24 +114,23 @@ class ChangedWithCoercionTest < MiniTest::Spec
     include Changed
     include Coercion
 
-    property :released, type: Virtus::Attribute::Boolean
+    property :released, type: Types::Form::Bool
   end
 
   it do
     twin = SongTwin.new(Song.new)
     twin.changed?(:released).must_equal false
-    twin.released = 1
+    twin.released = 'true'
     twin.released.must_equal true
     twin.changed?(:released).must_equal true
   end
 
   it do
     twin = SongTwin.new(Song.new(true))
-    twin.released = true
     twin.changed?(:released).must_equal false
-    twin.released = 1 # it coerces, then assigns, then compares, which makes this NOT changed.
+    twin.released = 'true' # it coerces, then assigns, then compares, which makes this NOT changed.
     twin.changed?(:released).must_equal false
-    twin.released = false
+    twin.released = 'false'
     twin.changed?(:released).must_equal true
   end
 end

data/test/twin/coercion_test.rb

@@ -3,84 +3,116 @@ require "test_helper"
 require "disposable/twin/coercion"
 
 class CoercionTest < MiniTest::Spec
-  Band = Struct.new(:label)
 
-  class Irreversible < Virtus::Attribute
-    def coerce(value)
-      value*2
-    end
-  end
-
-  class Twin < Disposable::Twin
+  class TwinWithSkipSetter < Disposable::Twin
     feature Coercion
     feature Setup::SkipSetter
 
     property :id
-    property :released_at, :type => DateTime
+    property :released_at, type: Types::Form::DateTime
 
     property :hit do
-      property :length, :type => Integer
-      property :good,   :type => Virtus::Attribute::Boolean
+      property :length, type: Types::Coercible::Int
+      property :good,   type: Types::Bool
     end
 
     property :band do
       property :label do
-        property :value, :type => Irreversible
+        property :value, type: Types::Coercible::Float
       end
     end
   end
 
-  subject do
-    Twin.new(album)
+  describe "with Setup::SkipSetter" do
+
+    subject do
+      TwinWithSkipSetter.new(album)
+    end
+
+    let (:album) {
+      OpenStruct.new(
+        id: 1,
+        :released_at => "31/03/1981",
+        :hit         => OpenStruct.new(:length => "312"),
+        :band        => OpenStruct.new(:label => OpenStruct.new(:value => "9999.99"))
+      )
+    }
+
+    it "NOT coerce values in setup" do
+      subject.released_at.must_equal "31/03/1981"
+      subject.hit.length.must_equal "312"
+      subject.band.label.value.must_equal "9999.99"
+    end
+
+
+    it "coerce values when using a setter" do
+      subject.id = Object
+      subject.released_at = "30/03/1981"
+      subject.hit.length = "312"
+      subject.band.label.value = "9999.99"
+
+      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.band.label.value.must_equal 9999.99
+    end
   end
 
-  let (:album) {
-    OpenStruct.new(
-      id: 1,
-      :released_at => "31/03/1981",
-      :hit         => OpenStruct.new(:length => "312"),
-      :band        => Band.new(OpenStruct.new(:value => "9999.99"))
-    )
-  }
-
-  # it { subject.released_at.must_be_kind_of DateTime }
-  it { subject.released_at.must_equal "31/03/1981" } # NO coercion in setup.
-  it { subject.hit.length.must_equal "312" }
-  it { subject.band.label.value.must_equal "9999.99" }
-
-
-  it do
-    subject.id = Object
-    subject.released_at = "30/03/1981"
-    subject.hit.length = "312"
-    subject.band.label.value = "9999.99"
-
-    subject.id = Object
-    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.band.label.value.must_equal "9999.999999.99" # coercion happened once.
+  class TwinWithoutSkipSetter < Disposable::Twin
+    feature Coercion
+    property :id, type: Types::Coercible::Int
   end
-end
 
+  describe "without Setup::SkipSetter" do
 
-class CoercionWithoutSkipSetterTest < MiniTest::Spec
-  class Irreversible < Virtus::Attribute
-    def coerce(value)
-      value*2
+    subject do
+      TwinWithoutSkipSetter.new(OpenStruct.new(id: "1"))
+    end
+
+    it "coerce values in setup and when using a setter" do
+      subject.id.must_equal 1
+      subject.id = "2"
+      subject.id.must_equal 2
     end
   end
 
-  class Twin < Disposable::Twin
+  class TwinWithNilify < Disposable::Twin
     feature Coercion
-    property :id, type: Irreversible
+
+    property :date_of_birth,
+             type: Types::Form::Date, nilify: true
+    property :date_of_death_by_unicorns,
+             type: Types::Form::Nil | Types::Form::Date
+    property :id, nilify: true
   end
 
-  it do
-    twin = Twin.new(OpenStruct.new(id: "1"))
-    twin.id.must_equal "11" # coercion happens in Setup.
-    twin.id = "2"
-    twin.id.must_equal "22"
+  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))
+    end
+
+    it "coerce values correctly" do
+      subject.date_of_birth.must_equal Date.parse('1990-01-12')
+      subject.date_of_death_by_unicorns.must_equal Date.parse('2037-02-18')
+    end
+
+    it "coerce empty values to nil when using option nilify: true" do
+      subject.date_of_birth = ""
+      subject.date_of_birth.must_equal 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
+    end
+
+    it "converts blank string to nil, without :type option" do
+      subject.id = ""
+      subject.id.must_equal nil
+    end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disposable
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber
@@ -129,19 +129,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: virtus
+  name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 description: Decorators on top of your ORM layer.
 email:
 - apotonick@gmail.com