representable 3.0.4 → 3.1.1

data/test/inline_test.rb

@@ -22,7 +22,7 @@ class InlineTest < MiniTest::Spec
       let(:format) { format }
 
       it { render(request).must_equal_document output }
-      it { parse(request, input).song.name.must_equal "You've Taken Everything"}
+      it { _(parse(request, input).song.name).must_equal "You've Taken Everything"}
     end
   end
 
@@ -47,7 +47,7 @@ class InlineTest < MiniTest::Spec
       let(:format) { format } # FIXME: why do we have to define this?
 
       it { render(request).must_equal_document output }
-      it { parse(request, input).songs.first.name.must_equal "You've Taken Everything"}
+      it { _(parse(request, input).songs.first.name).must_equal "You've Taken Everything"}
     end
   end
 
@@ -58,7 +58,7 @@ class InlineTest < MiniTest::Spec
       end
     end
 
-    it { request.to_hash.must_equal({"song"=>{"name"=>"Alive"}}) }
+    it { _(request.to_hash).must_equal({"song"=>{"name"=>"Alive"}}) }
   end
 
 
@@ -76,7 +76,7 @@ class InlineTest < MiniTest::Spec
       end
 
       it "doesn't change represented object" do
-        request.send("from_#{format}", input).song.must_equal song
+        _(request.send("from_#{format}", input).song).must_equal song
       end
     end
   end
@@ -96,8 +96,8 @@ class InlineTest < MiniTest::Spec
 
       let(:decorator) { representer.prepare(request) }
 
-      it { decorator.to_hash.must_equal({"requester"=>"Josephine", "song"=>{"name"=>"Alive"}}) }
-      it { decorator.from_hash({"song"=>{"name"=>"You've Taken Everything"}}).song.name.must_equal "You've Taken Everything"}
+      it { _(decorator.to_hash).must_equal({"requester"=>"Josephine", "song"=>{"name"=>"Alive"}}) }
+      it { _(decorator.from_hash({"song"=>{"name"=>"You've Taken Everything"}}).song.name).must_equal "You've Taken Everything"}
     end
   end
 
@@ -110,7 +110,7 @@ class InlineTest < MiniTest::Spec
 
     it "uses an inline decorator and doesn't alter represented" do
       representer.prepare(Struct.new(:song).new(song)).to_hash
-      song.wont_be_kind_of Representable
+      _(song).wont_be_kind_of Representable
     end
   end
 
@@ -221,8 +221,8 @@ class InlineTest < MiniTest::Spec
       end
     end
 
-    it do OpenStruct.new(:song => OpenStruct.new(:title => "The Fever And The Sound", :artist => "Strung Out")).extend(representer).
-      to_hash.
+    it do _(OpenStruct.new(:song => OpenStruct.new(:title => "The Fever And The Sound", :artist => "Strung Out")).extend(representer).
+      to_hash).
       must_equal({"song"=>{"artist"=>"Strung Out", "title"=>"The Fever And The Sound"}})
     end
   end
@@ -246,7 +246,7 @@ class InlineTest < MiniTest::Spec
       end
     end
 
-    it { Object.new.extend(Mod).to_hash.must_equal("song"=>{"duration"=>"6:53"}) }
+    it { _(Object.new.extend(Mod).to_hash).must_equal("song"=>{"duration"=>"6:53"}) }
   end
 
   # define method inline with Decorator
@@ -267,6 +267,6 @@ class InlineTest < MiniTest::Spec
       end
     end
 
-    it { dec.new(Object.new).to_hash.must_equal("song"=>{"duration"=>"6:53"}) }
+    it { _(dec.new(Object.new).to_hash).must_equal("song"=>{"duration"=>"6:53"}) }
   end
 end

data/test/instance_test.rb

@@ -22,7 +22,7 @@ class InstanceTest < BaseTest
       end
 
       song = OpenStruct.new.extend(representer).from_hash({"title" => object})
-      song.title.must_equal object
+      _(song.title).must_equal object
     end
   end
 
@@ -36,11 +36,11 @@ class InstanceTest < BaseTest
         :extend => song_representer
     end
 
