representable 1.7.7 → 1.8.0

data/test/test_helper.rb

@@ -56,12 +56,12 @@ MiniTest::Spec.class_eval do
     end
   end
 
-  def render(object)
-    AssertableDocument.new(object.send("to_#{format}"), format)
+  def render(object, *args)
+    AssertableDocument.new(object.send("to_#{format}", *args), format)
   end
 
-  def parse(object, input)
-    object.send("from_#{format}", input)
+  def parse(object, input, *args)
+    object.send("from_#{format}", input, *args)
   end
 
   class AssertableDocument
@@ -120,3 +120,11 @@ MiniTest::Spec.class_eval do
   end
   include TestMethods
 end
+
+class BaseTest < MiniTest::Spec
+  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  }
+
+end

data/test/wrap_test.rb

@@ -0,0 +1,48 @@
+require "test_helper"
+
+class WrapTest < MiniTest::Spec
+  class HardcoreBand
+    include Representable::Hash
+  end
+
+  class SoftcoreBand < HardcoreBand
+  end
+
+  let (:band) { HardcoreBand.new }
+
+  it "returns false per default" do
+    assert_equal nil, SoftcoreBand.new.send(:representation_wrap)
+  end
+
+  it "infers a printable class name if set to true" do
+    HardcoreBand.representation_wrap = true
+    assert_equal "hardcore_band", band.send(:representation_wrap)
+  end
+
+  it "can be set explicitely" do
+    HardcoreBand.representation_wrap = "breach"
+    assert_equal "breach", band.send(:representation_wrap)
+  end
+
+  for_formats(
+    :hash => [Representable::Hash, {"Blink182"=>{"genre"=>"Pop"}}, {"Blink182"=>{"genre"=>"Poppunk"}}],
+    :json => [Representable::JSON, "{\"Blink182\":{\"genre\":\"Pop\"}}", "{\"Blink182\":{\"genre\":\"Poppunk\"}}"],
+    :xml  => [Representable::XML, "<Blink182><genre>Pop</genre></Blink182>", "<Blink182><genre>Poppunk</genre></Blink182>"],
+    # :yaml => [Representable::YAML, "---\nBlink182:\n"], # TODO: fix YAML.
+  ) do |format, mod, output, input|
+
+    describe "[#{format}] dynamic wrap" do
+      let (:band) { representer.prepare(Struct.new(:name, :genre).new("Blink", "Pop")) }
+      let (:format) { format }
+
+      representer!(:module => mod) do
+        self.representation_wrap = lambda { |args| "#{name}#{args[:number]}" }
+        property :genre
+      end
+
+      it { render(band, {:number => 182}).must_equal_document(output) }
+
+      it { parse(band, input, {:number => 182}).genre.must_equal "Poppunk" } # TODO: better test. also, xml parses _any_ wrap.
+    end
+  end
+end

data/test/xml_bindings_test.rb

@@ -11,92 +11,92 @@ class XMLBindingTest < MiniTest::Spec
     property :name
     self.representation_wrap = :song
   end
-  
+
   class SongWithRepresenter < ::Song
     include Representable
     include SongRepresenter
     self.representation_wrap = :song
   end
-  
+
   before do
     @doc  = Nokogiri::XML::Document.new
     @song = SongWithRepresenter.new("Thinning the Herd")
   end
-  
+
   describe "PropertyBinding" do
     describe "with plain text" do
       before do
-        @property = Representable::XML::PropertyBinding.new(Representable::Definition.new(:song), nil)
+        @property = Representable::XML::PropertyBinding.new(Representable::Definition.new(:song), nil, nil)
       end
-      
+
       it "extracts with #read" do
         assert_equal "Thinning the Herd", @property.read(Nokogiri::XML("<song>Thinning the Herd</song>"))
       end
-      
+
       it "inserts with #write" do
         @property.write(@doc, "Thinning the Herd")
         assert_xml_equal "<song>Thinning the Herd</song>", @doc.to_s
       end
     end
-    
+
     describe "with an object" do
       before do
-        @property = Representable::XML::PropertyBinding.new(Representable::Definition.new(:song, :class => SongWithRepresenter), nil)
+        @property = Representable::XML::PropertyBinding.new(Representable::Definition.new(:song, :class => SongWithRepresenter), nil, nil)
       end
