declarative 0.0.9 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 85ae72ce17160c8d0d6bbe197358967601d4565d
-  data.tar.gz: 28b480fc3526c9197fbe02899929c8a0cec4baa4
+SHA256:
+  metadata.gz: fc3dccaf0b8fa27ffd73acd1146949c5a79c1f950b72979038f20b34e751a516
+  data.tar.gz: f1744ace25a4cc4bb42ce3bb5d45a8ca09a993d8f5f7643e52bc747049674929
 SHA512:
-  metadata.gz: 6c2b2d5d60573417e5304f220cf3d1658bda2b5b52601b5ed554fb6447c1f62c5d4fad254c2b28dc68bf231aea8e0215bea5b565ade7189dfb6935efbf6fa534
-  data.tar.gz: 28abb6da89a87cbb256cce92327945641224cc077ef1f182451ce9695c02ed16aaeace1b5e56714ce948d9fafd4776de1312715893b07676ec0e8f1ca7ba6b44
+  metadata.gz: bac6ff5ad4c34454f3f2212f478299c7c1c22ff94d333149ff73ba93e24792d4b3c33f7cd78f7359fbc3a008c67412abb486b67fd22b22cd1b097f03f2816983
+  data.tar.gz: 8544c6eaa0ff5ebe1cefa67e5d003b2c44ad7ba0a353c1c169ef971b8a1dc496f7faaa0db75be987b92d45151a8c0db05babdf0f9d9718052cbb407e5ca8e30c

data/.travis.yml

@@ -1,8 +1,12 @@
 language: ruby
+before_install: gem install bundler
+cache: bundler
 rvm:
-  - 2.3.1
-  - 1.9.3
-gemfile:
-  - Gemfile
-before_install:
-  - gem install bundler
+  - ruby-head
+  - 2.7
+  - 2.6
+  - 2.5
+  - 2.4
+jobs:
+  allow_failures:
+    - rvm: ruby-head

data/CHANGES.md

@@ -1,3 +1,18 @@
+# 0.0.10
+
+* `Defaults.merge!` will now deprecate non-wrapped `Array` values. The following code is no longer valid (but still works).
+
+        defaults.merge!( list: [1,2] )
+
+    Instead, you need to wrap it in a command like `Variables::Append`.
+
+        defaults.merge!( list: Declarative::Variables::Append( [1,2] ) )
+
+    The reason for this change is to allow all kinds of operations with defaults variables, such as merges, overrides, append, prepend, and so on.
+
+* Introduce `Declarative::Variables.merge` to merge two sets of variables.
+* `Defaults` now uses `Variables` for merge/overide operations.
+
 # 0.0.9
 
 * Removing `uber` dependency.

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2015 Nick Sutterer
+Copyright (c) 2015-2020 Nick Sutterer
 
 MIT License
 

data/declarative.gemspec

@@ -9,15 +9,17 @@ Gem::Specification.new do |spec|
   spec.email         = ["apotonick@gmail.com"]
   spec.summary       = %q{DSL for nested schemas.}
   spec.description   = %q{DSL for nested generic schemas with inheritance and refining.}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/apotonick/declarative"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test)/})
+  end
+  spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = '>= 2.3.0'
 
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "minitest-line"
 end

data/lib/declarative/deep_dup.rb

@@ -1,14 +1,21 @@
+# frozen_string_literal: true
+
 module Declarative
-  class DeepDup
+  module DeepDup
     def self.call(args)
-      return Array[*dup_items(args)] if args.is_a?(Array)
-      return Hash[dup_items(args)] if args.is_a?(Hash)
-      args
+      case args
+      when Array
+        Array[*dup_items(args)]
+      when ::Hash
+        ::Hash[dup_items(args)]
+      else
+        args
+
+      end
     end
 
-  private
     def self.dup_items(arr)
       arr.to_a.collect { |v| call(v) }
     end
   end
-end
+end

data/lib/declarative/defaults.rb

@@ -1,16 +1,18 @@
 module Declarative
+  # {Defaults} is a mutable DSL object that collects default directives via #merge!.
+  # Internally, it uses {Variables} to implement the merging of defaults.
   class Defaults
     def initialize
       @static_options  = {}
-      @dynamic_options = ->(*) { Hash.new }
+      @dynamic_options = ->(*) { {} }
     end
 
     # Set default values. Usually called in Schema::defaults.
     # This can be called multiple times and will "deep-merge" arrays, e.g. `_features: []`.
     def merge!(hash={}, &block)
-      @static_options = Merge.(@static_options, hash)
-
+      @static_options  = Variables.merge( @static_options, handle_array_and_deprecate(hash) )
       @dynamic_options = block if block_given?
+
       self
     end
 
@@ -19,24 +21,25 @@ module Declarative
       # TODO: allow to receive rest of options/block in dynamic block. or, rather, test it as it was already implemented.
       evaluated_options = @dynamic_options.(name, given_options)
 
-      options = Merge.(@static_options, evaluated_options)
-      options = options.merge(given_options)
+      options = Variables.merge( @static_options, handle_array_and_deprecate(evaluated_options) )
+      Variables.merge( options, handle_array_and_deprecate(given_options) ) # FIXME: given_options is not tested!
+    end
+
+    def handle_array_and_deprecate(variables)
+      wrapped = Defaults.wrap_arrays(variables)
+
+      warn "[Declarative] Defaults#merge! and #call still accept arrays and automatically prepend those. This is now deprecated, you should replace `ary` with `Declarative::Variables::Append(ary)`." if wrapped.any?
+
+      variables.merge(wrapped)
     end
 
-    # Private! Don't use this anywhere.
-    # Merges two hashes and joins same-named arrays. This is often needed
-    # when dealing with defaults.
-    class Merge
-      def self.call(a, b)
-        a = a.dup
-        b.each do |k, v|
-          a[k] = v and next unless a.has_key?(k)
-          a[k] = v and next unless a[k].is_a?(Array)
-          a[k] = a[k] += v # only for arrays.
-        end
-
-        a
-      end
+    # Wrap arrays in `variables` with Variables::Append so they get appended to existing
+    # same-named arrays.
+    def self.wrap_arrays(variables)
+      Hash[ variables.
+        find_all { |k,v| v.instance_of?(Array) }.
+        collect  { |k,v| [k, Variables::Append(v)] }
+      ]
     end
   end
 end

data/lib/declarative/definitions.rb

@@ -1,7 +1,7 @@
 module Declarative
-  class Definitions < Hash
+  class Definitions < ::Hash
     class Definition
-      def initialize(name, options={}, &block)
+      def initialize(name, options={})
         @options = options.dup
         @options[:name] = name.to_s
       end
@@ -40,7 +40,7 @@ module Declarative
       options = options[:_defaults].(name, options) if options[:_defaults] # FIXME: pipeline?
       base    = options[:_base]
 
-      if options.delete(:inherit) and parent_property = get(name)
+      if options.delete(:inherit) and (parent_property = get(name))
         base    = parent_property[:nested]
         options = parent_property.merge(options) # TODO: Definition#merge
       end
@@ -71,4 +71,4 @@ module Declarative
       options[:_nested_builder].(options)
     end
   end
-end
+end

data/lib/declarative/heritage.rb

@@ -13,13 +13,6 @@ module Declarative
       each { |cfg| call!(inheritor, cfg, &block) }
     end
 
-  private
-    def call!(inheritor, cfg)
-      yield cfg if block_given? # allow messing around with recorded arguments.
-
-      inheritor.send(cfg[:method], *cfg[:args], &cfg[:block])
-    end
-
     module DSL
       def heritage
         @heritage ||= Heritage.new
@@ -41,5 +34,12 @@ module Declarative
         heritage.(mod)
       end
     end
+
+  private
+    def call!(inheritor, cfg)
+      yield cfg if block_given? # allow messing around with recorded arguments.
+
+      inheritor.send(cfg[:method], *cfg[:args], &cfg[:block])
+    end
   end
 end

data/lib/declarative/schema.rb

@@ -1,5 +1,6 @@
 require "declarative/definitions"
 require "declarative/defaults"
+require "declarative/variables"
 require "declarative/heritage"
 
 module Declarative
@@ -27,6 +28,10 @@ module Declarative
       def defaults(options={}, &block)
         heritage.record(:defaults, options, &block)
 
+        # Always convert arrays to Variables::Append instructions.
+        options = options.merge( Defaults.wrap_arrays(options) )
+        block   = wrap_arrays_from_block(block) if block_given?
+
         _defaults.merge!(options, &block)
       end
 
@@ -40,11 +45,14 @@ module Declarative
 
     private
       def build_definition(name, options={}, &block)
-        default_options = {}
-        default_options[:_base]           = default_nested_class
-        default_options[:_defaults]       = _defaults
+        default_options = {
+            _base: default_nested_class,
+            _defaults: _defaults
+        }
         default_options[:_nested_builder] = nested_builder if block
 
+        # options = options.merge( Defaults.wrap_arrays(options) )
+
         definitions.add(name, default_options.merge(options), &block)
       end
 
@@ -62,6 +70,16 @@ module Declarative
           class_eval(&options[:_block])
         end
       end
+
+      # When called, executes `block` and wraps all array values in Variables::Append.
+      # This is the default behavior in older versions and allows to provide arrays for
+      # default values that will be prepended.
+      def wrap_arrays_from_block(block)
+        ->(*args) {
+          options = block.(*args)
+          options.merge( Defaults.wrap_arrays( options ) )
+        }
+      end
     end
 
     module Feature
@@ -78,7 +96,7 @@ module Declarative
       def register_feature(mod)
         heritage.record(:register_feature, mod) # this is only for inheritance between decorators and modules!!! ("horizontal and vertical")
 
-        defaults.merge!(_features: [mod])
+        defaults.merge!( _features: Variables::Append([mod]) )
       end
     end
   end

data/lib/declarative/testing.rb

@@ -1,12 +1,24 @@
+# frozen_string_literal: true
+
 module Declarative
+  def self.Inspect(obj)
+    string = obj.inspect
+
+    if obj.is_a?(Proc)
+      elements = string.split('/')
+      string = "#{elements.first}#{elements.last}"
+    end
+    string.gsub(/0x\w+/, '')
+  end
+
   module Inspect
     def inspect
       string = super
       if is_a?(Proc)
-        elements = string.split("/")
+        elements = string.split('/')
         string = "#{elements.first}#{elements.last}"
       end
-      string.gsub(/0x\w+/, "")
+      string.gsub(/0x\w+/, '')
     end
 
     module Schema
@@ -19,15 +31,15 @@ module Declarative
 
   module Definitions::Inspect
     def inspect
-      each { |dfn|
+      each do |dfn|
         dfn.extend(Declarative::Inspect)
 
-        if dfn[:nested] && dfn[:nested].is_a?(Declarative::Schema::DSL)
+        if dfn[:nested]&.is_a?(Declarative::Schema::DSL)
           dfn[:nested].extend(Declarative::Inspect::Schema)
         else
-          dfn[:nested].extend(Declarative::Definitions::Inspect) if dfn[:nested]
+          dfn[:nested]&.extend(Declarative::Definitions::Inspect)
         end
-      }
+      end
       super
     end
 
@@ -35,4 +47,4 @@ module Declarative
       super.extend(Declarative::Inspect)
     end
   end
-end
+end

data/lib/declarative/variables.rb

@@ -0,0 +1,38 @@
+module Declarative
+  # Implements the pattern of maintaining a hash of key/values (usually "defaults")
+  # that are mutated several times by user and library code (override defaults).
+  #
+  # The Variables instance then represents the configuration data to be processed by the
+  # using library (e.g. Representable or Trailblazer).
+  class Variables
+    class Proc < ::Proc
+    end
+
+    # @return Hash hash where `overrides` is merged onto `defaults` respecting Merge, Append etc.
+    def self.merge(defaults, overrides)
+      defaults = defaults.merge({}) # todo: use our DeepDup. # TODO: or how could we provide immutability?
+
+      overrides.each do |k, v|
+        if v.is_a?(Variables::Proc)
+          defaults[k] = v.( defaults[k] )
+        else
+          defaults[k] = v
+        end
+      end
+
+      defaults
+    end
+
+    def self.Merge(merged_hash)
+      Variables::Proc.new do |original|
+        (original || {}).merge( merged_hash )
+      end
+    end
+
+    def self.Append(appended_array)
+      Variables::Proc.new do |original|
+        (original || []) + appended_array
+      end
+    end
+  end # Variables
+end

data/lib/declarative/version.rb

@@ -1,3 +1,3 @@
 module Declarative
-  VERSION = "0.0.9"
+  VERSION = "0.0.20"
 end

data/lib/declarative.rb

@@ -4,6 +4,7 @@ require "declarative/heritage"
 require "declarative/defaults"
 require "declarative/schema"
 require "declarative/deep_dup"
+require "declarative/variables"
 
 module Declarative
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: declarative
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.20
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-28 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -74,13 +74,9 @@ files:
 - lib/declarative/heritage.rb
 - lib/declarative/schema.rb
 - lib/declarative/testing.rb
+- lib/declarative/variables.rb
 - lib/declarative/version.rb
-- test/defaults_test.rb
-- test/definitions_test.rb
-- test/heritage_test.rb
-- test/schema_test.rb
-- test/test_helper.rb
-homepage: ''
+homepage: https://github.com/apotonick/declarative
 licenses:
 - MIT
 metadata: {}
@@ -92,21 +88,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: DSL for nested schemas.
-test_files:
-- test/defaults_test.rb
-- test/definitions_test.rb
-- test/heritage_test.rb
-- test/schema_test.rb
-- test/test_helper.rb
+test_files: []

data/test/defaults_test.rb

@@ -1,88 +0,0 @@
-require "test_helper"
-
-class DefaultsOptionsTest < Minitest::Spec
-  let (:song) { Struct.new(:title, :author_name, :song_volume, :description).new("Revolution", "Some author", 20, nil) }
-  let (:schema) { Declarative::Definitions.new(Declarative::Definitions::Definition).extend Declarative::Definitions::Inspect }
-  let (:defaults) { Declarative::Defaults.new }
-
-  describe "hash options combined with dynamic options" do
-    it do
-      defaults.merge!(render_nil: true) do |name|
-        { as: name.to_s.upcase }
-      end
-
-      schema.add :title, _defaults: defaults
-      schema.add :author_name
-      schema.add :description, _defaults: defaults
-
-      schema.inspect.must_equal '{"title"=>#<Declarative::Definitions::Definition: @options={:render_nil=>true, :as=>"TITLE", :name=>"title"}>, "author_name"=>#<Declarative::Definitions::Definition: @options={:name=>"author_name"}>, "description"=>#<Declarative::Definitions::Definition: @options={:render_nil=>true, :as=>"DESCRIPTION", :name=>"description"}>}'
-    end
-  end
-
-  describe "with only dynamic property options" do
-    it do
-      defaults.merge!({}) do |name|
-        { as: name.to_s.upcase }
-      end
-
-      schema.add :title, _defaults: defaults
-      schema.add :author_name
-      schema.add :description, _defaults: defaults
-
-      schema.inspect.must_equal '{"title"=>#<Declarative::Definitions::Definition: @options={:as=>"TITLE", :name=>"title"}>, "author_name"=>#<Declarative::Definitions::Definition: @options={:name=>"author_name"}>, "description"=>#<Declarative::Definitions::Definition: @options={:as=>"DESCRIPTION", :name=>"description"}>}'
-    end
-  end
-
-  describe "with only hashes" do
-    it do
-      defaults.merge!(render_nil: true)
-
-      schema.add :title, _defaults: defaults
-      schema.add :author_name
-      schema.add :description, _defaults: defaults
-
-      schema.inspect.must_equal '{"title"=>#<Declarative::Definitions::Definition: @options={:render_nil=>true, :name=>"title"}>, "author_name"=>#<Declarative::Definitions::Definition: @options={:name=>"author_name"}>, "description"=>#<Declarative::Definitions::Definition: @options={:render_nil=>true, :name=>"description"}>}'
-    end
-  end
-
-  describe "#add options win" do
-    it do
-      defaults.merge!(render_nil: true) do |name|
-        { as: name.to_s.upcase }
-      end
-
-      schema.add :title, as: "Title", _defaults: defaults
-      schema.add :author_name
-      schema.add :description, _defaults: defaults
-
-      schema.inspect.must_equal '{"title"=>#<Declarative::Definitions::Definition: @options={:render_nil=>true, :as=>"Title", :name=>"title"}>, "author_name"=>#<Declarative::Definitions::Definition: @options={:name=>"author_name"}>, "description"=>#<Declarative::Definitions::Definition: @options={:render_nil=>true, :as=>"DESCRIPTION", :name=>"description"}>}'
-    end
-  end
-
-
-  describe "multiple Defaults#merge!" do
-    it "merges arrays automatically" do
-      defaults.merge!(a: 1, b: 2)
-      defaults.merge!(      b: 3, _features: ["A"])
-      defaults.merge!(            _features: ["B", "C"])
-      defaults.(nil, {}).inspect.must_equal "{:a=>1, :b=>3, :_features=>[\"A\", \"B\", \"C\"]}"
-    end
-
-    it "what" do
-      defaults.merge!(_features: ["A"]) do |name, options|
-        { _features: ["B", "D"] }
-      end
-
-      defaults.(nil, {}).inspect.must_equal "{:_features=>[\"A\", \"B\", \"D\"]}"
-    end
-  end
-end
-
-class DefaultsMergeTest < Minitest::Spec
-  it do
-    a = { a: "a", features: ["b"] }
-    b = { a: "a", features: ["c", "d"], b: "b" }
-
-    Declarative::Defaults::Merge.(a, b).must_equal({:a=>"a", :features=>["b", "c", "d"], :b=>"b"})
-  end
-end

data/test/definitions_test.rb

@@ -1,95 +0,0 @@
-require "test_helper"
-
-class DefinitionsTest < Minitest::Spec
-  NestedBuilder = ->(options) {
-    base = options[:_base] || Declarative::Definitions.new(Declarative::Definitions::Definition)
-    base.instance_exec(&options[:_block])
-    base
-  }
-
-  let (:schema) { Declarative::Definitions.new(Declarative::Definitions::Definition).extend(Declarative::Definitions::Inspect) }
-
-  it "what" do
-    # #add works with name
-    schema.add :id
-    # get works with symbol
-    schema.get(:id).inspect.must_equal '#<Declarative::Definitions::Definition: @options={:name=>"id"}>'
-    # get works with string
-    schema.get("id").inspect.must_equal '#<Declarative::Definitions::Definition: @options={:name=>"id"}>'
-
-    # #add with name and options
-    schema.add(:id, unique: true)
-    schema.get(:id).inspect.must_equal '#<Declarative::Definitions::Definition: @options={:unique=>true, :name=>"id"}>'
-  end
-
-  it "overwrites old when called twice" do
-    schema.add :id
-    schema.add :id, cool: true
-    schema.inspect.must_equal '{"id"=>#<Declarative::Definitions::Definition: @options={:cool=>true, :name=>"id"}>}'
-  end
-
-  it "#add with block" do
-    schema.add :artist, _nested_builder: NestedBuilder do
-      add :name
-      add :band, _nested_builder: NestedBuilder do
-        add :location
-      end
-    end
-
-    schema.inspect.must_equal '{"artist"=>#<Declarative::Definitions::Definition: @options={:nested=>{"name"=>#<Declarative::Definitions::Definition: @options={:name=>"name"}>, "band"=>#<Declarative::Definitions::Definition: @options={:nested=>{"location"=>#<Declarative::Definitions::Definition: @options={:name=>"location"}>}, :name=>"band"}>}, :name=>"artist"}>}'
-  end
-
-  it "#add with :nested instead of block" do
-    nested_schema = Declarative::Definitions.new(Declarative::Definitions::Definition)
-    nested_schema.extend(Declarative::Definitions::Inspect)
-
-    nested_schema.add :name
-
-    schema.add :artist, nested: nested_schema
-
-    schema.inspect.must_equal '{"artist"=>#<Declarative::Definitions::Definition: @options={:nested=>{"name"=>#<Declarative::Definitions::Definition: @options={:name=>"name"}>}, :name=>"artist"}>}'
-  end
-
-
-  it "#add with inherit: true and block" do
-    schema.add :artist, cool: true, _nested_builder: NestedBuilder do
-      add :name
-      add :band, crazy: nil, _nested_builder: NestedBuilder do
-        add :location
-      end
-    end
-
-    schema.add :id, unique: true, value: 1
-
-    schema.add :artist, uncool: false, _nested_builder: NestedBuilder, inherit: true do
-      add :band, normal: false, _nested_builder: NestedBuilder, inherit: true do
-        add :genre
-      end
-    end
-
-    schema.add :id, unique: false, inherit: true
-
-    schema.inspect.must_equal '{"artist"=>#<Declarative::Definitions::Definition: @options={:cool=>true, :nested=>{"name"=>#<Declarative::Definitions::Definition: @options={:name=>"name"}>, "band"=>#<Declarative::Definitions::Definition: @options={:crazy=>nil, :nested=>{"location"=>#<Declarative::Definitions::Definition: @options={:name=>"location"}>, "genre"=>#<Declarative::Definitions::Definition: @options={:name=>"genre"}>}, :name=>"band", :normal=>false}>}, :name=>"artist", :uncool=>false}>, "id"=>#<Declarative::Definitions::Definition: @options={:unique=>false, :value=>1, :name=>"id"}>}'
-  end
-
-  it "#add with nested options followed by inherit: true" do
-    schema.add :id, deserializer: options = { render: false }
-    schema.add :id, inherit: true
-
-    schema.get(:id)[:deserializer][:parse] = true
-
-    options.must_equal(render: false)
-  end
-end
-
-
-class DefinitionTest < Minitest::Spec
-  let (:definition) { Declarative::Definitions::Definition.new(:name) }
-
-  it "#merge does return deep copy" do
-    options = { render: false }
-    merged = definition.merge(options)
-    definition.merge!(render: true)
-    merged.must_equal(:name=>"name", render: false)
-  end
-end