-    it( "xxx") { OpenStruct.new(:song => Song.new(1, "The Answer Is Still No")).extend(representer).
-      from_hash("song" => {"id" => 1}).song.must_equal Song.new(1, "The Answer Is Still No") }
+    it( "xxx") { _(OpenStruct.new(:song => Song.new(1, "The Answer Is Still No")).extend(representer).
+      from_hash("song" => {"id" => 1}).song).must_equal Song.new(1, "The Answer Is Still No") }
 
-    it { OpenStruct.new(:song => Song.new(1, "The Answer Is Still No")).extend(representer).
-      from_hash("song" => {"id" => 2}).song.must_equal Song.new(2, "Invincible") }
+    it { _(OpenStruct.new(:song => Song.new(1, "The Answer Is Still No")).extend(representer).
+      from_hash("song" => {"id" => 2}).song).must_equal Song.new(2, "Invincible") }
   end
 
 
@@ -59,9 +59,9 @@ class InstanceTest < BaseTest
       Song.new(1, "The Answer Is Still No"),
       Song.new(2, "")])
 
-      album.
+      _(album.
         extend(representer).
-        from_hash("songs" => [{"id" => 2},{"id" => 2, "title"=>"The Answer Is Still No"}]).songs.must_equal [
+        from_hash("songs" => [{"id" => 2},{"id" => 2, "title"=>"The Answer Is Still No"}]).songs).must_equal [
           Song.new(2, "Invincible"), Song.new(2, "The Answer Is Still No")]
     }
   end
@@ -71,8 +71,8 @@ class InstanceTest < BaseTest
       property :song, :instance => lambda { |options| Struct.new(:args, :id).new([options[:fragment], options[:user_options]]) }, :extend => song_representer
     end
 
-    it { OpenStruct.new(:song => Song.new(1, "The Answer Is Still No")).extend(representer).
-      from_hash({"song" => {"id" => 1}}, user_options: { volume: 1 }).song.args.must_equal([{"id"=>1}, {:volume=>1}]) }
+    it { _(OpenStruct.new(:song => Song.new(1, "The Answer Is Still No")).extend(representer).
+      from_hash({"song" => {"id" => 1}}, user_options: { volume: 1 }).song.args).must_equal([{"id"=>1}, {:volume=>1}]) }
   end
 
   # TODO: raise and test instance:{nil}
@@ -117,13 +117,13 @@ class InstanceTest < BaseTest
         extend(representer).
         from_hash("songs" => [{"title" => "The Answer Is Still No"}, {"title" => "Invincible"}])
 
-      album.songs.must_equal [
+      _(album.songs).must_equal [
         Song.new(1, "The Answer Is Still No"),
         Song.new(2, "Invincible")]
 
-      songs.object_id.must_equal album.songs.object_id
-      songs[0].object_id.must_equal album.songs[0].object_id
-      songs[1].object_id.must_equal album.songs[1].object_id
+      _(songs.object_id).must_equal album.songs.object_id
+      _(songs[0].object_id).must_equal album.songs[0].object_id
+      _(songs[1].object_id).must_equal album.songs[1].object_id
     }
   end
 
@@ -146,17 +146,17 @@ class InstanceTest < BaseTest
       Song.new(1, "The Answer Is Still No"),
       Song.new(2, "Invncble")])
 
-      album.
+      _(album.
         extend(representer).
         from_hash("songs" => [{"id" => 2, "title" => "Invincible"}]).
-        songs.must_equal [
+        songs).must_equal [
           Song.new(1, "The Answer Is Still No"),
           Song.new(2, "Invincible")]
           # TODO: check elements object_id!
 
-      songs.object_id.must_equal album.songs.object_id
-      songs[0].object_id.must_equal album.songs[0].object_id
-      songs[1].object_id.must_equal album.songs[1].object_id
+      _(songs.object_id).must_equal album.songs.object_id
+      _(songs[0].object_id).must_equal album.songs[0].object_id
+      _(songs[1].object_id).must_equal album.songs[1].object_id
     }
   end
 
@@ -178,15 +178,15 @@ class InstanceTest < BaseTest
       album= Struct.new(:songs).new(songs = [
         Song.new(1, "The Answer Is Still No")])
 
-      album.
+      _(album.
         extend(representer).
         from_hash("songs" => [{"title" => "Invincible"}]).
-        songs.must_equal [
+        songs).must_equal [
           Song.new(1, "The Answer Is Still No"),
           Song.new(2, "Invincible")]
 
-      songs.object_id.must_equal album.songs.object_id
-      songs[0].object_id.must_equal album.songs[0].object_id
+      _(songs.object_id).must_equal album.songs.object_id
+      _(songs[0].object_id).must_equal album.songs[0].object_id
     }
   end
 
@@ -212,15 +212,15 @@ class InstanceTest < BaseTest
         Song.new(1, "The Answer Is Still No"),
         Song.new(2, "Invincible")])
 
-      album.
+      _(album.
         extend(representer).
         from_hash("songs" => [{"replace_id"=>2, "id" => 3, "title" => "Soulmate"}]).
-        songs.must_equal [
+        songs).must_equal [
           Song.new(1, "The Answer Is Still No"),
           Song.new(3, "Soulmate")]
 
-      songs.object_id.must_equal album.songs.object_id
-      songs[0].object_id.must_equal album.songs[0].object_id
+      _(songs.object_id).must_equal album.songs.object_id
+      _(songs[0].object_id).must_equal album.songs[0].object_id
     }
   end
 
@@ -235,13 +235,13 @@ class InstanceTest < BaseTest
       album= Struct.new(:songs).new(songs = [
         Song.new(1, "The Answer Is Still No")])
 
-      album.
+      _(album.
         extend(representer).
         from_hash("songs" => [{"title" => "Invincible"}]).
-        songs.must_equal [
+        songs).must_equal [
           Song.new(nil, "Invincible")]
 
-      songs.object_id.wont_equal album.songs.object_id
+      _(songs.object_id).wont_equal album.songs.object_id
     }
   end
 end

data/test/is_representable_test.rb

@@ -9,9 +9,9 @@ class IsRepresentableTest < BaseTest
     end
 
     it "does extend but doesn't call #to_hash" do
-      Struct.new(:song).new(song = Object.new).extend(representer).
-        to_hash.must_equal("song" => song)
-      song.must_be_kind_of Representable::Hash
+      _(Struct.new(:song).new(song = Object.new).extend(representer).
+        to_hash).must_equal("song" => song)
+      _(song).must_be_kind_of Representable::Hash
     end
   end
 
@@ -30,9 +30,9 @@ class IsRepresentableTest < BaseTest
         end
       end
 
-      Struct.new(:song).new(song).extend(representer).
-        to_hash.must_equal("song" => 1)
-      song.wont_be_kind_of Representable::Hash
+      _(Struct.new(:song).new(song).extend(representer).
+        to_hash).must_equal("song" => 1)
+      _(song).wont_be_kind_of Representable::Hash
     end
   end
 
@@ -48,8 +48,8 @@ class IsRepresentableTest < BaseTest
       hit = Struct.new(:song).new.extend(representer).
         from_hash("song" => 1)
 
-      hit.song.must_equal OpenStruct.new
-      hit.song.must_be_kind_of Representable::Hash
+      _(hit.song).must_equal OpenStruct.new
+      _(hit.song).must_be_kind_of Representable::Hash
     end
   end
 
@@ -70,8 +70,8 @@ class IsRepresentableTest < BaseTest
       hit = Struct.new(:song).new.extend(representer).
         from_hash("song" => "Sonata No.2")
 
-      hit.song.must_equal "Piano?"
-      hit.song.wont_be_kind_of Representable::Hash
+      _(hit.song).must_equal "Piano?"
+      _(hit.song).wont_be_kind_of Representable::Hash
     end
   end
 end

data/test/json_test.rb

@@ -13,15 +13,15 @@ class JSONPublicMethodsTest < Minitest::Spec
 
   let(:json) { '{"id":1,"name":"Rancid"}' }
 
-  it { BandRepresenter.new(Band.new).from_json(json)[:id, :name].must_equal [1, "Rancid"] }
-  it { BandRepresenter.new(Band.new).parse(json)[:id, :name].must_equal [1, "Rancid"] }
+  it { _(BandRepresenter.new(Band.new).from_json(json)[:id, :name]).must_equal [1, "Rancid"] }
+  it { _(BandRepresenter.new(Band.new).parse(json)[:id, :name]).must_equal [1, "Rancid"] }
 
   #---
   # to_json
   let(:band) { Band.new(1, "Rancid") }
 
-  it { BandRepresenter.new(band).to_json.must_equal json }
-  it { BandRepresenter.new(band).render.must_equal json }
+  it { _(BandRepresenter.new(band).to_json).must_equal json }
+  it { _(BandRepresenter.new(band).render).must_equal json }
 end
 
   class APITest < MiniTest::Spec
@@ -356,7 +356,7 @@ end
       end
 
       it "renders" do
-        OpenStruct.new(:songs => {"7" => Song.new("Contemplation")}).extend(representer).to_hash.must_equal("songs"=>{"7"=>{"name"=>"Contemplation"}})
+        _(OpenStruct.new(:songs => {"7" => Song.new("Contemplation")}).extend(representer).to_hash).must_equal("songs"=>{"7"=>{"name"=>"Contemplation"}})
       end
 
       describe "parsing" do
@@ -364,12 +364,12 @@ end
         let(:hsh) { {"7"=>{"name"=>"Contemplation"}} }
 
         it "parses incoming hash" do
-          subject.from_hash("songs"=>hsh).songs.must_equal({"7"=>Song.new("Contemplation")})
+          _(subject.from_hash("songs"=>hsh).songs).must_equal({"7"=>Song.new("Contemplation")})
         end
 
         it "doesn't modify the incoming hash" do
           subject.from_hash("songs"=> incoming_hash = hsh.dup)
-          hsh.must_equal incoming_hash
+          _(hsh).must_equal incoming_hash
         end
       end
     end

data/test/lonely_test.rb

@@ -60,11 +60,11 @@ class LonelyRepresenterTest < MiniTest::Spec
       end
 
       it "parses array" do
-        [].extend(representer).from_json(json).must_equal songs
+        _([].extend(representer).from_json(json)).must_equal songs
       end
 
       it "parses array with decorator" do
-        decorator.new([]).from_json(json).must_equal songs
+        _(decorator.new([]).from_json(json)).must_equal songs
       end
     end
 
@@ -75,8 +75,8 @@ class LonelyRepresenterTest < MiniTest::Spec
         end
       end
 
-      it { songs.extend(representer).to_json.must_equal json }
-      it { [].extend(representer).from_json(json).must_equal songs }
+      it { _(songs.extend(representer).to_json).must_equal json }
+      it { _([].extend(representer).from_json(json)).must_equal songs }
     end
 
     describe "with contained text" do
@@ -93,7 +93,7 @@ class LonelyRepresenterTest < MiniTest::Spec
       end
 
       it "returns objects array from #from_json" do
-        [].extend(representer).from_json(json).must_equal songs
+        _([].extend(representer).from_json(json)).must_equal songs
       end
     end
   end
@@ -112,7 +112,7 @@ class LonelyRepresenterTest < MiniTest::Spec
     end
 
 
-    it { [1,2].extend(representer).to_hash(user_options: {one: One, two: Two}).must_equal(["One: 1", "Two: 2"]) }
+    it { _([1,2].extend(representer).to_hash(user_options: {one: One, two: Two})).must_equal(["One: 1", "Two: 2"]) }
   end
 
 
@@ -129,11 +129,11 @@ class LonelyRepresenterTest < MiniTest::Spec
 
       describe "#to_json" do
         it "renders hash" do
-          songs.extend(representer).to_json.must_equal json
+          _(songs.extend(representer).to_json).must_equal json
         end
 
         it "renders hash with decorator" do
-          decorator.new(songs).to_json.must_equal json
+          _(decorator.new(songs).to_json).must_equal json
         end
 
         it "respects :exclude" do
