Converter 1.0.3.0 → 1.1.0.0

data/lib/Converter.rb

@@ -9,19 +9,23 @@ module Converter
     Converter.convert self, target_class
   end
 
-  # Create new Target_Type instance according to the Conversion definition
-  # one of the classes (source.class or target_type) should include Converter module
+  def copy_to target
+      Converter.copy self, target
+  end
+
+  # Update the given target object according to the Conversion definition
+  # one of the classes (source.class or target.class) should include Converter module
   # @param [Any Class] source instance to copy from
-  # @param [class] target_type the result type
-  # @return instance of target_type with data converted from source
-  def self.convert(source, target_type, hash = {})
+  # @param [Any Class] target the result type
+  # @return target with new values
+  def self.copy source, target, hash = {}
     # Check if the object has already been converted (Circular pointing)
     if(converted_object = hash[source])
       return converted_object
     end
 
     # Create new target instance
-    hash[source] = target = target_type.new
+    hash[source] = target
     
     # Gets source Conversion definition
     # Check which one includes Converter module
@@ -36,6 +40,15 @@ module Converter
     target
   end
 
+  # Create new Target_Type instance according to the Conversion definition
+  # one of the classes (source.class or target_type) should include Converter module
+  # @param [Any Class] source instance to copy from
+  # @param [class] target_type the result type
+  # @return instance of target_type with data converted from source
+  def self.convert(source, target_type, hash = {})
+    copy source, target_type.new, hash
+  end
+
   private
     def self.get_convertable_object source, target
       if source.class.included_modules.include? Converter
@@ -49,15 +62,18 @@ module Converter
 
     def self.convert_one_attribute source, target, conversion_metadata, is_source_convertable, hash
       source_attribute_name = is_source_convertable ? conversion_metadata.convertable_attribute_name : conversion_metadata.poro_attribute_name
-      convert_block = is_source_convertable ? conversion_metadata.convert_from_convertable_block : conversion_metadata.convert_from_poro_block
       target_attribute_name = is_source_convertable ? conversion_metadata.poro_attribute_name : conversion_metadata.convertable_attribute_name
+      target_attribute_value = target.send(target_attribute_name)
       target_attribute_name = target_attribute_name.to_s.concat('=').to_sym
+      convert_block = conversion_metadata.get_converter(target_attribute_value, is_source_convertable)
 
       # Convert from one type to another (by default doesn't do anything)
       if convert_block.parameters.count == 1
         target_value = convert_block.call(source.send(source_attribute_name))
-      else
+      elsif convert_block.parameters.count == 2
         target_value = convert_block.call(source.send(source_attribute_name), hash)
+      else
+        target_value = convert_block.call(source.send(source_attribute_name), target_attribute_value, hash)
       end
 
       target.send(target_attribute_name, target_value)
@@ -77,7 +93,7 @@ module Converter
       # Set default values for nil arguments
       poro_attribute_name ||= convertable_attribute_name
       @attribute_converter ||= {}
-      
+
       if convert_block.class == Symbol
         convertable_type = convert_block.to_s
         poro_type = convert_back_block.to_s
@@ -101,11 +117,27 @@ module Converter
       @poro_attribute_name = poro_attribute_name
       @convert_from_convertable_block = convert_from_convertable_block
       @convert_from_poro_block = convert_from_poro_block
+      @copy_from_convertable_block = lambda { |source, target, hash| Converter.copy(source, target, hash) }
+      @copy_from_poro_block = lambda { |source, target, hash| Converter.copy(source, target , hash) }
     end
 
     attr_accessor :convertable_attribute_name
     attr_accessor :poro_attribute_name
     attr_accessor :convert_from_convertable_block
     attr_accessor :convert_from_poro_block
+    attr_accessor :copy_from_convertable_block
+    attr_accessor :copy_from_poro_block
+
+    def get_converter target_old_attribute_value, is_source_convertable
+      if target_old_attribute_value && is_source_convertable
+        copy_from_convertable_block
+      elsif target_old_attribute_value && !is_source_convertable
+        copy_from_poro_block
+      elsif !target_old_attribute_value && is_source_convertable
+        convert_from_convertable_block
+      else
+        convert_from_poro_block
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Converter
 version: !ruby/object:Gem::Version
-  version: 1.0.3.0
+  version: 1.1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,8 @@ bindir: bin
 cert_chain: []
 date: 2012-07-20 00:00:00.000000000 Z
 dependencies: []
-description: Add attr_converter to maps attributes to another object
+description: Add attr_converter to maps attributes to another object, and this allows
+  you to copy or convert between them automatically
 email: shukyc19@gmail.com
 executables: []
 extensions: []
@@ -41,6 +42,6 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Convert between to object by mapping theirs attributes
+summary: Convert or Copy between two objects by mapping theirs attributes
 test_files: []
 has_rdoc: