disposable 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9c9aa07f72bb27f1c9e16676ee32e3fd833227f
-  data.tar.gz: 6d4fed32a68c0fede66f34eb0e7cf879feccbc41
+  metadata.gz: 8921eb326e4ef806db082f3a43372b32b2e76fc8
+  data.tar.gz: 98ae84211f0b25a33ee0035237683d647d50a579
 SHA512:
-  metadata.gz: 1d1bceba1293f838c5a3878b868f0d1efcfe073354e223c3324c8ffca958cedd3c1de7525baed229f1c404e40dfb01294b32038c5988bf39ba300f357a4ad9b2
-  data.tar.gz: a40cd420d9bbceb1ae884ffec1343f53ba426f1d16bdbdbffc6ed9e68efef4d744619f0ce40a4e8300da24485e989338fdea581d35ecc85e18cad77fefe60a83
+  metadata.gz: daad1b6f0cd51e44c4d57fad2960070bb14cf33bf13028f378151648b421b72c9c29c2dd57d3f9d47b5641b337b8dcbd22d599f35a264082f1de5a68a86035d2
+  data.tar.gz: 154096ab8f26fcacc523eb8569a7c0d73213b931a658e91492a51c947febc0282d114926ae32d892d2611b24dcedd1aafa039b9cf490abc75867adeb1a251edc

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 0.1.9
+
+* The `:twin` option is no longer evaluated at compile time, only inline twins are run through `::process_inline!`. This allows specifying twin classes in lambdas for lazy-loading, and recursive twins.
+
 # 0.1.8
 
 * Specifying a nested twin with `:twin` instead of a block now gets identically processed to the block.

data/lib/disposable/twin.rb

@@ -43,38 +43,47 @@ module Disposable
     end
 
 
-    # TODO: move to Declarative, as in Representable and Reform.
-    def self.property(name, options={}, &block)
-      options[:private_name] = options.delete(:from) || name
+    class << self
+      # TODO: move to Declarative, as in Representable and Reform.
+      def property(name, options={}, &block)
+        options[:private_name] = options.delete(:from) || name
 
-      if options.delete(:virtual)
-        options[:writeable] = options[:readable] = false
+        if options.delete(:virtual)
+          options[:writeable] = options[:readable] = false
+        end
+
+        options[:extend] = options[:twin] # e.g. property :album, twin: Album.
+
+        representer_class.property(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
 
-      options[:extend] = options[:twin] # e.g. property :album, twin: Album.
+      def collection(name, options={}, &block)
+        property(name, options.merge(collection: true), &block)
+      end
 
-      representer_class.property(name, options, &block).tap do |definition|
+    private
+      def create_accessors(name, definition)
         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.
         end
         include mod
-
-        # FIXME: the problem here is that something like twin:{ Album } already gets evaluated here.
-        # property -> build_inline(representable_attrs.features)
-        if definition[:extend]
-          nested_twin = definition[:extend].evaluate(nil)
-          process_inline!(nested_twin, definition)
-          # DISCUSS: could we use build_inline's api here to inject the name feature?
-
-          definition.merge!(twin: nested_twin)
-        end
       end
-    end
 
-    def self.collection(name, options={}, &block)
-      property(name, options.merge(collection: true), &block)
+      # DISCUSS: this method might disappear or change pretty soon.
+      def process_inline!(mod, definition)
+      end
     end
 
     include Setup
@@ -110,9 +119,6 @@ module Disposable
     end
     include Accessors
 
-    # DISCUSS: this method might disappear or change pretty soon.
-    def self.process_inline!(mod, definition)
-    end
 
     # FIXME: this is experimental.
     module ToS

data/lib/disposable/version.rb

@@ -1,3 +1,3 @@
 module Disposable
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/test/twin/process_inline_test.rb

@@ -0,0 +1,35 @@
+require "test_helper"
+
+class ProcessInlineTest < MiniTest::Spec
+  Album = Struct.new(:artist, :composer, :recursive_composer)
+
+  module InlineTwin
+  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
+
+    property :artist do
+    end
+
+    property :composer, twin: ->{ ComposerTwin }
+
+    property :recursive_composer, twin: RecursiveComposerTwin
+  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

data/test/twin/struct_test.rb

@@ -57,12 +57,12 @@ class TwinWithNestedStructTest < MiniTest::Spec
     property :title
     include Sync
 
-    property :options, twin: true do # don't call #to_hash, this is triggered in the twin's constructor.
+    property :options do # don't call #to_hash, this is triggered in the twin's constructor.
       include Struct
       property :recorded
       property :released
 
-      property :preferences, twin: true do
+      property :preferences do
         include Struct
         property :show_image
         property :play_teaser

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disposable
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber
@@ -195,6 +195,7 @@ files:
 - test/twin/from_test.rb
 - test/twin/inherit_test.rb
 - test/twin/option_test.rb
+- test/twin/process_inline_test.rb
 - test/twin/readable_test.rb
 - test/twin/save_test.rb
 - test/twin/schema_test.rb
@@ -252,6 +253,7 @@ test_files:
 - test/twin/from_test.rb
 - test/twin/inherit_test.rb
 - test/twin/option_test.rb
+- test/twin/process_inline_test.rb
 - test/twin/readable_test.rb
 - test/twin/save_test.rb
 - test/twin/schema_test.rb