representable 1.3.0 → 1.3.1

data/CHANGES.textile

@@ -1,3 +1,7 @@
+h2. 1.3.1
+
+* Bringing back `:as`. For some strange reasons "we" lost that commit from @csexton!!!
+
 h2. 1.3.0
 
 * Remove @:exclude@ option.

data/README.md

@@ -454,8 +454,7 @@ Since representable-1.2 `false` values _are_ considered when parsing and renderi
 
 If you want `nil` values to be included when rendering, use the `:render_nil` option.
 
-  property :track, render_nil: true
-
+    property :track, render_nil: true
 
 ## Coercion
 
@@ -469,7 +468,6 @@ Use the `:type` option to specify the conversion target. Note that `:default` st
 
     module SongRepresenter
       include Representable::JSON
-      include Virtus
       include Representable::Coercion
       
       property :title

data/lib/representable/definition.rb

@@ -36,7 +36,7 @@ module Representable
     end
     
     def from
-      (options[:from] || name).to_s
+      (options[:from] || options[:as] || name).to_s
     end
     
     def default_for(value)

data/lib/representable/version.rb

@@ -1,3 +1,3 @@
 module Representable
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/test/coercion_test.rb

@@ -25,9 +25,7 @@ class VirtusCoercionTest < MiniTest::Spec
     
     describe "on class level" do
       class ImmigrantSong
-        attr_accessor :track
         include Representable::JSON
-        include Virtus
         include Representable::Coercion
         
         property :composed_at,  :type => DateTime, :default => "May 12th, 2012"
@@ -35,8 +33,6 @@ class VirtusCoercionTest < MiniTest::Spec
       end
       
       it "coerces into the provided type" do
-        skip "Virtus is still not correctly treating coercion on class level?"
-        
         song = ImmigrantSong.new.from_json("{\"composed_at\":\"November 18th, 1983\",\"track\":\"18\"}")
         assert_equal DateTime.parse("Fri, 18 Nov 1983 00:00:00 +0000"), song.composed_at
         assert_equal 18, song.track

data/test/json_test.rb

@@ -286,6 +286,24 @@ module JsonTest
       end
     end
 
+    describe ":as => :songName" do
+      class Song
+        include Representable::JSON
+        property :name, :as => :songName
+        attr_accessor :name
+      end
+
+      it "respects :as in #from_json" do
+        song = Song.from_json({:songName => "Run To The Hills"}.to_json)
+        assert_equal "Run To The Hills", song.name
+      end
+
+      it "respects :as in #to_json" do
+        song = Song.new; song.name = "22 Acacia Avenue"
+        assert_json '{"songName":"22 Acacia Avenue"}', song.to_json
+      end
+    end
+
     describe ":default => :value" do
       before do
         @Album = Class.new do
@@ -417,29 +435,35 @@ end
 
   class HashTest < MiniTest::Spec
     describe "hash :songs" do
-      before do
-        representer = Module.new do
-          include Representable::JSON
-          hash :songs
-        end
-
-        class SongList
-          attr_accessor :songs
-        end
-
-        @list = SongList.new.extend(representer)
+      representer!(Representable::JSON) do
+        hash :songs
       end
 
+      subject { OpenStruct.new.extend(representer) }
+
       it "renders with #to_json" do
-        @list.songs = {:one => "65", :two => "Emo Boy"}
-        assert_json "{\"songs\":{\"one\":\"65\",\"two\":\"Emo Boy\"}}", @list.to_json
+        subject.songs = {:one => "65", :two => "Emo Boy"}
+        assert_json "{\"songs\":{\"one\":\"65\",\"two\":\"Emo Boy\"}}", subject.to_json
       end
 
       it "parses with #from_json" do
-        assert_equal({"one" => "65", "two" => ["Emo Boy"]}, @list.from_json("{\"songs\":{\"one\":\"65\",\"two\":[\"Emo Boy\"]}}").songs)
+        assert_equal({"one" => "65", "two" => ["Emo Boy"]}, subject.from_json("{\"songs\":{\"one\":\"65\",\"two\":[\"Emo Boy\"]}}").songs)
       end
     end
 
+    describe "hash :songs, :class => Song" do
+      representer!(Representable::JSON) do
+        hash :songs, :extend => Module.new { include Representable::JSON; property :name }, :class => Song
+      end
+
+      it "renders" do
+        OpenStruct.new(:songs => {"7" => Song.new("Contemplation")}).extend(representer).to_hash.must_equal("songs"=>{"7"=>{"name"=>"Contemplation"}})
+      end
+
+      it "parses" do
+        OpenStruct.new.extend(representer).from_hash("songs"=>{"7"=>{"name"=>"Contemplation"}}).songs.must_equal({"7"=>Song.new("Contemplation")})
+      end
+    end
   end
 
 

data/test/representable_test.rb

@@ -161,6 +161,11 @@ class RepresentableTest < MiniTest::Spec
         band = Class.new(Band) { property :friends, :from => :friend }
         assert_equal "friend", band.representable_attrs.last.from
       end
+
+      it "can be set explicitly with as" do
+        band = Class.new(Band) { property :friends, :as => :friend }
+        assert_equal "friend", band.representable_attrs.last.from
+      end
       
       it "is infered from the name implicitly" do
         band = Class.new(Band) { property :friends }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: representable
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri