representable 3.0.0 → 3.1.0

data/test/prepare_test.rb

@@ -24,11 +24,11 @@ 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)
-      hit.to_hash.must_equal({"song" => PreparerClass.new(song)})
+      _(hit.to_hash).must_equal({"song" => PreparerClass.new(song)})
     end
 
 
@@ -54,13 +54,13 @@ 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)
       hit.from_hash("song" => {})
 
-      hit.song.must_equal(PreparerClass.new(String.new))
+      _(hit.song).must_equal(PreparerClass.new(String.new))
     end
   end
 end

data/test/private_options_test.rb

@@ -8,11 +8,11 @@ class PrivateOptionsTest < MiniTest::Spec # TODO: move me to separate file.
 
   it "render: doesn't modify options" do
     representer.new(nil).to_hash(options)
-    options.must_equal({exclude: "name"})
+    _(options).must_equal({exclude: "name"})
   end
 
   it "parse: doesn't modify options" do
     representer.new(nil).from_hash(options)
-    options.must_equal({exclude: "name"})
+    _(options).must_equal({exclude: "name"})
   end
 end

data/test/reader_writer_test.rb

@@ -10,10 +10,10 @@ class ReaderWriterTest < BaseTest
   subject { OpenStruct.new(:name => "Disorder And Disarray").extend(representer) }
 
   it "uses :writer when rendering" do
-    subject.to_hash(user_options: {nr: 14}).must_equal({"title" => "14) Disorder And Disarray"})
+    _(subject.to_hash(user_options: {nr: 14})).must_equal({"title" => "14) Disorder And Disarray"})
   end
 
   it "uses :reader when parsing" do
-    subject.from_hash({"title" => "15) The Wars End"}).name.must_equal "The Wars End"
+    _(subject.from_hash({"title" => "15) The Wars End"}).name).must_equal "The Wars End"
   end
 end

data/test/render_nil_test.rb

@@ -8,7 +8,7 @@ class RenderNilTest < MiniTest::Spec
       property :title, render_nil: true
     end
 
-    it { Song.new.extend(representer).to_hash.must_equal({"title"=>nil}) }
+    it { _(Song.new.extend(representer).to_hash).must_equal({"title"=>nil}) }
   end
 
   describe "with :extend it shouldn't extend nil" do
@@ -16,6 +16,6 @@ class RenderNilTest < MiniTest::Spec
       property :title, render_nil: true, extend: Class
     end
 
-    it { Song.new.extend(representer).to_hash.must_equal({"title"=>nil}) }
+    it { _(Song.new.extend(representer).to_hash).must_equal({"title"=>nil}) }
   end
 end

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
@@ -24,13 +24,13 @@ class RepresentTest < MiniTest::Spec
       }
 
       it { render(representer.represent(songs)).must_equal_document output }
-      it { parse(representer.represent([]), input).must_equal songs }
+      it { _(parse(representer.represent([]), input)).must_equal songs }
     end
 
     # 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
@@ -40,7 +40,7 @@ class RepresentTest < MiniTest::Spec
       }
 
       it { render(representer.represent(songs)).must_equal_document output }
-      it("ficken") { parse(representer.represent([]), input).must_equal songs }
+      it("ficken") { _(parse(representer.represent([]), input)).must_equal songs }
     end
   end
 
@@ -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
@@ -65,14 +65,14 @@ class RepresentTest < MiniTest::Spec
       }
 
       it { render(representer.represent(song)).must_equal_document output }
-      it { parse(representer.represent(Song.new), input).must_equal song }
+      it { _(parse(representer.represent(Song.new), input)).must_equal song }
     end
 
 
     # 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
@@ -82,7 +82,7 @@ class RepresentTest < MiniTest::Spec
       }
 
       it { render(representer.represent(song)).must_equal_document output }
-      it { parse(representer.represent(Song.new), input).must_equal song }
+      it { _(parse(representer.represent(Song.new), input)).must_equal song }
     end
   end
 end

data/test/representable_test.rb

@@ -76,8 +76,6 @@ class RepresentableTest < MiniTest::Spec
     end
 
     it "allows mixing in multiple representers" do
-      require 'representable/json'
-      require 'representable/xml'
       class Bodyjar
         include Representable::XML
         include Representable::JSON
@@ -134,8 +132,8 @@ class RepresentableTest < MiniTest::Spec
 
     # test ::inherited.
     it do
-      BaseClass.respond_to?(:other).must_equal false
-      SubClass.respond_to?(:other).must_equal true
+      _(BaseClass.respond_to?(:other)).must_equal false
+      _(SubClass.respond_to?(:other)).must_equal true
     end
 
     module DifferentIncluded
@@ -166,13 +164,13 @@ class RepresentableTest < MiniTest::Spec
     it "doesn't modify options hash" do
       options = {}
       representer.property(:title, options)
-      options.must_equal({})
+      _(options).must_equal({})
     end
 
     representer! {}
 
     it "returns the Definition instance" do
-      representer.property(:name).must_be_kind_of Representable::Definition
+      _(representer.property(:name)).must_be_kind_of Representable::Definition
     end
   end
 
@@ -226,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
@@ -235,7 +233,7 @@ class RepresentableTest < MiniTest::Spec
 
     it "includes false attributes" do
       @band.from_hash({"groupies"=>false})
-      assert_equal false, @band.groupies
+      refute @band.groupies
     end
 
     it "ignores properties not present in the incoming document" do
@@ -263,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
 
@@ -302,14 +300,14 @@ class RepresentableTest < MiniTest::Spec
       end
 
       it "#to_hash propagates to nested objects" do
-        OpenStruct.new(track: OpenStruct.new(nr: 1, length: OpenStruct.new(seconds: nil))).extend(representer).extend(Representable::Debug).
-          to_hash(user_options: {nr: 9}).must_equal({"track"=>{"nr"=>9, "length"=>{seconds: 9}}})
+        _(OpenStruct.new(track: OpenStruct.new(nr: 1, length: OpenStruct.new(seconds: nil))).extend(representer).extend(Representable::Debug).
+          to_hash(user_options: {nr: 9})).must_equal({"track"=>{"nr"=>9, "length"=>{seconds: 9}}})
       end
 
       it "#from_hash propagates to nested objects" do
         song = OpenStruct.new.extend(representer).from_hash({"track"=>{"nr" => "replace me", "length"=>{"seconds"=>"replacing"}}}, user_options: {nr: 9})
-        song.track.nr.must_equal 9
-        song.track.length.seconds.must_equal 9
+        _(song.track.nr).must_equal 9
+        _(song.track.length.seconds).must_equal 9
       end
     end
   end
@@ -366,12 +364,12 @@ class RepresentableTest < MiniTest::Spec
       end
 
       it "executes lambda in represented instance context" do
-        Song.new("Carnage").instance_eval do
+        _(Song.new("Carnage").instance_eval do
           def compute_representer(name)
             UpcaseRepresenter
           end
           self
-        end.extend(representer).to_hash.must_equal({"name" => "CARNAGE"})
+        end.extend(representer).to_hash).must_equal({"name" => "CARNAGE"})
       end
     end
 
@@ -384,8 +382,8 @@ class RepresentableTest < MiniTest::Spec
 
       it "uses object from :instance but still extends it" do
         song = Song.new.extend(representer).from_hash("name" => "Eric's Had A Bad Day")
-        song.name.must_equal obj
-        song.name.must_be_kind_of mod
+        _(song.name).must_equal obj
+        _(song.name).must_be_kind_of mod
       end
     end
 
@@ -400,8 +398,8 @@ class RepresentableTest < MiniTest::Spec
       end
 
       it "uses lambda when parsing" do
-        Song.new.extend(representer).from_hash({"name" => "You Make Me Thick"}).name.must_equal "you make me thick"
-        Song.new.extend(representer).from_hash({"name" => "Stepstranger"}).name.must_equal "stepstranger" # DISCUSS: we compare "".is_a?(UpcaseString)
+        _(Song.new.extend(representer).from_hash({"name" => "You Make Me Thick"}).name).must_equal "you make me thick"
+        _(Song.new.extend(representer).from_hash({"name" => "Stepstranger"}).name).must_equal "stepstranger" # DISCUSS: we compare "".is_a?(UpcaseString)
       end
 
       describe "with :class lambda" do
@@ -412,12 +410,12 @@ class RepresentableTest < MiniTest::Spec
 
         it "creates instance from :class lambda when parsing" do
           song = OpenStruct.new.extend(representer).from_hash({"name" => "Quitters Never Win"})
-          song.name.must_be_kind_of UpcaseString
-          song.name.must_equal "QUITTERS NEVER WIN"
+          _(song.name).must_be_kind_of UpcaseString
+          _(song.name).must_equal "QUITTERS NEVER WIN"
 
           song = OpenStruct.new.extend(representer).from_hash({"name" => "Still Failing?"})
-          song.name.must_be_kind_of String
-          song.name.must_equal "still failing?"
+          _(song.name).must_be_kind_of String
+          _(song.name).must_equal "still failing?"
         end
       end
     end
@@ -429,12 +427,12 @@ class RepresentableTest < MiniTest::Spec
       end
 
       it "uses lambda for each item when rendering" do
-        Album.new([UpcaseString.new("Dean Martin"), "Charlie Still Smirks"]).extend(representer).to_hash.must_equal("songs"=>["DEAN MARTIN", "charlie still smirks"])
+        _(Album.new([UpcaseString.new("Dean Martin"), "Charlie Still Smirks"]).extend(representer).to_hash).must_equal("songs"=>["DEAN MARTIN", "charlie still smirks"])
       end
 
       it "uses lambda for each item when parsing" do
         album = Album.new.extend(representer).from_hash("songs"=>["DEAN MARTIN", "charlie still smirks"])
-        album.songs.must_equal ["dean martin", "charlie still smirks"] # DISCUSS: we compare "".is_a?(UpcaseString)
+        _(album.songs).must_equal ["dean martin", "charlie still smirks"] # DISCUSS: we compare "".is_a?(UpcaseString)
       end
 
       describe "with :class lambda" do
@@ -445,18 +443,18 @@ class RepresentableTest < MiniTest::Spec
 
         it "creates instance from :class lambda for each item when parsing" do
           album = Album.new.extend(representer).from_hash("songs"=>["Still Failing?", "charlie still smirks"])
-          album.songs.must_equal ["still failing?", "CHARLIE STILL SMIRKS"]
+          _(album.songs).must_equal ["still failing?", "CHARLIE STILL SMIRKS"]
         end
       end
     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
+        _(Album.new(songs).extend(extend_rpr).to_hash).must_equal Album.new(songs).extend(decorator_rpr).to_hash
       end
     end
 
@@ -472,22 +470,22 @@ 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
           album_rpr = Module.new { include Representable::Hash; collection :songs, :class => Song, :extend => SongRepresenter}
 
-          album_rpr.prepare(album).to_hash.must_equal({"songs"=>[{"name"=>"Still Friends In The End"}]})
-          album.must_respond_to :to_hash
+          _(album_rpr.prepare(album).to_hash).must_equal({"songs"=>[{"name"=>"Still Friends In The End"}]})
+          _(album).must_respond_to :to_hash
         end
       end
 
       describe "Decorator subclass" do
         it "uses :decorate strategy" do
-          AlbumRepresentation.prepare(album).to_hash.must_equal({"songs"=>[{"name"=>"Still Friends In The End"}]})
-          album.wont_respond_to :to_hash
+          _(AlbumRepresentation.prepare(album).to_hash).must_equal({"songs"=>[{"name"=>"Still Friends In The End"}]})
+          _(album).wont_respond_to :to_hash
         end
       end
     end

data/test/schema_test.rb

@@ -58,13 +58,13 @@ 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"}) }
+    it { _(band.extend(Module).to_hash).must_equal({"label"=>{"name"=>"Epitaph", "location"=>{"city"=>"Sanfran"}}, "genre"=>"Punkrock"}) }
 
     # Decorator does correctly include features in inlines.
-    it { Decorator.new(band).to_hash.must_equal({"label"=>{"name"=>"Epitaph", "location"=>{"city"=>"Sanfran"}}, "genre"=>"Punkrock"}) }
+    it { _(Decorator.new(band).to_hash).must_equal({"label"=>{"name"=>"Epitaph", "location"=>{"city"=>"Sanfran"}}, "genre"=>"Punkrock"}) }
   end
 
 
@@ -77,14 +77,14 @@ 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) ).
   #   to_hash.must_equal({}) }
   it do
-    Decorator.new(band).to_hash.must_equal({"genre"=>"Punkrock", "label"=>{"name"=>"Fat Wreck", "location"=>{"city"=>"Sanfran"}}})
+    _(Decorator.new(band).to_hash).must_equal({"genre"=>"Punkrock", "label"=>{"name"=>"Fat Wreck", "location"=>{"city"=>"Sanfran"}}})
   end
 
 
@@ -103,7 +103,7 @@ class SchemaTest < MiniTest::Spec
   end
 
   it do
-    InheritDecorator.new(band).to_hash.must_equal({"genre"=>"Punkrock", "label"=>{"name"=>"Fat Wreck", "city"=>"San Francisco", "location"=>{"city"=>"Sanfran"}}})
+    _(InheritDecorator.new(band).to_hash).must_equal({"genre"=>"Punkrock", "label"=>{"name"=>"Fat Wreck", "city"=>"San Francisco", "location"=>{"city"=>"Sanfran"}}})
   end
 
 
@@ -116,11 +116,8 @@ 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"}}})
+    _(InheritFromDecorator.new(band).to_hash).must_equal({"genre"=>"Punkrock", "label"=>{"name"=>"Fat Wreck", "city"=>"San Francisco", "employees"=>[{"name"=>"Mike"}], "location"=>{"city"=>"Sanfran"}}})
   end
 end
 

data/test/serialize_deserialize_test.rb

@@ -13,7 +13,7 @@ class SerializeDeserializeTest < BaseTest
         }
     end
 
-    it { subject.from_hash({"song" => Object}, user_options: {volume: 9}).song.must_equal "OBJECT Object {:volume=>9}" }
+    it { _(subject.from_hash({"song" => Object}, user_options: {volume: 9}).song).must_equal "OBJECT Object {:volume=>9}" }
   end
 
   describe "serialize" do
@@ -28,6 +28,6 @@ class SerializeDeserializeTest < BaseTest
 
     before { subject.song = "Arrested In Shanghai" }
 
-    it { subject.to_hash(user_options: {volume: 9}).must_equal({"song"=>"Arrested In Shanghai {:volume=>9}"}) }
+    it { _(subject.to_hash(user_options: {volume: 9})).must_equal({"song"=>"Arrested In Shanghai {:volume=>9}"}) }
   end
 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
@@ -24,13 +24,13 @@ class SkipParseTest < MiniTest::Spec
       "airplays" => [{"station" => "JJJ"}]
     }, user_options: { skip?: true })
 
-    song.title.must_equal "Victim Of Fate"
-    song.band.name.must_equal "Mute 98"
-    song.airplays[0].station.must_equal "JJJ"
+    _(song.title).must_equal "Victim Of Fate"
+    _(song.band.name).must_equal "Mute 98"
+    _(song.airplays[0].station).must_equal "JJJ"
   end
 
   # skip parsing.
-  let (:airplay) { OpenStruct.new(station: "JJJ") }
+  let(:airplay) { OpenStruct.new(station: "JJJ") }
 
   it do
     song.from_hash({
@@ -39,9 +39,9 @@ class SkipParseTest < MiniTest::Spec
       "airplays" => [{}, {"station" => "JJJ"}, {}],
     }, user_options: { skip?: true })
 
-    song.title.must_equal nil
-    song.band.must_equal nil
-    song.airplays.must_equal [airplay]
+    _(song.title).must_be_nil
+    _(song.band).must_be_nil
+    _(song.airplays).must_equal [airplay]
   end
 end
 
@@ -59,23 +59,23 @@ 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"}}) }
+  it { _(song.to_hash(user_options: { skip?: true })).must_equal({"title"=>"Black Night", "band"=>{"name"=>"Time Again"}}) }
   # skip.
-  it { skip_song.to_hash(user_options: { skip?: true }).must_equal({"title"=>"Time Bomb"}) }
+  it { _(skip_song.to_hash(user_options: { skip?: true })).must_equal({"title"=>"Time Bomb"}) }
 
   # do render all collection items.
   it do
     song = OpenStruct.new(airplays: [OpenStruct.new(station: "JJJ"), OpenStruct.new(station: "ABC")]).extend(representer)
-    song.to_hash(user_options: { skip?: true }).must_equal({"airplays"=>[{"station"=>"JJJ"}, {"station"=>"ABC"}]})
+    _(song.to_hash(user_options: { skip?: true })).must_equal({"airplays"=>[{"station"=>"JJJ"}, {"station"=>"ABC"}]})
   end
 
   # skip middle item.
   it do
     song = OpenStruct.new(airplays: [OpenStruct.new(station: "JJJ"), OpenStruct.new(station: "Radio Dreyeckland"), OpenStruct.new(station: "ABC")]).extend(representer)
-    song.to_hash(user_options: { skip?: true }).must_equal({"airplays"=>[{"station"=>"JJJ"}, {"station"=>"ABC"}]})
+    _(song.to_hash(user_options: { skip?: true })).must_equal({"airplays"=>[{"station"=>"JJJ"}, {"station"=>"ABC"}]})
   end
 end