active_import 0.0.2 → 0.0.3

data/README.rdoc

@@ -30,10 +30,12 @@ There are three Rake tasks that allow you to use a converter on a file:
 
 === Examples
 
-rake active_import:csv user.csv CONVERTER=User CONVERTER_OPTIONS="give_admin_access=true"
+    rake active_import:csv FILE=user.csv CONVERTER=User CONVERTER_OPTIONS="give_admin_access=true"
 
 In this case the file in db/active_import/user.csv would be run through the converter UserConverter. The options specified are available within the converter. In this case @options["give_admin_access"] will evaluate to true.
 
+The FILE parameter is not strictly necessary in this case either as the default file name will be an underscored value of the name of the converter.
+
 == Seeding
 
 Seeding allows you to import several files through different model converters in a single command. It involves the creation of a .seed file. Each file goes on a single line and the options are separated by pipe symbols.
@@ -44,8 +46,15 @@ Seeding allows you to import several files through different model converters in
     user_info/roles.xls | Role
     user_info/permissions.xls | UserPermission
 
+You could save this file as db/active_import/user_info.seed and run the command like this:
+
+    rake active_import:seed SET=user_info
+
 Note this will get the data files from a subdirectory: db/active_import/user_info. Also the top conversion uses options but as they are optional, the following two do not.
 
+If you do not specify a set, the rake task will look for a set based on the current development environment: ie development.seed.
+
+
 == The Converter Class
 
 === Column Setup

data/lib/active_import.rb

@@ -1,6 +1,7 @@
 require "active_import/import_csv"
 require "active_import/import_excel"
 require 'active_import/model_converter'
+require 'active_import/seed'
 
 module ActiveImport
   class Railtie < ::Rails::Railtie

data/lib/active_import/seed.rb

@@ -0,0 +1,50 @@
+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|
+        unless (/^#/.match(seed_line))
+          seed_info = seed_line.split("|")
+          data_file_name = seed_info[0]
+          converter_name = seed_info[1]
+
+          unless data_file_name.nil? || converter_name.nil?
+            data_file_name = import_file_with_path data_file_name
+
+            if (File.exists? data_file_name)
+              converter_name.strip!
+              converter_options = process_converter_options seed_info[2]
+
+              puts "Importing from: #{data_file_name.cyan}"
+              puts "Using converter: #{converter_name.cyan}"
+              puts "Options: #{converter_options.to_s.cyan}"
+
+              model_converter = eval("#{converter_name.camelize}Converter.new")
+              model_converter.options = converter_options
+
+              import = nil
+              extension = File.extname(data_file_name).downcase.strip
+              case extension
+                when ".xls"
+                  puts "Excel file detected".yellow
+                  import = ActiveImport::ImportExcel.new(model_converter, data_file_name)
+                when ".xlsx"
+                  puts "Excel(X) file detected".yellow
+                  import = ActiveImport::ImportExcel.new(model_converter, data_file_name)
+                when ".csv"
+                  puts "CSV file detected".yellow
+                  import = ActiveImport::ImportCsv.new(model_converter, data_file_name)
+                else
+                  puts "File type cannot be processed".red
+              end
+              parse(import, model_converter) unless import.nil?
+            else
+              puts "Skipping non existing file: #{data_file_name}".red
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_import/version.rb

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

data/lib/generators/active_import/templates/model_converter.rb.erb

@@ -4,7 +4,7 @@ class <%= @converter_name.camelize %>Converter < ActiveImport::ModelConverter
     def setup 
 <% @attributes.each do |attribute| -%>
 <% unless ["id", "created_at", "updated_at"].include? attribute -%>
-        add_column :<%= attribute %>, :match => "<%= attribute %>", :type => :<%= @model.columns_hash[attribute].type %>, :mandatory => true 
+        add_column :<%= attribute %>, :match => "^<%= attribute %>$", :type => :<%= @model.columns_hash[attribute].type %>, :mandatory => true
 <% end -%>
 <% end -%>
     end

data/lib/tasks/active_import_tasks.rake

@@ -63,49 +63,6 @@ def parse(import, model_converter)
 end
 
 def seed_from_file(seed_file_name)
-  seed_file = File.open(seed_file_name, "r")
-  seed_file.each_line do |seed_line|
-    unless (/^#/.match(seed_line))
-      seed_info = seed_line.split("|")
-      data_file_name = seed_info[0]
-      converter_name = seed_info[1]
-
-      unless data_file_name.nil? || converter_name.nil?
-        data_file_name = import_file_with_path data_file_name
-
-        if (File.exists? data_file_name)
-          converter_name.strip!
-          converter_options = process_converter_options seed_info[2]
-
-          puts "Importing from: #{data_file_name.cyan}"
-          puts "Using converter: #{converter_name.cyan}"
-          puts "Options: #{converter_options.to_s.cyan}"
-
-          model_converter = eval("#{converter_name.camelize}Converter.new")
-          model_converter.options = converter_options
-
-          import = nil
-          extension = File.extname(data_file_name).downcase.strip
-          case extension
-            when ".xls"
-              puts "Excel file detected".yellow
-              import = ActiveImport::ImportExcel.new(model_converter, data_file_name)
-            when ".xlsx"
-              puts "Excel(X) file detected".yellow
-              import = ActiveImport::ImportExcel.new(model_converter, data_file_name)
-            when ".csv"
-              puts "CSV file detected".yellow
-              import = ActiveImport::ImportCsv.new(model_converter, data_file_name)
-            else
-              puts "File type cannot be processed".red
-          end
-          parse(import, model_converter) unless import.nil?
-        else
-          puts "Skipping non existing file: #{data_file_name}".red
-        end
-      end
-    end
-  end
 end
 
 namespace :active_import do
@@ -131,7 +88,7 @@ namespace :active_import do
     seed_file_name = File.join(Rails.root, "db", "active_import", "#{set}.seed")
     if File.exists?(seed_file_name)
       puts "Seeding from file: '#{seed_file_name.yellow}'"
-      seed_from_file seed_file_name
+      ActiveImport::Seed.seed_from_file seed_file_name
     else
       puts "Cannot find seed file: '#{seed_file_name}'".red
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_import
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-01 00:00:00.000000000Z
+date: 2012-04-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70351188223760 !ruby/object:Gem::Requirement
+  requirement: &70129661763280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70351188223760
+  version_requirements: *70129661763280
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70351188223340 !ruby/object:Gem::Requirement
+  requirement: &70129661762220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70351188223340
+  version_requirements: *70129661762220
 - !ruby/object:Gem::Dependency
   name: roo
-  requirement: &70351188222880 !ruby/object:Gem::Requirement
+  requirement: &70129661759880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70351188222880
+  version_requirements: *70129661759880
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70351188222460 !ruby/object:Gem::Requirement
+  requirement: &70129661758520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70351188222460
+  version_requirements: *70129661758520
 description: ''
 email:
 - david.monagle@intrica.com.au
@@ -65,6 +65,7 @@ files:
 - lib/active_import/import_csv.rb
 - lib/active_import/import_excel.rb
 - lib/active_import/model_converter.rb
+- lib/active_import/seed.rb
 - lib/active_import/version.rb
 - lib/active_import.rb
 - lib/generators/active_import/model_converter_generator.rb
@@ -119,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3536894334839617531
+      hash: 3899470936762174354
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3536894334839617531
+      hash: 3899470936762174354
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.6