rseed 1.0.5 → 1.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGI0MmQ1MjQ1NDBjM2Q4YTk1Zjc4ZTgyNWEyYjc3YjNmZjZiNWQ5Mg==
+    OGFiYjJmNWQzZDJkNzgyM2RjZjVmNjI5ZjhmYzI3MWJhMTQxZTExZA==
   data.tar.gz: !binary |-
-    ZDRmODFkM2EwNTE2NWY4YjFiYmUzZDM1YzlmYWZjYTNmMjYxYWMxNQ==
+    N2VjOGZkMTY3MjE1MWU5MjAyNmJlNWUzMmJiMzhkYTczMjJiZjc2OA==
 SHA512:
   metadata.gz: !binary |-
-    MGNiODY1NWZmMmIzZjQxY2VkYTAwYTZjM2IxNzI5OTVkNmQyYWFhMmY5NzE5
-    YTNmNDI5YjcwNWE0NGQ2MTlhNzkxZDA2MmUzZjJhMmJkMDRiMDNmMjIyMTQ3
-    ZTZkNWJiNTM5NGI5MjY3ODVkNDRmMmY2Y2U1YTcwNDJjYmI1MTQ=
+    YjJhYjY0ZjE3YTEwZTNkNzMzYzFmZmJlM2ZlYWY1ZjllY2EwODcxNzJjMGZk
+    YjE5MThhMTczYmE3ODhmOGQyMjMyNjcwYzFkMjg3OTk0Yjk3OWViNDljNWFl
+    Mzg2M2JiNzRiNjVhYWJiOGVlYWNiY2E3Y2MyNDQ1NzFkODJkOGQ=
   data.tar.gz: !binary |-
-    MmI2MTk0ZmQyZjNlMTAxNzk0NGExMTYzNGFjYTVjOTVlZmE1NWMwYzc2OTJk
-    NzFkOGE3ODg2MmYyNWZjZDFmMGVjY2RhNGI2NThkNjlhOWIwOThlNjA1MTlj
-    YjAzNWY1YWVjYzlmMjA4MTU3ZjZkNWQ2NmQ0ZGE5ZjBlOTc5NDY=
+    NjU0YmIyYmQ4ZWE1Yzc5OTI2OTE2OWQ1ZDU0ODllMzU5OGQ4MjM4NjQyODRj
+    YmFlMTFkODM3Mzk1MmVlODQ1MDNjNDA5MWUxODBlYjVhOWEzODEwMWIyMzQ0
+    MTFkMWU0YjQ4OTVjYmY1ZDhjYTliOTBlYmUwZWMyMWQwMTM5ODk=

data/lib/generators/rseed/templates/converter.rb.erb

@@ -11,9 +11,9 @@ class <%= @converter_name.camelize %>Converter < Rseed::Converter
     def <%= @model_name %>_attributes values
         attributes = {}
 
-        [<%= [].tap { |list| (@columns.keys + @relationships.keys).each {|attribute| list << ":#{attribute}"}}.join(", ") %>].each do |attribute|
-            attributes[attribute] = values[attribute]
-        end
+        [
+            <%= [].tap { |list| (@columns.keys + @relationships.keys).each {|attribute| list << ":#{attribute}"}}.join(", ") %>
+        ].each { |attribute| attributes[attribute] = values[attribute] }
 
         return attributes
     end

data/lib/rseed/attribute.rb

@@ -1,5 +1,7 @@
 module Rseed
   class Attribute
+    include AttributeConverters
+
     attr_accessor :name
     attr_accessor :options
 
@@ -21,7 +23,7 @@ module Rseed
       !re.match(match_name).nil?
     end
 
-    def deserialize values
+    def deserialize values, deserialize_options = {}
       return nil if values[self.name].nil?
       value = values[self.name]
 
@@ -36,7 +38,9 @@ module Rseed
       elsif options[:type]
         # Check for a deserialize function for the type
         dsf = "deserialize_#{options[:type].to_s}"
-        if self.respond_to? dsf
+        if deserialize_options[:converter] && deserialize_options[:converter].respond_to?(dsf)
+          value = deserialize_options[:converter].send(dsf, value)
+        elsif self.respond_to? dsf
           value = self.send(dsf, value)
         end
       end

data/lib/rseed/converter.rb

@@ -1,7 +1,5 @@
 module Rseed
   class Converter
-    include AttributeConverters
-
     class << self
       attr_accessor :converter_attributes
     end
@@ -51,7 +49,7 @@ module Rseed
     def deserialize_raw values
       converted_values = HashWithIndifferentAccess.new
       self.class.converter_attributes.each do |attribute|
-        converted_values[attribute.name] = attribute.deserialize(values)
+        converted_values[attribute.name] = attribute.deserialize(values, converter: self)
       end
 
       deserialize converted_values

data/lib/rseed/helpers.rb

@@ -39,6 +39,7 @@ module Rseed
           progress_bar.format "#{"Complete".green} %t <%B> %C (%a)"
           progress_bar.finish if progress_bar.total
         when :error
+          processor.logger.error "Error processing record #{meta[:record_count]}"
           processor.logger.error result[:message].to_s.red
           processor.logger.error result[:error]
           processor.logger.error result[:backtrace].join('\n') if result[:backtrace]

data/lib/rseed/version.rb

@@ -1,3 +1,3 @@
 module Rseed
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/lib/rseed.rb

@@ -1,6 +1,6 @@
 require "csv"
-require "rseed/attribute"
 require "rseed/attribute_converters"
+require "rseed/attribute"
 require "rseed/version"
 require "rseed/adapter"
 require "rseed/hash_adapter"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rseed
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - David Monagle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize