declarative 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c98390ed3e76619fa18ba957ed6b03b05929dd09
-  data.tar.gz: 66134914bba1a3b8fc39d9f4316e0292dcd53ff0
+  metadata.gz: 821bc94b5316e638016b621016276d0b43ae7545
+  data.tar.gz: 330cde61ef63784b7111de6c3167c0bdc9329e37
 SHA512:
-  metadata.gz: 203b7692773222fe5104e464ac6444fb571b0d0df9b8625be00f7c8b8d03f3dbc8e76972ed19f3128c4c946ca0a98045e6b787ca5dfd00d98310a92667707680
-  data.tar.gz: 364e53c6e76737d40c1255fca40c7f62db0b20902b4b05238a696579d5d2df0c18a385b000a547a2681b3ef705c155a53c29e55585033278d30a82e393f7b8c3
+  metadata.gz: 84188b1b135bf31cb9d2c7b2d08c4145688a39a246c8fc99fe04d3c4824350ee20741142de62f2362f8b9d589d44c978db0694c6c923892fab23f8a1507e29c7
+  data.tar.gz: 2b056f07f475a823d6763c64c4e5272a218c5d214052f0e8bbe8b3730cd8e059ae995a23bc9239fa34c40392d484e2b44763b20edccfb9f931c61f8f9a55e9b2

data/.travis.yml

@@ -1,8 +1,6 @@
 language: ruby
 rvm:
-  - 2.2.3
-  - 2.1.2
-  - 2.0.0
+  - 2.3.1
   - 1.9.3
 gemfile:
   - Gemfile

data/CHANGES.md

@@ -1,3 +1,8 @@
+# 0.0.8
+
+* When calling `Schema#defaults` (or `Defaults#merge!`) multiple times, same-named arrays will be joined instead of overridden. This fixes a common problem when merging different default settings.
+* Remove `Defaults#[]` and `Defaults#[]=`. This now happens via `#merge!`.
+
 # 0.0.7
 
 * Simplify `Defaults` and remove a warning in Ruby 2.2.3.

data/lib/declarative/defaults.rb

@@ -7,20 +7,38 @@ module Declarative
       @dynamic_options = ->(*) { Hash.new }
     end
 
-    def merge!(hash, &block)
-      @static_options.merge!(hash) if hash.any?
+    # 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)
+
       @dynamic_options = block if block_given?
       self
     end
 
-    extend Uber::Delegates
-    delegates :@static_options, :[], :[]= # mutuable API!
-
-    # TODO: allow to receive rest of options/block in dynamic block. or, rather, test it as it was already implemented.
+    # Evaluate defaults and merge given_options into them.
     def call(name, given_options)
-      options = @static_options
-      options = options.merge(@dynamic_options.(name, given_options))
+      # 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)
     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
+    end
   end
 end

data/lib/declarative/schema.rb

@@ -78,8 +78,9 @@ module Declarative
       def register_feature(mod)
         heritage.record(:register_feature, mod) # this is only for inheritance between decorators and modules!!! ("horizontal and vertical")
 
-        defaults[:_features] ||= []
-        defaults[:_features] << mod
+        defaults.merge!(_features: [mod])
+        # defaults[:_features] ||= []
+        # defaults[:_features] << mod
       end
     end
   end

data/lib/declarative/version.rb

@@ -1,3 +1,3 @@
 module Declarative
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/test/defaults_test.rb

@@ -58,4 +58,31 @@ class DefaultsOptionsTest < Minitest::Spec
       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/schema_test.rb

@@ -85,4 +85,32 @@ class SchemaTest < Minitest::Spec
       ConcreteWithOptions.extend(Declarative::Inspect::Schema).inspect.must_equal 'Schema: {"artist"=>#<Declarative::Definitions::Definition: @options={:cool=>true, :nested=>#<OpenStruct cool=true>, :name=>"artist"}>}'
     end
   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

@@ -2,4 +2,5 @@ require "declarative"
 require "minitest/autorun"
 require "pp"
 
-require "declarative/testing"
+require "declarative/testing"
+require "ostruct"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declarative
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-27 00:00:00.000000000 Z
+date: 2016-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber