elastic_record 1.4.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4c8b3152cde2dccd64daeba0c1b674e1f4baa59
-  data.tar.gz: ecc417f58c2838fb097ddee6fcbc2e017eedf13e
+  metadata.gz: 6e7ce3ca4166690dfd09ab6072e1cb1d84e5efda
+  data.tar.gz: 61c4da83fe674d7c95a63e475ff3ba39daedde11
 SHA512:
-  metadata.gz: a43f86409d56f0bfcb898262baab0a4a85c7c3db621a6645fae2c8ae96dfe3f27a5ccacebbb256b7e1c33dcdaf0d8c1c96d2a85c677889bd3a9d0da0250800dd
-  data.tar.gz: f7750a39e91ba9b3133b915e8ebfd8f5f272df0fa802d5be5b164dded785085eaada91e3aef4cb6c9d015e3058bd1db505368c17fa149cbbe4d7c5db3d2ad9f1
+  metadata.gz: 9e463040d4d6ca0393b8ebdd54bf6df62366e6d65664ad8a46c1fc2eae4d51e805f21e643ba2f2b245cfe2637d95ad48fda1b12a5a8a306139399db660e3ed0d
+  data.tar.gz: 1078110a75c4837be1e422fecb8a05efcaf8a953198435baeb0ebf8988c75d32b9eb5370dd930f06a8c19768ae16d2d6f5bbb003a403cc23a45df2e1b0213a2f

data/.travis.yml

@@ -1,7 +1,7 @@
 services:
   - elasticsearch
 rvm:
-  - 2.0.0
+  - 2.1.2
 env:
   - "GEM=ar:mysql2"
   - "GEM=ar:postgresql"

data/README.rdoc

@@ -7,7 +7,7 @@ ElasticRecord is an elasticsearch ORM.
 == Setup
 
 The usual Gemfile addition:
-  
+
   gem 'elastic_record'
 
 
@@ -73,17 +73,17 @@ To change the 'size' and 'from' values of a query, use offset and limit:
 
   search.limit(40).offset(80)   # Creates a query with {size: 40, from: 80}
 
-=== Facets
+=== Aggregations
 
-Since term facets are the most common, they are the easiest to add to a query:
+Aggregations are added with the aggregate method:
 
-  search.facet('colors')
+  search.aggregate('popular_colors' => {'terms' => {'field' => 'color'}})
 
-It is important to note that adding facets to a query is different than retrieving the results of the query:
+It is important to note that adding aggregations to a query is different than retrieving the results of the query:
 
-  search = search.facet('colors').facet('size')
-  search.facets
-  #=> {"colors" => ..., "size" => ...}
+  search = search.aggregate('popular_colors' => {'terms' => {'field' => 'color'}})
+  search.aggregations
+  #=> {"popular_colors" => {"buckets" => ...}}
 
 === Getting Results
 

data/elastic_record.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'elastic_record'
-  s.version = '1.4.2'
+  s.version = '2.0.0'
   s.summary = 'Use Elastic Search with your objects'
   s.description = 'Find your records with elastic search'
 
@@ -18,6 +18,6 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {test}/*`.split("\n")
 
-  s.add_dependency 'arelastic', '>= 0.4.0'
+  s.add_dependency 'arelastic', '>= 0.6.0'
   s.add_dependency 'activemodel'
 end

data/lib/elastic_record/index/deferred.rb

@@ -23,7 +23,7 @@ module ElasticRecord
           if writes_made
             begin
               index.disable_deferring!
-              index.delete_by_query match_all: {}
+              index.delete_by_query query: {match_all: {}}
             ensure
               index.enable_deferring!
             end
@@ -84,4 +84,4 @@ module ElasticRecord
       end
     end
   end
-end
+end

data/lib/elastic_record/index/documents.rb

@@ -37,7 +37,7 @@ module ElasticRecord
       end
 
       def record_exists?(id)
-        get(id)['exists']
+        get(id)['found']
       end
 
       def search(elastic_query, options = {})
@@ -99,4 +99,4 @@ module ElasticRecord
         end
     end
   end
-end
+end

data/lib/elastic_record/index/manage.rb

@@ -71,16 +71,22 @@ module ElasticRecord
       end
 
       def aliased_names
-        json = connection.json_get '/_cluster/state'
-        json["metadata"]["indices"].select { |name, status| status["aliases"].include?(alias_name) }.map { |name, status| name }
+        if (index_names = all_names).any?
+          json = connection.json_get "/#{index_names.join(',')}/_alias"
+          json.keys.select do |index_name|
+            json[index_name]['aliases'].keys.include?(alias_name)
+          end
+        else
+          []
+        end
       end
 
       def all_names
-        json = connection.json_get '/_status'
-
-        regex = %r{^#{alias_name}_?}
-        json['indices'].keys.grep(regex)
+        connection.json_get("/#{alias_name}/_mapping/#{type}/").keys
+      rescue
+        # TODO: In ES 1.4, this returns empty rather than a 404
+        []
       end
     end
   end
-end
+end

data/lib/elastic_record/index/mapping.rb

@@ -8,9 +8,12 @@ module ElasticRecord
       def update_mapping(index_name = alias_name)
         connection.json_put "/#{index_name}/#{type}/_mapping", type => mapping
       end
-      
+
       def get_mapping(index_name = alias_name)
-        connection.json_get "/#{index_name}/#{type}/_mapping"
+        json = connection.json_get "/#{index_name}/#{type}/_mapping"
+        unless json.empty?
+          json.values.first['mappings']
+        end
       end
 
       def delete_mapping(index_name = alias_name)
@@ -45,4 +48,4 @@ module ElasticRecord
       end
     end
   end
-end
+end

data/lib/elastic_record/index/percolator.rb

@@ -2,42 +2,40 @@ module ElasticRecord
   class Index
     module Percolator
       def create_percolator(name, elastic_query)
-        unless exists? percolator_index_name
-          create percolator_index_name
-        end
-        connection.json_put "/_percolator/#{percolator_index_name}/#{name}", elastic_query
+        connection.json_put "/#{percolator_name}/.percolator/#{name}", elastic_query
       end
 
       def delete_percolator(name)
-        connection.json_delete "/_percolator/#{percolator_index_name}/#{name}"
+        connection.json_delete "/#{percolator_name}/.percolator/#{name}"
       end
 
       def percolator_exists?(name)
-        !get_percolator(name).nil?
+        connection.head("/#{percolator_name}/.percolator/#{name}") == '200'
       end
 
       def get_percolator(name)
-        json = connection.json_get("/_percolator/#{percolator_index_name}/#{name}")
-        json['_source'] if json['exists']
+        json = connection.json_get("/#{percolator_name}/.percolator/#{name}")
+        json['_source'] if json['found']
       end
 
       def percolate(document)
-        connection.json_get("/#{percolator_index_name}/#{type}/_percolate", 'doc' => document)['matches']
+        hits = connection.json_get("/#{percolator_name}/#{type}/_percolate", 'doc' => document)['matches']
+        hits.map { |hits| hits['_id']}
       end
 
       def all_percolators
-        if hits = connection.json_get("/_percolator/#{percolator_index_name}/_search?q=*&size=500")['hits']
+        if hits = connection.json_get("/#{percolator_name}/.percolator/_search?q=*&size=500")['hits']
           hits['hits'].map { |hit| hit['_id'] }
         end
       end
 
       def reset_percolators
-        delete(percolator_index_name) if exists?(percolator_index_name)
-        create(percolator_index_name)
+        delete(percolator_name) if exists?(percolator_name)
+        create(percolator_name)
       end
 
-      def percolator_index_name
-        @percolator_index_name ||= "percolate_#{alias_name}"
+      def percolator_name
+        "#{alias_name}_percolator"
       end
     end
   end

data/lib/elastic_record/index/warmer.rb

@@ -6,19 +6,19 @@ module ElasticRecord
       end
 
       def delete_warmer(name)
-        connection.json_delete "/#{alias_name}/#{type}/_warmer/#{name}"
+        connection.json_delete "/#{alias_name}/_warmer/#{name}"
       end
 
       def get_warmer(name)
-        connection.json_get("/#{alias_name}/#{type}/_warmer/#{name}").values.first['warmers'][name]
+        json = connection.json_get("/#{alias_name}/#{type}/_warmer/#{name}")
+        if json.any?
+          json.values.first['warmers'][name]
+        end
       end
 
       def warmer_exists?(name)
-        get_warmer(name)
-        true
-      rescue ElasticRecord::ConnectionError
-        false
+        !get_warmer(name).nil?
       end
     end
   end
-end
+end

data/lib/elastic_record/index.rb

@@ -85,4 +85,4 @@ module ElasticRecord
         "#{alias_name}_#{(Time.now.to_f * 100).to_i}"
       end
   end
-end
+end

data/lib/elastic_record/relation/none.rb

@@ -13,6 +13,10 @@ module ElasticRecord
         {}
       end
 
+      def aggregations
+        {}
+      end
+
       def as_elastic
         Arelastic::Filters::Not.new(Arelastic::Queries::MatchAll.new).as_elastic
       end

data/lib/elastic_record/relation/search_methods.rb

@@ -92,6 +92,15 @@ module ElasticRecord
         clone.facet! facet_or_name, options
       end
 
+      def aggregate!(aggregation)
+        self.aggregation_values += [aggregation]
+        self
+      end
+
+      def aggregate(aggregation)
+        clone.aggregate! aggregation
+      end
+
       def order!(*args) # :nodoc:
         self.order_values += args.flatten
         self
@@ -141,6 +150,7 @@ module ElasticRecord
             build_limit(limit_value),
             build_offset(offset_value),
             build_facets(facet_values),
+            build_aggregations(aggregation_values),
             build_orders(order_values)
           ].compact
 
@@ -225,6 +235,10 @@ module ElasticRecord
           end
         end
 
+        def build_aggregations(aggregations)
+          Arelastic::Searches::Aggregations.new(aggregations) unless aggregations.empty?
+        end
+
         def build_facets(facets)
           Arelastic::Searches::Facets.new(facets) unless facets.empty?
         end

data/lib/elastic_record/relation/value_methods.rb

@@ -1,6 +1,6 @@
 module ElasticRecord
   class Relation
-    MULTI_VALUE_METHODS  = [:extending, :facet, :filter, :order, :select]
+    MULTI_VALUE_METHODS  = [:extending, :facet, :filter, :order, :select, :aggregation]
     SINGLE_VALUE_METHODS = [:query, :limit, :offset, :reverse_order]
   end
 end

data/lib/elastic_record/relation.rb

@@ -26,6 +26,10 @@ module ElasticRecord
       search_results['facets']
     end
 
+    def aggregations
+      search_results['aggregations']
+    end
+
     def explain(id)
       klass.elastic_index.explain(id, as_elastic)
     end

data/test/elastic_record/callbacks_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::CallbacksTest < MiniTest::Unit::TestCase
+class ElasticRecord::CallbacksTest < MiniTest::Test
   def test_added_to_index
     widget = Widget.new id: '10', color: 'green'
     refute Widget.elastic_index.record_exists?(widget.id)

data/test/elastic_record/config_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::ConfigTest < MiniTest::Unit::TestCase
+class ElasticRecord::ConfigTest < MiniTest::Test
   def test_defaults
     assert_equal '5m', ElasticRecord::Config.scroll_keep_alive
   end

data/test/elastic_record/connection_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::ConnectionTest < MiniTest::Unit::TestCase
+class ElasticRecord::ConnectionTest < MiniTest::Test
   def test_servers
     assert_equal ['foo'], ElasticRecord::Connection.new('foo').servers
     assert_equal ['foo', 'bar'], ElasticRecord::Connection.new(['foo', 'bar']).servers

data/test/elastic_record/index/configurator_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::Index::ConfiguratorTest < MiniTest::Unit::TestCase
+class ElasticRecord::Index::ConfiguratorTest < MiniTest::Test
   def test_property
     configurator.property :am_i_cool, type: "boolean"
 

data/test/elastic_record/index/documents_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::Index::DocumentsTest < MiniTest::Unit::TestCase
+class ElasticRecord::Index::DocumentsTest < MiniTest::Test
   class InheritedWidget < Widget
     def self.base_class
       Widget
@@ -41,7 +41,7 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Unit::TestCase
     index.index_document('bob', name: 'bob')
     index.index_document('joe', name: 'joe')
 
-    index.delete_by_query(query_string: {query: 'name.analyzed:bob'})
+    index.delete_by_query('query' => {query_string: {query: 'name.analyzed:bob'}})
 
     refute index.record_exists?('bob')
     assert index.record_exists?('joe')
@@ -64,9 +64,9 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Unit::TestCase
       index.delete_document '3'
 
       expected = [
-        {index: {_index: "widgets", _type: "widget", _id: "5"}},
+        {index: {_index: index.alias_name, _type: "widget", _id: "5"}},
         {color: "green"},
-        {delete: {_index: "widgets", _type: "widget", _id: "3"}}
+        {delete: {_index: index.alias_name, _type: "widget", _id: "3"}}
       ]
       assert_equal expected, index.current_bulk_batch
     end
@@ -89,7 +89,7 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Unit::TestCase
       InheritedWidget.elastic_index.index_document '5', color: 'green'
 
       expected = [
-        {index: {_index: "widgets", _type: "widget", _id: "5"}},
+        {index: {_index: index.alias_name, _type: "widget", _id: "5"}},
         {color: "green"}
       ]
       assert_equal expected, index.current_bulk_batch
@@ -101,4 +101,4 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Unit::TestCase
     def index
       @index ||= Widget.elastic_index
     end
-end
+end

data/test/elastic_record/index/manage_test.rb

@@ -1,13 +1,13 @@
 require 'helper'
 
-class ElasticRecord::Index::ManageTest < MiniTest::Unit::TestCase
+class ElasticRecord::Index::ManageTest < MiniTest::Test
   class Felon
     include TestModel
   end
 
   def setup
     super
-    Felon.elastic_index.delete_all
+    Felon.elastic_index.delete('felons*')
   end
 
   def test_create
@@ -55,4 +55,4 @@ class ElasticRecord::Index::ManageTest < MiniTest::Unit::TestCase
     def index
       @index ||= Felon.elastic_index
     end
-end
+end

data/test/elastic_record/index/mapping_test.rb

@@ -1,15 +1,13 @@
 require 'helper'
 
-class ElasticRecord::Index::MappingTest < MiniTest::Unit::TestCase
+class ElasticRecord::Index::MappingTest < MiniTest::Test
   def test_delete_mapping
     index_name = index.create
-    index.get_mapping(index_name)
+    refute_nil index.get_mapping(index_name)['widget']
 
     index.delete_mapping(index_name)
 
-    assert_raises ElasticRecord::ConnectionError do
-      index.get_mapping(index_name)
-    end
+    assert_nil index.get_mapping(index_name)
   end
 
   def test_default_mapping
@@ -33,4 +31,4 @@ class ElasticRecord::Index::MappingTest < MiniTest::Unit::TestCase
     def index
       @index ||= ElasticRecord::Index.new(Widget)
     end
-end
+end

data/test/elastic_record/index/percolator_test.rb

@@ -1,13 +1,13 @@
 require 'helper'
 
-class ElasticRecord::Index::PercolatorTest < MiniTest::Unit::TestCase
+class ElasticRecord::Index::PercolatorTest < MiniTest::Test
   def test_create_percolator
     index.disable_deferring!
 
     index.delete_percolator('green') if index.percolator_exists?('green')
     index.delete_percolator('blue') if index.percolator_exists?('blue')
 
-    index.create_percolator('green', 'color' => 'green')
+    index.create_percolator('green', 'query' => {'match' => {'color' => 'green'}})
 
     assert index.percolator_exists?('green')
     refute index.percolator_exists?('blue')
@@ -16,13 +16,24 @@ class ElasticRecord::Index::PercolatorTest < MiniTest::Unit::TestCase
   def test_delete_percolator
     index.disable_deferring!
 
-    index.create_percolator('green', 'color' => 'green')
+    index.create_percolator('green', 'query' => {'match' => {'color' => 'green'}})
     assert index.percolator_exists?('green')
 
     index.delete_percolator('green')
     refute index.percolator_exists?('green')
   end
 
+  def test_reset_percolators
+    index.disable_deferring!
+
+    index.create_percolator('green', 'query' => {'match' => {'color' => 'green'}})
+    assert index.percolator_exists?('green')
+
+    index.reset_percolators
+
+    refute index.percolator_exists?('green')
+  end
+
   def test_percolate
   end
 

data/test/elastic_record/index/settings_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::Index::SettingsTest < MiniTest::Unit::TestCase
+class ElasticRecord::Index::SettingsTest < MiniTest::Test
   def test_default_settings
     expected = {}
     assert_equal expected, ElasticRecord::Index.new(Widget).settings

data/test/elastic_record/index/warmer_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::Index::WarmerTest < MiniTest::Unit::TestCase
+class ElasticRecord::Index::WarmerTest < MiniTest::Test
   def test_create_warmer
     index.delete_warmer('green') if index.warmer_exists?('green')
     refute index.warmer_exists?('green')

data/test/elastic_record/index_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::IndexTest < MiniTest::Unit::TestCase
+class ElasticRecord::IndexTest < MiniTest::Test
   def test_copy
     copied = index.dup
 

data/test/elastic_record/integration/active_record_test.rb

@@ -49,7 +49,7 @@ module ElasticRecord
   end
 end
 
-class ElasticRecord::Mysql2Test < MiniTest::Unit::TestCase
+class ElasticRecord::Mysql2Test < MiniTest::Test
   include ElasticRecord::ActiveRecordIntegration
 
   def setup
@@ -64,7 +64,7 @@ class ElasticRecord::Mysql2Test < MiniTest::Unit::TestCase
   end
 end
 
-class ElasticRecord::PostgresqlTest < MiniTest::Unit::TestCase
+class ElasticRecord::PostgresqlTest < MiniTest::Test
   include ElasticRecord::ActiveRecordIntegration
 
   def setup

data/test/elastic_record/lucene_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::LuceneTest < MiniTest::Unit::TestCase
+class ElasticRecord::LuceneTest < MiniTest::Test
   def test_escape
     assert_equal "\\\\", ElasticRecord::Lucene.escape("\\")
     assert_equal "Matt \\&& Joe", ElasticRecord::Lucene.escape("Matt && Joe")

data/test/elastic_record/model_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::ModelTest < MiniTest::Unit::TestCase
+class ElasticRecord::ModelTest < MiniTest::Test
   class InheritedModel < Widget
   end
 

data/test/elastic_record/railties/controller_runtime_test.rb

@@ -1,7 +1,7 @@
 require 'helper'
 require "elastic_record/railties/controller_runtime"
 
-class ElasticRecord::Railties::ControllerRuntimeTest < MiniTest::Unit::TestCase
+class ElasticRecord::Railties::ControllerRuntimeTest < MiniTest::Test
   class TestRuntime
     def self.log_process_action(payload)
       ['sweet']

data/test/elastic_record/relation/admin_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::Relation::AdminTest < MiniTest::Unit::TestCase
+class ElasticRecord::Relation::AdminTest < MiniTest::Test
   def test_create_percolator
     index.delete_percolator('green') if index.percolator_exists?('green')
 
@@ -25,4 +25,4 @@ class ElasticRecord::Relation::AdminTest < MiniTest::Unit::TestCase
       Widget.elastic_index
     end
 
-end
+end

data/test/elastic_record/relation/batches_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::Relation::BatchesTest < MiniTest::Unit::TestCase
+class ElasticRecord::Relation::BatchesTest < MiniTest::Test
   def setup
     super
     create_widgets

data/test/elastic_record/relation/delegation_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::Relation::DelegationTest < MiniTest::Unit::TestCase
+class ElasticRecord::Relation::DelegationTest < MiniTest::Test
   def test_delegate_to_array
     Widget.elastic_index.index_document('5', color: 'red')
     

data/test/elastic_record/relation/finder_methods_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::Relation::FinderMethodsTest < MiniTest::Unit::TestCase
+class ElasticRecord::Relation::FinderMethodsTest < MiniTest::Test
   def setup
     super
     create_widgets
@@ -24,7 +24,7 @@ class ElasticRecord::Relation::FinderMethodsTest < MiniTest::Unit::TestCase
 
   def test_find_passed_an_empty_args
     assert_raises ActiveRecord::RecordNotFound do
-      Widget.elastic_relation.find()
+      Widget.elastic_relation.find
     end
   end
 
@@ -53,6 +53,19 @@ class ElasticRecord::Relation::FinderMethodsTest < MiniTest::Unit::TestCase
     assert_equal 1, Widget.elastic_relation.filter('color' => 'red').all.size
   end
 
+  def test_find_by
+    Widget.elastic_index.bulk_add [
+      Widget.new(color: 'red', id: '05'),
+      Widget.new(color: 'blue', id: '10'),
+    ]
+
+    assert_equal '05', Widget.elastic_relation.find_by(color: 'red').id
+    assert_equal '05', Widget.elastic_relation.find_by!(color: 'red').id
+    assert_raises ActiveRecord::RecordNotFound do
+      Widget.elastic_relation.find_by!(color: 'green')
+    end
+  end
+
   private
 
     def create_widgets

data/test/elastic_record/relation/merging_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::Relation::MergingTest < MiniTest::Unit::TestCase
+class ElasticRecord::Relation::MergingTest < MiniTest::Test
   def test_merge_single_values
     relation = Widget.elastic_relation.limit(5)
     other = Widget.elastic_relation.limit(10)

data/test/elastic_record/relation/none_test.rb

@@ -1,14 +1,15 @@
 require 'helper'
 
-class ElasticRecord::Relation::NoneTest < MiniTest::Unit::TestCase
+class ElasticRecord::Relation::NoneTest < MiniTest::Test
   def test_none
     none = Widget.elastic_relation.none
 
     assert_equal 0,     none.size
     assert_equal 0,     none.count
     assert_equal [],    none.to_a
+    assert_equal({},    none.aggregations)
 
     expected_elastic = {"not" => {"match_all" => {}}}
     assert_equal expected_elastic, none.as_elastic
   end
-end
+end

data/test/elastic_record/relation/search_methods_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::Relation::SearchMethodsTest < MiniTest::Unit::TestCase
+class ElasticRecord::Relation::SearchMethodsTest < MiniTest::Test
   def test_query_with_no_queries
     expected = {"match_all" => {}}
 
@@ -57,19 +57,6 @@ class ElasticRecord::Relation::SearchMethodsTest < MiniTest::Unit::TestCase
     assert_equal expected, relation.as_elastic['query']
   end
 
-  def test_find_by
-    Widget.elastic_index.bulk_add [
-      Widget.new(color: 'red', id: '05'),
-      Widget.new(color: 'blue', id: '10'),
-    ]
-
-    assert_equal '05', relation.find_by(color: 'red').id
-    assert_equal '05', relation.find_by!(color: 'red').id
-    assert_raises ActiveRecord::RecordNotFound do
-      relation.find_by!(color: 'green')
-    end
-  end
-
   def test_query_with_only_query
     relation.query!('foo')
 
@@ -146,6 +133,18 @@ class ElasticRecord::Relation::SearchMethodsTest < MiniTest::Unit::TestCase
     assert_equal expected, faceted.as_elastic['facets']
   end
 
+  def test_aggregation_with_bang
+    relation.aggregate!("tags" => {"terms" => {"field" => "tags"}})
+
+    expected = {
+      "tags" => {
+        "terms" => {"field" => "tags"}
+      }
+    }
+
+    assert_equal expected, relation.as_elastic['aggs']
+  end
+
   def test_limit
     relation.limit!(5)
 

data/test/elastic_record/relation_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::RelationTest < MiniTest::Unit::TestCase
+class ElasticRecord::RelationTest < MiniTest::Test
   def test_count
     create_widgets [Widget.new(id: 5, color: 'red'), Widget.new(id: 10, color: 'blue')]
 
@@ -15,6 +15,15 @@ class ElasticRecord::RelationTest < MiniTest::Unit::TestCase
     assert_equal 2, facets['popular_colors']['total']
   end
 
+  def test_aggregations
+    create_widgets [Widget.new(id: 5, color: 'red'), Widget.new(id: 10, color: 'blue')]
+
+    aggregations = Widget.elastic_relation.aggregate('popular_colors' => {'terms' => {'field' => 'color'}}).aggregations # Widget.arelastic.facet['popular_colors'].terms('color')).facets
+
+    assert_equal 2, aggregations['popular_colors']['buckets'].size
+    assert_equal %w(red blue).to_set, aggregations['popular_colors']['buckets'].map { |bucket| bucket['key'] }.to_set
+  end
+
   def test_explain
     create_widgets [Widget.new(id: 10, color: 'blue')]
 

data/test/elastic_record/searching_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::SearchingTest < MiniTest::Unit::TestCase
+class ElasticRecord::SearchingTest < MiniTest::Test
   def test_elastic_search
 
   end

data/test/helper.rb

@@ -13,21 +13,19 @@ ElasticRecord::Config.model_names = %w(Warehouse Widget)
 FakeWeb.allow_net_connect = %r[^https?://127.0.0.1]
 
 module MiniTest
-  class Unit
-    class TestCase
-      def setup
-        FakeWeb.clean_registry
+  class Test
+    def setup
+      FakeWeb.clean_registry
 
-        ElasticRecord::Config.models.each do |model|
-          model.elastic_index.create_and_deploy if model.elastic_index.all_names.empty?
-          model.elastic_index.enable_deferring!
-        end
+      ElasticRecord::Config.models.each do |model|
+        model.elastic_index.create_and_deploy if model.elastic_index.all_names.empty?
+        model.elastic_index.enable_deferring!
       end
+    end
 
-      def teardown
-        ElasticRecord::Config.models.each do |model|
-          model.elastic_index.reset_deferring!
-        end
+    def teardown
+      ElasticRecord::Config.models.each do |model|
+        model.elastic_index.reset_deferring!
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Infogroup
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement