representable 1.2.2 → 1.2.3

data/CHANGES.textile

@@ -1,3 +1,7 @@
+h2. 1.2.3
+
+* Using virtus for coercion now works in both classes and modules. Thanks to @solnic for a great collaboration. Open-source rocks!
+
 h2. 1.2.2
 
 * Added @XML::AttributeHash@ to store hash key-value pairs in attributes instead of dedicated tags.

data/Gemfile

@@ -1,3 +1,5 @@
 source :rubygems
 
 gemspec
+
+#gem "virtus", :path => "../virtus"

data/README.rdoc

@@ -320,18 +320,18 @@ Naturally, this works for both ways.
 
 == Coercion
 
-If you fancy coercion when parsing a document you can use the Coercion module which uses virtus[https://github.com/solnic/virtus] for type conversion. Due to some virtus' nature this can be used on class layer with inline representers, only for now.
+If you fancy coercion when parsing a document you can use the Coercion module which uses virtus[https://github.com/solnic/virtus] for type conversion.
 
-Include virtus in your Gemfile, first.
+Include virtus in your Gemfile, first. Be sure to include virtus 0.5.0 or greater.
 
   gem 'virtus'
-  
+
 Use the +:type+ option to specify the conversion target. Note that +:default+ still works.
 
-  class Hero
+  module HeroRepresenter
     include Representable::JSON
     include Virtus
-    extend Representable::Coercion::ClassMethods
+    include Representable::Coercion
       
     property :born_at, :type => DateTime, :default => "May 12th, 2012"
   end

data/lib/representable.rb

@@ -16,7 +16,7 @@ require 'representable/definition'
 #
 # == On module level
 #
-# Modules give you much more flexibility since you can mix them into objects at runtime, roughly following the DCI
+# Modules give you much more flexibility since you can mix them into objects at runtime, following the DCI
 # pattern.
 #
 #   module HeroRepresenter
@@ -30,19 +30,11 @@ module Representable
   
   def self.included(base)
     base.class_eval do
-      include Deprecations
+      extend ClassInclusions, ModuleExtensions
       extend ClassMethods
       extend ClassMethods::Declarations
-      extend ClassMethods::Accessors
-      
-      def self.included(base)
-        base.representable_attrs.push(*representable_attrs.clone) # "inherit".
-      end
       
-      # Copies the representable_attrs to the extended object.
-      def self.extended(object)
-        object.representable_attrs=(representable_attrs)
-      end
+      include Deprecations
     end
   end
   
@@ -128,7 +120,23 @@ private
   end
   
   
-  module ClassMethods # :nodoc:
+  module ClassInclusions
+    def included(base)
+      super
+      base.representable_attrs.push(*representable_attrs.clone) # "inherit".
+    end
+  end
+  
+  module ModuleExtensions
+    # Copies the representable_attrs to the extended object.
+    def extended(object)
+      super
+      object.representable_attrs=(representable_attrs)
+    end
+  end
+  
+  
+  module ClassMethods
     # Create and yield object and options. Called in .from_json and friends. 
     def create_represented(document, *args)
       new.tap do |represented|
@@ -136,9 +144,14 @@ private
       end
     end
     
+    
     module Declarations
-      def definition_class
-        Definition
+      def representable_attrs
+        @representable_attrs ||= Config.new
+      end
+      
+      def representation_wrap=(name)
+        representable_attrs.wrap = name
       end
       
       # Declares a represented document node, which is usually a XML tag or a JSON key.
@@ -149,7 +162,7 @@ private
       #   property :name, :from => :title
       #   property :name, :class => Name
       #   property :name, :default => "Mike"
-      #   property :name, :include_nil => true
+      #   property :name, :render_nil => true
       def property(name, options={})
         representable_attrs << definition_class.new(name, options)
       end
@@ -172,16 +185,10 @@ private
         options[:hash] = true
         property(name, options)
       end
-    end
-    
-    
-    module Accessors
-      def representable_attrs
-        @representable_attrs ||= Config.new
-      end
       
-      def representation_wrap=(name)
-        representable_attrs.wrap = name
+    private
+      def definition_class
+        Definition
       end
     end
   end

data/lib/representable/coercion.rb

@@ -14,5 +14,4 @@ module Representable::Coercion
       super(name, args)
     end
   end
-  
 end

data/lib/representable/version.rb

@@ -1,3 +1,3 @@
 module Representable
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/representable.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "minitest", ">= 2.8.1"
   s.add_development_dependency "mocha"
   s.add_development_dependency "mongoid"
-  s.add_development_dependency "virtus"
+  s.add_development_dependency "virtus", "~> 0.5.0"
 end

data/test/coercion_test.rb

@@ -6,23 +6,25 @@ class VirtusCoercionTest < MiniTest::Spec
   end
     
   describe "Coercion with Virtus" do
-    #before do
-    #  module SongRepresenter
-    #    include Representable::JSON
-    #    include Representable::Coercion
-    #    property :composed_at, :type => DateTime 
-    #  end
-    #end
-   # 
-   # it "coerces properties in #from_json" do
-   #   song = Song.new.extend(SongRepresenter).from_json("{\"composed_at\":\"November 18th, 1983\"}")
-   #   assert_kind_of DateTime, song.composed_at
-   #   assert_equal "expected", song.composed_at
-   # end
+    describe "on object level" do
+      module SongRepresenter
+        include Representable::JSON
+        include Representable::Coercion
+        property :composed_at, :type => DateTime 
+      end
+     
+      it "coerces properties in #from_json" do
+        song = Song.new.extend(SongRepresenter).from_json("{\"composed_at\":\"November 18th, 1983\"}")
+        assert_kind_of DateTime, song.composed_at
+        assert_equal DateTime.parse("Fri, 18 Nov 1983 00:00:00 +0000"), song.composed_at
+      end
+    end
+    
+    
     class ImmigrantSong
       include Representable::JSON
       include Virtus
-      extend Representable::Coercion::ClassMethods
+      include Representable::Coercion
       
       property :composed_at, :type => DateTime, :default => "May 12th, 2012"
     end

data/test/representable_test.rb

@@ -205,7 +205,7 @@ class RepresentableTest < MiniTest::Spec
   
   describe "#definition_class" do
     it "returns Definition class" do
-      assert_equal Representable::Definition, Band.definition_class
+      assert_equal Representable::Definition, Band.send(:definition_class)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: representable
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000 Z
+date: 2012-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -128,17 +128,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
 description: Maps representation documents from and to Ruby objects. Includes XML
   and JSON support, plain properties, collections and compositions.
 email: