representable 3.0.3 → 3.0.4

data/test/cached_test.rb

@@ -53,15 +53,15 @@ class CachedTest < MiniTest::Spec
 
 
   describe "serialization" do
-    let (:album_hash) { {"name"=>"Louder And Even More Dangerous", "songs"=>[{"title"=>"Southbound:{:volume=>10}"}, {"title"=>"Jailbreak:{:volume=>10}"}]} }
+    let(:album_hash) { {"name"=>"Louder And Even More Dangerous", "songs"=>[{"title"=>"Southbound:{:volume=>10}"}, {"title"=>"Jailbreak:{:volume=>10}"}]} }
 
-    let (:song) { Model::Song.new("Jailbreak") }
-    let (:song2) { Model::Song.new("Southbound") }
-    let (:album) { Model::Album.new("Live And Dangerous", [song, song2, Model::Song.new("Emerald")]) }
-    let (:representer) { AlbumRepresenter.new(album) }
+    let(:song) { Model::Song.new("Jailbreak") }
+    let(:song2) { Model::Song.new("Southbound") }
+    let(:album) { Model::Album.new("Live And Dangerous", [song, song2, Model::Song.new("Emerald")]) }
+    let(:representer) { AlbumRepresenter.new(album) }
 
     it do
-      album2 = Model::Album.new("Louder And Even More Dangerous", [song2, song])
+      # album2 = Model::Album.new("Louder And Even More Dangerous", [song2, song])
 
       # makes sure options are passed correctly.
       representer.to_hash(user_options: {volume: 9}).must_equal({"name"=>"Live And Dangerous",
@@ -81,20 +81,20 @@ class CachedTest < MiniTest::Spec
       data = Profiler.profile { representer.to_hash }
 
       # 3 songs get decorated.
-      data.must_match /3\s*Representable::Function::Decorate#call/m
+      data.must_match(/3\s*Representable::Function::Decorate#call/m)
       # These weird Regexp bellow are a quick workaround to accomodate
       # the different profiler result formats.
       #   - "3   <Class::Representable::Decorator>#prepare" -> At MRI Ruby
       #   - "3  Representable::Decorator.prepare"           -> At JRuby
 
       # 3 nested decorator is instantiated for 3 Songs, though.
-      data.must_match /3\s*(<Class::)?Representable::Decorator\>?[\#.]prepare/m
+      data.must_match(/3\s*(<Class::)?Representable::Decorator\>?[\#.]prepare/m)
       # no Binding is instantiated at runtime.
       data.wont_match "Representable::Binding#initialize"
       # 2 mappers for Album, Song
       # data.must_match "2   Representable::Mapper::Methods#initialize"
       # title, songs, 3x title, composer
-      data.must_match /8\s*Representable::Binding[#\.]render_pipeline/m
+      data.must_match(/8\s*Representable::Binding[#\.]render_pipeline/m)
       data.wont_match "render_functions"
       data.wont_match "Representable::Binding::Factories#render_functions"
     end
@@ -102,7 +102,7 @@ class CachedTest < MiniTest::Spec
 
 
   describe "deserialization" do
-    let (:album_hash) {
+    let(:album_hash) {
       {
         "name"=>"Louder And Even More Dangerous",
         "songs"=>[
@@ -125,7 +125,7 @@ class CachedTest < MiniTest::Spec
       album.songs[1].title.must_equal "Jailbreak"
       album.songs[1].composer.name.must_equal "Phil Lynott"
       album.songs[2].title.must_equal "Emerald"
-      album.songs[2].composer.must_equal nil
+      album.songs[2].composer.must_be_nil
 
       # TODO: test options.
     end
@@ -139,12 +139,12 @@ class CachedTest < MiniTest::Spec
       # only 2 nested decorators are instantiated, Song, and Artist.
       # Didn't like the regexp?
       # MRI and JRuby has different output formats. See note above.
-      data.must_match /5\s*(<Class::)?Representable::Decorator>?[#\.]prepare/
+      data.must_match(/5\s*(<Class::)?Representable::Decorator>?[#\.]prepare/)
       # a total of 5 properties in the object graph.
       data.wont_match "Representable::Binding#initialize"
 
       data.wont_match "parse_functions" # no pipeline creation.
-      data.must_match /10\s*Representable::Binding[#\.]parse_pipeline/
+      data.must_match(/10\s*Representable::Binding[#\.]parse_pipeline/)
       # three mappers for Album, Song, composer
       # data.must_match "3   Representable::Mapper::Methods#initialize"
       # # 6 deserializers as the songs collection uses 2.

data/test/class_test.rb

@@ -54,7 +54,7 @@ class ClassTest < BaseTest
 
 
   describe "lambda receiving fragment and args" do
-    let (:klass) { Class.new do
+    let(:klass) { Class.new do
       class << self
         attr_accessor :args
       end
@@ -75,7 +75,7 @@ class ClassTest < BaseTest
 
 
   describe "collection: lambda receiving fragment and args" do
-    let (:klass) { Class.new do
+    let(:klass) { Class.new do
       class << self
         attr_accessor :args
       end

data/test/coercion_test.rb

@@ -17,7 +17,7 @@ class VirtusCoercionTest < MiniTest::Spec
     end
   end
 
-  let (:album) { OpenStruct.new(:title => "Dire Straits", :length => 41.34,
+  let(:album) { OpenStruct.new(:title => "Dire Straits", :length => 41.34,
     :band  => OpenStruct.new(:founded => "1977"),
     :songs => [OpenStruct.new(:ok => 1), OpenStruct.new(:ok => 0)]) }
 

data/test/config_test.rb

@@ -7,7 +7,7 @@ class ConfigTest < MiniTest::Spec
 
   describe "wrapping" do
     it "returns false per default" do
-      assert_equal nil, subject.wrap_for("Punk", nil)
+      assert_nil subject.wrap_for("Punk", nil)
     end
 
     # it "infers a printable class name if set to true" do
@@ -23,13 +23,13 @@ class ConfigTest < MiniTest::Spec
 
   describe "#[]" do
     # does return nil for non-existent
-    it { subject[:hello].must_equal nil }
+    it { subject[:hello].must_be_nil }
   end
 
   # describe "#[]" do
   #   before { subject.add(:title, {:me => true}) }
 
-  #   it { subject[:unknown].must_equal     nil }
+  #   it { subject[:unknown].must_be_nil }
   #   it { subject.get(:title)[:me].must_equal  true }
   #   it { subject["title"][:me].must_equal true }
   # end
@@ -59,7 +59,7 @@ class ConfigTest < MiniTest::Spec
     # this is actually tested in context in inherit_test.
     it "overrides former definition" do
       subject.add(:title, {:peer => Module})
-      subject.get(:title)[:me].must_equal nil
+      subject.get(:title)[:me].must_be_nil
       subject.get(:title)[:peer].must_equal Module
     end
 
@@ -84,7 +84,7 @@ class ConfigTest < MiniTest::Spec
       subject.get(:genre).must_be_kind_of Representable::Definition
 
       subject.remove(:genre)
-      subject.get(:genre).must_equal nil
+      subject.get(:genre).must_be_nil
     end
   end
 

data/test/decorator_scope_test.rb

@@ -6,7 +6,7 @@ class DecoratorScopeTest < MiniTest::Spec
     property :title, :getter => lambda { |*| title_from_representer }, :decorator_scope => true
   end
 
-  let (:representer_with_method) {
+  let(:representer_with_method) {
     Module.new do
       include Representable::Hash
       property :title, :decorator_scope => true

data/test/decorator_test.rb

@@ -19,13 +19,13 @@ class DecoratorTest < MiniTest::Spec
     property :value
   end
 
-  let (:song) { Song.new("Mama, I'm Coming Home") }
-  let (:album) { Album.new([song]) }
+  let(:song) { Song.new("Mama, I'm Coming Home") }
+  let(:album) { Album.new([song]) }
 
-  let (:rating) { OpenStruct.new(system: 'MPAA', value: 'R') }
+  let(:rating) { OpenStruct.new(system: 'MPAA', value: 'R') }
 
   describe "inheritance" do
-    let (:inherited_decorator) do
+    let(:inherited_decorator) do
       Class.new(AlbumRepresentation) do
         property :best_song
       end.new(Album.new([song], "Stand Up"))
@@ -34,7 +34,7 @@ class DecoratorTest < MiniTest::Spec
     it { inherited_decorator.to_hash.must_equal({"songs"=>[{"name"=>"Mama, I'm Coming Home"}], "best_song"=>"Stand Up"}) }
   end
 
-  let (:decorator) { AlbumRepresentation.new(album) }
+  let(:decorator) { AlbumRepresentation.new(album) }
 
   let(:rating_decorator) { RatingRepresentation.new(rating) }
 
@@ -43,7 +43,7 @@ class DecoratorTest < MiniTest::Spec
     album.wont_respond_to :to_hash
     song.wont_respond_to :to_hash # DISCUSS: weak test, how to assert blank slate?
     # no @representable_attrs in decorated objects
-    song.instance_variable_get(:@representable_attrs).must_equal nil
+    song.wont_be(:instance_variable_defined?, :@representable_attrs)
 
     rating_decorator.to_hash.must_equal({"system" => "MPAA", "value" => "R"})
   end
@@ -80,8 +80,8 @@ class DecoratorTest < MiniTest::Spec
       representer.new(album).from_hash({"songs"=>[{"name"=>"Atomic Garden"}]})
 
       # no @representable_attrs in decorated objects
-      song.instance_variable_get(:@representable_attrs).must_equal nil
-      album.instance_variable_get(:@representable_attrs).must_equal nil
+      song.wont_be(:instance_variable_defined?, :@representable_attrs)
+      album.wont_be(:instance_variable_defined?, :@representable_attrs)
     end
   end
 end

data/test/default_test.rb

@@ -9,7 +9,7 @@ class DefaultTest < MiniTest::Spec
   end
 
   describe "#from_hash" do
-    let (:song) { Song.new.extend(representer) }
+    let(:song) { Song.new.extend(representer) }
 
     it { song.from_hash({}).must_equal Song.new(nil, "Huber Breeze") }
     # default doesn't apply when empty string.

data/test/defaults_options_test.rb

@@ -1,9 +1,9 @@
 require 'test_helper'
 
 class DefaultsOptionsTest < BaseTest
-  let (:format) { :hash }
-  let (:song) { Struct.new(:title, :author_name, :song_volume, :description).new("Revolution", "Some author", 20, nil) }
-  let (:prepared) { representer.prepare song }
+  let(:format) { :hash }
+  let(:song) { Struct.new(:title, :author_name, :song_volume, :description).new("Revolution", "Some author", 20, nil) }
+  let(:prepared) { representer.prepare song }
 
   describe "hash options combined with dynamic options" do
     representer! do

data/test/definition_test.rb

@@ -6,15 +6,13 @@ class DefinitionTest < MiniTest::Spec
   # TODO: test that we DON'T clone options, that must happen in
   describe "#initialize" do
     it do
-      opts = nil
-
       # new yields the defaultized options HASH.
       definition = Definition.new(:song, :extend => Module) do |options|
         options[:awesome] = true
         options[:parse_filter] << 1
 
         # default variables
-        options[:as].must_equal nil
+        options[:as].must_be_nil
         options[:extend].must_equal Module
       end
       definition.name.must_equal "song"
@@ -27,14 +25,14 @@ class DefinitionTest < MiniTest::Spec
   end
 
   describe "#[]" do
-    let (:definition) { Definition.new(:song) }
+    let(:definition) { Definition.new(:song) }
     # default is nil.
-    it { definition[:bla].must_equal nil }
+    it { definition[:bla].must_be_nil }
   end
 
   # merge!
   describe "#merge!" do
-    let (:definition) { Definition.new(:song, :whatever => true) }
+    let(:definition) { Definition.new(:song, :whatever => true) }
 
     # merges new options.
     it { definition.merge!(:something => true)[:something].must_equal true }
@@ -61,7 +59,7 @@ class DefinitionTest < MiniTest::Spec
     end
 
     describe "with :parse_filter" do
-      let (:definition) { Definition.new(:title, :parse_filter => 1) }
+      let(:definition) { Definition.new(:title, :parse_filter => 1) }
 
       # merges :parse_filter and :render_filter.
       it do
@@ -85,11 +83,11 @@ class DefinitionTest < MiniTest::Spec
 
   # delete!
   describe "#delete!" do
-    let (:definition) { Definition.new(:song, serialize: "remove me!") }
+    let(:definition) { Definition.new(:song, serialize: "remove me!") }
 
     before { definition[:serialize].(nil).must_equal "remove me!" }
 
-    it { definition.delete!(:serialize)[:serialize].must_equal nil }
+    it { definition.delete!(:serialize)[:serialize].must_be_nil }
   end
 
   # #inspect
@@ -104,7 +102,7 @@ class DefinitionTest < MiniTest::Spec
     end
 
     it "responds to #representer_module" do
-      assert_equal nil, Representable::Definition.new(:song).representer_module
+      assert_nil Representable::Definition.new(:song).representer_module
       assert_equal Hash, Representable::Definition.new(:song, :extend => Hash).representer_module
     end
 
@@ -217,7 +215,7 @@ class DefinitionTest < MiniTest::Spec
   describe ":default => value" do
     it "responds to #default" do
       @def = Representable::Definition.new(:song)
-      assert_equal nil, @def[:default]
+      assert_nil @def[:default]
     end
 
     it "accepts a default value" do

data/test/examples/object.rb

@@ -7,8 +7,6 @@ require "pp"
 source = OpenStruct.new(name: "30 Years Live", songs: [
   OpenStruct.new(id: 1, title: "Dear Beloved"), OpenStruct.new(id: 2, title: "Fuck Armageddon")])
 
-pp source
-
 require "representable/object"
 
 class AlbumRepresenter < Representable::Decorator
@@ -26,6 +24,4 @@ Song = Struct.new(:title)
 
 target = Album.new
 
-AlbumRepresenter.new(target).from_object(source)
-
-pp target
+AlbumRepresenter.new(target).from_object(source)

data/test/exec_context_test.rb

@@ -7,8 +7,8 @@ class ExecContextTest < MiniTest::Spec
     # :yaml => [Representable::YAML, "---\nsong:\n  name: Alive\n", "---\nsong:\n  name: You've Taken Everything\n"],
   ) do |format, mod, input, output|
 
-    let (:song) { representer.prepare(Song.new("Timing")) }
-    let (:format) { format }
+    let(:song) { representer.prepare(Song.new("Timing")) }
+    let(:format) { format }
 
 
     describe "exec_context: nil" do

data/test/features_test.rb

@@ -20,11 +20,11 @@ class FeaturesTest < MiniTest::Spec
     end
   }
 
-  let (:song) { OpenStruct.new(:details => Object.new) }
+  let(:song) { OpenStruct.new(:details => Object.new) }
 
   describe "Module" do
     representer! do
-      instance_exec &definition
+      instance_exec(&definition)
     end
 
     it { song.extend(representer).to_hash.must_equal({"title"=>"Is It A Lie", "length"=>"2:31", "details"=>{"title"=>"Is It A Lie"}}) }
@@ -33,7 +33,7 @@ class FeaturesTest < MiniTest::Spec
 
   describe "Decorator" do
     representer!(:decorator => true) do
-      instance_exec &definition
+      instance_exec(&definition)
     end
 
     it { representer.new(song).to_hash.must_equal({"title"=>"Is It A Lie", "length"=>"2:31", "details"=>{"title"=>"Is It A Lie"}}) }

data/test/filter_test.rb

@@ -1,8 +1,8 @@
 require 'test_helper'
 
 class FilterPipelineTest < MiniTest::Spec
-  let (:block1) { lambda { |input, options| "1: #{input}" } }
-  let (:block2) { lambda { |input, options| "2: #{input}" } }
+  let(:block1) { lambda { |input, options| "1: #{input}" } }
+  let(:block2) { lambda { |input, options| "2: #{input}" } }
 
   subject { Representable::Pipeline[block1, block2] }
 

data/test/for_collection_test.rb

@@ -7,8 +7,8 @@ class ForCollectionTest < MiniTest::Spec
     property :name
   end
 
-  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\"}]" }
 
 
   # Module.for_collection
@@ -20,9 +20,9 @@ class ForCollectionTest < MiniTest::Spec
   ) do |format, mod, output, input|
 
     describe "Module::for_collection [#{format}]" do
-      let (:format) { format }
+      let(:format) { format }
 
-      let (:representer) {
+      let(:representer) {
         Module.new do
           include mod
           property :name#, :as => :title
@@ -40,9 +40,9 @@ class ForCollectionTest < MiniTest::Spec
     end
 
     describe "Module::for_collection without configuration [#{format}]" do
-      let (:format) { format }
+      let(:format) { format }
 
-      let (:representer) {
+      let(:representer) {
         Module.new do
           include mod
           property :name
@@ -55,8 +55,8 @@ class ForCollectionTest < MiniTest::Spec
 
 
     describe "Decorator::for_collection [#{format}]" do
-      let (:format) { format }
-      let (:representer) {
+      let(:format) { format }
+      let(:representer) {
         Class.new(Representable::Decorator) do
           include mod
           property :name

data/test/generic_test.rb

@@ -1,10 +1,10 @@
 require 'test_helper'
 
 class GenericTest < MiniTest::Spec # TODO: rename/restructure to CollectionTest.
-  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  }
 
 
   describe "::collection" do
@@ -14,7 +14,7 @@ class GenericTest < MiniTest::Spec # TODO: rename/restructure to CollectionTest.
 
     it "doesn't initialize property" do
       new_album.from_hash({})
-      new_album.songs.must_equal nil
+      new_album.songs.must_be_nil
     end
 
     it "leaves properties untouched" do
@@ -32,14 +32,14 @@ class GenericTest < MiniTest::Spec # TODO: rename/restructure to CollectionTest.
     ) do |format, mod, output, input|
 
       describe "nil collections" do
-        let (:format) { format }
+        let(:format) { format }
 
         representer!(:module => mod) do
           collection :songs
           self.representation_wrap = :album if format == :xml
         end
 
-        let (:album) { Album.new.extend(representer) }
+        let(:album) { Album.new.extend(representer) }
 
         it "doesn't render collection in #{format}" do
           render(album).must_equal_document output
@@ -55,14 +55,14 @@ class GenericTest < MiniTest::Spec # TODO: rename/restructure to CollectionTest.
     ) do |format, mod, output, input|
 
       describe "empty collections" do
-        let (:format) { format }
+        let(:format) { format }
 
         representer!(:module => mod) do
           collection :songs
           self.representation_wrap = :album if format == :xml
         end
 
-        let (:album) { OpenStruct.new(:songs => []).extend(representer) }
+        let(:album) { OpenStruct.new(:songs => []).extend(representer) }
 
         it "renders empty collection in #{format}" do
           render(album).must_equal_document output
@@ -79,14 +79,14 @@ class GenericTest < MiniTest::Spec # TODO: rename/restructure to CollectionTest.
     ) do |format, mod, output, input|
 
       describe "render_empty [#{format}]" do
-        let (:format) { format }
+        let(:format) { format }
 
         representer!(:module => mod) do
           collection :songs, :render_empty => false
           self.representation_wrap = :album if format == :xml
         end
 
-        let (:album) { OpenStruct.new(:songs => []).extend(representer) }
+        let(:album) { OpenStruct.new(:songs => []).extend(representer) }
 
         it { render(album).must_equal_document output }
       end