factorylabs-activewarehouse-etl 0.9.1.2 → 0.9.1.3

data/Rakefile

@@ -72,11 +72,11 @@ module AWETL
         ActiveWarehouse ETL is a pure Ruby Extract-Transform-Load application for loading data into a database.
       EOF
 
-      s.add_dependency('rake',                '>= 0.7.1')
-      s.add_dependency('activesupport',       '>= 1.3.1')
-      s.add_dependency('activerecord',        '>= 1.14.4')
+      s.add_dependency('rake',                '>= 0.8.3')
+      s.add_dependency('activesupport',       '>= 2.1.0')
+      s.add_dependency('activerecord',        '>= 2.1.0')
       s.add_dependency('fastercsv',           '>= 1.2.0')
-      s.add_dependency('adapter_extensions',  '>= 0.1.0')
+      s.add_dependency('adapter_extensions',  '>= 0.5.0')
 
       s.rdoc_options << '--exclude' << '.'
       s.has_rdoc = false

data/lib/etl/engine.rb

@@ -470,8 +470,8 @@ module ETL #:nodoc:
       say "Avg transforms: #{Engine.rows_read/benchmarks[:transforms]} rows/sec" if benchmarks[:transforms] > 0
       say "Avg writes: #{Engine.rows_read/benchmarks[:writes]} rows/sec" if benchmarks[:writes] > 0
 
-      say "Avg time writing execution records: #{ETL::Execution::Record.average_time_spent}"
-      
+      # say "Avg time writing execution records: #{ETL::Execution::Record.average_time_spent}"
+      # 
       # ETL::Transform::Transform.benchmarks.each do |klass, t|
 #         say "Avg #{klass}: #{Engine.rows_read/t} rows/sec"
 #       end

data/lib/etl/parser/fixed_width_parser.rb

@@ -13,14 +13,15 @@ module ETL #:nodoc:
       # Return each row
       def each
         Dir.glob(file).each do |file|
+          lines_skipped = 0
           open(file).each do |line|
             row = {}
-            lines_skipped = 0
+            if lines_skipped < source.skip_lines
+              lines_skipped += 1
+              next
+            end
             fields.each do |name, f|
-              if lines_skipped < source.skip_lines
-                lines_skipped += 1
-                next
-              end
+
               # TODO make strip optional?
               row[name] = line[f.field_start, f.field_length].strip
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: factorylabs-activewarehouse-etl
 version: !ruby/object:Gem::Version 
-  version: 0.9.1.2
+  version: 0.9.1.3
 platform: ruby
 authors: 
 - Anthony Eden
@@ -124,7 +124,6 @@ files:
 - lib/etl/execution/batch.rb
 - lib/etl/execution/job.rb
 - lib/etl/execution/migration.rb
-- lib/etl/execution/record.rb
 - lib/etl/generator/generator.rb
 - lib/etl/generator/surrogate_key_generator.rb
 - lib/etl/parser/apache_combined_log_parser.rb

data/lib/etl/execution/record.rb

@@ -1,18 +0,0 @@
-module ETL #:nodoc:
-  module Execution #:nodoc:
-    # Represents a single record
-    class Record < ETL::Execution::Base
-      belongs_to :table
-      class << self
-        attr_accessor :time_spent
-        def time_spent
-          @time_spent ||= 0
-        end
-        def average_time_spent
-          return 0 if time_spent == 0
-          ETL::Engine.rows_read / time_spent
-        end
-      end
-    end
-  end
-end