representable 3.0.3 → 3.0.4

data/test/nested_test.rb

@@ -11,7 +11,7 @@ class NestedTest < MiniTest::Spec
 
     [false, true].each do |is_decorator|
       describe "::nested with (inline representer|decorator): #{is_decorator}" do
-        let (:format) { format }
+        let(:format) { format }
 
         representer!(:module => mod, :decorator => is_decorator) do
           nested :label do
@@ -27,8 +27,8 @@ class NestedTest < MiniTest::Spec
           # self.representation_wrap = :album if format == :xml
         end
 
-        let (:album) { Album.new("Epitaph", "Brett Gurewitz", 19) }
-        let (:decorator) { representer.prepare(album) }
+        let(:album) { Album.new("Epitaph", "Brett Gurewitz", 19) }
+        let(:decorator) { representer.prepare(album) }
 
         it "renders nested Album-properties in separate section" do
           render(decorator).must_equal_document output
@@ -49,7 +49,7 @@ class NestedTest < MiniTest::Spec
 
 
     describe "Decorator ::nested with extend:" do
-      let (:format) { format }
+      let(:format) { format }
 
       representer!(:name => :label_rpr) do
       	include mod
@@ -67,7 +67,7 @@ class NestedTest < MiniTest::Spec
         self.representation_wrap = :album if format == :xml
       end
 
-      let (:album) { representer.prepare(Album.new("Epitaph", "Brett Gurewitz", 19)) }
+      let(:album) { representer.prepare(Album.new("Epitaph", "Brett Gurewitz", 19)) }
 
       # TODO: shared example with above.
       it "renders nested Album-properties in separate section" do
@@ -99,7 +99,7 @@ class NestedTest < MiniTest::Spec
       nested :label, :inherit => true, :as => "Label"
     end
 
-    let (:album) { representer.prepare(Album.new("Epitaph", "Brett Gurewitz", 19)) }
+    let(:album) { representer.prepare(Album.new("Epitaph", "Brett Gurewitz", 19)) }
 
     it "renders nested Album-properties in separate section" do
       representer.prepare(album).to_hash.must_equal({"Label"=>{"owner"=>"Brett Gurewitz"}})

data/test/object_test.rb

@@ -18,8 +18,8 @@ class ObjectTest < MiniTest::Spec
     # TODO: collection
   end
 
-  let (:source) { Song.new("The King Is Dead", Album.new("Ruiner", [Song.new("In Vino Veritas II")])) }
-  let (:target) { Song.new }
+  let(:source) { Song.new("The King Is Dead", Album.new("Ruiner", [Song.new("In Vino Veritas II")])) }
+  let(:target) { Song.new }
 
   it do
     representer.prepare(target).from_object(source)
@@ -33,8 +33,8 @@ class ObjectTest < MiniTest::Spec
   it do
     representer.prepare(Song.new("The King Is Dead")).from_object(Song.new)
 
-    target.title.must_equal nil # scalar property gets overridden when nil.
-    target.album.must_equal nil # nested property stays nil.
+    target.title.must_be_nil # scalar property gets overridden when nil.
+    target.album.must_be_nil # nested property stays nil.
   end
 
   # to_object

data/test/parse_pipeline_test.rb

@@ -45,7 +45,6 @@ class ParsePipelineTest < MiniTest::Spec
     end
 
     def instance!(*options)
-      puts "@@@@@ #{options.inspect}"
       Song.new
     end
 
@@ -59,6 +58,5 @@ class ParsePipelineTest < MiniTest::Spec
     album = Album.new
     Representer.new(album).from_hash({"artist"=>{"email"=>"yo"}, "songs"=>[{"title"=>"Affliction"}, {"title"=>"Dream Beater"}]})
     album.songs.must_equal([Song.new("Affliction"), Song.new("Dream Beater")])
-    puts album.inspect
   end
 end

data/test/pipeline_test.rb

@@ -68,7 +68,7 @@ class PipelineTest < MiniTest::Spec
 
   ######### scalar property
 
-  let (:title) {
+  let(:title) {
     dfn = R::Definition.new(:title)
 
     R::Hash::Binding.new(dfn)
@@ -105,13 +105,13 @@ class PipelineTest < MiniTest::Spec
     property :name
   end
 
-  let (:artist) {
+  let(:artist) {
     dfn = R::Definition.new(:artist, extend: ArtistRepresenter, class: Artist)
 
     R::Hash::Binding.new(dfn)
   }
 
-  let (:song_model) { Song.new("Lime Green", Artist.new("Diesel Boy")) }
+  let(:song_model) { Song.new("Lime Green", Artist.new("Diesel Boy")) }
 
   it "rendering typed property" do
     doc = {}
@@ -146,7 +146,7 @@ class PipelineTest < MiniTest::Spec
 
   ######### collection :ratings
 
-  let (:ratings) {
+  let(:ratings) {
     dfn = R::Definition.new(:ratings, collection: true, skip_render: ->(*) { false })
 
     R::Hash::Binding::Collection.new(dfn)
@@ -167,7 +167,7 @@ class PipelineTest < MiniTest::Spec
   end
 
 ######### collection :songs, extend: SongRepresenter
-  let (:artists) {
+  let(:artists) {
     dfn = R::Definition.new(:artists, collection: true, extend: ArtistRepresenter, class: Artist)
 
     R::Hash::Binding::Collection.new(dfn)
@@ -188,7 +188,7 @@ class PipelineTest < MiniTest::Spec
     doc.must_equal({"artists"=>[{"name"=>"Diesel Boy"}, {"name"=>"Van Halen"}]})
   end
 
-let (:album_model) { Album.new(nil, [Artist.new("Diesel Boy"), Artist.new("Van Halen")]) }
+let(:album_model) { Album.new(nil, [Artist.new("Diesel Boy"), Artist.new("Van Halen")]) }
 
   it "parse typed collection" do
     doc = {"artists"=>[{"name"=>"Diesel Boy"}, {"name"=>"Van Halen"}]}
@@ -212,7 +212,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::GetValue, 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)

data/test/populator_test.rb

@@ -16,7 +16,7 @@ class PopulatorTest < Minitest::Spec
       end
     end
 
-    let (:album) { Album.new([]) }
+    let(:album) { Album.new([]) }
 
     it do
       album.extend(representer).from_hash("songs"=>[{"id"=>1}, {"id"=>2}], "artist"=>{"name"=>"Waste"})
@@ -55,7 +55,7 @@ class PopulatorFindOrInstantiateTest < Minitest::Spec
       end
     end
 
-    let (:album) { Composer.new.extend(representer).extend(Representable::Debug) }
+    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"}})
@@ -69,8 +69,8 @@ class PopulatorFindOrInstantiateTest < Minitest::Spec
       album.from_hash({"song"=>{"title"=>"Lower"}})
 
       album.song.title.must_equal "Lower"
-      album.song.id.must_equal nil
-      album.song.uid.must_equal nil
+      album.song.id.must_be_nil
+      album.song.uid.must_be_nil
     end
   end
 
@@ -82,7 +82,7 @@ class PopulatorFindOrInstantiateTest < Minitest::Spec
       end
     end
 
-    let (:album) { Struct.new(:songs).new([]).extend(representer) }
+    let(:album) { Struct.new(:songs).new([]).extend(representer) }
 
     it "finds by :id and creates new without :id" do
       album.from_hash({"songs"=>[
@@ -95,8 +95,8 @@ class PopulatorFindOrInstantiateTest < Minitest::Spec
       album.songs[0].uid.must_equal "abcd" # not changed via populator, indicating this is a formerly "persisted" object.
 
       album.songs[1].title.must_equal "Suffer"
-      album.songs[1].id.must_equal nil
-      album.songs[1].uid.must_equal nil
+      album.songs[1].id.must_be_nil
+      album.songs[1].uid.must_be_nil
     end
 
     # TODO: test with existing collection

data/test/prepare_test.rb

@@ -24,7 +24,7 @@ class PrepareTest < BaseTest
         :representable => false # don't call #to_hash.
     end
 
-    let (:hit) { Struct.new(:song).new(song).extend(representer) }
+    let(:hit) { Struct.new(:song).new(song).extend(representer) }
 
     it "calls prepare:, nothing else" do
       # render(hit).must_equal_document(output)
@@ -54,7 +54,7 @@ class PrepareTest < BaseTest
         :representable => false # don't call #to_hash.
     end
 
-    let (:hit) { Struct.new(:song).new.extend(representer) }
+    let(:hit) { Struct.new(:song).new.extend(representer) }
 
     it "calls prepare:, nothing else" do
       # render(hit).must_equal_document(output)

data/test/represent_test.rb

@@ -1,8 +1,8 @@
 require 'test_helper'
 
 class RepresentTest < MiniTest::Spec
-  let (:songs) { [song, Song.new("Can't Take Them All")] }
-  let (:song) { Song.new("Days Go By") }
+  let(:songs) { [song, Song.new("Can't Take Them All")] }
+  let(:song) { Song.new("Days Go By") }
 
   for_formats(
     :hash => [Representable::Hash, out=[{"name" => "Days Go By"}, {"name"=>"Can't Take Them All"}], out],
@@ -12,9 +12,9 @@ class RepresentTest < MiniTest::Spec
 
     # Representer.represents detects collection.
     describe "Module#to_/from_#{format}" do
-      let (:format) { format }
+      let(:format) { format }
 
-      let (:representer) {
+      let(:representer) {
         Module.new do
           include mod
           property :name
@@ -29,8 +29,8 @@ class RepresentTest < MiniTest::Spec
 
     # Decorator.represents detects collection.
     describe "Decorator#to_/from_#{format}" do
-      let (:format) { format }
-      let (:representer) {
+      let(:format) { format }
+      let(:representer) {
         Class.new(Representable::Decorator) do
           include mod
           property :name
@@ -53,9 +53,9 @@ class RepresentTest < MiniTest::Spec
 
     # Representer.represents detects singular.
     describe "Module#to_/from_#{format}" do
-      let (:format) { format }
+      let(:format) { format }
 
-      let (:representer) {
+      let(:representer) {
         Module.new do
           include mod
           property :name
@@ -71,8 +71,8 @@ class RepresentTest < MiniTest::Spec
 
     # Decorator.represents detects singular.
     describe "Decorator#to_/from_#{format}" do
-      let (:format) { format }
-      let (:representer) {
+      let(:format) { format }
+      let(:representer) {
         Class.new(Representable::Decorator) do
           include mod
           property :name

data/test/representable_test.rb

@@ -224,7 +224,7 @@ class RepresentableTest < MiniTest::Spec
       @band = Class.new(Band) { property :name; collection :founders, :writeable => false; attr_accessor :founders }.new
       @band.from_hash("name" => "Iron Maiden", "groupies" => 2, "founders" => ["Steve Harris"])
       assert_equal "Iron Maiden", @band.name
-      assert_equal nil, @band.founders
+      assert_nil @band.founders
     end
 
     it "always returns the represented" do
@@ -261,7 +261,7 @@ class RepresentableTest < MiniTest::Spec
 
         @band = Band.new.extend(repr)
         @band.send(config.first, config.last)
-        assert_equal nil, @band.name, "Failed in #{format}"
+        assert_nil @band.name, "Failed in #{format}"
       end
     end
 
@@ -449,9 +449,9 @@ class RepresentableTest < MiniTest::Spec
     end
 
     describe ":decorator" do
-      let (:extend_rpr) { Module.new { include Representable::Hash; collection :songs, :extend => SongRepresenter } }
-      let (:decorator_rpr) { Module.new { include Representable::Hash; collection :songs, :decorator => SongRepresenter } }
-      let (:songs) { [Song.new("Bloody Mary")] }
+      let(:extend_rpr) { Module.new { include Representable::Hash; collection :songs, :extend => SongRepresenter } }
+      let(:decorator_rpr) { Module.new { include Representable::Hash; collection :songs, :decorator => SongRepresenter } }
+      let(:songs) { [Song.new("Bloody Mary")] }
 
       it "is aliased to :extend" do
         Album.new(songs).extend(extend_rpr).to_hash.must_equal Album.new(songs).extend(decorator_rpr).to_hash
@@ -470,8 +470,8 @@ class RepresentableTest < MiniTest::Spec
     end
 
     describe "::prepare" do
-      let (:song) { Song.new("Still Friends In The End") }
-      let (:album) { Album.new([song]) }
+      let(:song) { Song.new("Still Friends In The End") }
+      let(:album) { Album.new([song]) }
 
       describe "module including Representable" do
         it "uses :extend strategy" do

data/test/schema_test.rb

@@ -58,7 +58,7 @@ class SchemaTest < MiniTest::Spec
   end
 
   describe "3-level deep with features" do
-    let (:label) { OpenStruct.new(:name => "Epitaph", :location => OpenStruct.new(:city => "Sanfran", :name => "DON'T SHOW ME!")) }
+    let(:label) { OpenStruct.new(:name => "Epitaph", :location => OpenStruct.new(:city => "Sanfran", :name => "DON'T SHOW ME!")) }
 
     # Module does correctly include features in inlines.
     it { band.extend(Module).to_hash.must_equal({"label"=>{"name"=>"Epitaph", "location"=>{"city"=>"Sanfran"}}, "genre"=>"Punkrock"}) }
@@ -77,8 +77,8 @@ class SchemaTest < MiniTest::Spec
 
   # puts Decorator.representable_attrs[:definitions].inspect
 
-  let (:label) { OpenStruct.new(:name => "Fat Wreck", :city => "San Francisco", :employees => [OpenStruct.new(:name => "Mike")], :location => OpenStruct.new(:city => "Sanfran")) }
-  let (:band) { OpenStruct.new(:genre => "Punkrock", :label => label) }
+  let(:label) { OpenStruct.new(:name => "Fat Wreck", :city => "San Francisco", :employees => [OpenStruct.new(:name => "Mike")], :location => OpenStruct.new(:city => "Sanfran")) }
+  let(:band) { OpenStruct.new(:genre => "Punkrock", :label => label) }
 
 
   # it { FlatlinersDecorator.new( OpenStruct.new(label: OpenStruct.new) ).
@@ -116,9 +116,6 @@ class SchemaTest < MiniTest::Spec
     end
   end
 
-  require "pp"
-  pp InheritFromDecorator.representable_attrs.get(:label)[:extend].(nil).representable_attrs
-
   it do
     InheritFromDecorator.new(band).to_hash.must_equal({"genre"=>"Punkrock", "label"=>{"name"=>"Fat Wreck", "city"=>"San Francisco", "employees"=>[{"name"=>"Mike"}], "location"=>{"city"=>"Sanfran"}}})
   end

data/test/skip_test.rb

@@ -14,7 +14,7 @@ class SkipParseTest < MiniTest::Spec
     end
   end
 
-  let (:song) { OpenStruct.new.extend(representer) }
+  let(:song) { OpenStruct.new.extend(representer) }
 
   # do parse.
   it do
@@ -30,7 +30,7 @@ class SkipParseTest < MiniTest::Spec
   end
 
   # skip parsing.
-  let (:airplay) { OpenStruct.new(station: "JJJ") }
+  let(:airplay) { OpenStruct.new(station: "JJJ") }
 
   it do
     song.from_hash({
@@ -39,8 +39,8 @@ class SkipParseTest < MiniTest::Spec
       "airplays" => [{}, {"station" => "JJJ"}, {}],
     }, user_options: { skip?: true })
 
-    song.title.must_equal nil
-    song.band.must_equal nil
+    song.title.must_be_nil
+    song.band.must_be_nil
     song.airplays.must_equal [airplay]
   end
 end
@@ -59,8 +59,8 @@ class SkipRenderTest < MiniTest::Spec
     end
   end
 
-  let (:song)      { OpenStruct.new(title: "Black Night", band: OpenStruct.new(name: "Time Again")).extend(representer) }
-  let (:skip_song) { OpenStruct.new(title: "Time Bomb",   band: OpenStruct.new(name: "Rancid")).extend(representer) }
+  let(:song)      { OpenStruct.new(title: "Black Night", band: OpenStruct.new(name: "Time Again")).extend(representer) }
+  let(:skip_song) { OpenStruct.new(title: "Time Bomb",   band: OpenStruct.new(name: "Rancid")).extend(representer) }
 
   # do render.
   it { song.to_hash(user_options: { skip?: true }).must_equal({"title"=>"Black Night", "band"=>{"name"=>"Time Again"}}) }

data/test/test_helper.rb

@@ -5,6 +5,14 @@ require 'test_xml/mini_test'
 
 require "representable/debug"
 
+module MiniTest::Assertions
+  def assert_equal_xml(text, subject)
+    subject.gsub("\n", "").gsub(/(\s\s+)/, "").must_equal(text.gsub("\n", "").gsub(/(\s\s+)/, ""))
+  end
+end
+String.infect_an_assertion :assert_equal_xml, :must_xml
+
+# TODO: delete all that in 4.0:
 class Album
   attr_accessor :songs, :best_song
   def initialize(songs=nil, best_song=nil)
@@ -77,7 +85,7 @@ MiniTest::Spec.class_eval do
   end
 
   def self.representer!(options={}, &block)
-    fmt = options # we need that so the 2nd call to ::let (within a ::describe) remembers the right format.
+    fmt = options # we need that so the 2nd call to ::let(within a ::describe) remembers the right format.
 
     name   = options[:name]   || :representer
     format = options[:module] || Representable::Hash
@@ -95,6 +103,8 @@ MiniTest::Spec.class_eval do
       mod
     end
 
+    undef :inject_representer if method_defined? :inject_representer
+
     def inject_representer(mod, options)
       return unless options[:inject]
 
@@ -110,7 +120,7 @@ MiniTest::Spec.class_eval do
     def representer_for(modules=[Representable::Hash], &block)
       Module.new do
         extend TestMethods
-        include *modules
+        include(*modules)
         module_exec(&block)
       end
     end
@@ -121,10 +131,10 @@ MiniTest::Spec.class_eval do
 end
 
 class BaseTest < MiniTest::Spec
-  let (:new_album)  { OpenStruct.new.extend(representer) }
-  let (:album)      { OpenStruct.new(:songs => ["Fuck Armageddon"]).extend(representer) }
-  let (:song) { OpenStruct.new(:title => "Resist Stance") }
-  let (:song_representer) { Module.new do include Representable::Hash; property :title end  }
+  let(:new_album)  { OpenStruct.new.extend(representer) }
+  let(:album)      { OpenStruct.new(:songs => ["Fuck Armageddon"]).extend(representer) }
+  let(:song) { OpenStruct.new(:title => "Resist Stance") }
+  let(:song_representer) { Module.new do include Representable::Hash; property :title end  }
 
 end
 

data/test/wrap_test.rb

@@ -8,10 +8,10 @@ class WrapTest < MiniTest::Spec
   class SoftcoreBand < HardcoreBand
   end
 
-  let (:band) { HardcoreBand.new }
+  let(:band) { HardcoreBand.new }
 
   it "returns false per default" do
-    assert_equal nil, SoftcoreBand.new.send(:representation_wrap)
+    assert_nil SoftcoreBand.new.send(:representation_wrap)
   end
 
   it "infers a printable class name if set to true" do
@@ -32,8 +32,8 @@ class WrapTest < MiniTest::Spec
   ) do |format, mod, output, input|
 
     describe "[#{format}] dynamic wrap" do
-      let (:band) { representer.prepare(Struct.new(:name, :genre).new("Blink", "Pop")) }
-      let (:format) { format }
+      let(:band) { representer.prepare(Struct.new(:name, :genre).new("Blink", "Pop")) }
+      let(:format) { format }
 
       representer!(:module => mod) do
         self.representation_wrap = lambda { |args| "#{name}#{args[:number]}" }
@@ -65,7 +65,7 @@ class HashDisableWrapTest < MiniTest::Spec
     end
   end
 
-  let (:band) { BandDecorator.prepare(Band.new("Social Distortion")) }
+  let(:band) { BandDecorator.prepare(Band.new("Social Distortion")) }
 
   # direct, local api.
   it do
@@ -90,7 +90,7 @@ class HashDisableWrapTest < MiniTest::Spec
   end
 
 
-  let (:album) { AlbumDecorator.prepare(Album.new(Band.new("Social Distortion", Label.new("Epitaph")))) }
+  let(:album) { AlbumDecorator.prepare(Album.new(Band.new("Social Distortion", Label.new("Epitaph")))) }
 
   # band has wrap turned off per property definition, however, label still has wrap.
   it "renders" do
@@ -120,7 +120,7 @@ class XMLDisableWrapTest < MiniTest::Spec
     # end
   end
 
-  let (:band) { BandDecorator.prepare(Band.new("Social Distortion")) }
+  let(:band) { BandDecorator.prepare(Band.new("Social Distortion")) }
 
   it do
     band.to_xml.must_equal_xml "<bands><name>Social Distortion</name></bands>"
@@ -137,7 +137,7 @@ class XMLDisableWrapTest < MiniTest::Spec
   end
 
 
-  let (:album) { AlbumDecorator.prepare(Album.new(Band.new("Social Distortion", Label.new("Epitaph")))) }
+  let(:album) { AlbumDecorator.prepare(Album.new(Band.new("Social Distortion", Label.new("Epitaph")))) }
 
   # band has wrap turned of per property definition, however, label still has wrap.
   it "rendersxx" do