elastics-client 1.1.11 → 1.2.0

data/lib/elastics/client_live_reindex.rb

@@ -3,12 +3,12 @@ module Elastics
 
     extend self
 
-    # this method will be overridden by the flex-admin gem
+    # this method will be overridden by the elastics-admin gem
     def should_prefix_index?
       false
     end
 
-    # this method will be overridden by the flex-admin gem
+    # this method will be overridden by the elastics-admin gem
     def should_track_change?
       false
     end

data/lib/elastics/configuration.rb

@@ -24,7 +24,7 @@ module Elastics
     def indices
       @indices ||= Indices.new(config_file)
     end
-    
+
     # force color in console (used with jruby)
     def ansi=(bool)
       Dye.color = bool

data/lib/elastics/errors.rb

@@ -1,14 +1,15 @@
 module Elastics
 
-  class ArgumentError          < ArgumentError; end
-  class SourceError            < StandardError; end
-  class MissingPartialError    < StandardError; end
-  class DocumentMappingError   < StandardError; end
-  class MissingIndexEntryError < StandardError; end
-  class ExistingIndexError     < StandardError; end
-  class MissingHttpClientError < StandardError; end
-  class MissingParentError     < StandardError; end
-  class MissingVariableError   < StandardError; end
+  class ArgumentError              < ArgumentError; end
+  class SourceError                < StandardError; end
+  class MissingTemplateMethodError < StandardError; end
+  class MissingPartialError        < StandardError; end
+  class DocumentMappingError       < StandardError; end
+  class MissingIndexEntryError     < StandardError; end
+  class ExistingIndexError         < StandardError; end
+  class MissingHttpClientError     < StandardError; end
+  class MissingParentError         < StandardError; end
+  class MissingVariableError       < StandardError; end
 
   class HttpError < StandardError
 

data/lib/elastics/result/bulk.rb

@@ -8,12 +8,11 @@ module Elastics
       end
 
       def failed
-        self['items'].reject{|i| i.first.last['ok'] }
+        self['items'].reject{|i| i['index']['status'].between?(200,226) }
       end
 
-
       def successful
-        self['items'].select{|i| i.first.last['ok']}
+        self['items'].select{|i| i['index']['status'].between?(200,226) }
       end
 
     end

data/lib/elastics/result/search.rb

@@ -19,10 +19,15 @@ module Elastics
       end
       alias_method :documents, :collection
 
+      # deprecated
       def facets
         self['facets']
       end
 
+      def aggregations
+        self['aggregations']
+      end
+
     end
   end
 end

data/lib/elastics/struct/symbolize.rb

@@ -8,13 +8,13 @@ module Elastics
         when Elastics::Struct::Hash, Elastics::Struct::Array, Elastics::Struct::AsIs
           obj
         when ::Hash
-          h = Struct::Hash.new
+          h = Elastics::Struct::Hash.new
           obj.each do |k,v|
             h[k.to_sym] = symbolize(v)
           end
           h
         when ::Array
-          a = Struct::Array.new
+          a = Elastics::Struct::Array.new
           obj.each{|i| a << i}
           a
         else

data/lib/elastics/template.rb

@@ -65,16 +65,18 @@ module Elastics
     def try_clean_and_retry(vars)
       response_vars = request(vars)
       if !Prunable::VALUES.include?(vars[:cleanable_query].is_a?(Hash) ?
-                                        vars[:cleanable_query][:query] :
-                                        vars[:cleanable_query]) && Conf.http_client.raise_proc.call(response_vars[3])
+                                    vars[:cleanable_query][:query] :
+                                    vars[:cleanable_query]) && Conf.http_client.raise_proc.call(response_vars[3])
         e = HttpError.new(response_vars[3], caller_line)
         e.to_hash['error'] =~ /^SearchPhaseExecutionException/
-        # remove problematic characters
-        (vars[:cleanable_query].is_a?(Hash) ? vars[:cleanable_query][:query] : vars[:cleanable_query]).tr!('"&|!(){}[]~^:+-\\', '')
-        # if after the cleanup is prunable, then we remove it now so #interpolate could use the eventual default
+        # remove problematic characters in place
+        (vars[:cleanable_query].is_a?(Hash) ?
+         vars[:cleanable_query][:query] :
+         vars[:cleanable_query]).tr!('"&|!(){}[]~^:+-\\', '')
+        # if after the cleanup it is prunable, then we remove it now so #interpolate could use the eventual default
         if Prunable::VALUES.include?(vars[:cleanable_query].is_a?(Hash) ?
-                                      vars[:cleanable_query][:query] :
-                                      vars[:cleanable_query])
+                                     vars[:cleanable_query][:query] :
+                                     vars[:cleanable_query])
           if vars[:cleanable_query].is_a?(Hash)
             vars[:cleanable_query].delete(:query)
           else

data/lib/elastics/template/api.rb

@@ -0,0 +1,15 @@
+module Elastics
+  class Template
+    class Api < Template
+
+      attr_reader :references, :aliases
+
+      def initialize(method, path, data=nil, *vars)
+        super
+        @references          = @instance_vars.delete(:REFERENCES) || {}
+        @aliases             = @references['aliases'] || []
+      end
+
+    end
+  end
+end

data/lib/elastics/template/slim_search.rb

@@ -2,10 +2,10 @@ module Elastics
   class Template
     class SlimSearch < Search
 
-      # removes the fields param (no _source returned)
+      # no _source returned
       # the result.loaded_collection, will load the records from the db
       def self.variables
-        super.deep_merge!(:params => {:fields => ''})
+        super.deep_merge!(:params => {:_source => false})
       end
 
     end

data/lib/elastics/template/tags.rb

@@ -26,7 +26,7 @@ module Elastics
           match =~ TAG_REGEXP
           t = Tag.new($1, $2)
           push t unless find{|i| i.name == t.name}
-          (match !~ /^"/) ? "\#{vars.get_prunable(:'#{t.name}')}" : "vars.get_prunable(:'#{t.name}')"
+          (match !~ /^"/) ? "\#{vars.fetch_value(:'#{t.name}')}" : "vars.fetch_value(:'#{t.name}')"
         end
       end
 

data/lib/elastics/utility_methods.rb

@@ -2,12 +2,12 @@ module Elastics
   module UtilityMethods
 
     def search(data, vars={})
-      Template::Search.new(data).setup(Elastics.elastics).render(vars)
+      Template::Search.new(data, vars).setup(Elastics.elastics).render(vars)
     end
 
     # like Elastics.search, but it will use the Elastics::Template::SlimSearch instead
     def slim_search(data, vars={})
-      Template::SlimSearch.new(data).setup(Elastics.elastics).render(vars)
+      Template::SlimSearch.new(data, vars).setup(Elastics.elastics).render(vars)
     end
 
     %w[HEAD GET PUT POST DELETE].each do |m|
@@ -36,6 +36,14 @@ module Elastics
       elastics.doc(*args)
     end
 
+    def find(pattern)
+      elastics.find(pattern)
+    end
+
+    def usage(*args)
+      elastics.usage(*args)
+    end
+
     def scan_search(*args, &block)
       elastics.scan_search(*args, &block)
     end
@@ -49,7 +57,7 @@ module Elastics
 
     def dump_all(*vars, &block)
       refresh_index(*vars)
-      scan_all({:params => {:fields => '*,_source'}}, *vars) do |batch|
+      scan_all({:params => {:_source => '*'}}, *vars) do |batch|
         batch.map!{|document| document.delete('_score'); document}
         block.call(batch)
       end
@@ -58,7 +66,7 @@ module Elastics
     # refresh and pull the full document from the index
     def dump_one(*vars)
       refresh_index(*vars)
-      document = search_by_id({:params => {:fields => '*,_source'}}, *vars)
+      document = search_by_id({:params => {:_source => '*'}}, *vars)
       document.delete('_score')
       document
     end

data/lib/elastics/utils.rb

@@ -88,16 +88,26 @@ module Elastics
 
     def class_name_to_type(class_name)
       type = class_name.tr(':', '_')
-      type.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
-      type.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-      type.downcase!
-      type
+      finalize_type(type)
+    end
+
+    def class_name_to_path(class_name)
+      type = class_name.gsub('::', '/')
+      finalize_type(type)
     end
 
     def type_to_class_name(type)
       type.gsub(/__(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
     end
 
+    private
+
+    def finalize_type(type)
+      type.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+      type.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+      type.downcase!
+      type
+    end
 
   end
 end

data/lib/elastics/variables.rb

@@ -21,7 +21,7 @@ module Elastics
     end
 
     # returns Prunable::Value if the value is in VALUES (called from stringified)
-    def get_prunable(key)
+    def fetch_value(key)
       val = fetch_nested(key)
       return val if self[:no_pruning].include?(key)
       Prunable::VALUES.include?(val) ? Prunable::Value : val

metadata

@@ -1,97 +1,91 @@
 --- !ruby/object:Gem::Specification
 name: elastics-client
 version: !ruby/object:Gem::Version
-  version: 1.1.11
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000 Z
+date: 2015-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: dye
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: prompter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.6
-description: ! 'Core gem used by all the elastics gems. Provides the core resources:
-  HTTP clients,
-
-  Elasticsearch API Methods, Templating System, Cascading Variables Management, Result
-  Extenders, Logging & Debugging, Self-documenting Tool, Rake Tasks, ...'
+description: |-
+  Core gem used by all the elastics gems. Provides the core resources: HTTP clients,
+  Elasticsearch API Methods, Templating System, Cascading Variables Management, Result Extenders, Logging & Debugging, Self-documenting Tool, Rake Tasks, ...
 email: dd.nexus@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
+- VERSION
 - elastics-client.gemspec
 - lib/elastics-client.rb
 - lib/elastics/api_stubs.rb
+- lib/elastics/api_templates/cat_api.yml
 - lib/elastics/api_templates/cluster_api.yml
-- lib/elastics/api_templates/core_api.yml
+- lib/elastics/api_templates/document_api.yml
+- lib/elastics/api_templates/elastics_additions.yml
 - lib/elastics/api_templates/indices_api.yml
+- lib/elastics/api_templates/search_api.yml
 - lib/elastics/class_proxy/base.rb
 - lib/elastics/class_proxy/templates.rb
 - lib/elastics/class_proxy/templates/doc.rb
@@ -119,6 +113,7 @@ files:
 - lib/elastics/struct/symbolize.rb
 - lib/elastics/tasks.rb
 - lib/elastics/template.rb
+- lib/elastics/template/api.rb
 - lib/elastics/template/common.rb
 - lib/elastics/template/logger.rb
 - lib/elastics/template/partial.rb
@@ -130,35 +125,39 @@ files:
 - lib/elastics/utils.rb
 - lib/elastics/variables.rb
 - lib/tasks.rake
-- VERSION
-- LICENSE
 homepage: http://elastics.github.io/elastics
 licenses:
 - MIT
-post_install_message: ! "________________________________________________________________________________\n\n
-  \                            ELASTICS INSTALLATION NOTES\n________________________________________________________________________________\n\nNew
-  Documentation:  http://elastics.github.io/elastics\n\nUpgrading Tutorial: http://elastics.github.io/elastics/doc/7-Tutorials/2-Migrate-from-0.x.html\n\n________________________________________________________________________________\n"
+metadata: {}
+post_install_message: |
+  ________________________________________________________________________________
+
+                               ELASTICS INSTALLATION NOTES
+  ________________________________________________________________________________
+
+  New Documentation:  http://elastics.github.io/elastics
+
+  Upgrading Tutorial: http://elastics.github.io/elastics/doc/7-Tutorials/2-Migrate-from-0.x.html
+
+  ________________________________________________________________________________
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Client gem for elasticsearch
 test_files: []
-has_rdoc: 

data/lib/elastics/api_templates/core_api.yml

@@ -1,206 +0,0 @@
-# These methods are available as Elastics.<method>(variable_hash)
-# you can get the updated full reference and usage example of these methods
-# by just doing in the console:
-# Elastics.doc
-
-
-
-#-----------------------------------------------------------------------------#
-### Index ###
-# http://www.elasticsearch.org/guide/reference/api/index_/
-
-# You must pass the :data variable
-store: &store
-  - PUT
-  - /<<index>>/<<type>>/<<id>>
-
-# alias for symmetry with post_store
-put_store: *store
-
-# id is assigned by ES; you must pass :data
-post_store:
-  - POST
-  - /<<index>>/<<type>>
-
-
-
-#-----------------------------------------------------------------------------#
-### Delete ###
-# http://www.elasticsearch.org/guide/reference/api/delete/
-
-delete: &delete
-  - DELETE
-  - /<<index>>/<<type>>/<<id>>
-
-remove: *delete
-
-
-
-#-----------------------------------------------------------------------------#
-### Get ###
-# http://www.elasticsearch.org/guide/reference/api/get.html
-
-get:
-  - GET
-  - /<<index>>/<<type>>/<<id>>
-
-get_source:
-  - GET
-  - /<<index>>/<<type>>/<<id>>/_source
-
-
-
-#-----------------------------------------------------------------------------#
-### Multi Get ###
-# http://www.elasticsearch.org/guide/reference/api/multi-get.html
-
-multi_get:
-  - GET
-  - /<<index>>/<<type>>/_mget
-  - ids: << ids >>
-
-
-
-#-----------------------------------------------------------------------------#
-### Update ###
-# http://www.elasticsearch.org/guide/reference/api/update/
-
-# you must pass script or doc and the other options as the :data variable
-update:
-  - POST
-  - /<<index>>/<<type>>/<<id>>/_update
-
-
-
-#-----------------------------------------------------------------------------#
-### Search ###
-# The search api is covered by the templating system
-
-# you must pass the suggest structure as the :data variable
-suggest:
-  - POST
-  - /<<index>>/<<type>>/_suggest
-
-
-#-----------------------------------------------------------------------------#
-### Multi Search ###
-# the Multi Search api is covered by the YourClass.multi_search method
-# added by the Elastics::Templates module
-
-
-
-#-----------------------------------------------------------------------------#
-### Percolate ###
-# http://www.elasticsearch.org/guide/reference/api/percolate.html
-
-# You must pass the the document (and additional queries) as :data variable
-percolate:
-  - GET
-  - /<<index>>/<<type>>/_percolate
-
-# You must pass the the query (and additional fields) as :data variable
-put_percolator:
-  - PUT
-  - /_percolator/<<index>>/<<percolator>>
-
-# http://www.elasticsearch.org/guide/reference/api/percolate.html
-delete_percolator:
-  - DELETE
-  - /_percolator/<<index>>/<<percolator>>
-
-
-
-#-----------------------------------------------------------------------------#
-### Bulk ###
-# http://www.elasticsearch.org/guide/reference/api/bulk.html
-
-post_bulk_string: &bulk
-  - POST
-  - /_bulk
-  - << bulk_string >>
-
-# Deprecated alias for backward compatibility
-bulk: *bulk
-
-
-
-#-----------------------------------------------------------------------------#
-### Count ###
-# http://www.elasticsearch.org/guide/reference/api/count.html
-
-count:
-  - GET
-  - /<<index>>/<<type>>/_count
-  # pass :data structure if you need
-
-
-
-#-----------------------------------------------------------------------------#
-### Delete by query ###
-# http://www.elasticsearch.org/guide/reference/api/delete-by-query.html
-
-delete_by_query:
-  - DELETE
-  - /<<index>>/<<type>>/_query
-  # pass :data variable query if you need
-
-
-
-#-----------------------------------------------------------------------------#
-### More Like This ###
-# http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-more-like-this.html
-
-# You can pass the search API (facets, from/to and so on) as :data variable
-more_like_this: &mlt
-  - GET
-  - /<<index>>/<<type>>/<<id>>/_mlt
-
-# aliased
-mlt: *mlt
-
-
-
-#-----------------------------------------------------------------------------#
-### Validate ###
-# http://www.elasticsearch.org/guide/reference/api/validate/
-
-# you must pass the query to validate as the :data variable
-# you can pass the parameters as the :params variable
-validate:
-  - GET
-  - /<<index>>/<<type>>/_validate/query
-
-
-
-#-----------------------------------------------------------------------------#
-### Explain ###
-# http://www.elasticsearch.org/guide/reference/api/explain/
-
-# you must pass the query to explain as the :data variable
-# you can pass the parameters as the :params variable
-explain:
-  - GET
-  - /<<index>>/<<type>>/<<id>>/_explain
-
-
-
-#-----------------------------------------------------------------------------#
-### Elastics additions ###
-
-# not a real API method, but handy
-match_all:
-  - GET
-  - /<<index>>/<<type>>/_search
-  - query:
-      match_all: {}
-
-
-
-#-----------------------------------------------------------------------------#
-# get a document without using the get API (which doesn't support fields '*')
-search_by_id:
-  - GET
-  - /<<index>>/<<type>>/_search
-  - query:
-      term:
-        _id: <<id>>