data/test/heritage_test.rb

@@ -1,49 +0,0 @@
-require "test_helper"
-
-class HeritageTest < Minitest::Spec
-  P = Proc.new{}.extend(Declarative::Inspect)
-  # #record
-  module RepresenterA
-    extend Declarative::Heritage::DSL
-
-    # one arg.
-    heritage.record(:representation_wrap=, true)
-    # 2 args.
-    heritage.record(:property, :name, enable: true)
-    # 3 args.
-    heritage.record(:property, :id, {}, &P)
-  end
-
-  it { RepresenterA.heritage.inspect.must_equal "[{:method=>:representation_wrap=, :args=>[true], :block=>nil}, {:method=>:property, :args=>[:name, {:enable=>true}], :block=>nil}, {:method=>:property, :args=>[:id, {}], :block=>#<Proc:@heritage_test.rb:4>}]" }
-
-
-  describe "dup of arguments" do
-    module B
-      extend Declarative::Heritage::DSL
-
-      options = {render: true, nested: {render: false}}
-
-      heritage.record(:property, :name, options, &P)
-
-      options[:parse] = true
-      options[:nested][:parse] = false
-    end
-
-    it { B.heritage.inspect.must_equal "[{:method=>:property, :args=>[:name, {:render=>true, :nested=>{:render=>false}}], :block=>#<Proc:@heritage_test.rb:4>}]" }
-  end
-
-  describe "#call with block" do
-    let (:heritage) { Declarative::Heritage.new.record(:property, :id, {}) }
-
-    class CallWithBlock
-      def self.property(name, options)
-        @args = [name, options]
-      end
-    end
-
-    it do
-      heritage.(CallWithBlock) { |cfg| cfg[:args].last.merge!(_inherited: true) }
-      CallWithBlock.instance_variable_get(:@args).must_equal [:id, {:_inherited=>true}]
-    end
-  end
-end

data/test/schema_test.rb

@@ -1,115 +0,0 @@
-require "test_helper"
-
-class SchemaTest < Minitest::Spec
-  class Decorator
-    extend Declarative::Schema
-
-    def self.default_nested_class
-      Decorator
-    end
-  end
-
-  module AddLinks
-    def self.included(includer)
-      super
-      includer.property(:links)
-    end
-  end
-
-  class Concrete < Decorator
-    defaults render_nil: true do |name|
-      { as: name.to_s.upcase }
-    end
-    feature AddLinks
-
-    property :artist, cool: true do
-      property :name
-      property :band, crazy: nil do
-        property :location
-      end
-    end
-
-    property :id, unique: true, value: 1
-  end
-
-
-  it do
-    Concrete.extend(Declarative::Inspect::Schema)
-    Concrete.inspect
-    Concrete.inspect.gsub(/\s/, "").must_equal 'Schema:{
-    "links"=>#<Declarative::Definitions::Definition:@options={:render_nil=>true,:as=>"LINKS",:name=>"links"}>,
-    "artist"=>#<Declarative::Definitions::Definition:@options={:render_nil=>true,:as=>"ARTIST",:cool=>true,:nested=>Schema:{
-      "links"=>#<Declarative::Definitions::Definition:@options={:name=>"links"}>,
-      "name"=>#<Declarative::Definitions::Definition:@options={:name=>"name"}>,
-      "band"=>#<Declarative::Definitions::Definition:@options={:crazy=>nil,:nested=>Schema:{
-        "links"=>#<Declarative::Definitions::Definition:@options={:name=>"links"}>,
-        "location"=>#<Declarative::Definitions::Definition:@options={:name=>"location"}>},:name=>"band"}>},:name=>"artist"}>,
-    "id"=>#<Declarative::Definitions::Definition:@options={:render_nil=>true,:as=>"ID",:unique=>true,:value=>1,:name=>"id"}>}'.
-     gsub("\n", "").gsub(/\s/, "")
-  end
-
-  class InheritingConcrete < Concrete
-    property :uuid
-  end
-
-
-  it do
-    InheritingConcrete.extend(Declarative::Inspect::Schema)
-    InheritingConcrete.inspect
-    InheritingConcrete.inspect.gsub(/\s/, "").must_equal 'Schema:{
-    "links"=>#<Declarative::Definitions::Definition:@options={:render_nil=>true,:as=>"LINKS",:name=>"links"}>,
-    "artist"=>#<Declarative::Definitions::Definition:@options={:render_nil=>true,:as=>"ARTIST",:cool=>true,:nested=>Schema:{
-      "links"=>#<Declarative::Definitions::Definition:@options={:name=>"links"}>,
-      "name"=>#<Declarative::Definitions::Definition:@options={:name=>"name"}>,
-      "band"=>#<Declarative::Definitions::Definition:@options={:crazy=>nil,:nested=>Schema:{
-        "links"=>#<Declarative::Definitions::Definition:@options={:name=>"links"}>,
-        "location"=>#<Declarative::Definitions::Definition:@options={:name=>"location"}>},:name=>"band"}>},:name=>"artist"}>,
-    "id"=>#<Declarative::Definitions::Definition:@options={:render_nil=>true,:as=>"ID",:unique=>true,:value=>1,:name=>"id"}>,
-    "uuid"=>#<Declarative::Definitions::Definition:@options={:render_nil=>true,:as=>"UUID",:name=>"uuid"}>}
-     '.
-     gsub("\n", "").gsub(/\s/, "")
-  end
-
-
-  describe "::property still allows passing internal options" do
-    class ConcreteWithOptions < Decorator
-      defaults cool: true
-
-      # you can pass your own _nested_builder and it will still receive correct,
-      # defaultized options.
-      property :artist, _nested_builder: ->(options) { OpenStruct.new(cool: options[:cool]) }
-    end
-
-    it do
-      ConcreteWithOptions.extend(Declarative::Inspect::Schema).inspect.must_equal 'Schema: {"artist"=>#<Declarative::Definitions::Definition: @options={:cool=>true, :nested=>#<OpenStruct cool=true>, :name=>"artist"}>}'
-    end
-  end
-
-  describe "multiple ::defaults" do
-    class Twin < Decorator
-      module A; end
-      module B; end
-      module D; end
-
-      defaults a: "a", _features: [A] do |name|
-        { first: 1, _features: [D] }
-      end
-
-      # DISCUSS: currently, we only allow one dynamic block.
-      defaults b: "b", _features: [B]# do |name, options|
-      #  {}
-      #end
-
-
-      property :id do end
-    end
-
-    it do
-      Twin.extend(Declarative::Inspect::Schema).inspect.must_equal 'Schema: {"id"=>#<Declarative::Definitions::Definition: @options={:a=>"a", :b=>"b", :first=>1, :nested=>Schema: {}, :name=>"id"}>}'
-      # :_features get merged.
-      Twin.definitions.get(:id)[:nested].is_a? Twin::A
-      Twin.definitions.get(:id)[:nested].is_a? Twin::B
-      Twin.definitions.get(:id)[:nested].is_a? Twin::D
-    end
-  end
-end

data/test/test_helper.rb

@@ -1,4 +0,0 @@
-require "minitest/autorun"
-require "declarative"
-require "declarative/testing"
-require "ostruct"