representable 1.6.1 → 1.7.0

data/test/representable_test.rb

@@ -38,10 +38,10 @@ class RepresentableTest < MiniTest::Spec
         assert_equal "name", BandRepresentation.representable_attrs.first.name
       end
 
-      it "inherits to including modules" do
+      it "inherits to including modules xxx " do
         assert_equal 2,  PunkBandRepresentation.representable_attrs.size
-        assert_equal "name", PunkBandRepresentation.representable_attrs.first.name
-        assert_equal "street_cred", PunkBandRepresentation.representable_attrs.last.name
+        assert_equal "name", PunkBandRepresentation.representable_attrs[:name].name
+        assert_equal "street_cred", PunkBandRepresentation.representable_attrs[:street_cred].name
       end
 
       it "inherits to including class" do
@@ -51,8 +51,8 @@ class RepresentableTest < MiniTest::Spec
         end
 
         assert_equal 2,  band.representable_attrs.size
-        assert_equal "name", band.representable_attrs.first.name
-        assert_equal "street_cred", band.representable_attrs.last.name
+        assert_equal "name", band.representable_attrs[:name].name
+        assert_equal "street_cred", band.representable_attrs[:street_cred].name
       end
 
       it "allows including the concrete representer module later" do
@@ -96,26 +96,26 @@ class RepresentableTest < MiniTest::Spec
   end
 
 
-  describe "Representable" do
-    describe "inheritance" do
-      class CoverSong < OpenStruct
-      end
-      module SongRepresenter
-        include Representable::Hash
-        property :name
-      end
-      module CoverSongRepresenter
-        include Representable::Hash
-        include SongRepresenter
-        property :by
-      end
+  describe "inheritance" do
+    class CoverSong < OpenStruct
+    end
 
-      it "merges properties from all ancestors" do
-        props = {"name"=>"The Brews", "by"=>"Nofx"}
-        assert_equal(props, CoverSong.new(props).extend(CoverSongRepresenter).to_hash)
+    module SongRepresenter
+      include Representable::Hash
+      property :name
+    end
 
-      end
+    module CoverSongRepresenter
+      include Representable::Hash
+      include SongRepresenter
+      property :by
+    end
+
+    it "merges properties from all ancestors" do
+      props = {"name"=>"The Brews", "by"=>"Nofx"}
+      assert_equal(props, CoverSong.new(props).extend(CoverSongRepresenter).to_hash)
     end
+
     it "allows mixing in multiple representers" do
       require 'representable/json'
       require 'representable/xml'
@@ -154,21 +154,50 @@ class RepresentableTest < MiniTest::Spec
 
 
   describe "#property" do
+    describe "overriding" do
+      representer! do
+        property :title, :as => :name
+      end
+
+      it { representer.representable_attrs.size.must_equal 1 }
+      it { representer.representable_attrs[:title].options.must_equal({:as => :name}) }
+
+      it "overrides property when called again" do
+        representer.class_eval do
+          property :title, :representable => true
+        end
+
+        representer.representable_attrs.size.must_equal 1
+        representer.representable_attrs[:title].options.must_equal({:representable => true})
+      end
+
+      it "overrides when inheriting same property" do
+        overriding = representer! { property :title, :representable => true }
+
+        representer.class_eval do
+          include overriding
+        end
+
+        representer.representable_attrs.size.must_equal 1
+        representer.representable_attrs[:title].options.must_equal({:representable => true})
+      end
+    end
+
     describe ":from" do
       # TODO: do this with all options.
       it "can be set explicitly" do
         band = Class.new(Band) { property :friends, :from => :friend }
-        assert_equal "friend", band.representable_attrs.last.from
+        assert_equal "friend", band.representable_attrs[:friends].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
+        assert_equal "friend", band.representable_attrs[:friends].from
       end
 
       it "is infered from the name implicitly" do
         band = Class.new(Band) { property :friends }
-        assert_equal "friends", band.representable_attrs.last.from
+        assert_equal "friends", band.representable_attrs[:friends].from
       end
     end
 
@@ -185,8 +214,8 @@ class RepresentableTest < MiniTest::Spec
     end
 
     it "creates correct Definition" do
-      assert_equal "albums", RockBand.representable_attrs.last.name
-      assert RockBand.representable_attrs.last.array?
+      assert_equal "albums", RockBand.representable_attrs[:albums].name
+      assert RockBand.representable_attrs[:albums].array?
     end
   end
 
@@ -858,89 +887,4 @@ class RepresentableTest < MiniTest::Spec
       end
     end
   end
-
-  describe "Config" do
-    subject { Representable::Config.new }
-    PunkRock = Class.new
-
-    describe "wrapping" do
-      it "returns false per default" do
-        assert_equal nil, subject.wrap_for("Punk")
-      end
-
-      it "infers a printable class name if set to true" do
-        subject.wrap = true
-        assert_equal "punk_rock", subject.wrap_for(PunkRock)
-      end
-
-      it "can be set explicitely" do
-        subject.wrap = "Descendents"
-        assert_equal "Descendents", subject.wrap_for(PunkRock)
-      end
-    end
-
-    describe "#clone" do
-      it "clones all definitions" do
-        subject << Object.new
-        assert subject.first != subject.clone.first
-      end
-    end
-
-    describe "Config inheritance" do
-      # TODO: this section will soon be moved to uber.
-      describe "inheritance when including" do
-        # TODO: test all the below issues AND if cloning works.
-        module TestMethods
-          def representer_for(modules=[Representable], &block)
-            Module.new do
-              extend TestMethods
-              include *modules
-              module_exec(&block)
-            end
-          end
-        end
-        include TestMethods
-
-        it "inherits to uninitialized child" do
-          representer_for do # child
-            include(representer_for do # parent
-              representable_attrs.inheritable_array(:links) << "bar"
-            end)
-          end.representable_attrs.inheritable_array(:links).must_equal(["bar"])
-        end
-
-        it "works with uninitialized parent" do
-          representer_for do # child
-            representable_attrs.inheritable_array(:links) << "bar"
-
-            include(representer_for do # parent
-            end)
-          end.representable_attrs.inheritable_array(:links).must_equal(["bar"])
-        end
-
-        it "inherits when both are initialized" do
-          representer_for do # child
-            representable_attrs.inheritable_array(:links) << "bar"
-
-            include(representer_for do # parent
-              representable_attrs.inheritable_array(:links) << "stadium"
-            end)
-          end.representable_attrs.inheritable_array(:links).must_equal(["bar", "stadium"])
-        end
-
-        it "clones parent inheritables" do # FIXME: actually we don't clone here!
-          representer_for do # child
-            representable_attrs.inheritable_array(:links) << "bar"
-
-            include(parent = representer_for do # parent
-              representable_attrs.inheritable_array(:links) << "stadium"
-            end)
-
-            parent.representable_attrs.inheritable_array(:links) << "park"  # modify parent array.
-
-          end.representable_attrs.inheritable_array(:links).must_equal(["bar", "stadium"])
-        end
-      end
-    end
-  end
 end

data/test/test_helper.rb

@@ -50,11 +50,36 @@ MiniTest::Spec.class_eval do
   include XmlHelper
 
   def self.representer!(format=Representable::Hash, name=:representer, &block)
+    fmt = format # we need that so the 2nd call to ::let (within a ::describe) remembers the right format.
+
+    if fmt.is_a?(Hash)
+      name   = fmt[:name] || :representer
+      format = fmt[:module] || Representable::Hash
+    end
+
     let(name) do
-      Module.new do
+      mod = Module.new
+
+      if fmt.is_a?(Hash)
+        inject_representer(mod, fmt)
+      end
+
+      mod.module_eval do
         include format
         instance_exec(&block)
       end
+
+      mod
+    end
+
+    def inject_representer(mod, options)
+      return unless options[:inject]
+
+      injected_name = options[:inject]
+      injected = send(injected_name) # song_representer
+      mod.singleton_class.instance_eval do
+        define_method(injected_name) { injected }
+      end
     end
   end
 
@@ -66,6 +91,8 @@ MiniTest::Spec.class_eval do
         module_exec(&block)
       end
     end
+
+    alias_method :representer!, :representer_for
   end
   include TestMethods
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: representable
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -167,6 +167,7 @@ files:
 - Rakefile
 - TODO
 - lib/representable.rb
+- lib/representable/TODO.getting_serious
 - lib/representable/binding.rb
 - lib/representable/bindings/hash_bindings.rb
 - lib/representable/bindings/xml_bindings.rb
@@ -177,6 +178,7 @@ files:
 - 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/collection.rb
@@ -185,6 +187,7 @@ files:
 - lib/representable/json/collection.rb
 - lib/representable/json/hash.rb
 - lib/representable/mapper.rb
+- lib/representable/serializer.rb
 - lib/representable/version.rb
 - lib/representable/xml.rb
 - lib/representable/xml/collection.rb
@@ -192,6 +195,7 @@ files:
 - lib/representable/yaml.rb
 - representable.gemspec
 - test/coercion_test.rb
+- test/config_test.rb
 - test/decorator_test.rb
 - test/definition_test.rb
 - test/example.rb