-      
+
       it "extracts with #read" do
         assert_equal @song, @property.read(Nokogiri::XML("<song><name>Thinning the Herd</name></song>"))
       end
-      
+
       it "inserts with #write" do
         @property.write(@doc, @song)
         assert_xml_equal("<song><name>Thinning the Herd</name></song>", @doc.to_s)
       end
     end
-    
+
     describe "with an object and :extend" do
       before do
-        @property = Representable::XML::PropertyBinding.new(Representable::Definition.new(:song, :class => Song, :extend => SongRepresenter), nil)
+        @property = Representable::XML::PropertyBinding.new(Representable::Definition.new(:song, :class => Song, :extend => SongRepresenter), nil, nil)
       end
-      
+
       it "extracts with #read" do
         assert_equal @song, @property.read(Nokogiri::XML("<song><name>Thinning the Herd</name></song>"))
       end
-      
+
       it "inserts with #write" do
         @property.write(@doc, @song)
         assert_xml_equal("<song><name>Thinning the Herd</name></song>", @doc.to_s)
       end
     end
   end
-  
-    
+
+
   describe "CollectionBinding" do
     describe "with plain text items" do
       before do
-        @property = Representable::XML::CollectionBinding.new(Representable::Definition.new(:song, :collection => true), nil)
+        @property = Representable::XML::CollectionBinding.new(Representable::Definition.new(:song, :collection => true), Struct.new(:song).new, nil)
       end
-      
+
       it "extracts with #read" do
         assert_equal ["The Gargoyle", "Bronx"], @property.read(Nokogiri::XML("<doc><song>The Gargoyle</song><song>Bronx</song></doc>").root)
       end
-      
+
       it "inserts with #write" do
         parent = Nokogiri::XML::Node.new("parent", @doc)
         @property.write(parent, ["The Gargoyle", "Bronx"])
         assert_xml_equal("<songs><song>The Gargoyle</song><song>Bronx</song></songs>", parent.to_s)
       end
     end
-    
+
     describe "with objects" do
       before do
-        @property = Representable::XML::PropertyBinding.new(Representable::Definition.new(:song, :collection => true, :class => SongWithRepresenter), nil)
+        @property = Representable::XML::PropertyBinding.new(Representable::Definition.new(:song, :collection => true, :class => SongWithRepresenter), nil, nil)
       end
-      
+
       it "extracts with #read" do
         assert_equal @song, @property.read(Nokogiri::XML("<song><name>Thinning the Herd</name></song>"))
       end
-      
+
       it "inserts with #write" do
         @property.write(@doc, @song)
         assert_xml_equal("<song><name>Thinning the Herd</name></song>", @doc.to_s)
@@ -106,43 +106,43 @@ class XMLBindingTest < MiniTest::Spec
       end
     end
   end
-  
-  
+
+
   describe "HashBinding" do
     describe "with plain text items" do
       before do
-        @property = Representable::XML::HashBinding.new(Representable::Definition.new(:songs, :hash => true), nil)
+        @property = Representable::XML::HashBinding.new(Representable::Definition.new(:songs, :hash => true), nil, nil)
       end
-      
+
       it "extracts with #read" do
         assert_equal({"first" => "The Gargoyle", "second" => "Bronx"} , @property.read(Nokogiri::XML("<songs><first>The Gargoyle</first><second>Bronx</second></songs>")))
       end
-      
+
       it "inserts with #write" do
         parent = Nokogiri::XML::Node.new("parent", @doc)
         @property.write(parent, {"first" => "The Gargoyle", "second" => "Bronx"})
         assert_xml_equal("<songs><first>The Gargoyle</first><second>Bronx</second></songs>", parent.to_s)
       end
     end
-    
+
     describe "with objects" do
       before do
         @property = Representable::XML::HashBinding.new(Representable::Definition.new(:songs, :hash => true, :class => Song, :extend => SongRepresenter), nil)
       end
     end
   end
-  
-  
+
+
   describe "AttributeBinding" do
     describe "with plain text items" do
       before do
-        @property = Representable::XML::AttributeBinding.new(Representable::Definition.new(:name, :attribute => true), nil)
+        @property = Representable::XML::AttributeBinding.new(Representable::Definition.new(:name, :attribute => true), nil, nil)
       end
-      
+
       it "extracts with #read" do
         assert_equal "The Gargoyle", @property.read(Nokogiri::XML("<song name=\"The Gargoyle\" />").root)
       end
-      
+
       it "inserts with #write" do
         parent = Nokogiri::XML::Node.new("song", @doc)
         @property.write(parent, "The Gargoyle")
@@ -153,13 +153,13 @@ class XMLBindingTest < MiniTest::Spec
 
   describe "ContentBinding" do
     before do
-      @property = Representable::XML::ContentBinding.new(Representable::Definition.new(:name, :content => true), nil)
+      @property = Representable::XML::ContentBinding.new(Representable::Definition.new(:name, :content => true), nil, nil)
     end
-    
+
     it "extracts with #read" do
       assert_equal "The Gargoyle", @property.read(Nokogiri::XML("<song>The Gargoyle</song>").root)
     end
-    
+
     it "inserts with #write" do
       parent = Nokogiri::XML::Node.new("song", @doc)
       @property.write(parent, "The Gargoyle")

data/test/xml_test.rb

@@ -138,20 +138,20 @@ class XmlTest < MiniTest::Spec
 
     describe "XML::Binding#build_for" do
       it "returns AttributeBinding" do
-        assert_kind_of XML::AttributeBinding, XML::PropertyBinding.build_for(Def.new(:band, :from => "band", :attribute => true), nil)
+        assert_kind_of XML::AttributeBinding, XML::PropertyBinding.build_for(Def.new(:band, :as => "band", :attribute => true), nil, nil)
       end
 
       it "returns PropertyBinding" do
-        assert_kind_of XML::PropertyBinding, XML::PropertyBinding.build_for(Def.new(:band, :class => Hash), nil)
-        assert_kind_of XML::PropertyBinding, XML::PropertyBinding.build_for(Def.new(:band, :from => :content), nil)
+        assert_kind_of XML::PropertyBinding, XML::PropertyBinding.build_for(Def.new(:band, :class => Hash), nil, nil)
+        assert_kind_of XML::PropertyBinding, XML::PropertyBinding.build_for(Def.new(:band, :as => :content), nil, nil)
       end
 
       it "returns CollectionBinding" do
-        assert_kind_of XML::CollectionBinding, XML::PropertyBinding.build_for(Def.new(:band, :collection => :true), nil)
+        assert_kind_of XML::CollectionBinding, XML::PropertyBinding.build_for(Def.new(:band, :collection => :true), nil, nil)
       end
 
       it "returns HashBinding" do
-        assert_kind_of XML::HashBinding, XML::PropertyBinding.build_for(Def.new(:band, :hash => :true), nil)
+        assert_kind_of XML::HashBinding, XML::PropertyBinding.build_for(Def.new(:band, :hash => :true), nil, nil)
       end
     end
 
@@ -166,7 +166,7 @@ class XmlTest < MiniTest::Spec
       module AlbumRepresenter
         include Representable::XML
         property :best_song, :class => Song, :extend => SongRepresenter
-        collection :songs, :class => Song, :from => :song, :extend => SongRepresenter
+        collection :songs, :class => Song, :as => :song, :extend => SongRepresenter
         representation_wrap = :album
       end
 
@@ -213,11 +213,11 @@ end
 
 
 class AttributesTest < MiniTest::Spec
-  describe ":from => rel, :attribute => true" do
+  describe ":as => rel, :attribute => true" do
     class Link
       include Representable::XML
-      property :href,   :from => "href",  :attribute => true
-      property :title,  :from => "title", :attribute => true
+      property :href,   :as => "href",  :attribute => true
+      property :title,  :as => "title", :attribute => true
       attr_accessor :href, :title
     end
 
@@ -293,10 +293,10 @@ end
 
 
 class CollectionTest < MiniTest::Spec
-  describe ":class => Band, :from => :band, :collection => true" do
+  describe ":class => Band, :as => :band, :collection => true" do
     class Compilation
       include Representable::XML
-      collection :bands, :class => Band, :from => :band
+      collection :bands, :class => Band, :as => :band
       attr_accessor :bands
     end
 
@@ -324,11 +324,11 @@ class CollectionTest < MiniTest::Spec
   end
 
 
-  describe ":from" do
+  describe ":as" do
     let(:xml) {
       Module.new do
         include Representable::XML
-        collection :songs, :from => :song
+        collection :songs, :as => :song
       end }
 
     it "collects untyped items" do
@@ -349,7 +349,7 @@ class CollectionTest < MiniTest::Spec
     let (:xml) {
       Module.new do
         include Representable::XML
-        collection :songs, :from => :song, :wrap => :songs
+        collection :songs, :as => :song, :wrap => :songs
       end }
 
     describe "#from_xml" do

metadata

@@ -1,153 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: representable
 version: !ruby/object:Gem::Version
-  version: 1.7.7
+  version: 1.8.0
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: uber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test_xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.7
 description: Renders and parses JSON/XML/YAML documents from and to Ruby objects.
@@ -158,8 +172,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -177,16 +191,17 @@ files:
 - lib/representable/decorator.rb
 - lib/representable/decorator/coercion.rb
 - lib/representable/definition.rb
-- lib/representable/deprecations.rb
 - lib/representable/deserializer.rb
-- lib/representable/feature/readable_writeable.rb
 - lib/representable/hash.rb
+- lib/representable/hash/allow_symbols.rb
 - lib/representable/hash/collection.rb
 - lib/representable/hash_methods.rb
 - lib/representable/json.rb
 - lib/representable/json/collection.rb
 - lib/representable/json/hash.rb
 - lib/representable/mapper.rb
+- lib/representable/parse_strategies.rb
+- lib/representable/readable_writeable.rb
 - lib/representable/serializer.rb
 - lib/representable/version.rb
 - lib/representable/xml.rb
@@ -194,23 +209,37 @@ files:
 - lib/representable/xml/hash.rb
 - lib/representable/yaml.rb
 - representable.gemspec
+- test/as_test.rb
+- test/class_test.rb
 - test/coercion_test.rb
 - test/config_test.rb
+- test/decorator_scope_test.rb
 - test/decorator_test.rb
 - test/definition_test.rb
 - test/example.rb
+- test/exec_context_test.rb
 - test/generic_test.rb
+- test/getter_setter_test.rb
 - test/hash_bindings_test.rb
 - test/hash_test.rb
+- test/if_test.rb
 - test/inherit_test.rb
 - test/inheritance_test.rb
 - test/inline_test.rb
+- test/instance_test.rb
+- test/is_representable_test.rb
 - test/json_test.rb
 - test/mongoid_test.rb
 - test/nested_test.rb
+- test/parse_strategy_test.rb
+- test/pass_options_test.rb
+- test/prepare_test.rb
+- test/reader_writer_test.rb
 - test/representable_test.rb
+- test/stringify_hash_test.rb
 - test/test_helper.rb
 - test/test_helper_test.rb
+- test/wrap_test.rb
 - test/xml_bindings_test.rb
 - test/xml_test.rb
 - test/yaml_test.rb
@@ -223,19 +252,54 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Renders and parses JSON/XML/YAML documents from and to Ruby objects. Includes
   plain properties, collections, nesting, coercion and more.
-test_files: []
+test_files:
+- test/as_test.rb
+- test/class_test.rb
+- test/coercion_test.rb
+- test/config_test.rb
+- test/decorator_scope_test.rb
+- test/decorator_test.rb
+- test/definition_test.rb
+- test/example.rb
+- test/exec_context_test.rb
+- test/generic_test.rb
+- test/getter_setter_test.rb
+- test/hash_bindings_test.rb
+- test/hash_test.rb
+- test/if_test.rb
+- test/inherit_test.rb
+- test/inheritance_test.rb
+- test/inline_test.rb
+- test/instance_test.rb
+- test/is_representable_test.rb
+- test/json_test.rb
+- test/mongoid_test.rb
+- test/nested_test.rb
+- test/parse_strategy_test.rb
+- test/pass_options_test.rb
+- test/prepare_test.rb
+- test/reader_writer_test.rb
+- test/representable_test.rb
+- test/stringify_hash_test.rb
+- test/test_helper.rb
+- test/test_helper_test.rb
+- test/wrap_test.rb
+- test/xml_bindings_test.rb
+- test/xml_test.rb
+- test/yaml_test.rb
+has_rdoc: