representable 3.0.0 → 3.2.0

data/test/inherit_test.rb

@@ -10,7 +10,7 @@ class InheritTest < MiniTest::Spec
     property :track, :as => :no
   end
 
-  let (:song) { Song.new(Struct.new(:string).new("Roxanne"), 1) }
+  let(:song) { Song.new(Struct.new(:string).new("Roxanne"), 1) }
 
   describe ":inherit plain property" do
     representer! do
@@ -19,8 +19,8 @@ class InheritTest < MiniTest::Spec
       property :track, :inherit => true, :getter => lambda { |*| "n/a" }
     end
 
-    it { SongRepresenter.prepare(song).to_hash.must_equal({"title"=>{"str"=>"Roxanne"}, "no"=>1}) }
-    it { representer.prepare(song).to_hash.must_equal({"title"=>{"str"=>"Roxanne"}, "no"=>"n/a"}) } # as: inherited.
+    it { _(SongRepresenter.prepare(song).to_hash).must_equal({"title"=>{"str"=>"Roxanne"}, "no"=>1}) }
+    it { _(representer.prepare(song).to_hash).must_equal({"title"=>{"str"=>"Roxanne"}, "no"=>"n/a"}) } # as: inherited.
   end
 
   describe ":inherit with empty inline representer" do
@@ -32,23 +32,23 @@ class InheritTest < MiniTest::Spec
       end
     end
 
-    it { SongRepresenter.prepare(Song.new(Struct.new(:string).new("Believe It"), 1)).to_hash.must_equal({"title"=>{"str"=>"Believe It"}, "no"=>1}) }
+    it { _(SongRepresenter.prepare(Song.new(Struct.new(:string).new("Believe It"), 1)).to_hash).must_equal({"title"=>{"str"=>"Believe It"}, "no"=>1}) }
     # the block doesn't override the inline representer.
-    it { representer.prepare( Song.new(Struct.new(:string).new("Believe It"), 1)).to_hash.must_equal({"title"=>{"str"=>"Believe It"}, "no"=>1}) }
+    it { _(representer.prepare( Song.new(Struct.new(:string).new("Believe It"), 1)).to_hash).must_equal({"title"=>{"str"=>"Believe It"}, "no"=>1}) }
   end
 
   describe ":inherit with overriding inline representer" do
     representer! do
       include SongRepresenter
 
-      puts "passing block"
+      # passing block
       property :name, :inherit => true do # inherit as: title
         property :string, :as => :s
         property :length
       end
     end
 
-    it { representer.prepare( Song.new(Struct.new(:string, :length).new("Believe It", 10), 1)).to_hash.must_equal({"title"=>{"s"=>"Believe It","length"=>10}, "no"=>1}) }
+    it { _(representer.prepare( Song.new(Struct.new(:string, :length).new("Believe It", 10), 1)).to_hash).must_equal({"title"=>{"s"=>"Believe It","length"=>10}, "no"=>1}) }
   end
 
   describe ":inherit with empty inline and options" do
@@ -60,8 +60,8 @@ class InheritTest < MiniTest::Spec
       end
     end
 
-    it { SongRepresenter.prepare(Song.new(Struct.new(:string).new("Believe It"), 1)).to_hash.must_equal({"title"=>{"str"=>"Believe It"}, "no"=>1}) }
-    it { representer.prepare( Song.new(Struct.new(:string).new("Believe It"), 1)).to_hash.must_equal({"name"=>{"str"=>"Believe It"}, "no"=>1}) }
+    it { _(SongRepresenter.prepare(Song.new(Struct.new(:string).new("Believe It"), 1)).to_hash).must_equal({"title"=>{"str"=>"Believe It"}, "no"=>1}) }
+    it { _(representer.prepare( Song.new(Struct.new(:string).new("Believe It"), 1)).to_hash).must_equal({"name"=>{"str"=>"Believe It"}, "no"=>1}) }
   end
 
   describe ":inherit with inline without block but options" do
@@ -71,8 +71,8 @@ class InheritTest < MiniTest::Spec
       property :name, :inherit => true, :as => :name # FIXME: add :getter or something else dynamic since this is double-wrapped.
     end
 
-    it { SongRepresenter.prepare(Song.new(Struct.new(:string).new("Believe It"), 1)).to_hash.must_equal({"title"=>{"str"=>"Believe It"}, "no"=>1}) }
-    it { representer.prepare( Song.new(Struct.new(:string).new("Believe It"), 1)).to_hash.must_equal({"name"=>{"str"=>"Believe It"}, "no"=>1}) }
+    it { _(SongRepresenter.prepare(Song.new(Struct.new(:string).new("Believe It"), 1)).to_hash).must_equal({"title"=>{"str"=>"Believe It"}, "no"=>1}) }
+    it { _(representer.prepare( Song.new(Struct.new(:string).new("Believe It"), 1)).to_hash).must_equal({"name"=>{"str"=>"Believe It"}, "no"=>1}) }
   end
 
 
@@ -86,12 +86,12 @@ class InheritTest < MiniTest::Spec
     end
 
     it "replaces inherited property" do
-      representer.representable_attrs.size.must_equal 2
+      _(representer.representable_attrs.size).must_equal 2
 
       definition = representer.representable_attrs.get(:track) # TODO: find a better way to assert Definition identity.
       # definition.keys.size.must_equal 2
-      definition[:representable].   must_equal true
-      definition.name.must_equal "track" # was "no".
+      _(definition[:representable]).   must_equal true
+      _(definition.name).must_equal "track" # was "no".
     end
   end
 
@@ -108,7 +108,7 @@ class InheritTest < MiniTest::Spec
       end
     end
 
-    let (:inheriting) {
+    let(:inheriting) {
       class InheritingDecorator < representer
         include Representable::Debug
         property :hit, :inherit => true do
@@ -119,12 +119,12 @@ class InheritTest < MiniTest::Spec
       end
     }
 
-    it { representer.new(OpenStruct.new(hit: OpenStruct.new(title: "I WILL BE OVERRIDDEN", :length => "2:59"))).to_hash.must_equal(
+    it { _(representer.new(OpenStruct.new(hit: OpenStruct.new(title: "I WILL BE OVERRIDDEN", :length => "2:59"))).to_hash).must_equal(
       {"hit"=>{"title"=>"Cheap Transistor Radio"}}) }
 
     # inheriting decorator inherits inline representer class (InlineRepresenter#title).
     # inheriting decorator adds :length.
-    it { inheriting.new(OpenStruct.new(:hit => OpenStruct.new(:title => "Hole In Your Soul", :length => "2:59"))).to_hash.must_equal(
+    it { _(inheriting.new(OpenStruct.new(:hit => OpenStruct.new(:title => "Hole In Your Soul", :length => "2:59"))).to_hash).must_equal(
       {"hit"=>{"title"=>"Cheap Transistor Radio", "length"=>"2:59"}}) }
   end
 
@@ -135,7 +135,7 @@ class InheritTest < MiniTest::Spec
       property :name, :inherit => true
     end
 
-    it { representer.prepare(Song.new("The Beginning")).to_hash.must_equal({"name"=>"The Beginning"})}
+    it { _(representer.prepare(Song.new("The Beginning")).to_hash).must_equal({"name"=>"The Beginning"})}
   end
 end
 

data/test/inline_test.rb

@@ -1,8 +1,8 @@
 require 'test_helper'
 
 class InlineTest < MiniTest::Spec
-  let (:song)    { Song.new("Alive") }
-  let (:request) { representer.prepare(OpenStruct.new(:song => song)) }
+  let(:song)    { Song.new("Alive") }
+  let(:request) { representer.prepare(OpenStruct.new(:song => song)) }
 
   {
     :hash => [Representable::Hash, {"song"=>{"name"=>"Alive"}}, {"song"=>{"name"=>"You've Taken Everything"}}],
@@ -19,10 +19,10 @@ class InlineTest < MiniTest::Spec
         end
       end
 
-      let (:format) { format }
+      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
 
@@ -36,7 +36,7 @@ class InlineTest < MiniTest::Spec
     collection_options ||= {}
 
     describe "[#{format}] collection with :class" do
-      let (:request) { representer.prepare(OpenStruct.new(:songs => [song])) }
+      let(:request) { representer.prepare(OpenStruct.new(:songs => [song])) }
 
       representer!(:module => mod) do
         collection :songs, collection_options.merge(:class => Song) do
@@ -44,10 +44,10 @@ class InlineTest < MiniTest::Spec
         end
       end
 
-      let (:format) { format } # FIXME: why do we have to define this?
+      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,14 +76,14 @@ 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
 
 
   describe "inheriting from outer representer" do
-    let (:request) { Struct.new(:song, :requester).new(song, "Josephine") }
+    let(:request) { Struct.new(:song, :requester).new(song, "Josephine") }
 
     [false, true].each do |is_decorator| # test for module and decorator.
       representer!(:decorator => is_decorator) do
@@ -94,10 +94,10 @@ class InlineTest < MiniTest::Spec
         end
       end
 
-      let (:decorator) { representer.prepare(request) }
+      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
 
@@ -128,7 +128,7 @@ class InlineTest < MiniTest::Spec
   #   end
 
   #   describe ":getter with inline representer" do
-  #     let (:format) { format }
+  #     let(:format) { format }
 
   #     representer!(:module => mod) do
   #       self.representation_wrap = :album
@@ -136,7 +136,7 @@ class InlineTest < MiniTest::Spec
   #       property :artist, :getter => lambda { |args| represented }, :extend => ArtistRepresenter
   #     end
 
-  #     let (:album) { OpenStruct.new(:label => "Epitaph").extend(representer) }
+  #     let(:album) { OpenStruct.new(:label => "Epitaph").extend(representer) }
 
   #     it "renders nested Album-properties in separate section" do
   #       render(album).must_equal_document output
@@ -157,7 +157,7 @@ class InlineTest < MiniTest::Spec
     end
 
     describe ":getter with :decorator" do
-      let (:format) { format }
+      let(:format) { format }
 
       representer!(:module => mod) do
         self.representation_wrap = "album"
@@ -165,7 +165,7 @@ class InlineTest < MiniTest::Spec
         property :artist, :getter => lambda { |args| represented }, :decorator => ArtistDecorator
       end
 
-      let (:album) { OpenStruct.new(:label => "Epitaph").extend(representer) }
+      let(:album) { OpenStruct.new(:label => "Epitaph").extend(representer) }
 
       it "renders nested Album-properties in separate section" do
         render(album).must_equal_document output
@@ -182,7 +182,7 @@ class InlineTest < MiniTest::Spec
   }) do |format, mod, output|
 
     describe "helper method within inline representer [#{format}]" do
-      let (:format) { format }
+      let(:format) { format }
 
       representer!(:module => mod, :decorator => true) do
         self.representation_wrap = :request if format == :xml
@@ -199,7 +199,7 @@ class InlineTest < MiniTest::Spec
         end
       end
 
-      let (:request) { representer.prepare(OpenStruct.new(:song => Song.new("Alive"))) }
+      let(:request) { representer.prepare(OpenStruct.new(:song => Song.new("Alive"))) }
 
       it do
         render(request).must_equal_document output
@@ -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
 
 
@@ -55,13 +55,13 @@ class InstanceTest < BaseTest
     end
 
     it {
-      album= Struct.new(:songs).new(songs = [
+      album= Struct.new(:songs).new([
       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}
@@ -81,7 +81,7 @@ class InstanceTest < BaseTest
   #     property :song, :instance => lambda { |*| nil }, :extend => song_representer
   #   end
 
-  #   let (:hit) { hit = OpenStruct.new(:song => song).extend(representer) }
+  #   let(:hit) { hit = OpenStruct.new(:song => song).extend(representer) }
 
   #   it "calls #to_hash on song instance, nothing else" do
   #     hit.to_hash.must_equal("song"=>{"title"=>"Resist Stance"})
@@ -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

@@ -1,10 +1,34 @@
 require 'test_helper'
+require 'json'
 
 module JsonTest
+class JSONPublicMethodsTest < Minitest::Spec
+  #---
+  # from_json
+  class BandRepresenter < Representable::Decorator
+    include Representable::JSON
+    property :id
+    property :name
+  end
+
+  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"] }
+
+  #---
+  # 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 }
+end
+
   class APITest < MiniTest::Spec
     Json = Representable::JSON
     Def = Representable::Definition
 
+
     describe "JSON module" do
       before do
         @Band = Class.new do
@@ -229,9 +253,7 @@ module JsonTest
         assert_json '{"songName":"22 Acacia Avenue"}', song.to_json
       end
     end
-
-end
-
+  end
 
   class CollectionTest < MiniTest::Spec
     describe "collection :name" do
@@ -334,20 +356,20 @@ 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
         subject { OpenStruct.new.extend(representer) }
-        let (:hsh) { {"7"=>{"name"=>"Contemplation"}} }
+        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