datashift 0.12.0 → 0.12.1

data/Rakefile

@@ -29,26 +29,6 @@ $:.unshift lib unless $:.include?(lib)
 
 require 'datashift'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = DataShift.gem_name
-  gem.homepage = "http://github.com/autotelik/datashift"
-  gem.license = "MIT"
-  gem.summary = %Q{ Shift data betwen Excel/CSV and any Ruby app}
-  gem.description = %Q{Comprehensive tools to import/export between Excel/CSV and ActiveRecord databases, Rails apps, and any Ruby project.}
-  gem.email = "rubygems@autotelik.co.uk"
-  gem.authors = ["Thomas Statter"]
-  # dependencies defined in Gemfile
-  gem.files.exclude ['sandbox/**']
-  gem.files.exclude ['spec/**/*']
-  
-  gem.add_dependency 'spreadsheet'
-  gem.add_dependency 'rubyzip'
-  
-end
-Jeweler::RubygemsDotOrgTasks.new
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'

data/VERSION

@@ -1 +1 @@
-0.12.0
+0.12.1

data/datashift.gemspec

@@ -2,11 +2,13 @@ require 'rake'
   
 Gem::Specification.new do |s|
   s.name = "datashift"
-  s.version = "0.12.0"
+  s.version = "0.12.1"
+  s.date = Date.today.to_s
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  
   s.authors = ["Thomas Statter"]
-  s.date = "2013-01-02"
+
   s.description = "Comprehensive tools to import/export between Excel/CSV and ActiveRecord databases, Rails apps, and any Ruby project."
   s.email = "rubygems@autotelik.co.uk"
   s.extra_rdoc_files = [

data/lib/loaders/csv_loader.rb

@@ -83,6 +83,12 @@ module DataShift
             rescue => e
               failure( row, true )
               logger.error "Failed to process row [#{i}] (#{@current_row})"
+              
+              if(verbose)
+                puts "Failed to process row [#{i}] (#{@current_row})" 
+                puts e.inspect 
+              end
+              
               # don't forget to reset the load object 
               new_load_object
               next

data/lib/loaders/excel_loader.rb

@@ -42,7 +42,6 @@ module DataShift
 
       @excel.open(file_name)
         
-      #if(options[:verbose])
       puts "\n\n\nLoading from Excel file: #{file_name}"
 
       sheet_number = options[:sheet_number] || 0
@@ -72,7 +71,8 @@ module DataShift
       # For example if model has an attribute 'price' will map columns called Price, price, PRICE etc to this attribute
       populate_method_mapper_from_headers( @headers, options )
       
-      logger.info "Excel Loader processing #{@sheet.num_rows} rows"
+      # currently pointless num_rows rubbish i.e inaccurate!
+      #logger.info "Excel Loader processing #{@sheet.num_rows} rows"
       
       @reporter.reset
       
@@ -129,7 +129,14 @@ module DataShift
               @reporter.processed_object_count += 1
               
               failure(@current_row, true)
+              
+              if(verbose)
+                puts "Failed to process row [#{i}] (#{@current_row})" 
+                puts e.inspect 
+              end
+              
               logger.error "Failed to process row [#{i}] (#{@current_row})"
+              
               # don't forget to reset the load object 
               new_load_object
               next
@@ -148,25 +155,25 @@ module DataShift
               logger.error load_object.errors.inspect if(load_object)
             else
               logger.info "Row #{@current_row} succesfully SAVED : ID #{load_object.id}"
-               @reporter.add_loaded_object(@load_object)
+              @reporter.add_loaded_object(@load_object)
             end
             
             # don't forget to reset the object or we'll update rather than create
             new_load_object
 
           end
-        
-          raise ActiveRecord::Rollback if(options[:dummy]) # Don't actually create/upload to DB if we are doing dummy run
-        end
+          
+          if(options[:dummy])
+            puts "Excel loading stage complete - Dummy run so Rolling Back."
+            raise ActiveRecord::Rollback # Don't actually create/upload to DB if we are doing dummy run
+          end
+          
+        end   # TRANSACTION N.B ActiveRecord::Rollback does not propagate outside of the containing transaction block
       
-      rescue => e
-        
-        if e.is_a?(ActiveRecord::Rollback) && options[:dummy]
-          puts "Excel loading stage complete - Dummy run so Rolling Back."
-        else
-          raise e
-        end
-      ensure
+      rescue => e  
+        puts "ERROR: Excel loading failed : #{e.inspect}"
+        raise e
+      ensure     
         report
       end
      

data/lib/loaders/loader_base.rb

@@ -45,6 +45,7 @@ module DataShift
     #  
     #  :reload           : Force load of the method dictionary for object_class even if already loaded
     #  :instance_methods : Include setter/delegate style instance methods for assignment, as well as AR columns
+    #  :verbose          : Verboise logging and to STDOUT
     #
     def initialize(object_class, find_operators = true, object = nil, options = {})
       @load_object_class = object_class
@@ -63,6 +64,8 @@ module DataShift
       @config = options.dup    # clone can cause issues like 'can't modify frozen hash'
 
       @verbose = @config[:verbose]
+      
+      puts "Verbose Mode" if(verbose)
       @headers = []
 
       @default_data_objects ||= {}
@@ -407,7 +410,7 @@ module DataShift
     def save
       return unless( @load_object )
       
-      #puts "DEBUG: SAVING #{@load_object.class} : #{@load_object.inspect}" if(@verbose)
+      puts "DEBUG: SAVING #{@load_object.class} : #{@load_object.inspect}" if(verbose)
       begin
         return @load_object.save
       rescue => e
@@ -515,9 +518,19 @@ module DataShift
       
     private
 
+    # This method usually called during processing to avoid errors with associations like
+    #   <ActiveRecord::RecordNotSaved: You cannot call create unless the parent is saved>
+    # If the object is still invalid at this point probably indicates compulsory 
+    # columns on model have not been processed before associations on that model
+    # TODO smart ordering of columns dynamically ourselves rather than relying on incoming data order
     def save_if_new
-      #puts "SAVE", load_object.inspect
-      save if(load_object.valid? && load_object.new_record?)
+      return unless(load_object.new_record?)
+      
+      if(load_object.valid?)  
+        save
+      else
+        puts "Cannot Save - Invalid #{load_object.class} - #{load_object.errors.full_messages}" if(verbose)
+      end
     end
   
   end

data/lib/loaders/reporter.rb

@@ -35,8 +35,9 @@ module DataShift
     def report
       loaded_objects.compact! if(loaded_objects)
       
-      puts "Processing complete:"
-      puts "Processed total of #{processed_object_count} entries"
+      puts "\nProcessing Summary Report"
+      puts ">>>>>>>>>>>>>>>>>>>>>>>>>\n"
+      puts "Processed total of #{processed_object_count} #{processed_object_count > 1 ? 'entries' : 'entry'}"
       puts "#{loaded_objects.size} objects were succesfully processed."
        
       puts "There were NO failures." if failed_objects.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datashift
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet