disposable 0.1.15 → 0.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af71c707fe20d98b1c391731fdcf9364c1817132
-  data.tar.gz: faae48ac6f616ebe485d7c9c4557cfe103ba9bb1
+  metadata.gz: a33b386392c77411ef19323562c9f0bb3b31761c
+  data.tar.gz: 789982e39d11feb8a4550e93452ca8d9ba91ac07
 SHA512:
-  metadata.gz: af47c88b1c74259f7903ef82e5cd480e40b0437796d421c2cfa43065ed6d19a83fc4361fd679460490b3b722100146b95baaea7712f49af81147385093636fda
-  data.tar.gz: 56482ea426fdb444826fca0240c97e0c615f155dc7bc7300c6e223f0f852484d7419d504fa7e8e55d5b73b1709212f3d0cce3d193fa0881b7034909dcf38ae80
+  metadata.gz: eb94a6c5097a5b380011f9a6cf6f6b02081b058842751110beec5b2f82cc37fc088f08d8b3ea2b8fb3d87e8607c9e44acc446d52470394f4ca27736cf8c29891
+  data.tar.gz: d11e58f841ecccfb165f6c48e6ddeb65eb3e9fe8b4aade955b6fc906bd056abc63589c9d42f05c1a35effb45becd6d0a6a616a171c81797d28fce1ac871895cf

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
+sudo: false
 rvm:
   - 2.2.0
   - 2.1.2
   - 2.0.0
   - 1.9.3
 gemfile:
-  - Gemfile
+  - Gemfile

data/CHANGES.md

@@ -1,6 +1,9 @@
-# 0.1.15
+# 0.2.0
 
-* Restrict to Representable < 2.4.
+* Internally, use [Declarative](https://github.com/apotonick/declarative) now for schema creation, resulting in the following internal changes.
+    * `Twin::representer_class.representable_attrs` is now `Twin::definitions`.
+* `Disposable::Twin::Schema` is now `Disposable::Rescheme`. Renamed its `:representer_from` option to `:definitions_from`.
+* `twin: Twin::Song` is the only way to specify an external twin. To reduce complexity, I've removed the lambda version of `:twin`.
 
 # 0.1.14
 

data/Gemfile

@@ -1,6 +1,8 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in disposable.gemspec
+source "https://rubygems.org"
 gemspec
 
- # gem 'representable', path: '../representable'
+# gem "representable", path: "../representable"
+gem "representable", github: "apotonick/representable"
+# gem "declarative", path: "../declarative"
+# gem "declarative", github: "apotonick/declarative"
+gem "minitest-line"

data/disposable.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "uber"
-  spec.add_dependency "representable", ">= 2.2.3", "< 2.4.0"
+  spec.add_dependency "declarative", "~> 0.0.4"
+  spec.add_dependency "representable", ">= 2.4.0.rc1", "< 2.5.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/disposable/callback.rb

@@ -12,26 +12,16 @@ module Disposable::Callback
   # you can call collection :songs again, with :inherit. TODO: verify.
 
   class Group
-    # TODO: make this easier via declarable.
-    extend Uber::InheritableAttr
-    inheritable_attr :representer_class
-
-    # class << self
-    #   include Representable::Cloneable
-    # end
-    self.representer_class = Class.new(Representable::Decorator) do
-      def self.default_inline_class
-        Group.extend Representable::Cloneable
-      end
+    extend Declarative::Schema
+
+    def self.default_nested_class
+      Group
     end
 
     def self.clone
       Class.new(self)
     end
 
-    def self.feature(*args)
-    end
-
     def self.collection(name, options={}, &block)
       property(name, options.merge(collection: true), &block)
     end
@@ -42,9 +32,9 @@ module Disposable::Callback
       # it should have a Definition per callback where the representer_module will be a nested Group or a Callback.
       inherit = options[:inherit] # FIXME: this is deleted in ::property.
 
-      representer_class.property(name, options, &block).tap do |dfn|
+      super(name, options, &block).tap do |dfn|
         return if inherit
-        hooks << ["property", dfn.name]
+        hooks << ["property", dfn[:name]]
       end
     end
 
@@ -60,12 +50,16 @@ module Disposable::Callback
 
     attr_reader :invocations
 
-    inheritable_attr :hooks
-    self.hooks = []
+    def self.hooks
+      @hooks ||= []
+    end
+
 
     class << self
       %w(on_add on_delete on_destroy on_update on_create on_change).each do |event|
         define_method event do |*args|
+          heritage.record(event, *args)
+
           hooks << [event.to_sym, args]
         end
       end
@@ -73,14 +67,13 @@ module Disposable::Callback
 
 
     def call(options={})
-      self.class.hooks.each do |cfg|
-        event, args = cfg
-
+      self.class.hooks.each do |event, args|
         if event == "property" # FIXME: make nicer.
-          definition = self.class.representer_class.representable_attrs.get(args)
-          twin = @twin.send(definition.getter) # album.songs
+          definition = self.class.definitions.get(args)
+          twin = @twin.send(definition[:name]) # album.songs
 
-          @invocations += definition.representer_module.new(twin).(options).invocations # Group.new(twin).()
+          # recursively call nested group.
+          @invocations += definition[:nested].new(twin).(options).invocations # Group.new(twin).()
           next
         end
 
@@ -108,7 +101,7 @@ module Disposable::Callback
   # Implements the binding between the Callback API (on_change) and the underlying layer (twin/AR/etc.).
   class Dispatch
     def initialize(twins)
-      @twins = twins.is_a?(Array) ? twins : [twins] # TODO: find that out with Collection.
+      @twins = Array(twins) # TODO: find that out with Collection.
       @invocations = []
     end
 
@@ -175,4 +168,4 @@ module Disposable::Callback
       end
     end
   end
-end
+end

data/lib/disposable/expose.rb

@@ -13,8 +13,8 @@ module Disposable
   #   AlbumExpose.new(OpenStruct.new(title: "AFI")).name #=> "AFI"
   class Expose
     class << self
-      def from(representer)
-        representer.representable_attrs.each do |definition|
+      def from(schema)
+        schema.each do |definition|
           process_definition!(definition)
         end
         self
@@ -22,7 +22,7 @@ module Disposable
 
     private
       def process_definition!(definition)
-        public_name  = definition.name
+        public_name  = definition[:name]
         private_name = definition[:private_name] || public_name
 
         accessors!(public_name, private_name, definition)

data/lib/disposable/{twin/schema.rb → rescheme.rb}

@@ -1,13 +1,13 @@
-# Schema::from allows to copy a representer structure. This will create "fresh" inline representers instead
+# Rescheme::from allows to copy a schema structure. This will create "fresh" inline schemas instead
 # of inheriting/copying the original classes, making it a replication of the structure, only.
 #
-# Options allow to customize the copied representer.
+# Options allow to customize the copied schema.
 #
 # +:exclude+: ignore options from original Definition when copying.
 #
 # Provided block is run per newly created Definition.
-#   Schema.from(...) { |dfn| dfn[:readable] = true }
-class Disposable::Twin::Schema
+#   Rescheme.from(...) { |dfn| dfn[:readable] = true }
+class Disposable::Rescheme
   def self.from(*args, &block)
     new.from(*args, &block)
   end
@@ -16,9 +16,9 @@ class Disposable::Twin::Schema
   def from(source_class, options, &block) # TODO: can we re-use this for all the decorator logic in #validate, etc?
     representer = build_representer(options)
 
-    source_representer = options[:representer_from].call(source_class)
+    definitions = options[:definitions_from].call(source_class)
 
-    source_representer.representable_attrs.each do |dfn|
+    definitions.each do |dfn|
       dfn = build_definition!(options, dfn, representer, &block)
       evaluate_block!(options, dfn, &block)
     end
@@ -41,7 +41,7 @@ private
     new_options.merge!(local_options)
 
     return from_scalar!(options, source_dfn, new_options, representer) if options[:recursive]==false
-    return from_scalar!(options, source_dfn, new_options, representer) unless source_dfn[:extend]
+    return from_scalar!(options, source_dfn, new_options, representer) unless source_dfn[:nested]
     from_inline!(options, source_dfn, new_options, representer, &block)
   end
 
@@ -52,14 +52,14 @@ private
   end
 
   def from_scalar!(options, dfn, new_options, representer)
-    representer.property(dfn.name, new_options)
+    representer.property(dfn[:name], new_options)
   end
 
   def from_inline!(options, dfn, new_options, representer, &block)
-    nested      = dfn[:extend].evaluate(nil) # nested now can be a Decorator, a representer module, a Form, a Twin.
-    dfn_options = new_options.merge(extend: from(nested, options, &block))
+    nested      = dfn[:nested]#.evaluate(nil) # nested now can be a Decorator, a representer module, a Form, a Twin.
+    dfn_options = new_options.merge(nested: from(nested, options, &block))
 
-    representer.property(dfn.name, dfn_options)
+    representer.property(dfn[:name], dfn_options)
   end
 
   def evaluate_block!(options, definition)

data/lib/disposable/twin/changed.rb

@@ -44,7 +44,7 @@ private
       next unless twin = send(dfn.getter)
       next unless twin.changed?
 
-      changes[dfn.name] = true
+      changes[dfn[:name]] = true
     end
   end
 end

data/lib/disposable/twin/composition.rb

@@ -6,7 +6,7 @@ module Disposable
     module Expose
       module ClassMethods
         def expose_class
-          @expose_class ||= Class.new(Disposable::Expose).from(representer_class)
+          @expose_class ||= Class.new(Disposable::Expose).from(definitions.values)
         end
       end # ClassMethods.
 
@@ -26,7 +26,7 @@ module Disposable
     module Composition
       module ClassMethods
         def expose_class
-          @expose_class ||= Class.new(Disposable::Composition).from(representer_class)
+          @expose_class ||= Class.new(Disposable::Composition).from(definitions.values)
         end
       end
 
@@ -39,7 +39,7 @@ module Disposable
         hash = {}
 
         @model.each do |name, model| # TODO: provide list of composee attributes in Composition.
-          part_properties = self.class.representer_class.representable_attrs.find_all { |dfn| dfn[:on] == name }.collect(&:name).collect(&:to_sym)
+          part_properties = schema.find_all { |dfn| dfn[:on] == name }.collect{ |dfn| dfn[:name].to_sym }
           hash[name] = self.class.nested_hash_representer.new(self).to_hash(include: part_properties)
         end
 

data/lib/disposable/twin/definitions.rb

@@ -0,0 +1,28 @@
+class Disposable::Twin
+  class Definition < Declarative::Definitions::Definition
+    def getter
+      self[:name]
+    end
+
+    def setter
+      "#{self[:name]}="
+    end
+  end
+
+  module DefinitionsEach
+    def each(options={})
+      return self unless block_given?
+
+      super() do |dfn|
+        next if options[:exclude]    and options[:exclude].include?(dfn[:name])
+        next if options[:scalar]     and dfn[:collection]
+        next if options[:collection] and ! dfn[:collection]
+        next if options[:twin]       and ! dfn[:nested]
+
+        yield dfn
+      end
+
+      self
+    end
+  end
+end

data/lib/disposable/twin/setup.rb

@@ -24,8 +24,8 @@ module Disposable
 
       def setup_property!(dfn, options)
         value =
-          if options.has_key?(name = dfn.name.to_sym)
-            options[dfn.name.to_sym]
+          if options.has_key?(name = dfn[:name].to_sym)
+            options[dfn[:name].to_sym]
           else
             setup_value_for(dfn, options)
           end
@@ -39,17 +39,18 @@ module Disposable
       end
 
       def read_value_for(dfn, options)
-        mapper.send(dfn.name) # model.title.
+        mapper.send(dfn[:name]) # model.title.
       end
 
       def setup_write!(dfn, value)
-        send(dfn.setter, value)
+        # send(dfn.setter, value)
+        send("#{dfn[:name]}=", value) # FIXME!
       end
 
       # Including this will _not_ use the property's setter in Setup and allow you to override it.
       module SkipSetter
         def setup_write!(dfn, value)
-          write_property(dfn.name, value, dfn)
+          write_property(dfn[:name], value, dfn)
         end
       end
     end # Setup

data/lib/disposable/twin/struct.rb

@@ -5,7 +5,7 @@
     #   Twin.new(id: 1)
     module Struct
       def read_value_for(dfn, options)
-        name = dfn.name
+        name = dfn[:name]
         @model[name.to_s] || @model[name.to_sym] # TODO: test sym vs. str.
       end
 
@@ -15,7 +15,7 @@
             prepare:       lambda { |model, *| model },
             serialize: lambda { |model, *| model.sync! },
             representable: true
-          ) if dfn[:twin]
+          ) if dfn[:nested]
         end
       end
 

data/lib/disposable/twin/sync.rb

@@ -5,12 +5,23 @@
 # Note: #sync currently implicitly saves AR objects with collections
 class Disposable::Twin
   module Sync
+    class Options < ::Hash
+      def exclude!(names)
+        excludes.push(*names)
+        self
+      end
+
+      def excludes
+        self[:exclude] ||= []
+      end
+    end
+
     # Creates a fresh copy of the internal representer and adds Representable::Hash.
     # This is used wherever a hash transformation is needed.
     def self.hash_representer(twin_class, &block)
-      Schema.from(twin_class,
+      Disposable::Rescheme.from(twin_class,
         recursive: false,
-        representer_from: lambda { |twin_class| twin_class.representer_class },
+        definitions_from: lambda { |twin_class| twin_class.definitions },
         superclass: Representable::Decorator,
         include: Representable::Hash,
         exclude_options: [:default], # TODO: TEST IN default_test.
@@ -25,19 +36,16 @@ class Disposable::Twin
     end
     alias_method :sync, :sync_models
 
-    # reading from fields allows using readers in form for presentation
-    # and writers still pass to fields in #validate????
-
     # Sync all scalar attributes, call sync! on nested and return model.
     def sync!(options) # semi-public.
       # TODO: merge this into Sync::Run or something and use in Struct, too, so we don't
       # need the representer anymore?
-      options_for_sync = sync_options(Decorator::Options[options])
+      options_for_sync = sync_options(Options[options])
 
       schema.each(options_for_sync) do |dfn|
         property_value = sync_read(dfn) #
 
-        unless dfn[:twin]
+        unless dfn[:nested]
           mapper.send(dfn.setter, property_value) # always sync the property
           next
         end
@@ -61,6 +69,7 @@ class Disposable::Twin
       send(definition.getter)
     end
 
+    # TODO: simplify that using a decent pipeline from Representable.
     module ToNestedHash
       def to_nested_hash(*)
         self.class.nested_hash_representer.new(nested_hash_source).to_hash
@@ -86,7 +95,7 @@ class Disposable::Twin
             dfn.merge!(
               prepare:   lambda { |model, *| model }, # TODO: why do we need that here?
               serialize: lambda { |form, args| form.to_nested_hash },
-            ) if dfn[:twin]
+            ) if dfn[:nested]
           end
         end # #build_nested_hash_representer
       end
@@ -107,7 +116,7 @@ class Disposable::Twin
       def sync_options(options)
         options = super
 
-        protected_fields = schema.each.find_all { |d| d[:writeable] == false }.collect { |d| d.name }
+        protected_fields = schema.each.find_all { |d| d[:writeable] == false }.collect { |d| d[:name] }
         options.exclude!(protected_fields)
       end
     end
@@ -126,7 +135,7 @@ class Disposable::Twin
       def sync_options(options)
         # DISCUSS: we currently don't track if nested forms have changed (only their attributes). that's why i include them all here, which
         # is additional sync work/slightly wrong. solution: allow forms to form.changed? not sure how to do that with collections.
-        scalars   = schema.each(scalar: true).collect { |dfn| dfn.name }
+        scalars   = schema.each(scalar: true).collect { |dfn| dfn[:name ]}
         unchanged = scalars - changed.keys
 
         # exclude unchanged scalars, nested forms and changed scalars still go in here!
@@ -139,7 +148,7 @@ class Disposable::Twin
     # Include this won't use the getter #title in #sync but read directly from @fields.
     module SkipGetter
       def sync_read(dfn)
-        @fields[dfn.name]
+        @fields[dfn[:name]]
       end
 
       def nested_hash_source

data/lib/disposable/twin.rb

@@ -1,19 +1,18 @@
-# DISCUSS: sync via @fields, not reader? allows overriding a la reform 1.
-
 require "uber/inheritable_attr"
-
-require "disposable/twin/representer"
+require "declarative/schema"
+require "disposable/twin/definitions"
 require "disposable/twin/collection"
 require "disposable/twin/setup"
 require "disposable/twin/sync"
 require "disposable/twin/save"
-require "disposable/twin/option"
 require "disposable/twin/builder"
 require "disposable/twin/changed"
 require "disposable/twin/property_processor"
 require "disposable/twin/persisted"
 require "disposable/twin/default"
 
+require "representable/decorator"
+
 # Twin.new(model/composition hash/hash, options)
 #   assign hash to @fields
 #   write: write to @fields
@@ -21,29 +20,20 @@ require "disposable/twin/default"
 
 module Disposable
   class Twin
-    extend Uber::InheritableAttr
-
-    inheritable_attr :representer_class
-    self.representer_class = Class.new(Decorator)
-
-    # Returns an each'able array of all properties defined in this twin.
-    # Allows to filter using
-    #   * collection: true
-    #   * twin:       true
-    #   * scalar:     true
-    #   * exclude:    ["title", "email"]
-    def schema
-      self.class.representer_class
+    extend Declarative::Schema
+    def self.definition_class
+      Definition
     end
 
-
-    extend Representable::Feature # imports ::feature, which calls ::register_feature.
-    def self.register_feature(mod)
-      representer_class.representable_attrs[:features][mod] = true
+    def schema
+      self.class.definitions.extend(DefinitionsEach)
     end
 
-
     class << self
+      def default_nested_class
+        Twin
+      end
+
       # TODO: move to Declarative, as in Representable and Reform.
       def property(name, options={}, &block)
         options[:private_name] = options.delete(:from) || name
@@ -52,18 +42,10 @@ module Disposable
           options[:writeable] = options[:readable] = false
         end
 
-        options[:extend] = options[:twin] # e.g. property :album, twin: Album.
+        options[:nested] = options.delete(:twin) if options[:twin]
 
-        representer_class.property(name, options, &block).tap do |definition|
+        super(name, options, &block).tap do |definition|
           create_accessors(name, definition)
-
-          if definition[:extend] and !options[:twin]
-            # This will soon be replaced with Declarative's API. # DISCUSS: could we use build_inline's api here to inject the name feature?
-            nested_twin = definition[:extend].evaluate(nil)
-            process_inline!(nested_twin, definition)
-
-            definition.merge!(twin: nested_twin) # DISCUSS: where do we need this?
-          end
         end
       end
 
@@ -80,14 +62,10 @@ module Disposable
         mod = Module.new do
           define_method(name)       { @fields[name.to_s] }
           # define_method(name)       { read_property(name) }
-          define_method("#{name}=") { |value| write_property(name, value, definition) } # TODO: this is more like prototyping.
+          define_method("#{name}=") { |value| write_property(name, value, definition) }
         end
         include mod
       end
-
-      # DISCUSS: this method might disappear or change pretty soon.
-      def process_inline!(mod, definition)
-      end
     end
 
     include Setup
@@ -97,8 +75,8 @@ module Disposable
     private
       # assumption: collections are always initialized from Setup since we assume an empty [] for "nil"/uninitialized collections.
       def write_property(name, value, dfn)
-        if dfn[:twin] and value
-          value = dfn.array? ? wrap_collection(dfn, value) : wrap_scalar(dfn, value)
+        if dfn[:nested] and value
+          value = dfn[:collection] ? wrap_collection(dfn, value) : wrap_scalar(dfn, value)
         end
 
         field_write(name, value)
@@ -124,24 +102,13 @@ module Disposable
     end
     include Accessors
 
-
-    # FIXME: this is experimental.
-    module ToS
-      def to_s
-        return super if self.class.name
-        "#<Twin (inline):#{object_id}>"
-      end
-    end
-    include ToS
-
-
     class Twinner
       def initialize(dfn)
         @dfn = dfn
       end
 
       def call(value)
-        @dfn.twin_class.new(value)
+        @dfn[:nested].new(value)
       end
     end
 
@@ -152,7 +119,5 @@ module Disposable
       attr_reader :mapper
     end
     include ModelReaders
-
-    include Option
   end
-end
+end

data/lib/disposable/version.rb

@@ -1,3 +1,3 @@
 module Disposable
-  VERSION = "0.1.15"
+  VERSION = "0.2.0.rc1"
 end

data/lib/disposable.rb

@@ -1,5 +1,6 @@
 require "disposable/version"
 require "disposable/twin"
+require "disposable/rescheme"
 
 module Disposable
   class Twin

data/test/callback_group_test.rb

@@ -148,10 +148,10 @@ class CallbackGroupInheritanceTest < MiniTest::Spec
   it do
     Group.hooks.size.must_equal 4
     Group.hooks[0].to_s.must_equal "[:on_change, [:change!]]"
-    # Group.hooks[1][1].representer_module.hooks.to_s.must_equal "[[:on_add, [:notify_album!]],[:on_add, [:reset_song!]]]"
+    # Group.hooks[1][1][:nested].hooks.to_s.must_equal "[[:on_add, [:notify_album!]],[:on_add, [:reset_song!]]]"
     Group.hooks[2].to_s.must_equal "[:on_change, [:rehash_name!, {:property=>:title}]]"
 
-    Group.representer_class.representable_attrs.get(Group.hooks[3][1]).representer_module.hooks.to_s.must_equal "[[:on_change, [:sing!]]]"
+    Group.definitions.get(Group.hooks[3][1])[:nested].hooks.to_s.must_equal "[[:on_change, [:sing!]]]"
   end
 
   class EmptyGroup < Group
@@ -173,8 +173,9 @@ class CallbackGroupInheritanceTest < MiniTest::Spec
 
   it do
     Group.hooks.size.must_equal 4
+    pp EnhancedGroup.hooks
     EnhancedGroup.hooks.size.must_equal 6
-    EnhancedGroup.representer_class.representable_attrs.get(EnhancedGroup.hooks[5][1]).representer_module.hooks.to_s.must_equal "[[:on_add, [:rewind!]]]"
+    EnhancedGroup.definitions.get(EnhancedGroup.hooks[5][1])[:nested].hooks.to_s.must_equal "[[:on_add, [:rewind!]]]"
   end
 
   class EnhancedWithInheritGroup < EnhancedGroup
@@ -190,10 +191,10 @@ class CallbackGroupInheritanceTest < MiniTest::Spec
     Group.hooks.size.must_equal 4
     EnhancedGroup.hooks.size.must_equal 6
 
-    EnhancedGroup.representer_class.representable_attrs.get(EnhancedGroup.hooks[5][1]).representer_module.hooks.to_s.must_equal "[[:on_add, [:rewind!]]]"
+    EnhancedGroup.definitions.get(EnhancedGroup.hooks[5][1])[:nested].hooks.to_s.must_equal "[[:on_add, [:rewind!]]]"
     EnhancedWithInheritGroup.hooks.size.must_equal 6
-    EnhancedWithInheritGroup.representer_class.representable_attrs.get(EnhancedWithInheritGroup.hooks[1][1]).representer_module.hooks.to_s.must_equal "[[:on_add, [:rewind!]], [:on_add, [:eat!]]]"
-    EnhancedWithInheritGroup.representer_class.representable_attrs.get(EnhancedWithInheritGroup.hooks[3][1]).representer_module.hooks.to_s.must_equal "[[:on_change, [:sing!]], [:on_delete, [:yell!]]]"
+    EnhancedWithInheritGroup.definitions.get(EnhancedWithInheritGroup.hooks[1][1])[:nested].hooks.to_s.must_equal "[[:on_add, [:rewind!]], [:on_add, [:eat!]]]"
+    EnhancedWithInheritGroup.definitions.get(EnhancedWithInheritGroup.hooks[3][1])[:nested].hooks.to_s.must_equal "[[:on_change, [:sing!]], [:on_delete, [:yell!]]]"
   end
 
   class RemovingInheritGroup < Group
@@ -205,19 +206,19 @@ class CallbackGroupInheritanceTest < MiniTest::Spec
 
 # # puts "@@@@@ #{Group.hooks.object_id.inspect}"
 # # puts "@@@@@ #{EmptyGroup.hooks.object_id.inspect}"
-# puts "@@@@@ Group:         #{Group.representer_class.representable_attrs.get(:songs).representer_module.hooks.inspect}"
-# puts "@@@@@ EnhancedGroup: #{EnhancedGroup.representer_class.representable_attrs.get(:songs).representer_module.hooks.inspect}"
-# puts "@@@@@ InheritGroup:  #{EnhancedWithInheritGroup.representer_class.representable_attrs.get(:songs).representer_module.hooks.inspect}"
-# puts "@@@@@ RemovingGroup: #{RemovingInheritGroup.representer_class.representable_attrs.get(:songs).representer_module.hooks.inspect}"
-# # puts "@@@@@ #{EnhancedWithInheritGroup.representer_class.representable_attrs.get(:songs).representer_module.hooks.object_id.inspect}"
+# puts "@@@@@ Group:         #{Group.definitions.get(:songs)[:nested].hooks.inspect}"
+# puts "@@@@@ EnhancedGroup: #{EnhancedGroup.definitions.get(:songs)[:nested].hooks.inspect}"
+# puts "@@@@@ InheritGroup:  #{EnhancedWithInheritGroup.definitions.get(:songs)[:nested].hooks.inspect}"
+# puts "@@@@@ RemovingGroup: #{RemovingInheritGroup.definitions.get(:songs)[:nested].hooks.inspect}"
+# # puts "@@@@@ #{EnhancedWithInheritGroup.definitions.get(:songs)[:nested].hooks.object_id.inspect}"
 
   # TODO: object_id tests for all nested representers.
 
   it do
     Group.hooks.size.must_equal 4
     RemovingInheritGroup.hooks.size.must_equal 3
-    RemovingInheritGroup.representer_class.representable_attrs.get(RemovingInheritGroup.hooks[0][1]).representer_module.hooks.to_s.must_equal "[[:on_add, [:reset_song!]]]"
-    RemovingInheritGroup.representer_class.representable_attrs.get(RemovingInheritGroup.hooks[2][1]).representer_module.hooks.to_s.must_equal "[[:on_change, [:sing!]]]"
+    RemovingInheritGroup.definitions.get(RemovingInheritGroup.hooks[0][1])[:nested].hooks.to_s.must_equal "[[:on_add, [:reset_song!]]]"
+    RemovingInheritGroup.definitions.get(RemovingInheritGroup.hooks[2][1])[:nested].hooks.to_s.must_equal "[[:on_change, [:sing!]]]"
   end
 
   # Group::clone

data/test/expose_test.rb

@@ -16,7 +16,7 @@ class ExposeTest < MiniTest::Spec
   end
 
   class AlbumExpose < Disposable::Expose
-    from Twin::Album.representer_class
+    from Twin::Album.definitions.values
   end
 
   let (:album) { Model::Album.new(1, "Dick Sandwich") }
@@ -59,7 +59,7 @@ class ExposeCompositionTest < MiniTest::Spec
     end
 
     class AlbumComposition < Disposable::Composition
-      from Twin::Album.representer_class
+      from Twin::Album.definitions.values
     end
   end
 

data/test/{twin/schema_test.rb → rescheme_test.rb}

@@ -1,8 +1,6 @@
 require "test_helper"
 
-require "disposable/twin/schema"
-
-class SchemaTest < MiniTest::Spec
+class ReschemeTest < MiniTest::Spec
   module Representer
     include Representable
 
@@ -32,80 +30,80 @@ class SchemaTest < MiniTest::Spec
   end
 
   it do
-    decorator = Disposable::Twin::Schema.from(Representer, superclass: Representable::Decorator,
-      include: [Hello, Gday, Ciao], # Hello will win over Gday.
+    decorator = Disposable::Rescheme.from(Representer, superclass: Representable::Decorator,
+      include: [Representable::Hash, Hello, Gday, Ciao], # Hello will win over Gday.
       options_from: :deserializer,
-      representer_from: lambda { |nested| nested }
+      definitions_from: lambda { |nested| nested.definitions }
     )
 
     # include: works.
     decorator.new(nil).hello.must_equal "hello"
     decorator.new(nil).ciao.must_equal "ciao"
 
-    decorator.representable_attrs.get(:id).inspect.must_equal "#<Representable::Definition ==>id @options={:parse_filter=>[], :render_filter=>[], :as=>\"id\"}>"
-    decorator.representable_attrs.get(:title).inspect.must_equal "#<Representable::Definition ==>title @options={:writeable=>false, :deserializer=>{:skip_parse=>\"skip lambda\"}, :parse_filter=>[], :render_filter=>[], :as=>\"title\", :skip_parse=>\"skip lambda\"}>"
+    decorator.representable_attrs.get(:id).inspect.must_equal "#<Representable::Definition ==>id @options={:name=>\"id\", :parse_filter=>[], :render_filter=>[]}>"
+    decorator.representable_attrs.get(:title).inspect.must_equal "#<Representable::Definition ==>title @options={:writeable=>false, :deserializer=>{:skip_parse=>\"skip lambda\"}, :name=>\"title\", :parse_filter=>[], :render_filter=>[], :skip_parse=>\"skip lambda\"}>"
 
     songs = decorator.representable_attrs.get(:songs)
     options = songs.instance_variable_get(:@options)
-    nested_extend = options.delete(:extend)
-    options.inspect.must_equal "{:readable=>false, :deserializer=>{:skip_parse=>\"another lambda\", :music=>true, :writeable=>false}, :parse_filter=>[], :render_filter=>[], :as=>\"songs\", :_inline=>true, :skip_parse=>\"another lambda\", :music=>true, :writeable=>false}"
+    options[:nested].extend(Declarative::Inspect)
+    options.inspect.must_equal "{:readable=>false, :deserializer=>{:skip_parse=>\"another lambda\", :music=>true, :writeable=>false}, :nested=>#<Class:>, :extend=>#<Class:>, :name=>\"songs\", :parse_filter=>[], :render_filter=>[], :skip_parse=>\"another lambda\", :music=>true, :writeable=>false}"
 
     # nested works.
-    nested_extend.new(nil).hello.must_equal "hello"
-    nested_extend.new(nil).ciao.must_equal "ciao"
+    options[:nested].new(nil).hello.must_equal "hello"
+    options[:nested].new(nil).ciao.must_equal "ciao"
 
-    nested_extend.representable_attrs.get(:name).inspect.must_equal "#<Representable::Definition ==>name @options={:as=>\"Name\", :deserializer=>{:skip_parse=>\"a crazy cool instance method\"}, :parse_filter=>[], :render_filter=>[], :skip_parse=>\"a crazy cool instance method\"}>"
+    options[:nested].representable_attrs.get(:name).inspect.must_equal "#<Representable::Definition ==>name @options={:as=>\"Name\", :deserializer=>{:skip_parse=>\"a crazy cool instance method\"}, :name=>\"name\", :parse_filter=>[], :render_filter=>[], :skip_parse=>\"a crazy cool instance method\"}>"
   end
 
   # :options_from and :include is optional
   it do
-    decorator = Disposable::Twin::Schema.from(Representer, superclass: Representable::Decorator,
-      representer_from: lambda { |nested| nested }
+    decorator = Disposable::Rescheme.from(Representer, superclass: Representable::Decorator, include: [Representable::Hash],
+      definitions_from: lambda { |nested| nested.definitions }
     )
 
-    decorator.representable_attrs.get(:id).inspect.must_equal "#<Representable::Definition ==>id @options={:parse_filter=>[], :render_filter=>[], :as=>\"id\"}>"
-    decorator.representable_attrs.get(:title).inspect.must_equal "#<Representable::Definition ==>title @options={:writeable=>false, :deserializer=>{:skip_parse=>\"skip lambda\"}, :parse_filter=>[], :render_filter=>[], :as=>\"title\"}>"
+    decorator.representable_attrs.get(:id).inspect.must_equal "#<Representable::Definition ==>id @options={:name=>\"id\", :parse_filter=>[], :render_filter=>[]}>"
+    decorator.representable_attrs.get(:title).inspect.must_equal "#<Representable::Definition ==>title @options={:writeable=>false, :deserializer=>{:skip_parse=>\"skip lambda\"}, :name=>\"title\", :parse_filter=>[], :render_filter=>[]}>"
   end
 
 
   # :exclude_options allows skipping particular options when copying.
   it do
-    decorator = Disposable::Twin::Schema.from(Representer, superclass: Representable::Decorator,
-      representer_from: lambda { |nested| nested },
+    decorator = Disposable::Rescheme.from(Representer, superclass: Representable::Decorator, include: [Representable::Hash],
+      definitions_from: lambda { |nested| nested.definitions },
       exclude_options: [:deserializer]
     )
 
-    decorator.representable_attrs.get(:id).inspect.must_equal "#<Representable::Definition ==>id @options={:parse_filter=>[], :render_filter=>[], :as=>\"id\"}>"
-    decorator.representable_attrs.get(:title).inspect.must_equal "#<Representable::Definition ==>title @options={:writeable=>false, :parse_filter=>[], :render_filter=>[], :as=>\"title\"}>"
-    decorator.representable_attrs.get(:songs).representer_module.representable_attrs.get(:name).inspect.must_equal "#<Representable::Definition ==>name @options={:as=>\"Name\", :parse_filter=>[], :render_filter=>[]}>"
+    decorator.representable_attrs.get(:id).inspect.must_equal "#<Representable::Definition ==>id @options={:name=>\"id\", :parse_filter=>[], :render_filter=>[]}>"
+    decorator.representable_attrs.get(:title).inspect.must_equal "#<Representable::Definition ==>title @options={:writeable=>false, :name=>\"title\", :parse_filter=>[], :render_filter=>[]}>"
+    decorator.representable_attrs.get(:songs).representer_module.representable_attrs.get(:name).inspect.must_equal "#<Representable::Definition ==>name @options={:as=>\"Name\", :name=>\"name\", :parse_filter=>[], :render_filter=>[]}>"
   end
 
 
   it "::from with block allows customizing every definition and returns representer" do
-    decorator = Disposable::Twin::Schema.from(Representer,
+    decorator = Disposable::Rescheme.from(Representer, include: [Representable::Hash],
       superclass:       Representable::Decorator,
-      representer_from: lambda { |nested| nested },
+      definitions_from: lambda { |nested| nested.definitions },
     ) { |dfn| dfn.merge!(amazing: true) }
 
-    decorator.representable_attrs.get(:id).inspect.must_equal "#<Representable::Definition ==>id @options={:parse_filter=>[], :render_filter=>[], :as=>\"id\", :amazing=>true}>"
-    decorator.representable_attrs.get(:songs).representer_module.representable_attrs.get(:name).inspect.must_equal "#<Representable::Definition ==>name @options={:as=>\"Name\", :deserializer=>{:skip_parse=>\"a crazy cool instance method\"}, :parse_filter=>[], :render_filter=>[], :amazing=>true}>"
+    decorator.representable_attrs.get(:id).inspect.must_equal "#<Representable::Definition ==>id @options={:name=>\"id\", :parse_filter=>[], :render_filter=>[], :amazing=>true}>"
+    decorator.representable_attrs.get(:songs).representer_module.representable_attrs.get(:name).inspect.must_equal "#<Representable::Definition ==>name @options={:as=>\"Name\", :deserializer=>{:skip_parse=>\"a crazy cool instance method\"}, :name=>\"name\", :parse_filter=>[], :render_filter=>[], :amazing=>true}>"
   end
 
   it "recursive: false only copies first level" do
-    decorator = Disposable::Twin::Schema.from(Representer,
+    decorator = Disposable::Rescheme.from(Representer, include: [Representable::Hash],
       superclass:       Representable::Decorator,
-      representer_from: lambda { |nested| nested },
+      definitions_from: lambda { |nested| nested.definitions },
       recursive: false,
       exclude_options: [:deserializer]
     )
 
-    decorator.representable_attrs.get(:title).inspect.must_equal "#<Representable::Definition ==>title @options={:writeable=>false, :parse_filter=>[], :render_filter=>[], :as=>\"title\"}>"
-    decorator.representable_attrs.get(:songs).representer_module.representable_attrs.get(:name).inspect.must_equal "#<Representable::Definition ==>name @options={:as=>\"Name\", :deserializer=>{:skip_parse=>\"a crazy cool instance method\"}, :parse_filter=>[], :render_filter=>[]}>"
+    decorator.representable_attrs.get(:title).inspect.must_equal "#<Representable::Definition ==>title @options={:writeable=>false, :name=>\"title\", :parse_filter=>[], :render_filter=>[]}>"
+    decorator.representable_attrs.get(:songs).representer_module.representable_attrs.get(:name).inspect.must_equal "#<Representable::Definition ==>name @options={:as=>\"Name\", :deserializer=>{:skip_parse=>\"a crazy cool instance method\"}, :name=>\"name\", :parse_filter=>[], :render_filter=>[]}>"
   end
 end
 
 
-class TwinSchemaTest < MiniTest::Spec
+class TwinReschemeTest < MiniTest::Spec
   class Artist < Disposable::Twin
     property :name
   end
@@ -115,15 +113,15 @@ class TwinSchemaTest < MiniTest::Spec
   end
 
   it do
-    decorator = Disposable::Twin::Schema.from(Album, superclass: Representable::Decorator,
-      representer_from: lambda { |nested| nested.representer_class }
+    decorator = Disposable::Rescheme.from(Album, superclass: Representable::Decorator, include: [Representable::Hash],
+      definitions_from: lambda { |nested| nested.definitions }
     )
 
     artist = decorator.representable_attrs.get(:artist)
     options = artist.instance_variable_get(:@options)
-    nested_extend = options.delete(:extend)
-    options.inspect.must_equal "{:twin=>TwinSchemaTest::Artist, :private_name=>:artist, :parse_filter=>[], :render_filter=>[], :as=>\"artist\"}"
+    nested_extend = options[:nested]
+    options.extend(Declarative::Inspect).inspect.must_equal "{:private_name=>:artist, :nested=>#<Class:>, :name=>\"artist\", :extend=>#<Class:>, :parse_filter=>[], :render_filter=>[]}"
     assert nested_extend < Representable::Decorator
-    nested_extend.representable_attrs.get(:name).inspect.must_equal "#<Representable::Definition ==>name @options={:private_name=>:name, :parse_filter=>[], :render_filter=>[], :as=>\"name\"}>"
+    nested_extend.representable_attrs.get(:name).inspect.must_equal "#<Representable::Definition ==>name @options={:private_name=>:name, :name=>\"name\", :parse_filter=>[], :render_filter=>[]}>"
   end
 end

data/test/test_helper.rb

@@ -1,7 +1,8 @@
-require 'disposable'
-require 'minitest/autorun'
+require "disposable"
+require "minitest/autorun"
 require "pp"
 require "representable/debug"
+require "declarative/testing"
 
 class Track
   def initialize(options={})

data/test/twin/collection_test.rb

@@ -16,13 +16,13 @@ class TwinCollectionTest < MiniTest::Spec
     class Song < Disposable::Twin
       property :id # DISCUSS: needed for #save.
       property :title
-      property :album, :twin => Album
+      # property :album, twin: Album
     end
 
     class Album < Disposable::Twin
       property :id # DISCUSS: needed for #save.
       property :name
-      collection :songs, :twin => lambda { |*| Song }
+      collection :songs, twin: Song
     end
   end
 
@@ -62,8 +62,8 @@ class TwinCollectionActiveRecordTest < MiniTest::Spec
     class Album < Disposable::Twin
       property :id # DISCUSS: needed for #save.
       property :name
-      collection :songs, :twin => lambda { |*| Song }
-      property :artist, twin: lambda { |*| Artist }
+      collection :songs, twin: Twin::Song
+      property :artist, twin: Twin::Artist
 
       include Sync
       include Save
@@ -208,7 +208,7 @@ class CollectionUnitTest < MiniTest::Spec
     Album = Struct.new(:id, :name, :songs, :artist)
   end
 
-  let(:collection) { Disposable::Twin::Collection.new(Disposable::Twin::Twinner.new(Twin::Song.representer_class.representable_attrs.get(:album)), []) }
+  let(:collection) { Disposable::Twin::Collection.new(Disposable::Twin::Twinner.new(Twin::Song.definitions.get(:album)), []) }
 
   # #insert(index, model)
   it do

data/test/twin/feature_test.rb

@@ -18,23 +18,19 @@ class FeatureTest < MiniTest::Spec
   end
 
   class AlbumForm < Disposable::Twin
-    include Setup
     feature Date
     property :name
 
     collection :songs do
-      include Setup
       property :title
 
       property :composer do
-        include Setup
         feature Instrument
         property :name
       end
     end
 
     property :artist do
-      include Setup
       property :name
     end
   end

data/test/twin/inherit_test.rb

@@ -40,8 +40,8 @@ class InheritTest < MiniTest::Spec
 
   # definitions are not shared.
   it do
-    Twin::Album.representer_class.representable_attrs.get(:name).inspect.must_equal "#<Representable::Definition ==>name @options={:fromage=>:_name, :private_name=>:name, :parse_filter=>[], :render_filter=>[], :as=>\"name\"}>"
-    Twin::Compilation.representer_class.representable_attrs.get(:name).inspect.must_equal "#<Representable::Definition ==>name @options={:fromage=>:_name, :private_name=>:name, :parse_filter=>[], :render_filter=>[], :as=>\"name\", :writeable=>false, :inherit=>true}>"
+    Twin::Album.definitions.get(:name).extend(Declarative::Inspect).inspect.must_equal "#<Disposable::Twin::Definition: @options={:fromage=>:_name, :private_name=>:name, :name=>\"name\"}>"
+    Twin::Compilation.definitions.get(:name).extend(Declarative::Inspect).inspect.must_equal "#<Disposable::Twin::Definition: @options={:fromage=>:_name, :private_name=>:name, :name=>\"name\", :writeable=>false}>" # FIXME: where did :inherit go?
   end
 
 

data/test/twin/process_inline_test.rb

@@ -1,35 +1,35 @@
-require "test_helper"
+# require "test_helper"
 
-class ProcessInlineTest < MiniTest::Spec
-  Album = Struct.new(:artist, :composer, :recursive_composer)
+# class ProcessInlineTest < MiniTest::Spec
+#   Album = Struct.new(:artist, :composer, :recursive_composer)
 
-  module InlineTwin
-  end
+#   module InlineTwin
+#   end
 
-  class RecursiveComposerTwin < Disposable::Twin
-    property :composer, twin: self
-  end
+#   class RecursiveComposerTwin < Disposable::Twin
+#     property :composer, twin: self
+#   end
 
-  class AlbumTwin < Disposable::Twin
-    def self.process_inline!(inline_class, definition)
-      inline_class.send :include, InlineTwin
-    end
+#   class AlbumTwin < Disposable::Twin
+#     def self.process_inline!(inline_class, definition)
+#       inline_class.send :include, InlineTwin
+#     end
 
-    property :artist do
-    end
+#     property :artist do
+#     end
 
-    property :composer, twin: ->{ ComposerTwin }
+#     property :composer, twin: ->{ ComposerTwin }
 
-    property :recursive_composer, twin: RecursiveComposerTwin
-  end
+#     property :recursive_composer, twin: RecursiveComposerTwin
+#   end
 
-  class ComposerTwin < Disposable::Twin
-  end
+#   class ComposerTwin < Disposable::Twin
+#   end
 
-  it do
-    twin = AlbumTwin.new(Album.new(Object, Object))
-    assert ! (twin.class < InlineTwin)
-    assert   (twin.artist.class < InlineTwin)
-    assert ! (twin.composer.class < InlineTwin)
-  end
-end
+#   it do
+#     twin = AlbumTwin.new(Album.new(Object, Object))
+#     assert ! (twin.class < InlineTwin)
+#     assert   (twin.artist.class < InlineTwin)
+#     assert ! (twin.composer.class < InlineTwin)
+#   end
+# end

data/test/twin/setup_test.rb

@@ -17,7 +17,7 @@ class TwinSetupTest < MiniTest::Spec
 
     class Song < Disposable::Twin
       property :id
-      property :composer, twin: lambda { |*| Twin::Artist }
+      property :composer, twin: Twin::Artist
 
       include Setup
     end
@@ -25,8 +25,8 @@ class TwinSetupTest < MiniTest::Spec
     class Album < Disposable::Twin
       property :id
       property :name
-      collection :songs, twin: lambda { |*| Twin::Song }
-      property :artist, twin: lambda { |*| Twin::Artist }
+      collection :songs, twin: Twin::Song
+      property :artist, twin: Twin::Artist
 
       include Setup
     end

data/test/twin/twin_test.rb

@@ -7,25 +7,24 @@ class TwinTest < MiniTest::Spec
     Artist = Struct.new(:id)
   end
 
-
+  # test twin: option
   module Twin
+    class Artist < Disposable::Twin
+      property :id
+
+      include Setup
+    end
+
     class Album < Disposable::Twin
       property :id # DISCUSS: needed for #save.
       property :name
-      collection :songs, :twin => lambda { |*| Song }
-      property :artist, :twin => lambda { |*| Artist }
+      property :artist, twin: Artist
     end
 
     class Song < Disposable::Twin
       property :id # DISCUSS: needed for #save.
       property :title
-      property :album, :twin => Album
-    end
-
-    class Artist < Disposable::Twin
-      property :id
-
-      include Setup
+      property :album, twin: Album
     end
   end
 
@@ -91,20 +90,6 @@ class TwinTest < MiniTest::Spec
     #   result.must_equal twin.album
     # end
   end
-
-  # FIXME: experimental.
-  describe "#to_s" do
-    class HitTwin < Disposable::Twin
-      include Setup
-
-      property :song do
-      end
-    end
-
-    let (:hit) { OpenStruct.new(song: song) }
-    it { HitTwin.new(hit).to_s.must_match "#<TwinTest::HitTwin:" }
-    it { HitTwin.new(hit).song.to_s.must_match "#<Twin (inline):" }
-  end
 end
 
 
@@ -138,7 +123,7 @@ class TwinAsTest < MiniTest::Spec
 
     class Song < Disposable::Twin
       property :name, :from => :title
-      property :record, :twin => Album, :from => :album
+      property :record, twin: Album, :from => :album
 
       # model Model::Song
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disposable
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.2.0.rc1
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber
@@ -24,26 +24,40 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: declarative
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: representable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.4.0.rc1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.4.0.rc1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +166,7 @@ files:
 - lib/disposable/callback.rb
 - lib/disposable/composition.rb
 - lib/disposable/expose.rb
+- lib/disposable/rescheme.rb
 - lib/disposable/twin.rb
 - lib/disposable/twin/builder.rb
 - lib/disposable/twin/changed.rb
@@ -159,12 +174,10 @@ files:
 - lib/disposable/twin/collection.rb
 - lib/disposable/twin/composition.rb
 - lib/disposable/twin/default.rb
-- lib/disposable/twin/option.rb
+- lib/disposable/twin/definitions.rb
 - lib/disposable/twin/persisted.rb
 - lib/disposable/twin/property_processor.rb
-- lib/disposable/twin/representer.rb
 - lib/disposable/twin/save.rb
-- lib/disposable/twin/schema.rb
 - lib/disposable/twin/setup.rb
 - lib/disposable/twin/struct.rb
 - lib/disposable/twin/sync.rb
@@ -175,6 +188,7 @@ files:
 - test/example.rb
 - test/expose_test.rb
 - test/persisted_test.rb
+- test/rescheme_test.rb
 - test/skip_getter_test.rb
 - test/test_helper.rb
 - test/twin/benchmarking.rb
@@ -193,7 +207,6 @@ files:
 - test/twin/process_inline_test.rb
 - test/twin/readable_test.rb
 - test/twin/save_test.rb
-- test/twin/schema_test.rb
 - test/twin/setup_test.rb
 - test/twin/skip_unchanged_test.rb
 - test/twin/struct_test.rb
@@ -217,9 +230,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8
@@ -234,6 +247,7 @@ test_files:
 - test/example.rb
 - test/expose_test.rb
 - test/persisted_test.rb
+- test/rescheme_test.rb
 - test/skip_getter_test.rb
 - test/test_helper.rb
 - test/twin/benchmarking.rb
@@ -252,7 +266,6 @@ test_files:
 - test/twin/process_inline_test.rb
 - test/twin/readable_test.rb
 - test/twin/save_test.rb
-- test/twin/schema_test.rb
 - test/twin/setup_test.rb
 - test/twin/skip_unchanged_test.rb
 - test/twin/struct_test.rb

data/lib/disposable/twin/option.rb

@@ -1,12 +0,0 @@
-module Disposable::Twin::Option
-  def self.included(base)
-    base.extend ClassMethods
-  end
-
-  module ClassMethods
-    def option(name, options={})
-      # default: nil will always set an option in the, even when not in the incoming options.
-      property(name, options.merge(readable: false, writeable: false, default: nil))
-    end
-  end
-end

data/lib/disposable/twin/representer.rb

@@ -1,57 +0,0 @@
-require "representable/decorator"
-# require "representable/hash"
-
-module Disposable
-  class Twin
-    class Decorator < Representable::Decorator
-      # Overrides representable's Definition class so we can add semantics in our representers.
-      class Definition < Representable::Definition
-        def dynamic_options
-          super + [:twin]
-        end
-
-        def twin_class
-          self[:twin].evaluate(nil) # FIXME: do we support the :twin option, and should it be wrapped?
-        end
-      end
-
-      # FIXME: this is not properly used when inheriting - fix that in representable.
-      def self.build_config
-        Config.new(Definition)
-      end
-
-      def self.each(options={})
-        return representable_attrs[:definitions].values unless block_given?
-
-        definitions = representable_attrs
-
-        definitions.each do |dfn|
-          next if options[:exclude]    and options[:exclude].include?(dfn.name)
-          next if options[:scalar]     and dfn[:collection]
-          next if options[:collection] and ! dfn[:collection]
-          next if options[:twin]       and ! dfn[:twin]
-
-          yield dfn
-        end
-
-        definitions
-      end
-
-      def self.default_inline_class
-        Twin
-      end
-
-
-      class Options < ::Hash
-        def exclude!(names)
-          excludes.push(*names)
-          self
-        end
-
-        def excludes
-          self[:exclude] ||= []
-        end
-      end
-    end # Decorator.
-  end
-end