@@ -147,11 +147,11 @@ class LonelyRepresenterTest < MiniTest::Spec
 
       describe "#from_json" do
         it "returns objects array" do
-          {}.extend(representer).from_json(json).must_equal songs
+          _({}.extend(representer).from_json(json)).must_equal songs
         end
 
         it "parses hash with decorator" do
-          decorator.new({}).from_json(json).must_equal songs
+          _(decorator.new({}).from_json(json)).must_equal songs
         end
 
         it "respects :exclude" do
@@ -171,8 +171,8 @@ class LonelyRepresenterTest < MiniTest::Spec
           end
         end
 
-        it { songs.extend(representer).to_json.must_equal json }
-        it { {}.extend(representer).from_json(json).must_equal songs }
+        it { _(songs.extend(representer).to_json).must_equal json }
+        it { _({}.extend(representer).from_json(json)).must_equal songs }
       end
     end
 
@@ -187,7 +187,7 @@ class LonelyRepresenterTest < MiniTest::Spec
       let(:data) { {one: 2, two: 3} }
 
       describe "#to_json" do
-        it { data.extend(representer).to_json.must_equal %{{"one":2,"two":3}} }
+        it { _(data.extend(representer).to_json).must_equal %{{"one":2,"two":3}} }
 
         # it "respects :exclude" do
         #   assert_json "{\"two\":{\"name\":\"Can't Take Them All\"}}", {:one => Song.new("Days Go By"), :two => Song.new("Can't Take Them All")}.extend(representer).to_json(:exclude => [:one])
@@ -199,7 +199,7 @@ class LonelyRepresenterTest < MiniTest::Spec
       end
 
       describe "#from_json" do # FIXME: what's the point of this?
-        it { data.extend(representer).from_hash(data).must_equal data }
+        it { _(data.extend(representer).from_hash(data)).must_equal data }
       end
     end
 
@@ -234,6 +234,6 @@ class CollectionWithIncludeTest < MiniTest::Spec
     end
   end
 
-  it { representer.new([Song.new(1, "ACAB")]).to_hash.must_equal([{"id"=>1, "title"=>"ACAB"}]) }
-  it { representer.new([Song.new(1, "ACAB")]).to_hash(include: [:title]).must_equal([{"title"=>"ACAB"}]) }
+  it { _(representer.new([Song.new(1, "ACAB")]).to_hash).must_equal([{"id"=>1, "title"=>"ACAB"}]) }
+  it { _(representer.new([Song.new(1, "ACAB")]).to_hash(include: [:title])).must_equal([{"title"=>"ACAB"}]) }
 end

data/test/nested_test.rb

@@ -35,14 +35,14 @@ class NestedTest < MiniTest::Spec
 
           # do not use extend on the nested object. # FIXME: make this a proper test with two describes instead of this pseudo-meta stuff.
           if is_decorator==true
-            album.wont_be_kind_of(Representable::Hash)
+            _(album).wont_be_kind_of(Representable::Hash)
           end
         end
 
         it "parses nested properties to Album instance" do
           album = parse(representer.prepare(Album.new), output)
-          album.label.must_equal "Epitaph"
-          album.owner.must_equal "Brett Gurewitz"
+          _(album.label).must_equal "Epitaph"
+          _(album.owner).must_equal "Brett Gurewitz"
         end
       end
     end
@@ -76,9 +76,9 @@ class NestedTest < MiniTest::Spec
 
       it "parses nested properties to Album instance" do
       	album = parse(representer.prepare(Album.new), output)
-      	album.label.must_equal "Epitaph"
-      	album.owner.must_equal "Brett Gurewitz"
-        album.amount.must_equal 19
+      	_(album.label).must_equal "Epitaph"
+      	_(album.owner).must_equal "Brett Gurewitz"
+        _(album.amount).must_equal 19
       end
     end
   end
@@ -102,7 +102,7 @@ class NestedTest < MiniTest::Spec
     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"}})
+      _(representer.prepare(album).to_hash).must_equal({"Label"=>{"owner"=>"Brett Gurewitz"}})
     end
 
     # it "parses nested properties to Album instance" do