es-reindex 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7620b0c56bc7c9531fd32c9c573bfef963a3a2eb
-  data.tar.gz: 86eb8a9c6f896e6697d3adb3de6af34dc99fd866
+  metadata.gz: eed6bf0fb22e4ef0644bc07f8044707489dcac19
+  data.tar.gz: 785f245811cf514f8ccd50fb5bd6b24d91e65b81
 SHA512:
-  metadata.gz: 853868790c7f1b8658995ec38b4d9b5fc87bdf5658b6fa9dcca32d5a64cb6c14e1af9b294e1256e36c18f38bf828e6a0daeadf5d48efb607e110020e7020d772
-  data.tar.gz: fd4f29b8dadb1cacf345161e2928f541ee4a366ad98349d24de49fac848bdb13dd602f3fbcb9698d52bb90d17a94bb2cee30d8c8779a1e6c00a1f068c0a2b91f
+  metadata.gz: 6504ac4e4e7b46ba4e00c15bf2d90889e688479389d9ec399e571d67a709caa3324fb65f6b57d38c7f6558dd85acd9a017ebbea3855fb63ef71e40454b43359f
+  data.tar.gz: c01e98b13e0edcd1c6075827b2236e4666eb5759772c79e60722cfe8bde36062776df149feeaf18c8acc1a15cc032cd0157aeea14d3f14410fd0b6ac3c0ac8a4

data/.travis.yml

@@ -0,0 +1,8 @@
+services:
+  - elasticsearch
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - 2.2.0

data/README.markdown

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/mojolingo/es-reindex.svg)](https://travis-ci.org/mojolingo/es-reindex)
+
 # es-reindex - simple ruby gem for copying ElasticSearch index
 
 Simple ruby gem to copy and reindex ElasticSearch index,
@@ -7,12 +9,9 @@ Progress and time estimation is displayed during the scrolling process.
 
 ## Requirements
 
-Ruby 1.9.3 or newer is required, use [rvm](https://rvm.io/) for convenience.
-
-Following gems are required:
-
-+ [rest-client](https://github.com/archiloque/rest-client)
-+ [multi_json](https://github.com/intridea/multi_json)
+- Ruby 1.9.3 or newer
+- Gems:
+  - [elasticsearch](https://github.com/elasticsearch/elasticsearch-ruby)
 
 ## Usage (command line)
 
@@ -38,6 +37,8 @@ Usage:
 
 You can also use it as a PORO:
 
+#### To Copy
+
 ```ruby
 # Options:
 # remove: same as -r
@@ -49,11 +50,36 @@ options = {
   update: true
 }
 
-ESReindex.new('http://my_server/index', 'http://my_server/index_copy', options).go!
+ESReindex.copy! 'http://my_server/index', 'http://my_server/index_copy', options
+```
+
+#### To Reindex
+
+If you want to reindex the destination from the source without copying the mappings/settings from the source, you can do it as such:
+
+```ruby
+ESReindex.reindex! 'http://my_server/index', 'http://my_server/index_copy',
+  mappings: -> { set_of_mappings },
+  settings: -> { set_of_settings}
+```
+
+If using the `.reindex!` method, you MUST pass valid mappings/settings in via the options.
+
+#### Callbacks
+There also a set of callbacks you can use:
+
+```ruby
+ESReindex.copy! 'http://my_server/index', 'http://my_server/index_copy',
+  before_create: ->    { do_something },      # Runs before the (re)creation of the destination index
+  after_create:  ->    { do_something_else }, # Runs after the (re)creation of the destinatino index
+  before_each:   ->doc { use_the doc },       # Runs before each document is copied
+  after_each:    ->doc { foo_bar doc },       # Runs after each document is copied
+  after_copy:    ->    { finish_thing }       # Runs after everything is copied over
 ```
 
 ## Changelog
 
++ __0.2.0__: Lots of bugfixes, use elasticsearch client gem, add .reindex! method and callbacks
 + __0.1.0__: First gem release
 + __0.0.9__: Gemification, Oj -> MultiJSON
 + __0.0.8__: Optimization in string concat (@nara)
@@ -65,6 +91,17 @@ ESReindex.new('http://my_server/index', 'http://my_server/index_copy', options).
 + __0.0.2__: repated document count comparison
 + __0.0.1__: first revision
 
+## Credits
+
+- [Justin Aiken](https://github.com/JustinAiken)
+- [Victor Luft](https://github.com/victorluft)
+
+Original script:
+  - @geronime
+  - @pgaertig
+
+Developed by [Mojo Lingo](http://mojolingo.com).
+
 ## License
 es-reindex the gem is copyright (c)2014 Mojo Lingo, and released under the terms
 of the MIT license. See the LICENSE file for the gory details.

data/Rakefile

@@ -0,0 +1,7 @@
+require 'bundler/gem_tasks'
+require 'bundler/setup'
+
+task default: :spec
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new :spec

data/bin/es-reindex

@@ -24,4 +24,6 @@ if ARGV.size == 0 or ARGV[0] =~ /^-(?:h|-?help)$/
 end
 
 src, dst, options = ESReindex::ArgsParser.parse(ARGV)
-ESReindex.new(src, dst, options).go!
+ESReindex.logger = Logger.new(STDOUT)
+ESReindex.logger.level = Logger::INFO
+ESReindex.copy! src, dst, options.merge(from_cli: true)

data/es-reindex.gemspec

@@ -6,8 +6,8 @@ require "es-reindex/version"
 Gem::Specification.new do |s|
   s.name        = "es-reindex"
   s.version     = ESReindex::VERSION
-  s.authors     = ["Justin Aiken"]
-  s.email       = ["jaiken@mojolingo.com"]
+  s.authors     = ["Justin Aiken", "Victor Luft"]
+  s.email       = ["jaiken@mojolingo.com", "vluft@mojolingo.com"]
   s.homepage    = "https://github.com/mojolingo/es-reindex"
   s.summary     = %q{Ruby gem to copy ElasticSearch index (reindex).}
   s.description = %q{Ruby gem to copy ElasticSearch index (reindex).}
@@ -22,12 +22,15 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'rest-client', '>= 1.6.0'
-  s.add_runtime_dependency 'multi_json'
+  s.add_runtime_dependency 'elasticsearch', '>= 1.0.0'
 
-  s.add_development_dependency %q<coveralls>, ['>= 0']
+  # Development Dependencies:
+  s.add_development_dependency 'elasticsearch-persistence', '~> 0.1'
   s.add_development_dependency %q<bundler>, ["~> 1.0"]
-  s.add_development_dependency %q<rspec>, ["~> 2.99"]
   s.add_development_dependency %q<rake>, [">= 0"]
+
+  # Testing Dependencies:
+  s.add_development_dependency %q<coveralls>, ['>= 0']
+  s.add_development_dependency %q<rspec>, ["~> 2.99"]
   s.add_development_dependency %q<guard-rspec>, ['~> 4.5']
  end

data/lib/es-reindex.rb

@@ -1,29 +1,46 @@
-require 'rest-client'
-require 'multi_json'
+require 'elasticsearch'
+require 'logger'
+
+require 'es-reindex/railtie' if defined?(Rails)
 
 class ESReindex
 
   DEFAULT_URL = 'http://10.203.175.32:9200'
 
-  attr_accessor :src, :dst, :options, :start_time, :done
+  attr_accessor :src, :dst, :options, :surl, :durl, :sidx, :didx, :sclient, :dclient, :start_time, :done, :settings, :mappings
+
+  def self.copy!(src, dst, options = {})
+    self.new(src, dst, options).tap do |reindexer|
+      reindexer.setup_index_urls
+      reindexer.copy!
+    end
+  end
+
+  def self.reindex!(src, dst, options={})
+    self.new(src, dst, options.merge(copy_mappings: false)).tap do |reindexer|
+      reindexer.setup_index_urls
+      reindexer.copy!
+    end
+  end
 
   def initialize(src, dst, options = {})
+    ESReindex.logger ||= Logger.new(STDERR)
+
     @src     = src || ''
     @dst     = dst || ''
     @options = {
+      from_cli: false, # Coming from CLI?
       remove: false, # remove the index in the new location first
       update: false, # update existing documents (default: only create non-existing)
-      frame:  1000   # specify frame size to be obtained with one fetch during scrolling
+      frame:  1000,  # specify frame size to be obtained with one fetch during scrolling
+      copy_mappings: true # Copy old mappings/settings
     }.merge! options
 
     @done = 0
   end
 
-  def go!
-    MultiJson.load_options = {mode: :compat}
-    MultiJson.dump_options = {mode: :compat}
-
-    surl, durl, sidx, didx = '', '', '', ''
+  def setup_index_urls
+    @surl, @durl, @sidx, @didx = '', '', '', ''
     [[src, surl, sidx], [dst, durl, didx]].each do |param, url, idx|
       if param =~ %r{^(.*)/(.*?)$}
         url.replace $1
@@ -34,116 +51,148 @@ class ESReindex
       end
     end
 
-    printf "Copying '%s/%s' to '%s/%s'%s\n  Confirm or hit Ctrl-c to abort...\n",
-      surl, sidx, durl, didx,
-      remove? ?
-        ' with rewriting destination mapping!' :
-        update? ? ' with updating existing documents!' : '.'
+    @sclient = Elasticsearch::Client.new host: surl
+    @dclient = Elasticsearch::Client.new host: durl
+  end
+
+  def copy!
+    log "Copying '#{surl}/#{sidx}' to '#{durl}/#{didx}'#{remove? ? ' with rewriting destination mapping!' : update? ? ' with updating existing documents!' : '.'}"
+    confirm if from_cli?
+
+    success = (
+      clear_destination  &&
+      create_destination &&
+      copy_docs          &&
+      check_docs
+    )
+
+    if from_cli?
+      exit (success ? 0 : 1)
+    else
+      success
+    end
+  end
 
+  def confirm
+    printf "Confirm or hit Ctrl-c to abort...\n"
     $stdin.readline
+  end
 
-    # remove old index in case of remove=true
-    retried_request(:delete, "#{durl}/#{didx}") if remove? && retried_request(:get, "#{durl}/#{didx}/_status")
+  def clear_destination
+    dclient.indices.delete(index: didx) if remove? && dclient.indices.exists(index: didx)
+    true
+  rescue => e
+    false
+  end
 
-    # (re)create destination index
-    unless retried_request :get, "#{durl}/#{didx}/_status"
-      # obtain the original index settings first
-      unless settings = retried_request(:get, "#{surl}/#{sidx}/_settings")
-        warn "Failed to obtain original index '#{surl}/#{sidx}' settings!"
-        exit 1
-      end
-      settings = MultiJson.load settings
-      sidx = settings.keys[0]
-      settings[sidx].delete 'index.version.created'
-      printf 'Creating \'%s/%s\' index with settings from \'%s/%s\'... ', durl, didx, surl, sidx
-      unless retried_request :post, "#{durl}/#{didx}", MultiJson.dump(settings[sidx])
-        puts 'FAILED!'
-        exit 1
+  def create_destination
+    unless dclient.indices.exists index: didx
+      if copy_mappings?
+        return false unless get_settings
+        return false unless get_mappings
+        create_msg = " with settings & mappings from '#{surl}/#{sidx}'"
       else
-        puts 'OK.'
-      end
-      unless mappings = retried_request(:get, "#{surl}/#{sidx}/_mapping")
-        warn "Failed to obtain original index '#{surl}/#{sidx}' mappings!"
-        exit 1
-      end
-      mappings = MultiJson.load mappings
-      mappings = mappings[sidx]
-      mappings = mappings['mappings'] if mappings.is_a?(Hash) && mappings.has_key?('mappings')
-      mappings.each_pair do |type, mapping|
-        printf 'Copying mapping \'%s/%s/%s\'... ', durl, didx, type
-        unless retried_request(:put, "#{durl}/#{didx}/#{type}/_mapping", MultiJson.dump(type => mapping))
-          puts 'FAILED!'
-          exit 1
-        else
-          puts 'OK.'
-        end
+        @mappings = options[:mappings].call
+        @settings = options[:settings].call
+        create_msg = ""
       end
+
+      options[:before_create].call if options[:before_create].present?
+
+      log "Creating '#{durl}/#{didx}' index#{create_msg}..."
+      dclient.indices.create index: didx, body: { settings: settings, mappings: mappings }
+      log "Succesfully created '#{durl}/#{didx}''#{create_msg}."
+
+      options[:after_create].call if options[:after_create].present?
+    end
+
+    true
+  end
+
+  def get_settings
+    unless settings = sclient.indices.get_settings(index: sidx)
+      log "Failed to obtain original index '#{surl}/#{sidx}' settings!"
+      return false
+    end
+
+    @settings = settings[sidx]["settings"]
+    @settings["index"]["version"].delete "created"
+  end
+
+  def get_mappings
+    unless mappings = sclient.indices.get_mapping(index: sidx)
+      log "Failed to obtain original index '#{surl}/#{sidx}' mappings!", :error
+      return false
     end
+    @mappings = mappings[sidx]["mappings"]
+  end
 
-    printf "Copying '%s/%s' to '%s/%s'... \n", surl, sidx, durl, didx
+  def copy_docs
+    log "Copying '#{surl}/#{sidx}' to '#{durl}/#{didx}'..."
     @start_time = Time.now
-    shards = retried_request :get, "#{surl}/#{sidx}/_count?q=*"
-    shards = MultiJson.load(shards)['_shards']['total'].to_i
-    scan = retried_request :get, "#{surl}/#{sidx}/_search?search_type=scan&scroll=10m&size=#{frame / shards}"
-    scan = MultiJson.load scan
-    scroll_id = scan['_scroll_id']
-    total = scan['hits']['total']
-    printf "    %u/%u (%.1f%%) done.\r", done, total, 0
-
-    bulk_op = update? ? 'index' : 'create'
-
-    while true do
-      data = retried_request :get, "#{surl}/_search/scroll?scroll=10m&scroll_id=#{scroll_id}"
-      data = MultiJson.load data
-      break if data['hits']['hits'].empty?
-      scroll_id = data['_scroll_id']
-      bulk = ''
-      data['hits']['hits'].each do |doc|
+
+    scroll = sclient.search index: sidx, search_type: "scan", scroll: '10m', size: frame
+    scroll_id = scroll['_scroll_id']
+    total = scroll['hits']['total']
+    log "Copy progress: %u/%u (%.1f%%) done.\r" % [done, total, 0]
+
+    action = update? ? 'index' : 'create'
+
+    while scroll = sclient.scroll(scroll_id: scroll['_scroll_id'], scroll: '10m') and not scroll['hits']['hits'].empty? do
+      bulk = []
+      scroll['hits']['hits'].each do |doc|
+        options[:before_each].call doc if options[:before_each].present?
         ### === implement possible modifications to the document
         ### === end modifications to the document
-        base = {'_index' => didx, '_id' => doc['_id'], '_type' => doc['_type']}
-        ['_timestamp', '_ttl'].each{|doc_arg|
-          base[doc_arg] = doc[doc_arg] if doc.key? doc_arg
-        }
-        bulk << MultiJson.dump(bulk_op => base) + "\n"
-        bulk << MultiJson.dump(doc['_source'])  + "\n"
+        base = {'_index' => didx, '_id' => doc['_id'], '_type' => doc['_type'], data: doc['_source']}
+        bulk << {action => base}
         @done = done + 1
+        options[:after_each].call doc if options[:after_each].present?
       end
       unless bulk.empty?
-        bulk << "\n" # empty line in the end required
-        retried_request :post, "#{durl}/_bulk", bulk
+        dclient.bulk body: bulk
       end
 
       eta = total * (Time.now - start_time) / done
-      printf "    %u/%u (%.1f%%) done in %s, E.T.A.: %s.\r",
-        done, total, 100.0 * done / total, tm_len, start_time + eta
+      log "Copy progress: #{done}/#{total} (%.1f%%) done in #{tm_len}. E.T.A.: #{start_time + eta}." % (100.0 * done / total)
     end
 
-    printf "#{' ' * 80}\r    %u/%u done in %s.\n", done, total, tm_len
+    log "Copy progress: %u/%u done in %s.\n" % [done, total, tm_len]
+
+    options[:after_copy].call if options[:after_copy].present?
+
+    true
+  end
 
-    # no point for large reindexation with data still being stored in index
-    printf 'Checking document count... '
+  def check_docs
+    log 'Checking document count... '
     scount, dcount = 1, 0
     begin
       Timeout::timeout(60) do
         while true
-          scount = retried_request :get, "#{surl}/#{sidx}/_count?q=*"
-          dcount = retried_request :get, "#{durl}/#{didx}/_count?q=*"
-          scount = MultiJson.load(scount)['count'].to_i
-          dcount = MultiJson.load(dcount)['count'].to_i
+          scount = sclient.count(index: sidx)["count"]
+          dcount = dclient.count(index: didx)["count"]
           break if scount == dcount
           sleep 1
         end
       end
     rescue Timeout::Error
     end
-    printf "%u == %u (%s\n", scount, dcount, scount == dcount ? 'equals).' : 'NOT EQUAL)!'
+    log "Document count: #{scount} = #{dcount} (#{scount == dcount ? 'equal' : 'NOT EQUAL'})"
+
+    scount == dcount
+  end
 
-    exit 0
+  class << self
+    attr_accessor :logger
   end
 
 private
 
+  def log(msg, level = :info)
+    ESReindex.logger.send level, msg
+  end
+
   def remove?
     @options[:remove]
   end
@@ -156,6 +205,14 @@ private
     @options[:frame]
   end
 
+  def from_cli?
+    @options[:from_cli]
+  end
+
+  def copy_mappings?
+    @options[:copy_mappings]
+  end
+
   def tm_len
     l = Time.now - @start_time
     t = []
@@ -169,22 +226,4 @@ private
     out
   end
 
-  def retried_request(method, url, data=nil)
-    while true
-      begin
-        return data ?
-          RestClient.send(method, url, data) :
-          RestClient.send(method, url)
-      rescue RestClient::ResourceNotFound # no point to retry
-        return nil
-      rescue RestClient::BadRequest => e # Something's wrong!
-        warn "\n#{method.to_s.upcase} #{url} :-> ERROR: #{e.class} - #{e.message}"
-        warn e.response
-        return nil
-      rescue => e
-        warn "\nRetrying #{method.to_s.upcase} ERROR: #{e.class} - #{e.message}"
-        warn e.response
-      end
-    end
-  end
 end

data/lib/es-reindex/railtie.rb

@@ -0,0 +1,7 @@
+class ESReindex
+  class Railtie < Rails::Railtie
+    initializer 'Rails ESReindex.logger' do
+      ESReindex.logger = Rails.logger
+    end
+  end
+end

data/lib/es-reindex/version.rb

@@ -1,3 +1,3 @@
 class ESReindex
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/spec/es-reindex_spec.rb

@@ -8,12 +8,42 @@ describe ESReindex do
   let(:reindexer) { ESReindex.new src, dst, options }
 
   it "can be freshly initialized with options" do
-    expect(reindexer.options).to eq remove: false, update: true, frame: 1000
+    expect(reindexer.options).to eq remove: false, update: true, frame: 1000, from_cli: false, copy_mappings: true
   end
 
   it "starts with 0 indexes done" do
     expect(reindexer.done).to eq 0
   end
 
+  describe "#copy!" do
+    after { reindexer.copy! }
+
+    before do
+      %w{
+        confirm clear_destination create_destination copy_docs check_docs
+      }.each { |meth| reindexer.stub(meth).and_return true }
+    end
+
+    context "when run as a PORO" do
+      it "doesn't use #exit" do
+        expect(reindexer).to receive(:clear_destination).and_return false
+        expect(reindexer).not_to receive :exit
+      end
+    end
+
+    context "when run from the CLI bin" do
+      let(:options) { {from_cli: true} }
+
+      it "exits 1 on failure" do
+        expect(reindexer).to receive(:clear_destination).and_return false
+        expect(reindexer).to receive(:exit).with 1
+      end
+
+      it "exits 0 on success" do
+        expect(reindexer).to receive(:exit).with 0
+      end
+    end
+  end
+
   skip "it can actually do stuff"
 end

data/spec/integration/copy_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe "copy!", type: :integration do
+  let(:orig_index_name)  { "test_index" }
+  let(:new_index_name)   { "test_index_clone" }
+
+  let!(:original_klass)  { test_klass index_name: orig_index_name }
+  let!(:new_klass)       { test_klass index_name: new_index_name }
+
+  let(:test_post)        { original_klass.create id: 1, text: 'test_post' }
+  let(:test_post_2)      { new_klass.create      id: 2, text: 'other_post' }
+
+  # Create the index (test_index) on the test_klass:
+  before do
+    original_klass.create_index!
+    test_post
+    original_klass.refresh_index!
+  end
+
+  it "copies the index" do
+    ESReindex.copy! "#{ES_HOST}/#{orig_index_name}", "#{ES_HOST}/#{new_index_name}", {}
+    expect(new_klass.find test_post.id).to be_present
+  end
+
+  context "when the destination index already exists" do
+
+    # Create the index (test_index_clone) on the destination klass:
+    before do
+      new_klass.create_index!
+      test_post_2
+      new_klass.refresh_index!
+    end
+
+    it "merges it right on over" do
+      ESReindex.copy! "#{ES_HOST}/#{orig_index_name}", "#{ES_HOST}/#{new_index_name}", {}
+      expect(new_klass.find test_post.id).to   be_present
+      expect(new_klass.find test_post_2.id).to be_present
+    end
+
+    context "with the remove option" do
+      it "overwrites the destination index" do
+        ESReindex.copy! "#{ES_HOST}/#{orig_index_name}", "#{ES_HOST}/#{new_index_name}", {remove: true}
+        expect(new_klass.find test_post.id).to   be_present
+        expect {
+          new_klass.find test_post_2.id
+        }.to raise_error Elasticsearch::Persistence::Repository::DocumentNotFound
+      end
+    end
+  end
+end

data/spec/integration/reindex_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe "reindex!", type: :integration do
+  let(:orig_index_name)  { "test_index" }
+  let(:new_index_name)   { "test_index_clone" }
+
+  let!(:original_klass)  { test_klass index_name: orig_index_name }
+  let!(:new_klass)       { test_klass index_name: new_index_name, attributes: [:foo] }
+
+  let(:test_post)        { original_klass.create id: 1, text: 'test_post' }
+  let(:test_post_2)      { new_klass.create      id: 2, text: 'other_post' }
+
+  # Create the index (test_index) on the test_klass:
+  before do
+    original_klass.create_index!
+    test_post
+    original_klass.refresh_index!
+  end
+
+  let(:reindexed_post) { new_klass.find test_post.id }
+
+  it "reindexes with the selected mappings" do
+    ESReindex.reindex! "#{ES_HOST}/#{orig_index_name}", "#{ES_HOST}/#{new_index_name}",
+      mappings: -> { new_klass.mappings },
+      settings: -> { new_klass.settings }
+
+    expect(reindexed_post.id).to   eq test_post.id
+    expect(reindexed_post.text).to eq test_post.text
+    expect(reindexed_post).to respond_to :foo
+  end
+end

data/spec/spec_helper.rb

@@ -4,10 +4,25 @@ Coveralls.wear!
 require 'es-reindex'
 require 'es-reindex/args_parser'
 
+ES_HOST = ENV['ES_HOST'] || ESReindex::DEFAULT_URL
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
 RSpec.configure do |config|
   config.tty = true
 
   config.filter_run focus: true
   config.run_all_when_everything_filtered = true
-end
 
+  ESReindex.logger = Logger.new(STDERR)
+  ESReindex.logger.level = Logger::WARN
+
+  # Make sure our indexes are clear for a fresh start
+  config.before type: :integration do
+    Elasticsearch::Client.new(host: ES_HOST).indices.tap do |es|
+      es.delete index: 'test*'
+    end
+  end
+end

data/spec/support/test_model.rb

@@ -0,0 +1,20 @@
+require 'elasticsearch/persistence/model'
+
+def test_klass(options)
+  index_name  = options[:index_name]
+  extra_attrs = options[:attributes] || []
+
+  Class.new do
+    def self.name; 'TestKlass'; end
+
+    include Elasticsearch::Persistence::Model
+
+    gateway.client Elasticsearch::Client.new host: ES_HOST
+    gateway.index = index_name
+
+    attribute :id
+    attribute :text
+
+    extra_attrs.each { |att| attribute att }
+  end
+end

metadata

@@ -1,57 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: es-reindex
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Justin Aiken
+- Victor Luft
 autorequire: 
 bindir: bin
 cert_chain: []
 date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: elasticsearch-persistence
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -67,21 +54,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,6 +81,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.99'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -111,6 +112,7 @@ dependencies:
 description: Ruby gem to copy ElasticSearch index (reindex).
 email:
 - jaiken@mojolingo.com
+- vluft@mojolingo.com
 executables:
 - es-reindex
 extensions: []
@@ -118,18 +120,24 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE
 - README.markdown
+- Rakefile
 - bin/es-reindex
 - es-reindex.gemspec
 - lib/es-reindex.rb
 - lib/es-reindex/args_parser.rb
+- lib/es-reindex/railtie.rb
 - lib/es-reindex/version.rb
 - spec/es-reindex/args_parser_spec.rb
 - spec/es-reindex_spec.rb
+- spec/integration/copy_spec.rb
+- spec/integration/reindex_spec.rb
 - spec/spec_helper.rb
+- spec/support/test_model.rb
 homepage: https://github.com/mojolingo/es-reindex
 licenses:
 - MIT
@@ -157,4 +165,7 @@ summary: Ruby gem to copy ElasticSearch index (reindex).
 test_files:
 - spec/es-reindex/args_parser_spec.rb
 - spec/es-reindex_spec.rb
+- spec/integration/copy_spec.rb
+- spec/integration/reindex_spec.rb
 - spec/spec_helper.rb
+- spec/support/test_model.rb