activerecord-importer 0.2.0 → 0.3.0

data/Rakefile

@@ -13,8 +13,6 @@ Hoe.spec 'activerecord-importer' do
   self.author  = 'Gerald Bauer'
   self.email   = 'example@googlegroups.com'
     
-  # switch extension to .markdown for gihub formatting
-  self.readme_file  = 'README.md'
-  self.history_file = 'History.md'
+  self.licenses = ['Public Domain']   
   
 end

data/lib/activerecord/importer/runner.rb

@@ -21,8 +21,8 @@ module ActiveRecord::Importer
       pp @db_dest
 
       # lets use a props model for tracking versions/imports
-      @prop_clazz = Class.new( ActiveRecord::Base )   # same as  class Anoynymous < ActiveRecord::Base ; end
-      @prop_clazz.table_name = db_props_table_name     # same as   self.table_name = 'new_table_name'
+      @prop_klass = Class.new( ActiveRecord::Base )   # same as  class Anoynymous < ActiveRecord::Base ; end
+      @prop_klass.table_name = db_props_table_name     # same as   self.table_name = 'new_table_name'
     end
 
     ## todo: use connect_old! w/ !!! - check ar for convetion
@@ -41,71 +41,91 @@ module ActiveRecord::Importer
 
     def import( items )
 
+      ## todo: track start/stop time
+    
       items.each_with_index do |item,index|
-        model_clazz = item[0]
-        sql         = item[1]
         puts "Importing step #{index+1}/#{items.size}..."
-        import_table( model_clazz, sql )
+
+        model_klass = item[0]
+
+        if item.size > 2  # assume source is array (cols ary,recs ary)
+          cols = item[1]
+          recs = item[2]
+          import_table_from_ary( model_klass, cols, recs )
+        else         # assume source is sql (string)
+          sql  = item[1]
+          import_table_from_sql( model_klass, sql )
+        end
       end
 
       version = version_string()
 
-      puts "Adding version string >#{version}<..."
-      @prop_clazz.create!( :key => 'db.version.import', :value => version )
-      puts "OK"
+      print "Adding version string >#{version}<..."
+      @prop_klass.create!( :key => 'db.version.import', :value => version )
+      puts 'OK'
     end
 
 
-    ### sql          - source query
-    ### model_clazz - target model/table
+   def import_table_from_ary( model_klass, cols, recs )
+
+     print "Found #{recs.size} records; "
+
+     connect_new()
 
-    def import_table( model_clazz, sql )
+     print "adding to table >#{model_klass.name}<"
+     
+     recs.each_with_index do |rec,i|
+       obj = model_klass.new
+       cols.each_with_index do |col,index|
+         ## nb: use setters; lets us use obj.id = 42 e.g. mass assignment ignores/protects ids
+         obj.send( "#{col}=", rec[index] )
+       end
+       obj.save!
+       print_progress(i)  # keep user entertained ...o....O...
+     end
+     puts 'OK'
+   end # method import_table_from_ary
+
+
+   def import_table_from_sql( model_klass, sql )
 
       connect_old()
 
-      puts "Fetching records with query >#{sql}<..."
+      print "Fetching records with query >#{sql}<..."
   
       recs = ActiveRecord::Base.connection.execute( sql )
 
-      puts "OK - Found #{recs.length} records."
+      puts 'OK'
+      print "Found #{recs.length} records; "
 
       connect_new()
 
-      puts "Adding records to table >#{model_clazz.name}<..."
+      print "adding records to table >#{model_klass.name}<"
 
       recs.each_with_index do |rec,i|
-
-        # entertain use on console .....o....o...1000.. etc.
-        if ((i+1) % 1000) == 0
-          print (i+1)
-        elsif ((i+1) % 100) == 0
-          print 'O'
-        elsif ((i+1) % 10) == 0
-          print 'o'
-        else
-          print '.'  
-        end
-         
-        print "\r\n" if ((i+1) % 80) == 0   # add new line after 80 records
-
         #debug_dump_record( rec )
-        model_clazz.create!( downcase_hash( rec ) )
+        model_klass.create!( downcase_hash( rec ) )
+
+        print_progress(i)  # keep user entertained ...o....O...
       end
 
-      puts "OK"
+      puts 'OK'
     end
 
 
 def debug_dump_table( sql )
   
+  print "Connecting..."
   connect_old()
-  puts "OK - Connection successfully established."
+  puts  'OK'
+  puts  'Connection successfully established.'
 
-  puts "SQL>#{sql}<"
+  print "Fetch records with query >#{sql}<..."
 
   recs = ActiveRecord::Base.connection.execute( sql )
 
-  puts "OK - Found #{recs.length} records."
+  puts 'OK'
+  puts "Found #{recs.length} records."
 
 
   recs.each do |rec|
@@ -113,12 +133,29 @@ def debug_dump_table( sql )
     debug_dump_record( rec )
   end
 
-  puts "OK"
+  puts 'OK'
 end
 
 
 private
 
+
+def print_progress( i )
+  # entertain use on console .....o....o...1000.. etc.
+  if ((i+1) % 1000) == 0
+    print (i+1)
+  elsif ((i+1) % 100) == 0
+    print 'O'
+  elsif ((i+1) % 10) == 0
+    print 'o'
+  else
+    print '.'
+  end
+
+  print "\r\n" if ((i+1) % 80) == 0   # add new line after 80 records
+end
+
+
 def version_string
   
   username     = ENV['USERNAME']     || '!!(username missing)'

data/lib/activerecord/importer/version.rb

@@ -2,5 +2,5 @@
 module ActiveRecord ; end  # forward reference
 
 module ActiveRecord::Importer
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-importer
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-03 00:00:00 Z
+date: 2012-12-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdoc
@@ -64,8 +64,8 @@ files:
 - lib/activerecord/importer/runner.rb
 - lib/activerecord/importer/version.rb
 homepage: https://github.com/geraldb/activerecord-importer
-licenses: []
-
+licenses: 
+- Public Domain
 post_install_message: 
 rdoc_options: 
 - --main