elasticated 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdd5d2086175d504907b22b0b152d8adffa9e13b
-  data.tar.gz: 9db1e94f8ec716696ae2bb15cd1a3aa9878a030a
+  metadata.gz: 7a47e721c1c8eb8f59dc62b3a1f666575b41801e
+  data.tar.gz: a44094026309e9c0c6cf170fe96e350a8e8e598a
 SHA512:
-  metadata.gz: f24bf04a0195e2e0d5db22df845cfd4f4506c53e72a4878a2b72cfea06b92da6d92f0455c449240708838e59bad2f3b68a2b5f7d7714e39f4cc5da1d0579f94f
-  data.tar.gz: da184d8c17afa3675989cfb244eb047ad4d8e14f24d9f23db2892f536784908607430071b6404fe13bba79ffc32ab8743b35320ed47d90f01c2d2c7be1a66fd5
+  metadata.gz: adf36208fb4bb439827571bc93e148257f1fd567d7b1d88e080651c5f1492d86392e228f2b82654b1091b7d0b9c264ca469dac66984e2c68234a031af820d39e
+  data.tar.gz: 212bba862b890669e652710ab854aa8a1a9951018b7d27bfc8c64e66e73fec4e903c36aa0247cc032bedc44ff2cfba939742858a83a9ea5acd889e673a8ed8cf

data/lib/elasticated.rb

@@ -117,6 +117,10 @@ require_relative 'elasticated/mapping/object_builder'
 require_relative 'elasticated/mapping/nested_builder'
 require_relative 'elasticated/mapping/type_builder'
 require_relative 'elasticated/mapping/builder'
+require_relative 'elasticated/mapping/fields/standard_field'
+require_relative 'elasticated/mapping/fields/field_with_doc_values'
+require_relative 'elasticated/mapping/fields/string_field'
+require_relative 'elasticated/mapping/fields/analyzed_string_field'
 
 require_relative 'elasticated/index_selector'
 require_relative 'elasticated/partitioned_repository'

data/lib/elasticated/client.rb

@@ -69,6 +69,10 @@ module Elasticated
       transport.indices.put_mapping opts.merge(index: index_name, type: type_name, body: mapping)
     end
 
+    def update_settings(index_name, settings_body, opts={})
+      transport.indices.put_settings opts.merge(index: index_name, body: settings_body)
+    end
+
     def refresh_index(index_name)
       transport.indices.refresh index: index_name
       log.debug "Index '#{index_name}' refreshed"
@@ -120,7 +124,7 @@ module Elasticated
     end
 
     def bulk(bulk_body, opts={})
-      log_query :bulk, bulk_body, opts
+      log_query :bulk, bulk_body.to_json, opts
       transport.bulk opts.merge body: bulk_body
     end
 

data/lib/elasticated/mapping/fields/analyzed_string_field.rb

@@ -0,0 +1,21 @@
+module Elasticated
+  module Mapping
+    module Fields
+      class AnalyzedStringField < FieldWithDocValues
+
+        def build_body
+          body = { type: type }
+          not_analyzed_string = StringField.new(name, doc_values)
+          body[:fields] = not_analyzed_string.build
+          body[:fields][:analyzed] = { type: :string }
+          body
+        end
+
+        def type
+          :multi_field
+        end
+
+      end
+    end
+  end
+end

data/lib/elasticated/mapping/fields/field_with_doc_values.rb

@@ -0,0 +1,53 @@
+module Elasticated
+  module Mapping
+    module Fields
+      class FieldWithDocValues < StandardField
+
+        attr_accessor :doc_values
+
+        def initialize(name, doc_values=true)
+          super(name)
+          self.doc_values = doc_values
+        end
+
+        def build_body
+          body = super
+          body[:fielddata] = { format: :doc_values } if doc_values
+          body
+        end
+
+      end
+
+      class DateField < FieldWithDocValues
+        def type
+          :date
+        end
+      end
+
+      class IntegerField < FieldWithDocValues
+        def type
+          :integer
+        end
+      end
+
+      class FloatField < FieldWithDocValues
+        def type
+          :float
+        end
+      end
+
+      class DoubleField < FieldWithDocValues
+        def type
+          :double
+        end
+      end
+
+      class LongField < FieldWithDocValues
+        def type
+          :long
+        end
+      end
+
+    end
+  end
+end

data/lib/elasticated/mapping/fields/standard_field.rb

@@ -0,0 +1,33 @@
+module Elasticated
+  module Mapping
+    module Fields
+      class StandardField
+
+        # abstract class
+        # child must implement 'type()'
+
+        attr_accessor :name
+
+        def initialize(name)
+          self.name = name
+        end
+
+        def build
+          { name => build_body }
+        end
+
+        def build_body
+          { type: type }
+        end
+
+      end
+
+      class BooleanField < StandardField
+        def type
+          :boolean
+        end
+      end
+
+    end
+  end
+end

data/lib/elasticated/mapping/fields/string_field.rb

@@ -0,0 +1,19 @@
+module Elasticated
+  module Mapping
+    module Fields
+      class StringField < FieldWithDocValues
+
+        def build_body
+          body = super
+          body[:index] = :not_analyzed
+          body
+        end
+
+        def type
+          :string
+        end
+
+      end
+    end
+  end
+end

data/lib/elasticated/mapping/fields_builder.rb

@@ -4,50 +4,51 @@ module Elasticated
 
       include Mixins::BlockEvaluation
 
-      attr_accessor :hash, :name, :sub_objects, :nesteds
+      attr_accessor :name, :sub_objects, :nesteds, :fields
 
       def initialize(name)
-        self.hash = Hash.new
+        self.fields = Array.new
         self.sub_objects = Array.new
         self.nesteds = Array.new
         self.name = name
       end
 
-      def add_property(name, value)
-        hash[name] = value
+      def add_property(field)
+        fields << field
       end
 
       def date(field_name)
-        add_property field_name, build_date_field
+        add_property Fields::DateField.new(field_name)
       end
 
       def string(field_name)
-        add_property field_name, build_string_field
+        add_property Fields::StringField.new(field_name)
       end
 
       def float(field_name)
-        add_property field_name, build_float_field
+        add_property Fields::FloatField.new(field_name)
       end
 
       def double(field_name)
-        add_property field_name, build_double_field
+        add_property Fields::DoubleField.new(field_name)
       end
 
       def integer(field_name)
-        add_property field_name, build_integer_field
+        add_property Fields::IntegerField.new(field_name)
       end
 
       def long(field_name)
-        add_property field_name, build_long_field
+        add_property Fields::LongField.new(field_name)
       end
 
       def analyzed_string(field_name)
-        add_property field_name, build_analyzed_string_field(field_name)
+        add_property Fields::AnalyzedStringField.new(field_name)
       end
 
-      def bool(field_name)
-        add_property field_name, build_bool_field
+      def boolean(field_name)
+        add_property Fields::BooleanField.new(field_name)
       end
+      alias_method :bool, :boolean
 
       def object(object_name, &block)
         sub_object = ObjectBuilder.new object_name
@@ -66,7 +67,10 @@ module Elasticated
       end
 
       def build_body
-        ret = hash
+        ret = Hash.new
+        fields.each do |field|
+          ret.merge! field.build
+        end
         sub_objects.each do |sub_object|
           ret.merge! sub_object.build
         end
@@ -80,73 +84,6 @@ module Elasticated
         { name => build_body }
       end
 
-      private
-
-      def build_date_field
-        {
-          type: :date,
-          fielddata: { format: :doc_values }
-        }
-      end
-
-      def build_string_field
-        {
-          type: :string,
-          index: :not_analyzed,
-          fielddata: { format: :doc_values }
-        }
-      end
-
-      def build_integer_field
-        {
-          type: :integer,
-          fielddata: { format: :doc_values }
-        }
-      end
-
-      def build_float_field
-        {
-          type: :float,
-          fielddata: { format: :doc_values }
-        }
-      end
-
-      def build_double_field
-        {
-          type: :double,
-          fielddata: { format: :doc_values }
-        }
-      end
-
-      def build_long_field
-        {
-          type: :long,
-          fielddata: { format: :doc_values }
-        }
-      end
-
-      def build_analyzed_string_field(field_name)
-        {
-          type: :multi_field,
-          fields: {
-            field_name => {
-              type: :string,
-              index: :not_analyzed,
-              fielddata: { format: :doc_values }
-            },
-            analyzed: {
-              type: :string
-            }
-          }
-        }
-      end
-
-      def build_bool_field
-        {
-          type: :boolean
-        }
-      end
-
     end
   end
 end

data/lib/elasticated/query.rb

@@ -54,16 +54,23 @@ module Elasticated
     end
     alias_method :offset, :from
 
-    def sort(field, method=nil)
+    def custom_sort(custom_hash)
       self._sort ||= Array.new
-      _sort << { field => { order: method || :asc } }
+      _sort << custom_hash
       self
     end
 
+    def sort(field, method=nil)
+      custom_sort(field => { order: method || :asc })
+    end
+    alias_method :sort_by_field, :sort
+
+    def sort_by_script(script_hash)
+      custom_sort(_script: script_hash)
+    end
+
     def sort_randomly
-      self._sort ||= Array.new
-      _sort << { _script: { script: "Math.random()", type: "number" } }
-      self
+      sort_by_script(script: "Math.random()", type: "number")
     end
 
     def source(*fields_array)

data/lib/version.rb

@@ -1,9 +1,13 @@
 module Elasticated
-  VERSION = '3.0.1'
+  VERSION = '3.1.0'
 end
 
 # Changelog
 
+# 3.1.0
+
+# El Client puede actualizar settings de un indice particular
+
 # 3.0.1
 
 # Cambios introducidos en 2.3.0

data/spec/query_spec.rb

@@ -67,6 +67,16 @@ module Elasticated
 
     describe "the build method (over other fields)" do
 
+      it "should build a 'match_all' query sorted by a custom hash" do
+        my_custom_hash = { any_key: 'any_value' }
+        q.custom_sort(my_custom_hash)
+        expected_result = {
+          query: { match_all: {} },
+          sort: [my_custom_hash]
+        }
+        expect(q.build).to eq expected_result
+      end
+
       it "should build a 'match_all' query sorted by a single field" do
         q.sort :field
         expected_result = {
@@ -94,6 +104,16 @@ module Elasticated
         expect(q.build).to eq expected_result
       end
 
+      it "should build a 'match_all' query sorted by a custom script" do
+        my_script_hash = { script: "my_script", type: "my_type" }
+        q.sort_by_script(my_script_hash)
+        expected_result = {
+          query: { match_all: {} },
+          sort: [ { _script: my_script_hash } ]
+        }
+        expect(q.build).to eq expected_result
+      end
+
       it "should build a 'match_all' query sorted randomly" do
         q.sort_randomly
         expected_result = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticated
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Pablo Fernandez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -212,6 +212,10 @@ files:
 - lib/elasticated/loggers/silent_logger.rb
 - lib/elasticated/mapping.rb
 - lib/elasticated/mapping/builder.rb
+- lib/elasticated/mapping/fields/analyzed_string_field.rb
+- lib/elasticated/mapping/fields/field_with_doc_values.rb
+- lib/elasticated/mapping/fields/standard_field.rb
+- lib/elasticated/mapping/fields/string_field.rb
 - lib/elasticated/mapping/fields_builder.rb
 - lib/elasticated/mapping/nested_builder.rb
 - lib/elasticated/mapping/object_builder.rb