representable 2.4.0.rc2 → 2.4.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12b358b0408f681050cffbf59f725d7e30258a09
-  data.tar.gz: dbed48942320f3fe55ea7860afeb18460c31bd95
+  metadata.gz: 7f9cc279171577dec367b7910ae42b4d4f8b6240
+  data.tar.gz: 193116e06652a35c3fa5bd5124a401d51c8d5c7e
 SHA512:
-  metadata.gz: 5831da653f955596c08149596675ca62a0238ac6dd59c8f1840e8f8fbd792542a1d1324c78518fd97c176c9ef09640317ad9f618e9417a09348003534b83e3fb
-  data.tar.gz: 3da85e9e4109e885806e6f8903a85c946bb025f2023183aaf8409956bcb631099fe2f447910f45a2e6d6c7f876964b277be6f943e395f9f25c3c3561435e2d31
+  metadata.gz: 14296a6fb55202f2c747cbe0a77e97a3bef8f82673eae9467cd290243dd0ed438f3ffe5fbbf7ec53728818b91459774f18e7141117d9788bd497218ad4899325
+  data.tar.gz: 35a26662c16e844cb9944cdf06cb9a5014c266f53568e714d0f37e49922076cc200e1126fb554dc13a2a0115a97479ea5ddce300bf3d6663148f9adf9ef108c8

data/CHANGES.md

@@ -44,8 +44,13 @@ and it suddenly is super simple to understand
 * Removed `Binding@represented` (which was never public anyway). Use `Binding#represented`.
 * Changed signature: `Binding#get(represented:)`. In now needs a hash `{represented: ..}`.
 
-# 2.4.0.rc2
+# 2.4.0.rc3
 
+* `CreateObject` no longer invokes `AssignFragment`. This is now part of the official parse pipeline.
+
+# 2.4.0.rc4
+
+* `Set` is `SetValue`. `Get` is `GetValue`.
 * Use Declarative's `::build_definition` interface instead of overwriting `::property`.
 
 # 2.3.0

data/Gemfile

@@ -15,5 +15,5 @@ group :test do
   gem "pry"
 end
 
-gem "declarative", path: "../declarative"
+# gem "declarative", path: "../declarative"
 # gem "declarative", github: "apotonick/declarative"

data/lib/representable/deprecations.rb

@@ -84,7 +84,7 @@ module Representable::Binding::Deprecation
 
     def get(options={}) # DISCUSS: evluate if we really need this.
       warn "[Representable] Binding#get is deprecated."
-      self[:getter] ? Representable::Getter.(nil, options.merge(binding: self)) : Representable::Get.(nil, options.merge(binding: self))
+      self[:getter] ? Representable::Getter.(nil, options.merge(binding: self)) : Representable::GetValue.(nil, options.merge(binding: self))
     end
   end
 end

data/lib/representable/deserializer.rb

@@ -20,7 +20,7 @@ module Representable
   end
 
   OverwriteOnNil = ->(input, options) do
-    input.nil? ? (Set.(input, options); Pipeline::Stop) : input
+    input.nil? ? (SetValue.(input, options); Pipeline::Stop) : input
   end
 
   Default = ->(input, options) do
@@ -38,8 +38,6 @@ module Representable
   module Function
     class CreateObject
       def call(input, options)
-        AssignFragment.(input, options)
-
         instance_for(input, options) || class_for(input, options)
       end
 
@@ -99,8 +97,8 @@ module Representable
     options[:binding][:parse_filter].(input, options)
   end
 
-  Setter = ->(input, options) { options[:binding].evaluate_option(:setter, input, options) }
-  Set = ->(input, options) { options[:binding].send(:exec_context, options).send(options[:binding].setter, input) }
+  Setter   = ->(input, options) { options[:binding].evaluate_option(:setter, input, options) }
+  SetValue = ->(input, options) { options[:binding].send(:exec_context, options).send(options[:binding].setter, input) }
 
 
   Stop = ->(*) { Pipeline::Stop }

data/lib/representable/hash_methods.rb

@@ -4,7 +4,7 @@ module Representable
       hash  = filter_keys_for!(represented, options) # FIXME: this modifies options and replicates logic from Representable.
       bin   = representable_map(options, format).first
 
-      Collect::Hash[*bin.default_render_fragment_functions].extend(Pipeline::Debug).(hash, {doc: doc, user_options: options, binding: bin, represented: represented, decorator: self})
+      Collect::Hash[*bin.default_render_fragment_functions].(hash, {doc: doc, user_options: options, binding: bin, represented: represented, decorator: self})
     end
 
     def update_properties_from(doc, options, format)

data/lib/representable/insert.rb

@@ -16,12 +16,19 @@ module Representable
               arr[index] = Collect[*Pipeline::Insert.(func, new_func, replace: old_func)]
             end
 
-            arr[index] = new_func if old_func.is_a?(Proc)? (func==old_func) : old_func.instance_of?(func.class)
+            arr[index] = new_func if func==old_func
           }
         end
 
-        def delete!(arr, func)
-          arr.delete(func)
+        def delete!(arr, removed_func)
+          arr.delete(removed_func)
+
+          # TODO: make nice.
+          arr.each_with_index { |func, index|
+            if func.is_a?(Collect)
+              arr[index] = Collect[*Pipeline::Insert.(func, removed_func, delete: true)]
+            end
+          }
         end
       end
     end

data/lib/representable/parse_strategies.rb

@@ -1,8 +1,6 @@
 module Representable
   class Populator
     FindOrInstantiate = ->(input, options) {
-      AssignFragment.(input, options)
-
       binding = options[:binding]
 
       object_class = binding[:class].(input, options)
@@ -18,13 +16,17 @@ module Representable
       object
      }
 
+    # pipeline: [StopOnExcluded, AssignName, ReadFragment, StopOnNotFound, OverwriteOnNil, AssignFragment, #<Representable::Function::CreateObject:0x9805a44>, #<Representable::Function::Decorate:0x9805a1c>, Deserialize, Set]
+
     def self.apply!(options)
       return unless populator = options[:populator]
 
       options[:parse_pipeline] = ->(input, options) do
         pipeline = Pipeline[*parse_functions] # TODO: AssignFragment
-        pipeline = Pipeline::Insert.(pipeline, Set, delete: true) # remove the setter function.
+        pipeline = Pipeline::Insert.(pipeline, SetValue, delete: true) # remove the setter function.
         pipeline = Pipeline::Insert.(pipeline, populator, replace: CreateObject) # let the populator do CreateObject's job.
+        # puts pipeline.extend(Representable::Pipeline::Debug).inspect
+        pipeline
       end
     end
   end

data/lib/representable/pipeline_factories.rb

@@ -44,7 +44,7 @@ module Representable
       functions << Stop if self[:readable]==false
       functions << StopOnExcluded
       functions << If if self[:if]
-      functions << (self[:getter] ? Getter : Get)
+      functions << (self[:getter] ? Getter : GetValue)
       functions << Writer if self[:writer]
       functions << RenderFilter if self[:render_filter].any?
       functions << RenderDefault if has_default?
@@ -64,7 +64,7 @@ module Representable
     end
 
     def default_parse_fragment_functions
-      functions = []
+      functions = [AssignFragment]
       functions << SkipParse if self[:skip_parse]
 
       if typed?
@@ -82,7 +82,7 @@ module Representable
     def default_post_functions
       funcs = []
       funcs << ParseFilter if self[:parse_filter].any?
-      funcs << (self[:setter] ? Setter : Set)
+      funcs << (self[:setter] ? Setter : SetValue)
     end
   end
 end

data/lib/representable/serializer.rb

@@ -3,7 +3,7 @@ module Representable
     options[:binding].evaluate_option(:getter, input, options)
   end
 
-  Get = ->(input, options) { options[:binding].send(:exec_context, options).send(options[:binding].getter) }
+  GetValue = ->(input, options) { options[:binding].send(:exec_context, options).send(options[:binding].getter) }
 
   Writer = ->(input, options) do
     options[:binding].evaluate_option(:writer, input, options)

data/lib/representable/version.rb

@@ -1,3 +1,3 @@
 module Representable
-  VERSION = "2.4.0.rc2"
+  VERSION = "2.4.0.rc3"
 end

data/test/pipeline_test.rb

@@ -77,7 +77,7 @@ class PipelineTest < MiniTest::Spec
   it "rendering scalar property" do
     doc = {}
     P[
-      R::Get,
+      R::GetValue,
       R::StopOnSkipable,
       R::AssignName,
       R::WriteFragment
@@ -93,7 +93,7 @@ class PipelineTest < MiniTest::Spec
       R::StopOnNotFound,
       R::OverwriteOnNil,
       # R::SkipParse,
-      R::Set,
+      R::SetValue,
     ].extend(P::Debug).(doc={"title"=>"Eruption"}, {represented: song=Song.new("Lime Green"), binding: title, doc: doc}).must_equal "Eruption"
     song.title.must_equal "Eruption"
   end
@@ -116,7 +116,7 @@ class PipelineTest < MiniTest::Spec
   it "rendering typed property" do
     doc = {}
     P[
-      R::Get,
+      R::GetValue,
       R::StopOnSkipable,
       R::StopOnNil,
       R::SkipRender,
@@ -136,10 +136,11 @@ class PipelineTest < MiniTest::Spec
       R::StopOnNotFound,
       R::OverwriteOnNil,
       # R::SkipParse,
+      R::AssignFragment,
       R::CreateObject,
       R::Decorate,
       R::Deserialize,
-      R::Set,
+      R::SetValue,
     ].extend(P::Debug).(doc={"artist"=>{"name"=>"Doobie Brothers"}}, {represented: song_model, binding: artist, doc: doc, user_options: {}}).must_equal model=Artist.new("Doobie Brothers")
     song_model.artist.must_equal model
   end
@@ -155,7 +156,7 @@ class PipelineTest < MiniTest::Spec
   it "render scalar collection" do
     doc = {}
     P[
-      R::Get,
+      R::GetValue,
       R::StopOnSkipable,
       R::Collect[
         R::SkipRender,
@@ -176,7 +177,7 @@ class PipelineTest < MiniTest::Spec
   it "render typed collection" do
     doc = {}
     P[
-      R::Get,
+      R::GetValue,
       R::StopOnSkipable,
       R::Collect[
         R::SkipRender,
@@ -201,12 +202,13 @@ let (:album_model) { Album.new(nil, [Artist.new("Diesel Boy"), Artist.new("Van H
       R::OverwriteOnNil,
       # R::SkipParse,
       R::Collect[
+        R::AssignFragment,
         R::SkipRender,
         R::CreateObject,
         R::Decorate,
         R::Deserialize,
       ],
-      R::Set,
+      R::SetValue,
     ].extend(P::Debug).(doc, {represented: album_model, binding: artists, doc: doc, user_options: {}}).must_equal([Artist.new("Diesel Boy"), Artist.new("Van Halen")])
 
     album_model.artists.must_equal([Artist.new("Diesel Boy"), Artist.new("Van Halen")])
@@ -214,7 +216,7 @@ let (:album_model) { Album.new(nil, [Artist.new("Diesel Boy"), Artist.new("Van H
 
   # TODO: test with arrays, too, not "only" Pipeline instances.
   describe "#Insert Pipeline[], Function, replace: OldFunction" do
-    let (:pipeline) { P[R::Get, R::StopOnSkipable, R::StopOnNil] }
+    let (:pipeline) { P[R::GetValue, R::StopOnSkipable, R::StopOnNil] }
 
     it "returns Pipeline instance when passing in Pipeline instance" do
       P::Insert.(pipeline, R::Default, replace: R::StopOnSkipable).must_be_instance_of(R::Pipeline)
@@ -222,8 +224,8 @@ let (:album_model) { Album.new(nil, [Artist.new("Diesel Boy"), Artist.new("Van H
 
     it "replaces if exists" do
       # pipeline.insert!(R::Default, replace: R::StopOnSkipable)
-      P::Insert.(pipeline, R::Default, replace: R::StopOnSkipable).must_equal P[R::Get, R::Default, R::StopOnNil]
-      pipeline.must_equal P[R::Get, R::StopOnSkipable, R::StopOnNil]
+      P::Insert.(pipeline, R::Default, replace: R::StopOnSkipable).must_equal P[R::GetValue, R::Default, R::StopOnNil]
+      pipeline.must_equal P[R::GetValue, R::StopOnSkipable, R::StopOnNil]
     end
 
     it "replaces Function instance" do
@@ -234,26 +236,42 @@ let (:album_model) { Album.new(nil, [Artist.new("Diesel Boy"), Artist.new("Van H
 
     it "does not replace when not existing" do
       P::Insert.(pipeline, R::Default, replace: R::Prepare)
-      pipeline.must_equal P[R::Get, R::StopOnSkipable, R::StopOnNil]
+      pipeline.must_equal P[R::GetValue, R::StopOnSkipable, R::StopOnNil]
     end
 
     it "applies on nested Collect" do
-      pipeline = P[R::Get, R::Collect[R::Get, R::StopOnSkipable], R::StopOnNil]
+      pipeline = P[R::GetValue, R::Collect[R::GetValue, R::StopOnSkipable], R::StopOnNil]
 
-      P::Insert.(pipeline, R::Default, replace: R::StopOnSkipable).extend(P::Debug).inspect.must_equal "Pipeline[Get, Collect[Get, Default], StopOnNil]"
-      pipeline.must_equal P[R::Get, R::Collect[R::Get, R::StopOnSkipable], R::StopOnNil]
+      P::Insert.(pipeline, R::Default, replace: R::StopOnSkipable).extend(P::Debug).inspect.must_equal "Pipeline[GetValue, Collect[GetValue, Default], StopOnNil]"
+      pipeline.must_equal P[R::GetValue, R::Collect[R::GetValue, R::StopOnSkipable], R::StopOnNil]
 
 
-      P::Insert.(pipeline, R::Default, replace: R::StopOnNil).extend(P::Debug).inspect.must_equal "Pipeline[Get, Collect[Get, StopOnSkipable], Default]"
+      P::Insert.(pipeline, R::Default, replace: R::StopOnNil).extend(P::Debug).inspect.must_equal "Pipeline[GetValue, Collect[GetValue, StopOnSkipable], Default]"
+    end
+
+    it "applies on nested Collect with Function::CreateObject" do
+      pipeline = P[R::GetValue, R::Collect[R::GetValue, R::CreateObject], R::StopOnNil]
+
+      P::Insert.(pipeline, R::Default, replace: R::CreateObject).extend(P::Debug).inspect.must_equal "Pipeline[GetValue, Collect[GetValue, Default], StopOnNil]"
+      pipeline.must_equal P[R::GetValue, R::Collect[R::GetValue, R::CreateObject], R::StopOnNil]
+    end
+  end
+
+  describe "Insert.(delete: true)" do
+    let(:pipeline) { P[R::GetValue, R::StopOnNil] }
+
+    it do
+      P::Insert.(pipeline, R::GetValue, delete: true).extend(P::Debug).inspect.must_equal "Pipeline[StopOnNil]"
+      pipeline.extend(P::Debug).inspect.must_equal "Pipeline[GetValue, StopOnNil]"
     end
   end
 
-  describe "Insert delete: true" do
-    let(:pipeline) { P[R::Get, R::Collect[R::Get, R::StopOnSkipable], R::StopOnNil] }
+  describe "Insert.(delete: true) with Collect" do
+    let(:pipeline) { P[R::GetValue, R::Collect[R::GetValue, R::StopOnSkipable], R::StopOnNil] }
 
     it do
-      P::Insert.(pipeline, R::Get, delete: true).extend(P::Debug).inspect.must_equal "Pipeline[Collect[Get, StopOnSkipable], StopOnNil]"
-      pipeline.extend(P::Debug).inspect.must_equal "Pipeline[Get, Collect[Get, StopOnSkipable], StopOnNil]"
+      P::Insert.(pipeline, R::GetValue, delete: true).extend(P::Debug).inspect.must_equal "Pipeline[Collect[StopOnSkipable], StopOnNil]"
+      pipeline.extend(P::Debug).inspect.must_equal "Pipeline[GetValue, Collect[GetValue, StopOnSkipable], StopOnNil]"
     end
   end
 end

data/test/populator_test.rb

@@ -1,6 +1,35 @@
 require "test_helper"
 
-class PopulatorFindOrInstantiateTest < MiniTest::Spec
+class PopulatorTest < Minitest::Spec
+  Song   = Struct.new(:id)
+  Artist = Struct.new(:name)
+  Album  = Struct.new(:songs, :artist)
+
+  describe "populator: ->{}" do
+    representer! do
+      collection :songs, populator: ->(input, options) { options[:represented].songs << song = Song.new; song } do
+        property :id
+      end
+
+      property :artist, populator: ->(input, options) { options[:represented].artist = Artist.new } do
+        property :name
+      end
+    end
+
+    let (:album) { Album.new([]) }
+
+    it do
+      album.extend(representer).from_hash("songs"=>[{"id"=>1}, {"id"=>2}], "artist"=>{"name"=>"Waste"})
+      album.inspect.must_equal "#<struct PopulatorTest::Album songs=[#<struct PopulatorTest::Song id=1>, #<struct PopulatorTest::Song id=2>], artist=#<struct PopulatorTest::Artist name=\"Waste\">>"
+    end
+  end
+
+  describe "populator: ->{}, " do
+
+  end
+end
+
+class PopulatorFindOrInstantiateTest < Minitest::Spec
   Song = Struct.new(:id, :title, :uid) do
     def self.find_by(attributes={})
       return new(1, "Resist Stan", "abcd") if attributes[:id]==1# we should return the same object here
@@ -26,7 +55,7 @@ class PopulatorFindOrInstantiateTest < MiniTest::Spec
       end
     end
 
-    let (:album) { Composer.new.extend(representer) }
+    let (:album) { Composer.new.extend(representer).extend(Representable::Debug) }
 
     it "finds by :id and creates new without :id" do
       album.from_hash({"song"=>{"id" => 1, "title"=>"Resist Stance"}})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: representable
 version: !ruby/object:Gem::Version
-  version: 2.4.0.rc2
+  version: 2.4.0.rc3
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber