representable 1.3.1 → 1.3.2

data/CHANGES.textile

@@ -1,3 +1,7 @@
+h2. 1.3.2
+
+* Some minor internal changes. Added `Config#inherit` to encasulate array push behavior. 
+
 h2. 1.3.1
 
 * Bringing back `:as`. For some strange reasons "we" lost that commit from @csexton!!!

data/README.md

@@ -55,6 +55,19 @@ It also adds support for parsing.
     song = Song.new.extend(SongRepresenter).from_json(%{ {"title":"Roxanne"} })
     #=> #<Song title="Roxanne", track=nil>
 
+## Aliasing
+
+If your property name doesn't match the name in the document, use the `:as` option.
+
+    module SongRepresenter
+      include Representable::JSON
+
+      property :title, as: :name
+      property :track
+    end
+    
+    song.to_json #=> {"name":"Fallout","track":1}
+
 
 ## Wrapping
 
@@ -436,18 +449,6 @@ You can also define conditions on properties using `:if`, making them being cons
 When rendering or parsing, the `track` property is considered only if track is valid. Note that the block is executed in instance context, giving you access to instance methods.
 
 
-### Mapping
-
-If your property name doesn't match the attribute name in the document, use the `:as` option.
-
-    module SongRepresenter
-      property :title
-      property :track, as: :track_number
-    end
-    
-    song.to_json #=> {"title":"Superstars","track_number":1}
-
-
 ### False and Nil Values
 
 Since representable-1.2 `false` values _are_ considered when parsing and rendering. That particularly means properties that used to be unset (i.e. `nil`) after parsing might be `false` now. Vice versa, `false` properties that weren't included in the rendered document will be visible now.

data/lib/representable.rb

@@ -121,7 +121,7 @@ private
   module ClassInclusions
     def included(base)
       super
-      base.representable_attrs.push(*representable_attrs.clone) # "inherit".
+      base.representable_attrs.inherit(representable_attrs)
     end
   end
   
@@ -145,7 +145,7 @@ private
     
     module Declarations
       def representable_attrs
-        @representable_attrs ||= Config.new
+        @representable_attrs ||= build_config
       end
       
       def representation_wrap=(name)
@@ -190,10 +190,15 @@ private
       def definition_class
         Definition
       end
+
+      def build_config
+        Config.new
+      end
     end
   end
   
   
+  # NOTE: the API of Config is subject to change so don't rely too much on this private object.
   class Config < Array
     attr_accessor :wrap
     
@@ -207,7 +212,11 @@ private
     def clone
       self.class.new(collect { |d| d.clone })
     end
-    
+
+    def inherit(parent)
+      push(*parent.clone)
+    end
+
   private
     def infer_name_for(name)
       name.to_s.split('::').last.

data/lib/representable/bindings/hash_bindings.rb

@@ -63,13 +63,15 @@ module Representable
     class HashBinding < PropertyBinding
       def serialize_for(value)
         # requires value to respond to #each with two block parameters.
-        {}.tap do |hash|
-          value.each { |key, obj| hash[key] = serialize(obj) }
+        {}.tap do |hsh|
+          value.each { |key, obj| hsh[key] = serialize(obj) }
         end
       end
       
       def deserialize_from(fragment)
-        fragment.each { |key, item_fragment| fragment[key] = deserialize(item_fragment) }
+        {}.tap do |hsh|
+          fragment.each { |key, item_fragment| hsh[key] = deserialize(item_fragment) }
+        end
       end
     end
   end

data/lib/representable/version.rb

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

data/test/json_test.rb

@@ -460,8 +460,18 @@ end
         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")})
+      describe "parsing" do
+        subject { OpenStruct.new.extend(representer) }
+        let (:hash) { {"7"=>{"name"=>"Contemplation"}} }
+
+        it "parses incoming hash" do
+          subject.from_hash("songs"=>hash).songs.must_equal({"7"=>Song.new("Contemplation")})
+        end
+
+        it "doesn't modify the incoming hash" do
+          subject.from_hash("songs"=> incoming_hash = hash.dup)
+          hash.must_equal incoming_hash
+        end
       end
     end
   end

data/test/representable_test.rb

@@ -571,31 +571,29 @@ class RepresentableTest < MiniTest::Spec
   end
   
   describe "Config" do
-    before do
-      @config = Representable::Config.new
-      PunkRock = Class.new
-    end
+    subject { Representable::Config.new }
+    PunkRock = Class.new
     
     describe "wrapping" do
       it "returns false per default" do
-        assert_equal nil, @config.wrap_for("Punk")
+        assert_equal nil, subject.wrap_for("Punk")
       end
       
       it "infers a printable class name if set to true" do
-        @config.wrap = true
-        assert_equal "punk_rock", @config.wrap_for(PunkRock)
+        subject.wrap = true
+        assert_equal "punk_rock", subject.wrap_for(PunkRock)
       end
       
       it "can be set explicitely" do
-        @config.wrap = "Descendents"
-        assert_equal "Descendents", @config.wrap_for(PunkRock)
+        subject.wrap = "Descendents"
+        assert_equal "Descendents", subject.wrap_for(PunkRock)
       end
     end
     
     describe "clone" do
       it "clones all definitions" do
-        @config << Object.new
-        assert @config.first != @config.clone.first
+        subject << Object.new
+        assert subject.first != subject.clone.first
       end
     end
   end

data/test/test_helper.rb

@@ -62,4 +62,15 @@ MiniTest::Spec.class_eval do
       end
     end
   end
+
+  module TestMethods
+    def representer_for(modules=[Representable::Hash], &block)
+      Module.new do
+        extend TestMethods
+        include *modules
+        module_exec(&block)
+      end
+    end
+  end
+  include TestMethods
 end

metadata

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