active_import 0.0.3 → 0.1.0

data/lib/active_import.rb

@@ -1,3 +1,4 @@
+require "active_import/utility"
 require "active_import/import_csv"
 require "active_import/import_excel"
 require 'active_import/model_converter'

data/lib/active_import/seed.rb

@@ -1,6 +1,5 @@
 module ActiveImport
   class Seed
-
     def self.seed_from_file seed_file_name
       seed_file = File.open(seed_file_name, "r")
       seed_file.each_line do |seed_line|
@@ -10,11 +9,11 @@ module ActiveImport
           converter_name = seed_info[1]
 
           unless data_file_name.nil? || converter_name.nil?
-            data_file_name = import_file_with_path data_file_name
+            data_file_name = ActiveImport.import_file_with_path data_file_name
 
             if (File.exists? data_file_name)
               converter_name.strip!
-              converter_options = process_converter_options seed_info[2]
+              converter_options = ActiveImport.process_converter_options seed_info[2]
 
               puts "Importing from: #{data_file_name.cyan}"
               puts "Using converter: #{converter_name.cyan}"
@@ -38,7 +37,7 @@ module ActiveImport
                 else
                   puts "File type cannot be processed".red
               end
-              parse(import, model_converter) unless import.nil?
+              ActiveImport.parse(import, model_converter) unless import.nil?
             else
               puts "Skipping non existing file: #{data_file_name}".red
             end

data/lib/active_import/utility.rb

@@ -0,0 +1,39 @@
+module ActiveImport
+  def self.import_file_with_path file
+    f = file.strip
+    unless /^\//.match(f)
+      f = File.join(Rails.root, "db", "active_import", f)
+    end
+    f
+  end
+
+  def self.process_converter_options options_string
+    converter_options = {}
+    if options_string
+      options = options_string.split(";")
+      options.each do |option|
+        s = option.split("=")
+        converter_options[s[0].strip] = s[1].strip
+      end
+    end
+    converter_options
+  end
+
+  def self.parse(import, model_converter)
+    model_converter.before
+    import.parse do |import_row, converter, row_number, total_rows|
+      model_converter.process_values import_row
+      model = model_converter.save
+      if model.respond_to?("errors")
+        print "#{row_number.to_s.cyan}: "
+        if model.errors.empty?
+          puts "OK".green
+        else
+          model.errors.full_messages.each { |message| puts message.red }
+        end
+      end
+    end
+    model_converter.after
+    puts model_converter.report
+  end
+end

data/lib/active_import/version.rb

@@ -1,3 +1,3 @@
 module ActiveImport
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/lib/tasks/active_import_tasks.rake

@@ -1,37 +1,17 @@
 require "active_import"
 require "colorize"
 
-def import_file_with_path file
-  f = file.strip
-  unless /^\//.match(f)
-    f = File.join(Rails.root, "db", "active_import", f)
-  end
-  f
-end
-
-def process_converter_options options_string
-  converter_options = {}
-  if options_string
-    options = options_string.split(";")
-    options.each do |option|
-      s = option.split("=")
-      converter_options[s[0].strip] = s[1].strip
-    end
-  end
-  converter_options
-end
-
 def process_import_options
   converter = ENV["converter"] || ENV["CONVERTER"]
   converter_model = "#{converter.camelize}Converter"
   options = ENV["converter_options"] || ENV["CONVERTER_OPTIONS"]
-  converter_options = process_converter_options options
+  converter_options = ActiveImport.process_converter_options options
 
   puts "Converter Model: #{converter_model.cyan}"
   puts "Converter Options: #{converter_options.to_s.cyan}"
   file = ENV["file"] || ENV["FILE"]
   file ||= "#{converter.underscore}.csv"
-  data_file = import_file_with_path file
+  data_file = ActiveImport.import_file_with_path file
 
   if File.exists?(data_file)
     puts "Found import file: #{data_file}".green
@@ -44,34 +24,13 @@ def process_import_options
   return {:data_file => data_file, :model_converter => model_converter}
 end
 
-def parse(import, model_converter)
-  model_converter.before
-  import.parse do |import_row, converter, row_number, total_rows|
-    model_converter.process_values import_row
-    model = model_converter.save
-    if model.respond_to?("errors")
-      print "#{row_number.to_s.cyan}: "
-      if model.errors.empty?
-        puts "OK".green
-      else
-        model.errors.full_messages.each { |message| puts message.red }
-      end
-    end
-  end
-  model_converter.after
-  puts model_converter.report
-end
-
-def seed_from_file(seed_file_name)
-end
-
 namespace :active_import do
   desc "Load csv file into a model using a model converter"
   task :csv => :environment do
     result = process_import_options
     unless result[:data_file].nil?
       import = ActiveImport::ImportCsv.new(result[:model_converter], result[:data_file])
-      parse(import, result[:model_converter])
+      ActiveImport.parse(import, result[:model_converter])
     end
   end
   desc "Load excel file into a model using a model converter"
@@ -79,7 +38,7 @@ namespace :active_import do
     result = process_import_options
     unless result[:data_file].nil?
       import = ActiveImport::ImportExcel.new(result[:model_converter], result[:data_file])
-      parse(import, result[:model_converter])
+      ActiveImport.parse(import, result[:model_converter])
     end
   end
   desc "Seed a list of import files"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_import
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70129661763280 !ruby/object:Gem::Requirement
+  requirement: &70111127111460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70129661763280
+  version_requirements: *70111127111460
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70129661762220 !ruby/object:Gem::Requirement
+  requirement: &70111127109520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70129661762220
+  version_requirements: *70111127109520
 - !ruby/object:Gem::Dependency
   name: roo
-  requirement: &70129661759880 !ruby/object:Gem::Requirement
+  requirement: &70111127107260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70129661759880
+  version_requirements: *70111127107260
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70129661758520 !ruby/object:Gem::Requirement
+  requirement: &70111127102900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70129661758520
+  version_requirements: *70111127102900
 description: ''
 email:
 - david.monagle@intrica.com.au
@@ -66,6 +66,7 @@ files:
 - lib/active_import/import_excel.rb
 - lib/active_import/model_converter.rb
 - lib/active_import/seed.rb
+- lib/active_import/utility.rb
 - lib/active_import/version.rb
 - lib/active_import.rb
 - lib/generators/active_import/model_converter_generator.rb
@@ -120,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3899470936762174354
+      hash: 3636221692883456785
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -129,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3899470936762174354
+      hash: 3636221692883456785
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.6