jsuchal-activerecord-fast-import 0.1.3 → 0.1.4

data/README.markdown

@@ -1,66 +1,66 @@
-# activerecord-fast-import
-
-Loads data from text files into tables using fast native MySQL [LOAD DATA INFILE](http://dev.mysql.com/doc/refman/5.1/en/load-data.html) query.
-
-## Examples
-
-### Loading data from tab delimited log file
-
-Suppose you have an ActiveRecord model LogEntry defined as `LogEntry happened_at:datetime url:string` and a log file with tab delimited columns like this:
-
-    2009-09-30 12:32:43<tab>http://github.com/
-    2009-09-30 13:36:13<tab>http://facebook.com/
-
-To import data from this log file, you have to use
-
-    LogEntry.fast_import('huge.log')
-
-That's it! 
-
-Of course in real world you will also need more advanced features. Read on...
-
-
-### Changing delimiters and ignoring some rows
-
-Of course not all log files are delimited by tabs and newlines. Just pass custom delimiters to options. If you want to ignore first 10 lines, just use `:ignore_lines`
-
-    import_options = {
-        :fields_terminated_by => ',',
-        :lines_terminated_by => ';',
-        :ignore_lines => 10
-    }
-
-### Changing order of columns and ignoring columns
-
-Now, imagine you want to import data from a huge log file with following format:
-
-    http://github.com/<tab>Mozilla<tab>2009-09-30 12:32:43
-    http://facebook.com/<tab>Opera<tab>2009-09-30 13:36:13
-
-It is clear that columns are in different order and we even want to ignore the second column. Let's do it
-
-    import_options = {:columns => ["url", "@dummy", "happened_at"]}
-    LogEntry.fast_import('huge.log', import_options)
-
-The special `@dummy` loads that column into a local variable and when unused (in a transformation) is just ignored.
-
-### Transforming data
-
-Now imagine we have a log file like this:
-
-    2009-09-30 12:32:43<tab>http://github.com/<tab>image.jpg
-    2009-09-30 13:36:13<tab>http://facebook.com/<tab>styles/default.css
-
-We want to concatenate those two columns into one.
-
-    import_options = {
-        :columns => ["happened_at", "@domain", "@file"],
-        :mapping => { :url => "CONCAT(@domain, @file)" }
-    }
-    LogEntry.fast_import('huge.log', import_options)
-
-Of course you can use any of those shiny [MySQL functions](http://dev.mysql.com/doc/refman/5.1/en/functions.html).
-
-## Copyright
-
-Copyright (c) 2009 Jan Suchal. See LICENSE for details.
+# activerecord-fast-import
+
+Loads data from text files into tables using fast native MySQL [LOAD DATA INFILE](http://dev.mysql.com/doc/refman/5.1/en/load-data.html) query.
+
+## Examples
+
+### Loading data from tab delimited log file
+
+Suppose you have an ActiveRecord model LogEntry defined as `LogEntry happened_at:datetime url:string` and a log file with tab delimited columns like this:
+
+    2009-09-30 12:32:43<tab>http://github.com/
+    2009-09-30 13:36:13<tab>http://facebook.com/
+
+To import data from this log file, you have to use
+
+    LogEntry.fast_import('huge.log')
+
+That's it! 
+
+Of course in real world you will also need more advanced features. Read on...
+
+
+### Changing delimiters and ignoring some rows
+
+Of course not all log files are delimited by tabs and newlines. Just pass custom delimiters to options. If you want to ignore first 10 lines, just use `:ignore_lines`
+
+    import_options = {
+        :fields_terminated_by => ',',
+        :lines_terminated_by => ';',
+        :ignore_lines => 10
+    }
+
+### Changing order of columns and ignoring columns
+
+Now, imagine you want to import data from a huge log file with following format:
+
+    http://github.com/<tab>Mozilla<tab>2009-09-30 12:32:43
+    http://facebook.com/<tab>Opera<tab>2009-09-30 13:36:13
+
+It is clear that columns are in different order and we even want to ignore the second column. Let's do it
+
+    import_options = {:columns => ["url", "@dummy", "happened_at"]}
+    LogEntry.fast_import('huge.log', import_options)
+
+The special `@dummy` loads that column into a local variable and when unused (in a transformation) is just ignored.
+
+### Transforming data
+
+Now imagine we have a log file like this:
+
+    2009-09-30 12:32:43<tab>http://github.com/<tab>image.jpg
+    2009-09-30 13:36:13<tab>http://facebook.com/<tab>styles/default.css
+
+We want to concatenate those two columns into one.
+
+    import_options = {
+        :columns => ["happened_at", "@domain", "@file"],
+        :mapping => { :url => "CONCAT(@domain, @file)" }
+    }
+    LogEntry.fast_import('huge.log', import_options)
+
+Of course you can use any of those shiny [MySQL functions](http://dev.mysql.com/doc/refman/5.1/en/functions.html).
+
+## Copyright
+
+Copyright (c) 2009 Jan Suchal. See LICENSE for details.

data/Rakefile

@@ -13,6 +13,7 @@ begin
     gem.add_development_dependency "rspec"
     gem.add_dependency 'activerecord', [">= 2.1.2"]
   end
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/activerecord-fast-import.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{activerecord-fast-import}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan Suchal"]
-  s.date = %q{2009-09-02}
+  s.date = %q{2009-09-10}
   s.description = %q{Native MySQL additions to ActiveRecord, like LOAD DATA INFILE, ENABLE/DISABLE KEYS, TRUNCATE TABLE.}
   s.email = %q{johno@jsmf.net}
   s.extra_rdoc_files = [
@@ -17,8 +17,7 @@ Gem::Specification.new do |s|
      "README.markdown"
   ]
   s.files = [
-    ".document",
-     ".gitignore",
+    ".gitignore",
      "LICENSE",
      "README.markdown",
      "Rakefile",
@@ -30,11 +29,10 @@ Gem::Specification.new do |s|
      "spec/activerecord-fast-import_spec.rb",
      "spec/spec_helper.rb"
   ]
-  s.has_rdoc = true
   s.homepage = %q{http://github.com/jsuchal/activerecord-fast-import}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Fast MySQL import for ActiveRecord}
   s.test_files = [
     "spec/activerecord-fast-import_spec.rb",
@@ -43,7 +41,7 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 0"])

data/lib/activerecord-fast-import.rb

@@ -16,6 +16,13 @@ module ActiveRecord #:nodoc:
       connection.execute("ALTER TABLE #{quoted_table_name} ENABLE KEYS")
     end
 
+    # Disables keys, yields block, enables keys.
+    def self.with_keys_disabled
+      disable_keys
+      yield
+      enable_keys
+    end
+
     # Loads data from file using MySQL native LOAD DATA INFILE query, disabling
     # key updates for even faster import speed
     #
@@ -24,9 +31,9 @@ module ActiveRecord #:nodoc:
     # * +options+ (see <tt>load_data_infile</tt>)
     def self.fast_import(files, options = {})
       files = [files] unless files.is_a? Array
-      disable_keys
-      files.each {|file| load_data_infile(file, options)}
-      enable_keys
+      with_keys_disabled do
+        files.each {|file| load_data_infile(file, options)}
+      end
     end
 
     # Loads data from file using MySQL native LOAD DATA INFILE query

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jsuchal-activerecord-fast-import
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jan Suchal
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-02 00:00:00 -07:00
+date: 2009-09-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,6 @@ extra_rdoc_files:
 - LICENSE
 - README.markdown
 files: 
-- .document
 - .gitignore
 - LICENSE
 - README.markdown
@@ -54,7 +53,7 @@ files:
 - nbproject/project.xml
 - spec/activerecord-fast-import_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/jsuchal/activerecord-fast-import
 post_install_message: 
 rdoc_options: 
@@ -78,7 +77,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Fast MySQL import for ActiveRecord
 test_files: 
 - spec/activerecord-fast-import_spec.rb

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE