elasticated 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7387656ed02b23a0dd1926af85e5bc0f1d6e11fe
-  data.tar.gz: 238aa946faf6a8c8472df905e5239ce01b42dffe
+  metadata.gz: 0a8153fc5ed863fc035edd819e032298c140942d
+  data.tar.gz: b92fbd97b92746e57982ae8d053214242986b239
 SHA512:
-  metadata.gz: 28c779821945de5bfc766e516b85e7e691c9bc41eb2a8dcb48028fd7a695add6ccc63e20b33358ce68ae3470ddca97c26bfd6cd224fb4ebdca9471d309224c89
-  data.tar.gz: e19fbc522bb1e6d1f4227051a8a9f72232baede359213f5fd94375a561ba8cec5e9439d66e47b5368c25e7a6092fe105ae9d2a6a6bb367b175a9f4908655a40e
+  metadata.gz: 3455584f5b597ec4c21df45378ee2f23f0694f6129bb40d0b3392bfba3e8efeeb4582f30ee636fc716bc2a72ede184b0b37e40af8665c3f78890279f00387b53
+  data.tar.gz: eccb09df3c2ab43a38e795c7d063b4a36551652053f821be0304dfc3c60e5456e18b00f7d2a0e15986f8192c53e574e9876049d9fb309aa0f0299ae2db156e07

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

@@ -22,8 +22,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,11 @@
 module Elasticated
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end
 
 # Changelog
 
+# 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

@@ -251,6 +251,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
+      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: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Pablo Fernandez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler