elasticated 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eefc3eab5d4fd7000cb959f921e9d1622769c7df
-  data.tar.gz: 4cb4baa5ad341834938c175bffdad61669b63695
+  metadata.gz: cdd5d2086175d504907b22b0b152d8adffa9e13b
+  data.tar.gz: 9db1e94f8ec716696ae2bb15cd1a3aa9878a030a
 SHA512:
-  metadata.gz: 62b3e29e6aa0e3c6406d65b7ecb041ac7ab4762f92007e6f63f2f830527b41df33e619f0078c886701b465b27ada8f390dec6963eb9d35522e56ba1dcd9adff5
-  data.tar.gz: 57691483ddb1372257bf5bba74da566d8e7a6259ebc3c59f107b77e8a8b4780b64bce4d30d5926a34477e7072110d80a684dc37e35e4f09f423abad66783975c
+  metadata.gz: f24bf04a0195e2e0d5db22df845cfd4f4506c53e72a4878a2b72cfea06b92da6d92f0455c449240708838e59bad2f3b68a2b5f7d7714e39f4cc5da1d0579f94f
+  data.tar.gz: da184d8c17afa3675989cfb244eb047ad4d8e14f24d9f23db2892f536784908607430071b6404fe13bba79ffc32ab8743b35320ed47d90f01c2d2c7be1a66fd5

data/lib/elasticated/aggregations/date_histogram_aggregation.rb

@@ -2,21 +2,16 @@ module Elasticated
   class DateHistogramAggregation < HistogramAggregation
     include Subaggregated
 
-    attr_accessor :format, :offset
+    attr_accessor :format
 
     def initialize(field, opts={}, &block)
       self.format = opts.delete(:format) || 'yyyy-MM-dd'
       interval = opts.delete(:interval) || 'day'
-      self.offset = opts.delete(:offset)
       super field, interval, opts, &block
     end
 
     def build
       terms = { field: field, interval: interval, format: format }
-      if offset # '1.4 style'
-        terms.merge! pre_offset: offset
-        terms.merge! post_offset: offset
-      end
       terms.merge! extra_params
       aggregation_struct = { date_histogram: terms }
       aggregation_struct.merge! build_subaggregations

data/lib/elasticated/aggregations/safe_date_histogram_aggregation.rb

@@ -4,10 +4,9 @@ module Elasticated
 
     DEFAULT_INTERVAL  = '1d'
 
-    attr_accessor :offset, :time_zone, :points, :compact, :include_count
+    attr_accessor :time_zone, :points, :compact, :include_count
 
     def initialize(field, opts={}, &block)
-      self.offset    = opts.delete(:offset)
       self.time_zone = opts.delete(:time_zone)
       self.points    = opts.fetch(:points)
       opts.delete(:points)
@@ -19,10 +18,6 @@ module Elasticated
 
     def build
       terms = { field: field, interval: safe_interval.to_s }
-      if offset # '1.4 style'
-        terms.merge! pre_offset: offset
-        terms.merge! post_offset: offset
-      end
       if time_zone
         terms.merge! time_zone: time_zone
       end

data/lib/elasticated/delimiters/date_field_delimiter.rb

@@ -24,8 +24,12 @@ module Elasticated
           params.merge! date_since: date_since if date_since
           params.merge! date_until: date_until if date_until
         else
-          raise "Only one 'term' filter is allowed over the '#{field_name}' field" if values.count > 1
-          params.merge! date: values.first
+          if values.count > 1
+            params.merge! date_since: values.min
+            params.merge! date_until: values.max
+          else
+            params.merge! date: values.first
+          end
         end
         params
       end

data/lib/version.rb

@@ -1,9 +1,15 @@
 module Elasticated
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end
 
 # Changelog
 
+# 3.0.1
+
+# Cambios introducidos en 2.3.0
+
+# 3.0.0
+
 # Ahora Repository#execute_aggregated_search puede definir automaticamente si ejecutar las aggregations o no
 # Se agrega el alias 'range' para la condicion 'between'
 # Se agrega el alias 'terms' para la condicion 'equal'
@@ -22,6 +28,9 @@ end
 # Se agrega TermCondition
 # Ahora se puede especificar si el mapping es dinamico
 
+# 2.3.0
+# Ahora DateFieldDelimiter admite multiples fechas declaradas en un TermsCondition
+
 # 2.2.0
 # Se agrega la funcionalidad para especificar un orden aleatorio en las queries
 

data/spec/aggregation_spec.rb

@@ -275,6 +275,12 @@ module Elasticated
       expect(agg.build).to eq expected_result
     end
 
+    it "should build a date histogram aggregation with offset for date" do
+      agg = DateHistogramAggregation.new :date, offset: '+6h'
+      expected_result = { date_histogram: { field: :date, interval: 'day', format: 'yyyy-MM-dd', offset: '+6h' } }
+      expect(agg.build).to eq expected_result
+    end
+
     it "should build a date histogram aggregation with subaggregations" do
       agg = DateHistogramAggregation.new :date do |docs|
         docs.max :numeric_field

data/spec/date_field_delimiter_spec.rb

@@ -19,10 +19,12 @@ module Elasticated
         expect(params).to eq date: '2016-07-19'
       end
 
-      it "should raise when delimit by multiple terms" do
-        delimiter.add_term :created_at, 'nombre1'
-        delimiter.add_term :created_at, 'nombre2'
-        expect{ delimiter.build_strategy_params }.to raise_error RuntimeError
+      it "should delimit by multiple terms" do
+        delimiter.add_term :created_at, '2017-03-30'
+        delimiter.add_term :created_at, '2017-03-25'
+        delimiter.add_term :created_at, '2017-03-27'
+        params = delimiter.build_strategy_params
+        expect(params).to eq date_since: '2017-03-25', date_until: '2017-03-30'
       end
 
       it "should delimit by a min date" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticated
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Pablo Fernandez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler