disposable 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be7cc7255ab188ade93c3a41b34fe3d3e7d3fcea
-  data.tar.gz: 392c14ff2c4a94645c1eac6367e4d22cb93e7350
+  metadata.gz: a9c9aa07f72bb27f1c9e16676ee32e3fd833227f
+  data.tar.gz: 6d4fed32a68c0fede66f34eb0e7cf879feccbc41
 SHA512:
-  metadata.gz: 00f77a8ce79c13ca5a55a4ca96d657b99c829d0f6f91d34f81c452d13c4a0fcf2306ca28e55bfb5390f74a5b52873f1ec49b425146f918923d5d09c80d47a253
-  data.tar.gz: dd590bae941a3fa7e3e1b7ef74899619fef2de23cf2e154d93948873d729c21732f79d040b76d7769baa4940512a675069b23c8efa18103484529ba2f3d7afc2
+  metadata.gz: 1d1bceba1293f838c5a3878b868f0d1efcfe073354e223c3324c8ffca958cedd3c1de7525baed229f1c404e40dfb01294b32038c5988bf39ba300f357a4ad9b2
+  data.tar.gz: a40cd420d9bbceb1ae884ffec1343f53ba426f1d16bdbdbffc6ed9e68efef4d744619f0ce40a4e8300da24485e989338fdea581d35ecc85e18cad77fefe60a83

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 0.1.8
+
+* Specifying a nested twin with `:twin` instead of a block now gets identically processed to the block.
+
 # 0.1.7
 
 * Removed Setup#merge_options! and hash merge as this is already been done in #setup_properties.

data/lib/disposable/twin.rb

@@ -46,12 +46,13 @@ module Disposable
     # TODO: move to Declarative, as in Representable and Reform.
     def self.property(name, options={}, &block)
       options[:private_name] = options.delete(:from) || name
-      options[:pass_options] = true
 
       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|
         mod = Module.new do
           define_method(name)       { @fields[name.to_s] }
@@ -60,13 +61,14 @@ module Disposable
         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)
+          definition.merge!(twin: nested_twin)
         end
       end
     end

data/lib/disposable/version.rb

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

data/test/twin/collection_test.rb

@@ -13,17 +13,17 @@ class TwinCollectionTest < MiniTest::Spec
 
 
   module Twin
-    class Album < Disposable::Twin
-      property :id # DISCUSS: needed for #save.
-      property :name
-      collection :songs, :twin => lambda { |*| Song }
-    end
-
     class Song < Disposable::Twin
       property :id # DISCUSS: needed for #save.
       property :title
       property :album, :twin => Album
     end
+
+    class Album < Disposable::Twin
+      property :id # DISCUSS: needed for #save.
+      property :name
+      collection :songs, :twin => lambda { |*| Song }
+    end
   end
 
   let (:song) { Model::Song.new(1, "Broken", nil) }
@@ -46,18 +46,6 @@ require "disposable/twin/save"
 
 class TwinCollectionActiveRecordTest < MiniTest::Spec
   module Twin
-    class Album < Disposable::Twin
-      property :id # DISCUSS: needed for #save.
-      property :name
-      collection :songs, :twin => lambda { |*| Song }
-      property :artist, twin: lambda { |*| Artist }
-
-      include Sync
-      include Save
-      include Setup
-      include Collection::Semantics
-    end
-
     class Song < Disposable::Twin
       property :id # DISCUSS: needed for #save.
       property :title
@@ -70,6 +58,18 @@ class TwinCollectionActiveRecordTest < MiniTest::Spec
 
     class Artist < Disposable::Twin
     end
+
+    class Album < Disposable::Twin
+      property :id # DISCUSS: needed for #save.
+      property :name
+      collection :songs, :twin => lambda { |*| Song }
+      property :artist, twin: lambda { |*| Artist }
+
+      include Sync
+      include Save
+      include Setup
+      include Collection::Semantics
+    end
   end
 
   let (:album) { Album.create(name: "The Rest Is Silence") }

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, :pass_options=>true, :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, :pass_options=>true, :parse_filter=>[], :render_filter=>[], :as=>\"name\", :writeable=>false, :inherit=>true}>"
+    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}>"
   end
 
 

data/test/twin/schema_test.rb

@@ -66,4 +66,28 @@ class SchemaTest < MiniTest::Spec
     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\"}>"
   end
+end
+
+
+class TwinSchemaTest < MiniTest::Spec
+  class Artist < Disposable::Twin
+    property :name
+  end
+
+  class Album < Disposable::Twin
+    property :artist, twin: Artist
+  end
+
+  it do
+    decorator = Disposable::Twin::Schema.from(Album, superclass: Representable::Decorator,
+      representer_from: lambda { |nested| nested.representer_class }
+    )
+
+    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\"}"
+    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\"}>"
+  end
 end

data/test/twin/setup_test.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disposable
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber