disposable 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a0b6cd70b82bc532b0a07ca0035dc1f1c6b112cb90fca7d244e1ac3468c327f
-  data.tar.gz: 661653dde2ad0f4aca0107e84605e92764952023aae4c7b0d624cded6d7130ad
+  metadata.gz: 0d17fbfc73eb6b25b90136d515733b694ac2631ad3861f47d62dde5517ec394b
+  data.tar.gz: be69f4aaed8fda60749dcb3dc3188bb57def014cd91715198baab0eebd801386
 SHA512:
-  metadata.gz: f382b96782f326b2b52a85cfdf340c99a29824af3aa7cccbf9129a146700b73b6b48137361e56a7b1b017b48236c6aef15029d98b78a35e192eafeb765caacb2
-  data.tar.gz: b2712eab0e52144fbe418e2035dc39ccba6ce241304debaab9e04b4ee39f71dcc3eb95a77c0f1d2885538c38361f6efb896620c052e4bcb58f1529390b61eae8
+  metadata.gz: eb4b2eca60ed3001be80d50eff19fe008abf68030a99101eb0282b5fe65d091c21d62537a3dcbfafb32484e985d4e670377d701413de25832b8195f0ff08cdeb
+  data.tar.gz: b95131034f38c0907672943108c0633164817981ba0107c508e618467b69f0c7f2e914c91d1152219b3488e6432cd1a9839e394704a1465e1792ef540140613e

data/.travis.yml

@@ -7,6 +7,9 @@ rvm:
   - 2.3
   - 2.2
 env:
+  - "DRY_TYPES=1.1"
+  - "DRY_TYPES=1.0"
+  - "DRY_TYPES=0.15"
   - "DRY_TYPES=0.13"
   - "DRY_TYPES=0.12"
   - "ACTIVERECORD=5.0"
@@ -29,3 +32,11 @@ matrix:
     - rvm: ruby-head
     - env: ACTIVERECORD=4.1
     - rvm: 2.1
+    - rvm: 2.2
+  exclude:
+    - { rvm: 2.3, env: DRY_TYPES=1.1 }
+    - { rvm: 2.2, env: DRY_TYPES=1.1 }
+    - { rvm: 2.3, env: DRY_TYPES=1.0 }
+    - { rvm: 2.2, env: DRY_TYPES=1.0 }
+    - { rvm: 2.3, env: DRY_TYPES=0.15 }
+    - { rvm: 2.2, env: DRY_TYPES=0.15 }

data/CHANGES.md

@@ -1,3 +1,9 @@
+# 0.4.6
+
+* Remove deprecation warnings for newer versions of dry-types
+* Fix sqlite3 version to 1.3.x to avoid issue with AR 5.0
+* Raise an error if class is used as property name
+
 # 0.4.5
 
 * Use Gem::Version to detect version for dry-types

data/disposable.gemspec

@@ -22,11 +22,11 @@ Gem::Specification.new do |spec|
   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 "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"
+  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.rb

@@ -9,6 +9,9 @@ require "representable/decorator"
 
 module Disposable
   class Twin
+    class InvalidPropertyNameError < StandardError; end
+    INVALID_PROPERTY_NAMES = %i[class].freeze
+
     extend Declarative::Schema
     def self.definition_class
       Definition
@@ -32,6 +35,10 @@ module Disposable
 
       # TODO: move to Declarative, as in Representable and Reform.
       def property(name, options={}, &block)
+        if INVALID_PROPERTY_NAMES.include?(name)
+          raise InvalidPropertyNameError.new("#{name} is used internally and cannot be used as property name")
+        end
+
         options[:private_name] ||= options.delete(:from) || name
         is_inherited = options.delete(:_inherited)
 

data/lib/disposable/twin/coercion.rb

@@ -2,7 +2,9 @@ require "dry-types"
 
 module Disposable::Twin::Coercion
   module Types
-    include Dry::Types.module
+    # NOTE: Use Dry.Types() instead. Beware, it exports strict types by default, for old behavior use Dry.Types(default: :nominal)
+    DRY_MODULE =  Gem::Version.new(Dry::Types::VERSION) < Gem::Version.new("0.15.0") ? Dry::Types.module : Dry.Types()
+    include DRY_MODULE
   end
 
   DRY_TYPES_VERSION = Gem::Version.new(Dry::Types::VERSION)

data/lib/disposable/version.rb

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

data/test/twin/changed_test.rb

@@ -114,7 +114,7 @@ class ChangedWithCoercionTest < MiniTest::Spec
     include Changed
     include Coercion
 
-    property :released, type: DRY_TYPES_CONSTANT::Bool
+    property :released, type: DRY_TYPES_CONSTANT::Bool | DRY_TYPES_CONSTANT::Nil
   end
 
   it do
@@ -133,4 +133,4 @@ class ChangedWithCoercionTest < MiniTest::Spec
     twin.released = 'false'
     twin.changed?(:released).must_equal true
   end
-end
+end

data/test/twin/coercion_test.rb

@@ -82,7 +82,7 @@ class CoercionTest < MiniTest::Spec
              type: DRY_TYPES_CONSTANT::Date, nilify: true
     property :date_of_death_by_unicorns,
              type: DRY_TYPES_CONSTANT::Nil | DRY_TYPES_CONSTANT::Date
-    property :id, nilify: true
+    property :id, type: const_get("Types::Coercible::#{DRY_TYPES_INT_CONSTANT}"), nilify: true
   end
 
   describe "with Nilify" do
@@ -155,8 +155,7 @@ class CoercionTypingTest < MiniTest::Spec
 
     # property :title, type: Dry::Types::Strict::String.constructor(Dry::Types::Params.method(:to_nil))
 
-    constructor = Disposable::Twin::Coercion::DRY_TYPES_VERSION < Gem::Version.new("0.13.0") ? '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 :title, type: DRY_TYPES_CONSTANT::Nil | Types::Strict::String # this is the behavior of the "DB" data twin. this is NOT the form.
 
     # property :name, type: Types::Params::String
 

data/test/twin/struct/coercion_test.rb

@@ -10,7 +10,7 @@ class StructCoercionTest < Minitest::Spec
     feature Coercion
 
     property :content do
-      property :amount, type: DRY_TYPES_CONSTANT::Float
+      property :amount, type: DRY_TYPES_CONSTANT::Float | DRY_TYPES_CONSTANT::Nil
     end
 
     unnest :amount, from: :content

data/test/twin/twin_test.rb

@@ -152,3 +152,13 @@ class AccessorsTest < Minitest::Spec
     twin.format = "blubb"
   end
 end
+
+class InvalidPropertyNameTest < Minitest::Spec
+  it 'raises InvalidPropertyNameError' do
+  assert_raises(Disposable::Twin::InvalidPropertyNameError) {
+      class Twin < Disposable::Twin
+        property :class
+      end
+    }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disposable
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-30 00:00:00.000000000 Z
+date: 2019-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber
@@ -96,16 +96,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -152,16 +152,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
@@ -273,7 +273,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Decorators on top of your ORM layer with change tracking, collection semantics