rseed 1.0.4 → 1.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmM0NmU2ZmY1OWMwZDcwOWMyYjQzMGQxOTViM2I5ZGQ5NGU2M2I5MQ==
+    OGI0MmQ1MjQ1NDBjM2Q4YTk1Zjc4ZTgyNWEyYjc3YjNmZjZiNWQ5Mg==
   data.tar.gz: !binary |-
-    NTdiYWIzZTRmMDdiNGYyZmRkNzNkNzgyMzc4NjhiYjQ4ZWU3OTExYQ==
+    ZDRmODFkM2EwNTE2NWY4YjFiYmUzZDM1YzlmYWZjYTNmMjYxYWMxNQ==
 SHA512:
   metadata.gz: !binary |-
-    MjNlN2E4Mjc5OTYzMzg4NzM1NWQ0NTMxNGM0Y2MxZmFjOTgyODczMmI2ODI5
-    YjI1NTJmNzkwZTI1ZThiNGZkNjA0MDkxNWQ3MDAzNjRiZGE0MzZiMWY0YjY1
-    OGFmZjMyM2Y1ZTI5NTdlZmJiZjdlZDViM2RjOGMzNzQwZWJmMTk=
+    MGNiODY1NWZmMmIzZjQxY2VkYTAwYTZjM2IxNzI5OTVkNmQyYWFhMmY5NzE5
+    YTNmNDI5YjcwNWE0NGQ2MTlhNzkxZDA2MmUzZjJhMmJkMDRiMDNmMjIyMTQ3
+    ZTZkNWJiNTM5NGI5MjY3ODVkNDRmMmY2Y2U1YTcwNDJjYmI1MTQ=
   data.tar.gz: !binary |-
-    ZDQxN2YwMzk3ZGYzYTU5YTkxZDRmNWQ2MDFlYzFiZGQ1NTA0ZWI0NzgxYjMz
-    ZWQ3ZTVmODE1ZDBmNWJkYjJjOTcyZTRhNjNkYzc1YjY2Y2JmNjRlYThmZWQ2
-    ZDBlMzkzOWQwYWYwNTk5MDY4MGMzNTQ1NTFhZjYxZTFiMmZmZmY=
+    MmI2MTk0ZmQyZjNlMTAxNzk0NGExMTYzNGFjYTVjOTVlZmE1NWMwYzc2OTJk
+    NzFkOGE3ODg2MmYyNWZjZDFmMGVjY2RhNGI2NThkNjlhOWIwOThlNjA1MTlj
+    YjAzNWY1YWVjYzlmMjA4MTU3ZjZkNWQ2NmQ0ZGE5ZjBlOTc5NDY=

data/README.rdoc

@@ -45,36 +45,6 @@ This will cause the generator to create a file with fewer
 
 == The Converter File
 
-=== before_deserialize
-
-If you define a function called before_serialize you can do any preprocessing you require. One example of this is
-marking an archive flag on existing data:
-
-    def before_deserialize
-        HtmlColor.where(import_archive: true).update_all({:import_archive => false})
-        true
-    end
-
-Note that you must return true from this function. Returning false will cause the processor to give up and log an error.
-Thus you can also use the following:
-
-    def before_deserialize
-        return fail_with_error "Mandatory option is missing" unless options["mandatory_option"]
-        true
-    end
-
-=== after_deserialize
-
-You can define this function to be called at the end of processing. Following from the example above, if you set
-*import_archive* to be false for each model in the deserialize method, you could do the following to remove old
- records:
-
-    def after_deserialize
-        HtmlColor.where(import_archive: true).destroy_all
-    end
-
-This is obviously fairly destructive and there are better ways to deal with this situation than destroying the records.
-
 === Attribute Options
 
 * :header
@@ -107,6 +77,37 @@ You may use any active record method in this case, such as :first_or_create, or
 * :optional
 Defines the attribute as optionsal. This has no effect in the *HashAdapter*.
 
+=== before_deserialize
+
+If you define a function called before_serialize you can do any preprocessing you require. One example of this is
+marking an archive flag on existing data:
+
+    def before_deserialize
+        HtmlColor.where(import_archive: true).update_all({:import_archive => false})
+        true
+    end
+
+Note that you must return true from this function. Returning false will cause the processor to give up and log an error.
+Thus you can also use the following:
+
+    def before_deserialize
+        return fail_with_error "Mandatory option is missing" unless options["mandatory_option"]
+        true
+    end
+
+=== after_deserialize
+
+You can define this function to be called at the end of processing. Following from the example above, if you set
+*import_archive* to be false for each model in the deserialize method, you could do the following to remove old
+ records:
+
+    def after_deserialize
+        HtmlColor.where(import_archive: true).destroy_all
+    end
+
+This example is obviously fairly destructive and there are better ways to deal with this situation than destroying the
+records.
+
 == Rake Tasks
 
 These rake tasks allow you to run seeds manually:

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

@@ -39,7 +39,7 @@ class <%= @converter_name.camelize %>Converter < Rseed::Converter
         # <%= @model_name %> = ::<%= @class_name %>.new
         #
         # For create or update, use the following instead and change the match attribute name as required
-        # <%= @model_name %> = ::<%= @class_name %>.where(:id => values[:id]).first_or_initialize
+        # <%= @model_name %> = ::<%= @class_name %>.where(id: values[:id]).first_or_initialize
 <% end -%>
 
 <% if @match_attribute -%>
@@ -51,7 +51,7 @@ class <%= @converter_name.camelize %>Converter < Rseed::Converter
         success = <%= @model_name %>.update_attributes <%= @model_name %>_attributes(values)
 
         # This will return false and set errors if the record fails to update, signalling a failed import
-        return fail_with_error <%= @model_name %>.errors unless success
+        return fail_with_error <%= @model_name %>.errors.to_a.join(', ') unless success
 
         # Return true signalling a successful import
         true

data/lib/rseed/converter.rb

@@ -49,7 +49,7 @@ module Rseed
     # Takes the raw values coming out of an adapter and converts them based on the attribute definitions in the
     # converter.
     def deserialize_raw values
-      converted_values = {}
+      converted_values = HashWithIndifferentAccess.new
       self.class.converter_attributes.each do |attribute|
         converted_values[attribute.name] = attribute.deserialize(values)
       end

data/lib/rseed/helpers.rb

@@ -19,7 +19,7 @@ module Rseed
     title = options[:title] ? options[:title].dup : "Seed"
     title = "#{processor.converter.name.cyan} #{title.blue}"
     record_count = 0
-    progress_bar = ProgressBar.create(starting_at: nil, total: nil, format: "#{"Preprocessing".magenta} %t <%B>", title: title)
+    progress_bar = ProgressBar.create(starting_at: nil, total: nil, format: "#{"Preprocessing".magenta} %t <%B>", title: title, throttle_rate: 1)
     processor.logger = Logger.new(ProgressBarLogger.new(progress_bar))
     processor.deserialize do |status, result, meta|
       eta = meta ? meta[:eta] : nil
@@ -47,8 +47,10 @@ module Rseed
   end
 
   def from_file file, options = {}
-    f = import_file(file)
-    return false unless f
+    unless f = import_file(file)
+      logger.error "Cannot locate file: ".red + file.to_s
+      return false
+    end
     p = Processor.new(options)
     return nil unless p
     p.adapter.file = f

data/lib/rseed/processor.rb

@@ -20,7 +20,7 @@ module Rseed
             converter_options[s[0].strip] = s[1].strip
           end
         end
-        converter.options = converter_options
+        converter.options = HashWithIndifferentAccess.new(converter_options)
       end
       @adapter = adapter
       @converter = converter
@@ -72,7 +72,7 @@ module Rseed
               unless result[:success]
                 logger.error result[:message].to_s.red
                 logger.error result[:error].to_s.red
-                logger.error result[:backtrace].to_s
+                logger.error result[:backtrace].to_s unless result[:backtrace].to_s.blank?
               end
               yield :processing, result, meta
             end

data/lib/rseed/version.rb

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

metadata

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