forklift_etl 1.1.0 → 1.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjE2NGE4ZGQ0N2M3YWI2OTE4MDdkMGIzYTdhZTUzOWRmNzM0YzU3MQ==
+    NjcxMzMwMTNkNzgxNDcyYWJmZWMyYWRiNWZlMGJkMDA3YzJlMGRjNQ==
   data.tar.gz: !binary |-
-    N2EzZTBmNDFhZjEyMTQ3MzZkNmZkMDU3NmU3NGY1MzUyYmY2YmU1MQ==
+    ODQ5OTg3NGIwNDAyMTRiZDY2MzdmYWNlZjAzMTkwYTQ5MjI2ZmQ1ZA==
 SHA512:
   metadata.gz: !binary |-
-    NTQyNzc0OGI0YzMyOGQyNzE4YmQ3MDBlMDEwMDk2ZjQ4ODFlMTI1MmU2M2Mx
-    MzJjZDg2NzA1Y2Y1NDVmOWU0NTAzNDhkNmRhMGFjNGY2ZmE0MGYyYzJmNzBh
-    MGU5NmE3NmYyMTE2MzRjMTc2MzIwZjYwZTE3MWViOTE5ZmRlMDc=
+    NmM4ZDRkMzNlYTdiOGFmNGZhZTJiZTI4NDVjNGVjOTFmYzc2ZGE5NTk3NDU5
+    ZGI0NGRlM2FiYjliYmQzZWQzYmM0N2U0NTU5NGFkNTJiZmJmZGY2NjZlYmMx
+    MDgzMDQ2Y2Q0NGUxYjg1ZmI5NDVjOGU5ZDY1MTc1YWI0MTgzZGY=
   data.tar.gz: !binary |-
-    N2EwNjZiM2JlNzQzOTFlNGUzM2I5YWEwM2Y0ZGRlMjUyZTZhZTlkZWQ3MTJh
-    NzA3YTE5ZDgzMTkxMzFjZjZiMWYyYzMzZTEzZjVlMDg0NTlhYWUyNDBlODJm
-    Njk2ZGJmOTIwOTgyOWFkNTRkMTFkYjZhMjFkZDMzODZhOGJhOWQ=
+    ZjMzMDgwNDM1NmQwYjI0Njg4YjU4NDYwNWU0Y2RlZTE3YzgzNjI3ZWJkOWE1
+    MGE5YjU5MjVjODA4NmY5ZTA4OWRkZDdiZTI0Y2E0YzBiYjNkM2FlNjQ5YjMz
+    NDY2OTAwMWFlYTJmMWE4OGE0MzBmN2MzZjgwYzY0ZDMxODdhNTM=

data/LICENSE.txt

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/Rakefile

@@ -9,5 +9,7 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
     'spec/*/*/*_spec.rb',
     'spec/*/*/*/*_spec.rb',
   ]
+  spec.rspec_opts = '--format documentation'
 end
-task :default  => :spec
+
+task default: :spec

data/example/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'forklift_etl', :path => '../'
+gem 'forklift_etl', path: '../'

data/example/plan.rb

@@ -1,7 +1,7 @@
 # plan = Forklift::Plan.new
 # Or, you can pass configs
 plan = Forklift::Plan.new ({
-  # :logger => {:debug => true}
+  # logger: {debug: true}
 })
 
 plan.do! {
@@ -31,7 +31,7 @@ plan.do! {
     destination = plan.connections[:mysql][:destination]
     table = 'es_import'
     index = 'aaa'
-    query = { :query => { :match_all => {} } } # pagination will happen automatically
+    query = { query: { match_all: {} } } # pagination will happen automatically
     destination.truncate!(table) if destination.tables.include? table
     source.read(index, query) {|data| destination.write(data, table) }
   }
@@ -71,14 +71,14 @@ plan.do! {
     destination = plan.connections[:mysql][:destination]
 
     email_args = {
-      :to      => "YOU@FAKE.com",
-      :from    => "Forklift",
-      :subject => "Forklift has moved your database @ #{Time.new}",
+      to:       "YOU@FAKE.com",
+      from:     "Forklift",
+      subject:  "value", "Forklift has moved your database @ #{Time.new}",
     }
 
     email_variables = {
-      :total_users_count => destination.read('select count(1) as "count" from users')[0][:count],
-      :new_users_count => destination.read('select count(1) as "count" from users where date(created_at) = date(NOW())')[0][:count],
+      total_users_count:  destination.read('select count(1) as "count" from users')[0][:count],
+      new_users_count:    destination.read('select count(1) as "count" from users where date(created_at) = date(NOW())')[0][:count],
     }
 
     email_template = "./template/email.erb"

data/lib/forklift/base/logger.rb

@@ -18,7 +18,7 @@ module Forklift
 
       def logger
         log_dir = "#{forklift.config[:project_root]}/log"
-        @logger ||= ::Lumberjack::Logger.new("#{log_dir}/forklift.log", :buffer_size => 0)
+        @logger ||= ::Lumberjack::Logger.new("#{log_dir}/forklift.log", buffer_size: 0)
       end
 
       def log(message, severity="info")

data/lib/forklift/base/mailer.rb

@@ -24,9 +24,9 @@ module Forklift
 
       def message_defaults
         {
-          :from => "Forklift",
-          :subject => "Forklift has moved your database @ #{Time.new}",
-          :body => "Forklift has moved your database @ #{Time.new}",
+          from:     "Forklift",
+          subject:  "Forklift has moved your database @ #{Time.new}",
+          body:     "Forklift has moved your database @ #{Time.new}",
         }
       end
 

data/lib/forklift/plan.rb

@@ -52,10 +52,10 @@ module Forklift
       error_handler = default_error_handler
       error_handler = args[1] unless args[1].nil?
       self.steps[name] = {
-        :ran           => false,
-        :to_run        => false,
-        :block         => block,
-        :error_handler => error_handler,
+        ran:            false,
+        to_run:         false,
+        block:          block,
+        error_handler:  error_handler,
       }
     end
 
@@ -136,10 +136,10 @@ module Forklift
 
     def default_config
       return {
-        :project_root => Dir.pwd,
-        :logger => {
-          :stdout => true,
-          :debug => false,
+        project_root: Dir.pwd,
+        logger: {
+          stdout: true,
+          debug:  false,
         },
       }
     end

data/lib/forklift/transports/csv.rb

@@ -20,7 +20,7 @@ module Forklift
 
       def read(size=1000)
         data = []
-        CSV.foreach(config[:file], :headers => true, :converters => :all) do |row|
+        CSV.foreach(config[:file], headers: true, converters: :all) do |row|
           data << row.to_hash.symbolize_keys
           if(data.length == size)
             if block_given?
@@ -41,7 +41,7 @@ module Forklift
 
       def write(data, append=true)
         if (append == false)
-          FileUtils.rm(config[:file], {:force => true})
+          FileUtils.rm(config[:file], {force: true})
         end
 
         if( !File.exists?(config[:file]) )

data/lib/forklift/transports/elasticsearch.rb

@@ -52,18 +52,18 @@ module Forklift
 
         data.each do |d|
           object = {
-            :index => index,
-            :body  => d,
-            :type  => type,
+            index:  index,
+            body:   d,
+            type:   type,
           }
           object[:id] = d[primary_key] if ( !d[primary_key].nil? && update == true )
           client.index object
         end
-        client.indices.refresh({ :index => index })
+        client.indices.refresh({ index: index })
       end
 
       def delete_index(index)
-        client.indices.delete({ :index => index }) if client.indices.exists({ :index => index })
+        client.indices.delete({ index: index }) if client.indices.exists({ index: index })
       end
 
       private

data/lib/forklift/transports/mysql.rb

@@ -39,7 +39,7 @@ module Forklift
           if prepared_query.downcase.include?("select") && !prepared_query.downcase.include?("limit")
             prepared_query = "#{prepared_query} LIMIT #{offset}, #{limit}"
           end
-          response = q(prepared_query, :symbolize_keys => true)
+          response = q(prepared_query, symbolize_keys: true)
           response.each do |row|
             data << row
           end
@@ -231,10 +231,11 @@ module Forklift
         values.each do |v|
           part = "NULL"
           if( [::String, ::Symbol].include?(v.class) )
-            v.gsub!('\\') { '\\\\' }
-            v.gsub!('\"', '\/"')
-            v.gsub!('"', '\"')
-            part = "\"#{v}\""
+            s = v.to_s
+            s.gsub!('\\') { '\\\\' }
+            s.gsub!('\"', '\/"')
+            s.gsub!('"', '\"')
+            part = "\"#{s}\""
           elsif( [::Date, ::Time, ::DateTime].include?(v.class) )
             s = v.to_s(:db)
             part = "\"#{s}\""

data/lib/forklift/version.rb

@@ -1,3 +1,3 @@
 module Forklift
-  VERSION = "1.1.0"
+  VERSION = "1.1.2"
 end

data/readme.md

@@ -124,7 +124,7 @@ plan.do! do
   destination = plan.connections[:mysql][:destination]
   table = 'es_import'
   index = 'aaa'
-  query = { :query => { :match_all => {} } } # pagination will happen automatically
+  query = { query: { match_all: {} } } # pagination will happen automatically
   destination.truncate!(table) if destination.tables.include? table
   source.read(index, query) {|data| destination.write(data, table) }
 end
@@ -255,7 +255,7 @@ plan.do! do
     destination = plan.connections[:mysql][:destination]
     table = 'es_import'
     index = 'aaa'
-    query = { :query => { :match_all => {} } } # pagination will happen automatically
+    query = { query: { match_all: {} } } # pagination will happen automatically
     destination.truncate!(table) if destination.tables.include? table
     source.read(index, query) {|data| destination.write(data, table) }
   }

data/spec/integration/basic_spec.rb

@@ -21,7 +21,7 @@ describe 'basics' do
 
     it 'seeded the elasticsearch db' do
       client = SpecClient.elasticsearch('forklift_test')
-      results = client.search({ index: 'forklift_test' , body: { :query => { :match_all => {} } } })
+      results = client.search({ index: 'forklift_test' , body: { query: { match_all: {} } } })
       expect(results['hits']['total']).to eql 5
     end
   end

data/spec/integration/csv_spec.rb

@@ -40,8 +40,8 @@ describe 'csv' do
   it "can write data (simple)" do
     plan = SpecPlan.new
     data = [
-      {:thing => 1, :when => Time.now},
-      {:thing => 2, :when => Time.now},
+      {thing: 1, when: Time.now},
+      {thing: 2, when: Time.now},
     ]
 
     plan.do! {
@@ -62,14 +62,14 @@ describe 'csv' do
       destination = plan.connections[:csv][:forklift_test_destination]
 
       data = [
-        {:thing => 1, :when => Time.now},
-        {:thing => 2, :when => Time.now},
+        {thing: 1, when: Time.now},
+        {thing: 2, when: Time.now},
       ]
 
       destination.write(data)
 
       data = [
-        {:thing => 3, :when => Time.now},
+        {thing: 3, when: Time.now},
       ]
 
       destination.write(data)

data/spec/integration/elasticsearch_spec.rb

@@ -8,7 +8,7 @@ describe 'elasticsearch' do
 
   it "can read data (raw)" do
     index = 'forklift_test'
-    query = { :query => { :match_all => {} } }
+    query = { query: { match_all: {} } }
     plan = SpecPlan.new
     @rows = []
     plan.do! {
@@ -23,7 +23,7 @@ describe 'elasticsearch' do
 
   it "can read data (filtered)" do
     index = 'forklift_test'
-    query = { :query => { :match_all => {} } }
+    query = { query: { match_all: {} } }
     plan = SpecPlan.new
     @rows = []
     plan.do! {
@@ -40,7 +40,7 @@ describe 'elasticsearch' do
     index = 'forklift_test'
     plan = SpecPlan.new
     data = [
-      {:id => 99, :user_id => 99, :product_id => 99, :viewed_at => 99}
+      {id: 99, user_id: 99, product_id: 99, viewed_at: 99}
     ]
     plan.do! {
       destination = plan.connections[:elasticsearch][:forklift_test]
@@ -48,7 +48,7 @@ describe 'elasticsearch' do
     }
 
     destination = SpecClient.elasticsearch('forklift_test')
-    count = destination.count({ :index => index })["count"]
+    count = destination.count({ index: index })["count"]
 
     expect(count).to eql 6
   end
@@ -57,7 +57,7 @@ describe 'elasticsearch' do
     index = 'forklift_test'
     plan = SpecPlan.new
     data = [
-      {:id => 1, :user_id => 1, :product_id => 1, :viewed_at => 99}
+      {id: 1, user_id: 1, product_id: 1, viewed_at: 99}
     ]
     plan.do! {
       destination = plan.connections[:elasticsearch][:forklift_test]
@@ -65,9 +65,9 @@ describe 'elasticsearch' do
     }
 
     destination = SpecClient.elasticsearch('forklift_test')
-    count = destination.count({ :index => index })["count"]
+    count = destination.count({ index: index })["count"]
     expect(count).to eql 5
-    result = destination.search({ :index => index, :body => { :query => {:term => {:id => 1}} } })
+    result = destination.search({ index: index, body: { query: {term: {id: 1}} } })
     expect(result["hits"]["total"]).to eql 1
     obj = result["hits"]["hits"][0]["_source"]
     expect(obj["id"]).to eql 1
@@ -81,15 +81,15 @@ describe 'elasticsearch' do
     plan = SpecPlan.new
     client = SpecClient.elasticsearch('forklift_test')
     data = [
-      {:id => 1}
+      {id: 1}
     ]
     plan.do! {
       destination = plan.connections[:elasticsearch][:forklift_test]
-      expect { client.search({ :index => index }) }.to raise_error(/IndexMissingException/)
+      expect { client.search({ index: index }) }.to raise_error(/IndexMissingException/)
       destination.write(data, index, true)
-      expect { client.search({ :index => index }) }.to_not raise_error
+      expect { client.search({ index: index }) }.to_not raise_error
       destination.delete_index(index)
-      expect { client.search({ :index => index }) }.to raise_error(/IndexMissingException/)
+      expect { client.search({ index: index }) }.to raise_error(/IndexMissingException/)
     }    
   end
 end

data/spec/integration/multi_transport_spec.rb

@@ -11,7 +11,7 @@ describe 'multiple trasport types' do
     it 'can load in a full query' do
       table = 'es_import'
       index = 'forklift_test'
-      query = { :query => { :match_all => {} } }
+      query = { query: { match_all: {} } }
       plan = SpecPlan.new
       plan.do! {
         source = plan.connections[:elasticsearch][:forklift_test]
@@ -27,7 +27,7 @@ describe 'multiple trasport types' do
     it 'can load in a partial query' do
       table = 'es_import'
       index = 'forklift_test'
-      query = { :query => { :match_all => {} }, :sort => [{ :id => {:order => "asc" } }] }
+      query = { query: { match_all: {} }, sort: [{ id: {order: "asc" } }] }
       plan = SpecPlan.new
       plan.do! {
         source = plan.connections[:elasticsearch][:forklift_test]
@@ -47,7 +47,7 @@ describe 'multiple trasport types' do
     it 'can detect data types' do
       table = 'es_import'
       index = 'forklift_test'
-      query = { :query => { :match_all => {} } }
+      query = { query: { match_all: {} } }
       plan = SpecPlan.new
       plan.do! {
         source = plan.connections[:elasticsearch][:forklift_test]
@@ -73,7 +73,7 @@ describe 'multiple trasport types' do
 
     after(:each) do
       es = SpecClient.elasticsearch('forklift_test')
-      es.indices.delete({ :index => 'users' }) if es.indices.exists({ :index => 'users' })
+      es.indices.delete({ index: 'users' }) if es.indices.exists({ index: 'users' })
     end
 
     it 'can load in a full table' do
@@ -87,7 +87,7 @@ describe 'multiple trasport types' do
       }
 
       destination = SpecClient.elasticsearch('forklift_test')
-      count = destination.count({ :index => index })["count"]
+      count = destination.count({ index: index })["count"]
       expect(count).to eql 5
     end
     
@@ -104,7 +104,7 @@ describe 'multiple trasport types' do
       }
 
       destination = SpecClient.elasticsearch('forklift_test')
-      count = destination.count({ :index => index })["count"]
+      count = destination.count({ index: index })["count"]
       expect(count).to eql 3
     end
   end

data/spec/integration/mysql_spec.rb

@@ -37,7 +37,7 @@ describe 'mysql' do
   it "can write new data" do
     table = "users"
     data = [
-      {:email => 'other@example.com', :first_name => 'other', :last_name => 'n', :created_at => Time.new.to_s(:db), :updated_at => Time.new.to_s(:db)}
+      {email: 'other@example.com', first_name: 'other', last_name: 'n', created_at: Time.new.to_s(:db), updated_at: Time.new.to_s(:db)}
     ]
     plan = SpecPlan.new
     plan.do! {
@@ -53,7 +53,7 @@ describe 'mysql' do
   it "can update existing data" do 
     table = "users"
     data = [
-      {:id => 1, :email => 'evan@example.com', :first_name => 'New Name', :last_name => 'T', :created_at => Time.new.to_s(:db), :updated_at => Time.new.to_s(:db)}
+      {id: 1, email: 'evan@example.com', first_name: 'New Name', last_name: 'T', created_at: Time.new.to_s(:db), updated_at: Time.new.to_s(:db)}
     ]
     plan = SpecPlan.new
     plan.do! {
@@ -77,9 +77,9 @@ describe 'mysql' do
     
     it "can lazy-create a table with primary keys provided" do 
       data = [
-        {:id => 1, :thing => 'stuff a', :updated_at => Time.new},
-        {:id => 2, :thing => 'stuff b', :updated_at => Time.new},
-        {:id => 3, :thing => 'stuff c', :updated_at => Time.new},
+        {id: 1, thing: 'stuff a', updated_at: Time.new},
+        {id: 2, thing: 'stuff b', updated_at: Time.new},
+        {id: 3, thing: 'stuff c', updated_at: Time.new},
       ]
       table = "new_table"
       plan = SpecPlan.new
@@ -106,9 +106,9 @@ describe 'mysql' do
     
     it "can lazy-create a table without primary keys provided" do
       data = [
-        {:thing => 'stuff a', :updated_at => Time.new},
-        {:thing => 'stuff b', :updated_at => Time.new},
-        {:thing => 'stuff c', :updated_at => Time.new},
+        {thing: 'stuff a', updated_at: Time.new},
+        {thing: 'stuff b', updated_at: Time.new},
+        {thing: 'stuff c', updated_at: Time.new},
       ]
       table = "new_table"
       plan = SpecPlan.new

data/spec/support/spec_client.rb

@@ -28,7 +28,7 @@ class SpecClient
   end
 
   def self.csv(file)
-    CSV.read(file, :headers => true, :converters => :all).map {|r| r = r.to_hash.symbolize_keys }
+    CSV.read(file, headers: true, converters: :all).map {|r| r = r.to_hash.symbolize_keys }
   end
 
 end

data/spec/support/spec_plan.rb

@@ -1,10 +1,10 @@
 class SpecPlan
   def self.config
     return {
-      :project_root => File.join(Dir.pwd, 'spec'),
-      :logger => {
-        :stdout => false,
-        :debug => false,
+      project_root: File.join(Dir.pwd, 'spec'),
+      logger: {
+        stdout: false,
+        debug: false,
       },
     }
   end

data/spec/support/spec_seeds.rb

@@ -49,19 +49,19 @@ class SpecSeeds
       conn  = elasticsearch_connections[i]
       index = elasticsearch_databases[i]
       seed  = File.join(File.dirname(__FILE__), '..', 'support', 'dumps', 'elasticsearch', "#{index}.json")
-      conn.indices.delete({ :index => index }) if conn.indices.exists({ :index => index })
+      conn.indices.delete({ index: index }) if conn.indices.exists({ index: index })
       if File.exists? seed
         lines = JSON.parse(File.read(seed))
         lines.each do |line|
           object = {
-            :index => index,
-            :body  => line,
-            :type  => 'forklift',
-            :id    => line['id']
+            index:  index,
+            body:   line,
+            type:   'forklift',
+            id:     line['id']
           }
           conn.index object # assumes ES is setup to allow index creation on write
         end
-        conn.indices.refresh({ :index => index })
+        conn.indices.refresh({ index: index })
       end
       i = i + 1
     end
@@ -71,8 +71,8 @@ class SpecSeeds
     seed        = File.join(File.dirname(__FILE__), '..', 'support', 'dumps', 'csv', "source.csv")
     source      = '/tmp/source.csv'
     destination = '/tmp/destination.csv'
-    FileUtils.rm(source, {:force => true})
-    FileUtils.rm(destination, {:force => true})
+    FileUtils.rm(source, {force: true})
+    FileUtils.rm(destination, {force: true})
     FileUtils.copy(seed, source)
   end
 

data/spec/unit/misc/email_spec.rb

@@ -10,13 +10,13 @@ describe 'misc forklift core' do
       plan = SpecPlan.new
       plan.do! {
         email_args = {
-          :to      => "YOU@FAKE.com",
-          :from    => "Forklift",
-          :subject => "Forklift has moved your database",
+          to:       "YOU@FAKE.com",
+          from:     "Forklift",
+          subject:  "Forklift has moved your database",
         }
         email_variables = {
-          :total_users_count => 10,
-          :new_users_count => 5,
+          total_users_count: 10,
+          new_users_count: 5,
         }
         email_template = "#{File.dirname(__FILE__)}/../../template/spec_email_template.erb"
         @email = plan.mailer.send_template(email_args, email_template, email_variables).first

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forklift_etl
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Evan Tahler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -123,6 +123,7 @@ files:
 - .travis.yml
 - Gemfile
 - Gemfile.lock
+- LICENSE.txt
 - Rakefile
 - bin/forklift
 - example/Gemfile