representable 1.5.2 → 1.5.3

data/CHANGES.textile

@@ -1,3 +1,9 @@
+h2. 1.5.3
+
+* `Representable#update_properties_from` now always returns `represented`, which is `self` in a module representer and the decorated object in a decorator (only the latter changed).
+* Coercion in decorators should work now as expected.
+* Fixed a require bug.
+
 h2. 1.5.2
 
 * Rename `:representer_exec` to `:decorator_scope` and make it a documented (!) feature.

data/Gemfile

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 gemspec
 
 #gem "virtus", :path => "../virtus"
+gem 'rake', "10.1.0.beta3"

data/lib/representable.rb

@@ -45,7 +45,7 @@ module Representable
     representable_bindings_for(format, options).each do |bin|
       deserialize_property(bin, doc, options)
     end
-    self
+    represented
   end
 
 private

data/lib/representable/decorator/coercion.rb

@@ -1,13 +1,27 @@
+require 'representable/coercion'
+
 class Representable::Decorator
   module Coercion
     def self.included(base)
       base.class_eval do
+        # DISCUSS: this assumes we have a Representer included, yet.
+        alias_method :representable_initialize, :initialize
+        alias_method :representable_to_hash,    :to_hash
+
+        # FIXME: allow including coercion only from virtus.
         include Virtus
+        undef_method(:initialize)
+        undef_method(:to_hash)
+
         extend Representable::Coercion::ClassMethods
         extend ClassMethods
 
-        def initialize(represented) # override Virtus' #initialize.
-          @represented = represented
+        def initialize(*args) # override Virtus' #initialize.
+          representable_initialize(*args)
+        end
+
+        def to_hash(*args) # override Virtus' #to_hash.
+          representable_to_hash(*args)
         end
       end
     end

data/lib/representable/version.rb

@@ -1,3 +1,3 @@
 module Representable
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 end

data/test/coercion_test.rb

@@ -1,8 +1,10 @@
 require 'test_helper'
 require 'representable/coercion'
+require 'representable/decorator/coercion'
 
 class VirtusCoercionTest < MiniTest::Spec
   class Song  # note that we don't define accessors for the properties here.
+    attr_accessor :title
   end
 
   describe "Coercion with Virtus" do
@@ -12,14 +14,22 @@ class VirtusCoercionTest < MiniTest::Spec
         include Representable::Coercion
         property :composed_at,  :type => DateTime
         property :track,        :type => Integer
+        property :title # no coercion.
       end
 
       it "coerces properties in #from_json" do
-        song = Song.new.extend(SongRepresenter).from_json("{\"composed_at\":\"November 18th, 1983\",\"track\":\"18\"}")
+        song = Song.new.extend(SongRepresenter).from_json('{"composed_at":"November 18th, 1983","track":"18","title":"Scarified"}')
         assert_kind_of DateTime, song.composed_at
-        assert_equal 18, song.track
         assert_equal DateTime.parse("Fri, 18 Nov 1983 00:00:00 +0000"), song.composed_at
+        assert_equal 18, song.track
+        song.title.must_equal "Scarified"
       end
+
+      # it "coerces when rendering" do
+      #   song = Song.new
+      #   song.title = "Scarified"
+      #   song.to_json.must_equal ''
+      # end
     end
 
 
@@ -45,22 +55,29 @@ class VirtusCoercionTest < MiniTest::Spec
       end
     end
 
-    require 'representable/decorator/coercion'
     describe "on decorator" do
       class SongRepresentation < Representable::Decorator
         include Representable::JSON
         include Representable::Decorator::Coercion
 
         property :composed_at, :type => DateTime
+        property :title
       end
 
       it "coerces when parsing" do
-        song = SongRepresentation.new(OpenStruct.new).from_json("{\"composed_at\":\"November 18th, 1983\"}")
+        song = SongRepresentation.new(OpenStruct.new).from_json("{\"composed_at\":\"November 18th, 1983\", \"title\": \"Scarified\"}")
+        song.must_be_kind_of OpenStruct
         song.composed_at.must_equal DateTime.parse("Fri, 18 Nov 1983")
+        song.title.must_equal "Scarified"
       end
 
       it "coerces when rendering" do
-        SongRepresentation.new(OpenStruct.new(:composed_at => "November 18th, 1983")).to_json.must_equal "{\"composed_at\":\"1983-11-18T00:00:00+00:00\"}"
+        SongRepresentation.new(
+          OpenStruct.new(
+            :composed_at  => "November 18th, 1983",
+            :title        => "Scarified"
+          )
+        ).to_hash.must_equal({"composed_at"=>DateTime.parse("Fri, 18 Nov 1983"), "title"=>"Scarified"})
       end
     end
   end

data/test/decorator_test.rb

@@ -0,0 +1,45 @@
+require 'test_helper'
+
+class DecoratorTest < MiniTest::Spec
+  # TODO: Move to global place since it's used twice.
+  class SongRepresentation < Representable::Decorator
+    include Representable::JSON
+    property :name
+  end
+
+  class AlbumRepresentation < Representable::Decorator
+    include Representable::JSON
+
+    collection :songs, :class => Song, :extend => SongRepresentation
+  end
+
+  let (:song) { Song.new("Mama, I'm Coming Home") }
+  let (:album) { Album.new([song]) }
+  let (:decorator) { AlbumRepresentation.new(album) }
+
+  it "renders" do
+    decorator.to_hash.must_equal({"songs"=>[{"name"=>"Mama, I'm Coming Home"}]})
+    album.wont_respond_to :to_hash
+    song.wont_respond_to :to_hash # DISCUSS: weak test, how to assert blank slate?
+  end
+
+  describe "#from_hash" do
+    it "returns represented" do
+      decorator.from_hash({"songs"=>[{"name"=>"Mama, I'm Coming Home"}]}).must_equal album
+    end
+
+    it "parses" do
+      decorator.from_hash({"songs"=>[{"name"=>"Atomic Garden"}]})
+      album.songs.first.must_be_kind_of Song
+      album.songs.must_equal [Song.new("Atomic Garden")]
+      album.wont_respond_to :to_hash
+      song.wont_respond_to :to_hash # DISCUSS: weak test, how to assert blank slate?
+    end
+  end
+
+  describe "#decorated" do
+    it "is aliased to #represented" do
+      AlbumRepresentation.prepare(album).decorated.must_equal album
+    end
+  end
+end

data/test/representable_test.rb

@@ -266,7 +266,7 @@ class RepresentableTest < MiniTest::Spec
       assert_equal nil, @band.founders
     end
 
-    it "always returns self" do
+    it "always returns the represented" do
       assert_equal @band, @band.update_properties_from({"name"=>"Nofx"}, {}, Representable::Hash::PropertyBinding)
     end
 
@@ -740,42 +740,15 @@ class RepresentableTest < MiniTest::Spec
       end
     end
 
-    describe "decorator" do
-      # TODO: Move to global place since it's used twice.
-      class SongRepresentation < Representable::Decorator
-        include Representable::JSON
-        property :name
-      end
-
-      class AlbumRepresentation < Representable::Decorator
-        include Representable::JSON
-
-        collection :songs, :class => Song, :extend => SongRepresentation
-      end
-
-      let (:song) { Song.new("Mama, I'm Coming Home") }
-      let (:album) { Album.new([song]) }
-      let (:decorator) { AlbumRepresentation.new(album) }
-
-      it "renders" do
-        decorator.to_hash.must_equal({"songs"=>[{"name"=>"Mama, I'm Coming Home"}]})
-        album.wont_respond_to :to_hash
-        song.wont_respond_to :to_hash # DISCUSS: weak test, how to assert blank slate?
-      end
-
-      it "parses" do
-        decorator.from_hash({"songs"=>[{"name"=>"Atomic Garden"}]})
-        album.songs.first.must_be_kind_of Song
-        album.songs.must_equal [Song.new("Atomic Garden")]
-        album.wont_respond_to :to_hash
-        song.wont_respond_to :to_hash # DISCUSS: weak test, how to assert blank slate?
-      end
+    # TODO: Move to global place since it's used twice.
+    class SongRepresentation < Representable::Decorator
+      include Representable::JSON
+      property :name
+    end
+    class AlbumRepresentation < Representable::Decorator
+      include Representable::JSON
 
-      describe "#decorated" do
-        it "is aliased to #represented" do
-          AlbumRepresentation.prepare(album).decorated.must_equal album
-        end
-      end
+      collection :songs, :class => Song, :extend => SongRepresentation
     end
 
     describe "::prepare" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: representable
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -210,6 +210,7 @@ files:
 - lib/representable/yaml.rb
 - representable.gemspec
 - test/coercion_test.rb
+- test/decorator_test.rb
 - test/definition_test.rb
 - test/example.rb
 - test/hash_bindings_test.rb