representable 3.0.3 → 3.0.4

data/test/hash_bindings_test.rb

@@ -21,7 +21,7 @@ class HashBindingTest < MiniTest::Spec
       it "returns fragment if present" do
         assert_equal "Stick The Flag Up Your Goddamn Ass, You Sonofabitch", @property.read({"song" => "Stick The Flag Up Your Goddamn Ass, You Sonofabitch"}, "song")
         assert_equal "", @property.read({"song" => ""}, "song")
-        assert_equal nil, @property.read({"song" => nil}, "song")
+        assert_nil @property.read({"song" => nil}, "song")
       end
 
       it "returns FRAGMENT_NOT_FOUND if not in document" do

data/test/hash_test.rb

@@ -9,14 +9,14 @@ class HashPublicMethodsTest < Minitest::Spec
     property :name
   end
 
-  let (:data) { {"id"=>1,"name"=>"Rancid"} }
+  let(:data) { {"id"=>1,"name"=>"Rancid"} }
 
   it { BandRepresenter.new(Band.new).from_hash(data)[:id, :name].must_equal [1, "Rancid"] }
   it { BandRepresenter.new(Band.new).parse(data)[:id, :name].must_equal [1, "Rancid"] }
 
   #---
   # to_hash
-  let (:band) { Band.new(1, "Rancid") }
+  let(:band) { Band.new(1, "Rancid") }
 
   it { BandRepresenter.new(band).to_hash.must_equal data }
   it { BandRepresenter.new(band).render.must_equal data }
@@ -29,7 +29,7 @@ class HashWithScalarPropertyTest < MiniTest::Spec
     property :title
   end
 
-  let (:album) { Album.new("Liar") }
+  let(:album) { Album.new("Liar") }
 
   describe "#to_hash" do
     it "renders plain property" do
@@ -46,7 +46,7 @@ class HashWithScalarPropertyTest < MiniTest::Spec
     # Fixes issue #115
     it "allows nil value in the incoming document and corresponding nil value for the represented" do
       album = Album.new
-      album.title.must_equal nil
+      album.title.must_be_nil
       album.extend(representer).from_hash("title" => nil)
     end
   end
@@ -62,7 +62,7 @@ class HashWithTypedPropertyTest < MiniTest::Spec
     end
   end
 
-  let (:album) { Album.new(Song.new("Liar")) }
+  let(:album) { Album.new(Song.new("Liar")) }
 
   describe "#to_hash" do
     it "renders embedded typed property" do
@@ -80,21 +80,21 @@ class HashWithTypedPropertyTest < MiniTest::Spec
     it do
       album = Album.new(Song.new("Pre-medicated Murder"))
       album.extend(representer).from_hash("best_song" => nil)
-      album.best_song.must_equal nil
+      album.best_song.must_be_nil
     end
 
     # nested blank hash creates blank object when not populated.
     it do
       album = Album.new#(Song.new("Pre-medicated Murder"))
       album.extend(representer).from_hash("best_song" => {})
-      album.best_song.name.must_equal nil
+      album.best_song.name.must_be_nil
     end
 
     # Fixes issue #115
     it "allows nil value in the incoming document and corresponding nil value for the represented" do
       album = Album.new
       album.extend(representer).from_hash("best_song" => nil)
-      album.best_song.must_equal nil
+      album.best_song.must_be_nil
     end
   end
 end
@@ -107,7 +107,7 @@ class HashWithTypedPropertyAndAs < MiniTest::Spec
     end
   end
 
-  let (:album) { OpenStruct.new(:song => Song.new("Liar")).extend(representer) }
+  let(:album) { OpenStruct.new(:song => Song.new("Liar")).extend(representer) }
 
   it { album.to_hash.must_equal("hit" => {"name" => "Liar"}) }
   it { album.from_hash("hit" => {"name" => "Go With Me"}).must_equal OpenStruct.new(:song => Song.new("Go With Me")) }
@@ -119,13 +119,13 @@ end
   #   #     property :name
   #   #   end
 
-  #   #   let (:hash_album) { Module.new do
+  #   #   let(:hash_album) { Module.new do
   #   #     include Representable::XML
   #   #     self.representation_wrap = :album
   #   #     property :song, :extend => hash_song, :class => Song, :as => :hit
   #   #   end }
 
-  #   #   let (:album) { OpenStruct.new(:song => Song.new("Liar")).extend(hash_album) }
+  #   #   let(:album) { OpenStruct.new(:song => Song.new("Liar")).extend(hash_album) }
 
   #   #   it { album.to_xml.must_equal_xml("<album><hit><name>Liar</name></hit></album>") }
   #   #   #it { album.from_hash("hit" => {"name" => "Go With Me"}).must_equal OpenStruct.new(:song => Song.new("Go With Me")) }
@@ -144,7 +144,7 @@ class HashWithTypedCollectionTest < MiniTest::Spec
     end
   end
 
-  let (:album) { Album.new([Song.new("Liar", 1), Song.new("What I Know", 2)]) }
+  let(:album) { Album.new([Song.new("Liar", 1), Song.new("What I Know", 2)]) }
 
   describe "#to_hash" do
     it "renders collection of typed property" do
@@ -164,7 +164,7 @@ class HashWithScalarCollectionTest < MiniTest::Spec
   Album = Struct.new(:songs)
   representer! { collection :songs }
 
-  let (:album) { Album.new(["Jackhammer", "Terrible Man"]) }
+  let(:album) { Album.new(["Jackhammer", "Terrible Man"]) }
 
 
   describe "#to_hash" do

data/test/heritage_test.rb

@@ -3,16 +3,16 @@ require "test_helper"
 class HeritageTest < Minitest::Spec
   module Hello
     def hello
-      puts "Hello!"
+      "Hello!"
     end
   end
-    module Ciao
+
+  module Ciao
     def ciao
-      puts "Ciao!"
+      "Ciao!"
     end
   end
 
-
   class A < Representable::Decorator
     include Representable::Hash
 
@@ -34,15 +34,16 @@ class HeritageTest < Minitest::Spec
     property :id do end # overwrite old :id.
   end
 
-  it do
-    # puts A.heritage.inspect
-    # puts B.heritage.inspect
+  it "B must inherit Hello! feature from A" do
+    B.representable_attrs.get(:id)[:extend].(nil).new(nil).hello.must_equal "Hello!"
+  end
 
-    puts B.representable_attrs.get(:id)[:extend].(nil).new(nil).hello
-    puts B.representable_attrs.get(:id)[:extend].(nil).new(nil).ciao
+  it "B must have Ciao from module (feauture) Ciao" do
+    B.representable_attrs.get(:id)[:extend].(nil).new(nil).ciao.must_equal "Ciao!"
+  end
 
-    # feature Hello must be "inherited" from A and included in new C properties, too.
-    puts C.representable_attrs.get(:id)[:extend].(nil).new(nil).hello
+  it "C must inherit Hello! feature from A" do
+    C.representable_attrs.get(:id)[:extend].(nil).new(nil).hello.must_equal "Hello!"
   end
 
   module M
@@ -56,7 +57,9 @@ class HeritageTest < Minitest::Spec
     feature Ciao
   end
 
-  it do
-    Object.new.extend(N).hello
+  let(:obj_extending_N) { Object.new.extend(N) }
+
+  it "obj should inherit from N, and N from M" do
+    obj_extending_N.hello.must_equal "Hello!"
   end
 end

data/test/if_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class IfTest < MiniTest::Spec
-  let (:band_class) { Class.new do
+  let(:band_class) { Class.new do
     include Representable::Hash
     attr_accessor :fame
     self
@@ -18,14 +18,14 @@ class IfTest < MiniTest::Spec
     band_class.class_eval { property :fame, :if => lambda { |*| false } }
     band = band_class.new
     band.from_hash({"fame"=>"oh yes"})
-    assert_equal nil, band.fame
+    assert_nil band.fame
   end
 
   it "ignores property when :exclude'ed even when condition is true" do
     band_class.class_eval { property :fame, :if => lambda { |*| true } }
     band = band_class.new
     band.from_hash({"fame"=>"oh yes"}, {:exclude => [:fame]})
-    assert_equal nil, band.fame
+    assert_nil band.fame
   end
 
   it "executes block in instance context" do

data/test/include_exclude_test.rb

@@ -17,8 +17,8 @@ class IncludeExcludeTest < Minitest::Spec
     end
   end
 
-  let (:song) { Song.new("Listless", Artist.new("7yearsbadluck", 1  )) }
-  let (:decorator) { representer.new(song) }
+  let(:song) { Song.new("Listless", Artist.new("7yearsbadluck", 1  )) }
+  let(:decorator) { representer.new(song) }
 
   describe "#from_hash" do
     it "accepts :exclude option" do

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
@@ -41,7 +41,7 @@ class InheritTest < MiniTest::Spec
     representer! do
       include SongRepresenter
 
-      puts "passing block"
+      # passing block
       property :name, :inherit => true do # inherit as: title
         property :string, :as => :s
         property :length
@@ -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

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,7 +19,7 @@ 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"}
@@ -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,7 +44,7 @@ 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"}
@@ -83,7 +83,7 @@ class InlineTest < MiniTest::Spec
 
 
   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,7 +94,7 @@ 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"}
@@ -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

data/test/instance_test.rb

@@ -55,7 +55,7 @@ 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, "")])
 
@@ -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"})

data/test/json_test.rb

