declarative 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 821bc94b5316e638016b621016276d0b43ae7545
-  data.tar.gz: 330cde61ef63784b7111de6c3167c0bdc9329e37
+  metadata.gz: 85ae72ce17160c8d0d6bbe197358967601d4565d
+  data.tar.gz: 28b480fc3526c9197fbe02899929c8a0cec4baa4
 SHA512:
-  metadata.gz: 84188b1b135bf31cb9d2c7b2d08c4145688a39a246c8fc99fe04d3c4824350ee20741142de62f2362f8b9d589d44c978db0694c6c923892fab23f8a1507e29c7
-  data.tar.gz: 2b056f07f475a823d6763c64c4e5272a218c5d214052f0e8bbe8b3730cd8e059ae995a23bc9239fa34c40392d484e2b44763b20edccfb9f931c61f8f9a55e9b2
+  metadata.gz: 6c2b2d5d60573417e5304f220cf3d1658bda2b5b52601b5ed554fb6447c1f62c5d4fad254c2b28dc68bf231aea8e0215bea5b565ade7189dfb6935efbf6fa534
+  data.tar.gz: 28abb6da89a87cbb256cce92327945641224cc077ef1f182451ce9695c02ed16aaeace1b5e56714ce948d9fafd4776de1312715893b07676ec0e8f1ca7ba6b44

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 0.0.9
+
+* Removing `uber` dependency.
+
 # 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.

data/README.md

@@ -24,7 +24,7 @@ Normally, an abstract base class will define essential configuration.
 
 ```ruby
 class Model
-  include Declarative::Schema
+ extend Declarative::Schema
 
   def self.default_nested_class
     Model
@@ -106,4 +106,4 @@ class Model
 
 ## Copyright
 
-* Copyright (c) 2015 Nick Sutterer <apotonick@gmail.com>
+* Copyright (c) 2015 Nick Sutterer <apotonick@gmail.com>

data/declarative.gemspec

@@ -17,8 +17,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "uber", ">= 0.0.15"
-
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "minitest-line"

data/lib/declarative/defaults.rb

@@ -1,5 +1,3 @@
-require "uber/delegates"
-
 module Declarative
   class Defaults
     def initialize

data/lib/declarative/heritage.rb

@@ -1,3 +1,5 @@
+require "declarative/deep_dup"
+
 module Declarative
   class Heritage < Array
     # Record inheritable assignments for replay in an inheriting class.

data/lib/declarative/schema.rb

@@ -1,6 +1,6 @@
-require "declarative"
 require "declarative/definitions"
 require "declarative/defaults"
+require "declarative/heritage"
 
 module Declarative
   # Include this to maintain inheritable, nested schemas with ::defaults and
@@ -57,8 +57,8 @@ module Declarative
       end
 
       NestedBuilder = ->(options) do
-        base = Class.new(options[:_base]) do
-          feature *options[:_features]
+        Class.new(options[:_base]) do # base
+          feature(*options[:_features])
           class_eval(&options[:_block])
         end
       end
@@ -79,8 +79,6 @@ module Declarative
         heritage.record(:register_feature, mod) # this is only for inheritance between decorators and modules!!! ("horizontal and vertical")
 
         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.8"
+  VERSION = "0.0.9"
 end

data/test/definitions_test.rb

@@ -20,8 +20,6 @@ class DefinitionsTest < Minitest::Spec
     # #add with name and options
     schema.add(:id, unique: true)
     schema.get(:id).inspect.must_equal '#<Declarative::Definitions::Definition: @options={:unique=>true, :name=>"id"}>'
-
-    pp schema
   end
 
   it "overwrites old when called twice" do
@@ -39,8 +37,6 @@ class DefinitionsTest < Minitest::Spec
     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"}>}'
-
-    pp schema
   end
 
   it "#add with :nested instead of block" do
@@ -73,9 +69,6 @@ class DefinitionsTest < Minitest::Spec
 
     schema.add :id, unique: false, inherit: true
 
-    pp schema
-
-
     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
 

data/test/schema_test.rb

@@ -56,7 +56,6 @@ class SchemaTest < Minitest::Spec
   it do
     InheritingConcrete.extend(Declarative::Inspect::Schema)
     InheritingConcrete.inspect
-    # pp InheritingConcrete.definitions.get(:artist)[:nested].definitions.get(:band)[:nested].definitions
     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:{

data/test/test_helper.rb

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

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: declarative
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-25 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.0.15
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.15
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +100,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: DSL for nested schemas.