lib/hari/entity/serialization.rb in hari-0.0.4 vs lib/hari/entity/serialization.rb in hari-0.0.5

@@ -1,39 +1,83 @@
 module Hari
   class Entity
     module Serialization
       extend ActiveSupport::Concern
 
+      included do
+        include ActiveModel::Validations
+        include ActiveModel::Dirty
+        extend  Property::Builder
+      end
+
+      autoload :Array,    'hari/entity/serialization/array'
       autoload :Boolean,  'hari/entity/serialization/boolean'
       autoload :Date,     'hari/entity/serialization/date'
       autoload :DateTime, 'hari/entity/serialization/datetime'
       autoload :Float,    'hari/entity/serialization/float'
+      autoload :Hash,     'hari/entity/serialization/hash'
       autoload :Integer,  'hari/entity/serialization/integer'
       autoload :String,   'hari/entity/serialization/string'
       autoload :Time,     'hari/entity/serialization/time'
 
-      def to_json
-        hash = self.class.properties.inject({}) do |buffer, prop|
-          buffer.merge prop.name => prop.serialize(send(prop.name))
+      def initialize(attrs = {})
+        return if attrs.blank?
+
+        attrs = attrs.with_indifferent_access
+
+        self.class.properties.each do |prop|
+          write_attribute(prop.name, attrs[prop.name]) if attrs.key?(prop.name)
         end
+      end
 
-        Yajl::Encoder.encode hash
+      def attributes
+        self.class.properties.inject({}) do |buffer, prop|
+          buffer.merge prop.name => send(prop.name)
+        end
       end
 
-      module ClassMethods
+      alias :attribute :send
+      alias :read_attribute :send
+      alias :has_attribute? :respond_to?
+      alias :read_attribute_for_serialization :send
 
-        def from_json(source)
-          return if source.blank?
+      def write_attribute(name, value)
+        send "#{name}=", value
+      end
 
-          attrs = Yajl::Parser.parse(source).inject({}) do |buffer, (key, value)|
+      def to_hash
+        self.class.properties.inject({}) do |buffer, prop|
+          buffer.merge prop.name => prop.serialize(self)
+        end
+      end
+
+      def to_json
+        Yajl::Encoder.encode to_hash
+      end
+
+      module ClassMethods
+
+        def from_hash(source)
+          hash = source.inject({}) do |buffer, (key, value)|
             if prop = properties.find { |p| p.name == key }
               buffer[key] = prop.desserialize(value)
             end
 
             buffer
           end
 
-          new attrs
+          new(hash).tap { |e| e.changed_attributes.clear }
+        end
+
+        def from_json(source)
+          return if source.blank?
+
+          case source
+          when ::String
+            from_hash Yajl::Parser.parse(source)
+          when ::Hash
+            from_hash source
+          end
         end
 
       end
 
     end