metacrunch-elasticsearch 2.1.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26718380b20c6d344d4f356604d8800711f721a4
-  data.tar.gz: e4e38880f4709aebb74c76332d2e18f95fd0a2ae
+  metadata.gz: 3c8e449f5c84fd5b22946dc75c52b1693830e6c4
+  data.tar.gz: b698c9cc5904719a37d6902e4cee9528ea03577e
 SHA512:
-  metadata.gz: 9662ded772976b51e221caf81938795a91da1dcb0b66c939143480ebad25b2292e5ccf657a9e86e52c77b9fe2444e0910f9e2f591d62aba2927714718efd0a2c
-  data.tar.gz: d7007c5911b76fbc3815fdff41a4b3aa8e55efe190d114b304ce46527986b8123e936e8a34d6f37a9e4ac2b2ca4062f8a272f5c4dd801bdae796d229953ca686
+  metadata.gz: 396ae218ce4e493aa8d96bc7a5061e5941a65ea56c9d8cd791a9bcaeb0de11f5f83fc1df5f97379f967d969c86626b084dd9d39ed6fbeb3e6dbed7aacf88f2ae
+  data.tar.gz: 4254f096d00cb3d113e43f5b5b9e215699002972f6661a335a1c4683bdcaf76bcbe12128d2a45b30e8a4bb5043138a16887f6c049d6c52db9fe3e1af23e5cebe

data/Gemfile

@@ -1,27 +1,21 @@
 source "https://rubygems.org"
 
-# Specify your gem's dependencies in your gemspec
 gemspec
 
 group :development do
-  gem "bundler",         ">= 1.10"
-  gem "rake"
-  gem "rspec",           ">= 3.0.0",  "< 4.0.0"
-  gem "simplecov",       ">= 0.8.0"
-  gem "vcr",             ">= 2.9.0",  "< 3.0.0"
-  gem "webmock",         ">= 1.19.0", "< 2.0.0"
+  gem "bundler",      ">= 1.7"
+  gem "rake",         ">= 11.1"
+  gem "rspec",        ">= 3.0.0",  "< 4.0.0"
+  gem "simplecov",    ">= 0.11.0"
 
   if !ENV["CI"]
-    gem "hashdiff"
-    gem "pry",                "~> 0.10.3"
-    gem "pry-byebug",         "~> 3.3.0"
-    gem "pry-rescue",         "~> 1.4.2"
-    gem "pry-state",          "~> 0.1.7"
+    gem "hashdiff",   ">= 0.3.0", platform: :ruby
+    gem "pry-byebug", ">= 3.3.0", platform: :ruby
+    gem "pry-rescue", ">= 1.4.2", platform: :ruby
+    gem "pry-state",  ">= 0.1.7", platform: :ruby
   end
 end
 
 group :test do
-  gem "codeclimate-test-reporter", require: nil
+  gem "codeclimate-test-reporter", ">= 0.5.0", require: nil
 end
-
-gem "metacrunch", github: "ubpb/metacrunch", branch: :master

data/lib/metacrunch/elasticsearch.rb

@@ -1,9 +1,7 @@
-require "metacrunch"
 require "elasticsearch"
 
 module Metacrunch
   module Elasticsearch
-    require_relative "./elasticsearch/cli"
     require_relative "./elasticsearch/index_creator"
     require_relative "./elasticsearch/indexer"
     require_relative "./elasticsearch/reader"

data/lib/metacrunch/elasticsearch/index_creator.rb

@@ -1,10 +1,9 @@
 require "elasticsearch"
-require "metacrunch/processor"
 require_relative "../elasticsearch"
 require_relative "./client_factory"
 require_relative "./options_helpers"
 
-class Metacrunch::Elasticsearch::IndexCreator < Metacrunch::Processor
+class Metacrunch::Elasticsearch::IndexCreator
   include Metacrunch::Elasticsearch::ClientFactory
   include Metacrunch::Elasticsearch::OptionsHelpers
 
@@ -19,9 +18,9 @@ class Metacrunch::Elasticsearch::IndexCreator < Metacrunch::Processor
     raise ArgumentError.new("You have to supply an index name!") if @client_args[:index].blank?
   end
 
-  def call(items = [], pipeline = nil)
+  def call(items = [])
     client = client_factory
-    logger = pipeline.try(:logger) || @logger
+    logger = @logger
 
     if client.indices.exists?(@client_args)
       if @delete_existing_index == true

data/lib/metacrunch/elasticsearch/indexer.rb

@@ -1,10 +1,9 @@
 require "elasticsearch"
-require "metacrunch/processor"
 require_relative "../elasticsearch"
 require_relative "./client_factory"
 require_relative "./options_helpers"
 
-class Metacrunch::Elasticsearch::Indexer < Metacrunch::Processor
+class Metacrunch::Elasticsearch::Indexer
   include Metacrunch::Elasticsearch::ClientFactory
   include Metacrunch::Elasticsearch::OptionsHelpers
 
@@ -14,15 +13,15 @@ class Metacrunch::Elasticsearch::Indexer < Metacrunch::Processor
   attr_accessor :index
   attr_accessor :logger
   attr_accessor :type
-  
+
   def initialize(options = {})
     (@client_args = options).deep_symbolize_keys!
     extract_options!(@client_args, :_client_options_, :bulk_size, :callbacks, :id_accessor, :index, :logger, :type)
     raise ArgumentError.new("You have to supply an index name!") if @index.blank?
   end
 
-  def call(items = [], pipeline = nil)
-    logger = pipeline.try(:logger) || @logger
+  def call(items = [])
+    logger = @logger
 
     if (slice_size = @bulk_size || items.length) > 0
       client = client_factory

data/lib/metacrunch/elasticsearch/searcher.rb

@@ -1,10 +1,9 @@
 require "elasticsearch"
-require "metacrunch/processor"
 require_relative "../elasticsearch"
 require_relative "./client_factory"
 require_relative "./options_helpers"
 
-class Metacrunch::Elasticsearch::Searcher < Metacrunch::Processor
+class Metacrunch::Elasticsearch::Searcher
   include Enumerable
   include Metacrunch::Elasticsearch::ClientFactory
   include Metacrunch::Elasticsearch::OptionsHelpers
@@ -18,21 +17,16 @@ class Metacrunch::Elasticsearch::Searcher < Metacrunch::Processor
   attr_accessor :scan_size
   attr_accessor :scroll_expiry_time
   attr_accessor :type
-  
+
   def initialize(options = {})
     options.deep_symbolize_keys!
     extract_options!(options, :_client_options_, :bulk_size, :index, :scan_size, :scroll_expiry_time, :type)
     @body = options.presence || DEFAULT_BODY
   end
 
-  def call(items = [], pipeline = nil)
+  def call(items = [])
     @docs_enumerator ||= @bulk_size ? each_slice(@bulk_size) : [each.to_a].to_enum
-
-    begin
-      items.concat(@docs_enumerator.next)
-    rescue StopIteration
-      pipeline.terminate!
-    end
+    items.concat(@docs_enumerator.next)
   end
 
   def each

data/lib/metacrunch/elasticsearch/version.rb

@@ -1,5 +1,5 @@
 module Metacrunch
   module Elasticsearch
-    VERSION = "2.1.1"
+    VERSION = "3.0.0"
   end
 end

data/metacrunch-elasticsearch.gemspec

@@ -16,8 +16,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport",   ">= 4.0.0"
-  spec.add_dependency "elasticsearch",   "~> 1.0"
-  spec.add_dependency "metacrunch",      "~> 2.1"
+  spec.add_dependency "activesupport", ">= 4.0.0"
+  spec.add_dependency "elasticsearch", "~> 1.0"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metacrunch-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0
 platform: ruby
 authors:
 - René Sprotte
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -39,20 +39,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: metacrunch
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
 description: 
 email: 
 executables: []
@@ -69,9 +55,6 @@ files:
 - bin/console
 - bin/setup
 - lib/metacrunch/elasticsearch.rb
-- lib/metacrunch/elasticsearch/cli.rb
-- lib/metacrunch/elasticsearch/cli/dump_metadata.rb
-- lib/metacrunch/elasticsearch/cli/list_indices.rb
 - lib/metacrunch/elasticsearch/client_factory.rb
 - lib/metacrunch/elasticsearch/index_creator.rb
 - lib/metacrunch/elasticsearch/indexer.rb
@@ -81,7 +64,6 @@ files:
 - lib/metacrunch/elasticsearch/uri.rb
 - lib/metacrunch/elasticsearch/version.rb
 - lib/metacrunch/elasticsearch/writer.rb
-- lib/metacrunch_plugin.rb
 - metacrunch-elasticsearch.gemspec
 homepage: http://github.com/ubpb/metacrunch-elasticsearch
 licenses:

data/lib/metacrunch/elasticsearch/cli.rb

@@ -1,59 +0,0 @@
-module Metacrunch
-  module Elasticsearch
-    module Cli
-      require_relative "./cli/dump_metadata"
-      require_relative "./cli/list_indices"
-      #require_relative "./cli/reindex_command"
-    end
-  end
-end
-
-Metacrunch::Cli.setup("elasticsearch", "Commands for Elasticsearch") do |r|
-  #
-  #
-  #
-  r.register(Metacrunch::Elasticsearch::Cli::DumpMetadata) do |c|
-    c.name  "dump_metadata"
-    c.usage "dump_metadata"
-    c.desc  "Dump index metadata"
-
-    c.option :url,
-      desc: "Elasticsearch url",
-      type: :string,
-      aliases: "-u",
-      required: true
-    c.option :format,
-      desc: "Output format",
-      type: :string,
-      aliases: "-f",
-      default: :yaml
-    c.option :mappings_filename,
-      desc: "Dump mappings",
-      aliases: "-m"
-    c.option :settings_filename,
-      desc: "Dump settings",
-      aliases: "-s",
-      default: false
-    c.option :index,
-      desc: "Index name",
-      aliases: "-i",
-      required: true
-    c.option :type,
-      desc: "Type to dump mapping for",
-      aliases: "-t",
-      default: "_default_"
-
-  end
-
-  r.register(Metacrunch::Elasticsearch::Cli::ListIndices) do |c|
-    c.name  "list_indices"
-    c.usage "list_indices"
-    c.desc  "List indices"
-
-    c.option :url,
-      desc: "Elasticsearch url",
-      type: :string,
-      aliases: "-u",
-      required: true
-  end
-end

data/lib/metacrunch/elasticsearch/cli/dump_metadata.rb

@@ -1,84 +0,0 @@
-require "elasticsearch"
-require_relative "../cli"
-
-class Metacrunch::Elasticsearch::Cli::DumpMetadata < Metacrunch::Command
-  def call
-    [:mappings, :settings].each do |_element|
-      _filename_option = "#{_element}_filename"
-
-      if options[_filename_option].present?
-        options["dump_#{_element}"] = true
-      end
-
-      if options[_filename_option] == _filename_option
-        options.delete(_filename_option)
-      end
-
-      if options["dump_#{_element}"]
-        if filename = options["#{_element}_filename"]
-          File.write(filename, format(send(_element), format_from_filename(filename)))
-        else
-          puts send(_element)
-        end
-      end
-    end
-
-    if !options[:dump_mapping] && !options[:dump_settings]
-      puts format(settings.merge(mappings), options[:format])
-      
-      if options[:format] == :yaml
-        $stderr.puts <<-MESSAGE.strip_heredoc
-
-          You have requested to dump settings and mapping into YAML. Please keep in mind
-          that if you are trying to create an index with both, settings and mapping, this
-          request has to be JSON formatted. Nevertheless you can create the index with YAML
-          settings and put a YAML formatted mapping afterwards.
-
-          https://github.com/elastic/elasticsearch/issues/1755
-
-        MESSAGE
-      end
-    end
-  end
-  alias_method :perform, :call
-
-  private
-
-  def client
-    @client ||= Elasticsearch::Client.new(url: options[:url])
-  end
-
-  def format(obj, format)
-    if format.to_sym == :json
-      JSON.pretty_generate(obj)
-    elsif format.to_sym == :yaml
-      YAML.dump(obj)
-    else
-      raise "Unknown output format!"
-    end
-  end
-
-  def format_from_filename(filename)
-    return nil if filename.blank?
-
-    case File.extname(filename)
-    when /json\Z/i then :json
-    when /yml\Z|yaml\Z/i then :yaml
-    end
-  end
- 
-  def mappings
-    client.indices.get_mapping(index: @options[:index], type: @options[:type]).try(:values).try(:first)
-  end
- 
-  def settings
-    client.indices.get_settings(index: @options[:index])
-    .try(:values)
-    .try(:first)
-    .try(:tap) do |_obj|
-      _obj["settings"]["index"].reject! do |_key, _|
-        ["creation_date", "uuid", "version"].include?(_key)
-      end
-    end
-  end
-end

data/lib/metacrunch/elasticsearch/cli/list_indices.rb

@@ -1,19 +0,0 @@
-require "elasticsearch"
-require_relative "../cli"
-
-class Metacrunch::Elasticsearch::Cli::ListIndices < Metacrunch::Command
-  def call
-    puts indices
-  end
-  alias_method :perform, :call
-
-  private
-
-  def client
-    @client ||= Elasticsearch::Client.new(url: @options[:url])
-  end
-
-  def indices
-    client.cat.indices(h: "index", format: :json).map { |_element| _element["index"] }
-  end
-end

data/lib/metacrunch_plugin.rb

@@ -1 +0,0 @@
-require "metacrunch/elasticsearch"