@@ -11,14 +11,14 @@ class JSONPublicMethodsTest < Minitest::Spec
     property :name
   end
 
-  let (:json) { '{"id":1,"name":"Rancid"}' }
+  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") }
+  let(:band) { Band.new(1, "Rancid") }
 
   it { BandRepresenter.new(band).to_json.must_equal json }
   it { BandRepresenter.new(band).render.must_equal json }
@@ -253,9 +253,7 @@ end
         assert_json '{"songName":"22 Acacia Avenue"}', song.to_json
       end
     end
-
-end
-
+  end
 
   class CollectionTest < MiniTest::Spec
     describe "collection :name" do
@@ -363,7 +361,7 @@ 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")})

data/test/lonely_test.rb

@@ -12,7 +12,7 @@ class LonelyRepresenterTest < MiniTest::Spec
   ) do |format, mod, output, input|
 
     describe "[#{format}] lonely collection, render-only" do # TODO: introduce :representable option?
-      let (:format) { format }
+      let(:format) { format }
 
       representer!(module: mod) do
         items do
@@ -20,7 +20,7 @@ class LonelyRepresenterTest < MiniTest::Spec
         end
       end
 
-      let (:album) { [Song.new("Resist Stance"), Song.new("Suffer")].extend(representer) }
+      let(:album) { [Song.new("Resist Stance"), Song.new("Suffer")].extend(representer) }
 
       it "calls #to_hash on song instances, nothing else" do
         render(album).must_equal_document(output)
@@ -36,14 +36,14 @@ class LonelyRepresenterTest < MiniTest::Spec
     property :name
   end
 
-  let (:decorator) { rpr = representer; Class.new(Representable::Decorator) { include Representable::Hash; include rpr } }
+  let(:decorator) { rpr = representer; Class.new(Representable::Decorator) { include Representable::Hash; include rpr } }
 
   describe "JSON::Collection" do
-    let (:songs) { [Song.new("Days Go By"), Song.new("Can't Take Them All")] }
-    let (:json)  { "[{\"name\":\"Days Go By\"},{\"name\":\"Can't Take Them All\"}]" }
+    let(:songs) { [Song.new("Days Go By"), Song.new("Can't Take Them All")] }
+    let(:json)  { "[{\"name\":\"Days Go By\"},{\"name\":\"Can't Take Them All\"}]" }
 
     describe "with contained objects" do
-      let (:representer) {
+      let(:representer) {
         Module.new do
           include Representable::JSON::Collection
           items :class => Song, :extend => SongRepresenter
@@ -80,13 +80,13 @@ class LonelyRepresenterTest < MiniTest::Spec
     end
 
     describe "with contained text" do
-      let (:representer) {
+      let(:representer) {
         Module.new do
           include Representable::JSON::Collection
         end
       }
-      let (:songs) { ["Days Go By", "Can't Take Them All"] }
-      let (:json)  { "[\"Days Go By\",\"Can't Take Them All\"]" }
+      let(:songs) { ["Days Go By", "Can't Take Them All"] }
+      let(:json)  { "[\"Days Go By\",\"Can't Take Them All\"]" }
 
       it "renders contained items #to_json" do
         assert_json json, songs.extend(representer).to_json
@@ -118,14 +118,14 @@ class LonelyRepresenterTest < MiniTest::Spec
 
   describe "JSON::Hash" do  # TODO: move to HashTest.
     describe "with contained objects" do
-      let (:representer) {
+      let(:representer) {
         Module.new do
           include Representable::JSON::Hash
           values :class => Song, :extend => SongRepresenter
         end
       }
-      let (:json)  { "{\"one\":{\"name\":\"Days Go By\"},\"two\":{\"name\":\"Can't Take Them All\"}}" }
-      let (:songs) { {"one" => Song.new("Days Go By"), "two" => Song.new("Can't Take Them All")} }
+      let(:json)  { "{\"one\":{\"name\":\"Days Go By\"},\"two\":{\"name\":\"Can't Take Them All\"}}" }
+      let(:songs) { {"one" => Song.new("Days Go By"), "two" => Song.new("Can't Take Them All")} }
 
       describe "#to_json" do
         it "renders hash" do
@@ -178,13 +178,13 @@ class LonelyRepresenterTest < MiniTest::Spec
 
 
     describe "with scalar" do
-      let (:representer) {
+      let(:representer) {
         Module.new do
           include Representable::JSON::Hash
         end
       }
-      let (:json)  { %{{"one":1,"two":2}} }
-      let (:data) { {one: 2, two: 3} }
+      let(:json)  { %{{"one":1,"two":2}} }
+      let(:data) { {one: 2, two: 3} }
 
       describe "#to_json" do
         it { data.extend(representer).to_json.must_equal %{{"one":2,"two":3}} }