transplant 0.1.1 → 0.1.2

data/lib/transplant/planter.rb

@@ -6,24 +6,28 @@ module Transplant
     def initialize(app_name, connection)
       @app_name = app_name
       @connection = connection
+      @queries ||= []
+      @results ||= {}
     end
 
     def query(sql)
-      @connection.execute sql
+      return @results[sql] if @queries.include?(sql)
+      @queries << sql
+      @results[sql] = @connection.execute(sql)
     end
 
     def save(klass, other = {})
-      klass_name = klass.class.to_s.tableize.humanize
+      klass_name = klass.class.to_s.tableize.humanize.singularize
       if klass.valid?
         klass.save!
-        increment
+        succeed klass_name
         klass
       else
-        increment_failure(klass.class.to_s)
+        fail(klass_name)
         puts "Invalid #{klass_name} information:"
         Stats.output("Additional Info about #{klass_name}", other)
         Stats.output("#{klass_name} errors", klass.errors.full_messages)
-        Stats.output("#{klass_name} attributes:", klass.attributes)
+        Stats.output("#{klass_name} attributes", klass.attributes)
         return false
       end
     end
@@ -35,6 +39,10 @@ module Transplant
       @tables
     end
 
+    def column_names(table_name)
+      connection.columns(table_name).map(&:name)
+    end
+
     def truncate(*tables)
       tables.each { |table| self.query "TRUNCATE TABLE #{table.to_s}" }
     end
@@ -43,27 +51,28 @@ module Transplant
       truncate *tables
     end
 
-    def increment
-      @total_records ||= 0
-      @total_records += 1
+    def succeed(klass_name)
+      @successes              ||= Hash.new
+      @successes[klass_name]  ||= 0
+      @successes[klass_name]  += 1
     end
 
-    def increment_failure(klass_name)
+    def fail(klass_name)
       @failures              ||= Hash.new
       @failures[klass_name]  ||= 0
       @failures[klass_name]  += 1
     end
 
     def failures
-      @failures
-    rescue
       @failures ||= Hash.new
     end
 
-    def total_records
-      @total_records
-    rescue
-      @total_records ||= Hash.new
+    def successes
+      @successes ||= Hash.new
+    end
+
+    def total_successes
+      @successes.map { |table, count| count }.inject{ |sum,x| sum + x }
     end
   end
 end

data/lib/transplant/stats.rb

@@ -2,64 +2,78 @@ module Transplant
   class Stats
 
     def initialize(transplanter)
-      @transplanter = transplanter
+      @planter = transplanter
     end
 
     def output_all_info(opts = {})
       total_import_time(opts[:measurement]) if opts[:measurement].present?
       total_import_records
-      @transplanter.failures
+      successes
+      failures
     end
 
-    def self.output(header, input, depth = 0, sub_output = false)
-      if input.is_a? Hash
-        hash_output(header, input, depth, sub_output)
-      elsif input.is_a? Array
-        array_output(header, input, depth, sub_output)
+    class << self
+
+      def output(header, input, depth = 0, sub_output = false)
+        if input.is_a? Hash
+          hash_output(header, input, depth, sub_output)
+        elsif input.is_a? Array
+          array_output(header, input, depth, sub_output)
+        end
       end
-    end
 
-    def self.hash_output(header, hash, depth = 0, sub_hash = false)
-      puts "#{"\t"*depth}#{header}:" if hash.any?
-      hash.each_pair do |key, value|
-        if value.is_a? Hash
-          hash_output("", value, depth + 1, sub_hash = true)
-        elsif value.is_a? Array
-          array_output("", value, depth + 1, sub_array = true)
-        else
-          puts "#{"\t"*(depth + 1)}#{key}: #{value}"
+      def hash_output(header, hash, depth = 0, sub_hash = false)
+        puts tabs(depth) + "#{header}:" if hash.any? && header.present?
+        hash.each_pair do |key, value|
+          if value.is_a?(Hash) || value.is_a?(Array)
+            output(key, value, depth + 1, sub_hash = true)
+          else
+            puts tabs(depth + 1) + "* #{key}: #{value}"
+          end
         end
       end
-    end
 
-    def self.array_output(header, array, depth = 0, sub_array = false)
-      puts "#{"\t"*depth}#{header}:" if array.any?
-      array.each do |item|
-        if item.is_a? Array
-          array_output("", item, depth + 1, sub_array = true)
-        elsif item.is_a? Hash
-          hash_output("", item, depth + 1, sub_hash = true)
-        else
-          puts "#{"\t"*(depth + 1)}* #{item}"
+      def array_output(header, array, depth = 0, sub_array = false)
+        puts tabs(depth) + "#{header}:" if array.any? && header.present?
+        array.each do |item|
+          if item.is_a?(Hash) || item.is_a?(Array)
+            output("", item, depth + 1, sub_hash = true)
+          else
+            puts tabs(depth + 1) + "* #{item}"
+          end
         end
       end
+
+      def tabs(count)
+        "\t"*count
+      end
+      private :tabs
+
     end
 
     def total_import_records
-      puts "\nTotal number of records imported into #{@transplanter.app_name}: #{@transplanter.total_records}"
+      puts "Estimated number of records imported into #{@planter.app_name}: #{@planter.total_successes}"
+    end
+
+    def total_import_time(m)
+      puts "Total time taken to import everything into #{@planter.app_name}: #{(m.real/60).round(2)} minutes"
     end
 
-    def total_import_time(measurement)
-      puts "Total time taken to import everything into #{@transplanter.app_name}"
-      puts measurement
+    def successes
+      if @planter.successes.count <= 0
+        puts "\nNo records were imported! Boo!!!!\n"
+      else
+        count = Hash[@planter.successes.map { |key, value| [key.tableize.humanize, value] }]
+        self.class.output("\nEstimated number of successful imports to #{@planter.app_name}", count)
+      end
     end
 
     def failures
-      if @transplanter.failures.count <= 0
+      if @planter.failures.count <= 0
         puts "\nNo failed record imports!!!! Time to par-tay!!!!\n"
       else
-        failures = Hash[@transplanter.failures.map { |key, value| [key.tableize.humanize, value] }]
-        self.class.output("\nTotal number failed imports to #{@transplanter.app_name}:", failures)
+        count = Hash[@planter.failures.map { |key, value| [key.tableize.humanize, value] }]
+        self.class.output("\nEstimated number failed imports to #{@planter.app_name}", count)
       end
     end
 

data/lib/transplant/version.rb

@@ -1,3 +1,3 @@
 module Transplant
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/transplant.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Transplant::VERSION
 
   gem.add_dependency "activesupport", "~> 3.2.2"
-  gem.add_dependency "mysql2", "~> 0.3.11"
+  gem.add_dependency "activerecord", "~> 3.2.2"
   gem.add_development_dependency "rspec", "~> 2.9.0"
   gem.add_development_dependency "rake", "~> 0.9.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transplant
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,13 +28,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.2
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: 3.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2211955661356025144
+      hash: 3664032782828776263
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2211955661356025144
+      hash: 3664032782828776263
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21