elastic_record 0.11.1 → 0.12.0

data/test/elastic_record/index/percolator_test.rb

@@ -1,23 +1,25 @@
 require 'helper'
 
 class ElasticRecord::Index::PercolatorTest < MiniTest::Spec
-  def setup
-    super
-    index.disable_deferring!
-  end
-
   def test_create_percolator
-    index.delete(index.percolator_index_name) if index.exists?(index.percolator_index_name)
+    index.delete_percolator('green') if index.percolator_exists?('green')
+    index.delete_percolator('blue') if index.percolator_exists?('blue')
 
     index.create_percolator('green', 'color' => 'green')
 
-    assert index.exists?(index.percolator_index_name)
     assert index.percolator_exists?('green')
     refute index.percolator_exists?('blue')
   end
 
-  def test_percolator_index_name
-    assert_equal 'percolate_widgets', index.percolator_index_name
+  def test_delete_percolator
+    index.create_percolator('green', 'color' => 'green')
+    assert index.percolator_exists?('green')
+
+    index.delete_percolator('green')
+    refute index.percolator_exists?('green')
+  end
+
+  def test_percolate
   end
 
   private

data/test/elastic_record/index_test.rb

@@ -1,27 +1,44 @@
 require 'helper'
 
 class ElasticRecord::IndexTest < MiniTest::Spec
-  def test_model_name
-    index = Widget.elastic_index
+  def test_copy
+    copied = index.dup
+
+    refute_equal copied.settings.object_id, index.settings.object_id
+    refute_equal copied.mapping.object_id, index.mapping.object_id
+  end
 
+  def test_model_name
     assert_equal 'widgets', index.alias_name
     assert_equal 'widget', index.type
   end
 
   def test_disable
-    index = ElasticRecord::Index.new(Widget)
-
     index.disable!
 
     assert index.disabled
   end
 
   def test_enable
-    index = ElasticRecord::Index.new(Widget)
-
     index.disable!
     index.enable!
 
     refute index.disabled
   end
+
+  def test_configure
+    context = nil
+
+    index.configure do
+      context = self
+    end
+
+    assert_kind_of ElasticRecord::Index::Configurator, context
+  end
+
+  private;
+  
+    def index
+      @index ||= ElasticRecord::Index.new(Widget)
+    end
 end

data/test/elastic_record/lucene_test.rb

@@ -6,21 +6,29 @@ class ElasticRecord::LuceneTest < MiniTest::Spec
     assert_equal "Matt \\&& Joe", ElasticRecord::Lucene.escape("Matt && Joe")
   end
 
-  def test_smart_search
-    assert_smart_escape nil, '', ['name']
-    assert_smart_escape nil, nil, ['name']
+  def test_match_phrase
+    assert_match_phrase nil, '', ['name']
+    assert_match_phrase nil, nil, ['name']
 
-    assert_smart_escape '(name:foo*)', 'foo', ['name']
-    assert_smart_escape '(name:"foo-bar")', 'foo-bar', ['name']
-    assert_smart_escape "(name:bob's*)", "bob's", ['name']
-    assert_smart_escape '(name.analyzed:foo*)', 'foo', ['name'] { |f| "#{f}.analyzed" }
-    assert_smart_escape '(name:foo* OR street:foo*)', 'foo', ['name', 'street']
-    assert_smart_escape '(name:"foo bar" OR street:"foo bar") AND (name:faz* OR street:faz*)', '"foo bar" faz', ['name', 'street']
-    assert_smart_escape '(street:"42 place") AND (name:bar*)', 'street:"42 place" name:bar', ['name', 'street']
+    assert_match_phrase '(name:foo*)', 'foo', ['name']
+    assert_match_phrase '(name:"foo-bar")', 'foo-bar', ['name']
+    assert_match_phrase "(name:bob's*)", "bob's", ['name']
+    assert_match_phrase '(name:foo* OR street:foo*)', 'foo', ['name', 'street']
+    assert_match_phrase '(name:"foo bar" OR street:"foo bar") AND (name:faz* OR street:faz*)', '"foo bar" faz', ['name', 'street']
+    assert_match_phrase '(street:"42 place") AND (name:bar*)', 'street:"42 place" name:bar', ['name', 'street']
+  end
+
+  def test_match_phrase_with_unmatched_quotes
+    assert_match_phrase '(name:"foo bar")', '"foo bar', ['name']
+  end
+
+  def test_match_phrase_with_block
+    assert_match_phrase '(name.analyzed:foo*)', 'foo', ['name'] { |f| "#{f}.analyzed" }
   end
 
   private
-    def assert_smart_escape(expected, query, fields, &block)
-      assert_equal expected, ElasticRecord::Lucene.smart_query(query, fields, &block)
+
+    def assert_match_phrase(expected, query, fields, &block)
+      assert_equal expected, ElasticRecord::Lucene.match_phrase(query, fields, &block)
     end
-end
+end

data/test/elastic_record/model_test.rb

@@ -4,12 +4,12 @@ class ElasticRecord::ModelTest < MiniTest::Spec
   class InheritedModel < Widget
   end
 
-  # def test_elastic_connection
-  #   connection = Widget.elastic_connection
-  # 
-  #   assert_equal Widget.elastic_index.type, connection.default_type
-  #   assert_equal Widget.elastic_index.alias_name, connection.default_index
-  # end
+  def test_elastic_connection
+    connection = Widget.elastic_connection
+
+    assert_equal [ElasticRecord::Config.servers], connection.servers
+    assert_equal ElasticRecord::Config.connection_options, connection.options
+  end
 
   def test_elastic_relation
     relation = Widget.elastic_relation
@@ -24,7 +24,7 @@ class ElasticRecord::ModelTest < MiniTest::Spec
     assert_equal Widget, index.model
   end
 
-  # def test_elastic_index_inheritence
-  #   refute_equal Widget.elastic_index.object_id, InheritedModel.elastic_index.object_id
-  # end
+  def test_elastic_index_inheritence
+    refute_equal Widget.elastic_index.object_id, InheritedModel.elastic_index.object_id
+  end
 end

data/test/elastic_record/relation/batches_test.rb

@@ -14,6 +14,14 @@ class ElasticRecord::Relation::BatchesTest < MiniTest::Spec
     assert_equal ['5', '10', '15'].to_set, results.to_set
   end
 
+  def test_ids_in_batches
+    results = []
+    Widget.elastic_relation.find_ids_in_batches do |widgets|
+      results << widgets
+    end
+    assert_equal [['5', '10', '15'].to_set], results.map(&:to_set)
+  end
+
   def test_find_in_batches
     results = []
     Widget.elastic_relation.find_in_batches do |widgets|

data/test/elastic_record/relation/finder_methods_test.rb

@@ -21,17 +21,16 @@ class ElasticRecord::Relation::FinderMethodsTest < MiniTest::Spec
   end
 
   def test_first
-    assert_equal '05', Widget.elastic_relation.first.id
-    assert_equal '05', Widget.elastic_relation.filter('color' => 'red').first.id
-    assert_equal '10', Widget.elastic_relation.filter('color' => 'blue').first.id
+    assert_equal '10', Widget.elastic_relation.order('color').first.id
+    assert_equal '05', Widget.elastic_relation.order('color').filter('color' => 'red').first.id
+    assert_equal '10', Widget.elastic_relation.order('color').filter('color' => 'blue').first.id
     assert_nil Widget.elastic_relation.filter('color' => 'green').first
   end
 
   def test_last
-    assert_equal '10', Widget.elastic_relation.last.id
-    assert_equal '05', Widget.elastic_relation.filter('color' => 'red').last.id
-    assert_equal '10', Widget.elastic_relation.filter('color' => 'blue').last.id
-    assert_nil Widget.elastic_relation.filter('color' => 'green').last
+    assert_equal '05', Widget.elastic_relation.order('color').last.id
+    assert_equal '05', Widget.elastic_relation.order('color' => 'asc').last.id
+    assert_equal '10', Widget.elastic_relation.order('color' => 'desc').last.id
   end
 
   def test_all

data/test/elastic_record/relation/none_test.rb

@@ -7,5 +7,8 @@ class ElasticRecord::Relation::NoneTest < MiniTest::Spec
     assert_equal 0,     none.size
     assert_equal 0,     none.count
     assert_equal [],    none.to_a
+
+    expected_elastic = {"not" => {"match_all" => {}}}
+    assert_equal expected_elastic, none.as_elastic
   end
 end

data/test/elastic_record/relation/search_methods_test.rb

@@ -57,41 +57,6 @@ class ElasticRecord::Relation::SearchMethodsTest < MiniTest::Spec
     assert_equal expected, relation.as_elastic['query']
   end
 
-  def test_filter_with_another_relation
-    relation.filter! Widget.elastic_search.query('red')
-
-    expected = {
-      "constant_score" => {
-        "filter" => {
-          "has_child" => {
-            "type" => "widget",
-            "query" => {
-              "query_string" => {"query"=>"red"}
-            }
-          }
-        }
-      }
-    }
-
-    assert_equal expected, relation.as_elastic['query']
-  end
-
-  def test_filter_with_nil
-    relation.filter! 'name' => nil
-
-    expected = {
-      "constant_score" => {
-        "filter" => {
-          "missing" => {
-            "field" => "name"
-          }
-        }
-      }
-    }
-
-    assert_equal expected, relation.as_elastic['query']
-  end
-
   def test_query_with_only_query
     relation.query!('foo')
 
@@ -138,7 +103,7 @@ class ElasticRecord::Relation::SearchMethodsTest < MiniTest::Spec
     assert_equal expected, relation.as_elastic['facets']
   end
 
-  def test_facet_with_string
+  def test_facet_bang_with_string
     relation.facet!('tags', 'size' => 10)
 
     expected = {
@@ -153,6 +118,21 @@ class ElasticRecord::Relation::SearchMethodsTest < MiniTest::Spec
     assert_equal expected, relation.as_elastic['facets']
   end
 
+  def test_facet_with_string
+    faceted = relation.facet('tags', 'size' => 10)
+
+    expected = {
+      "tags" => {
+        "terms" => {
+          "field" => "tags",
+          "size"  => 10
+        }
+      }
+    }
+
+    assert_equal expected, faceted.as_elastic['facets']
+  end
+
   def test_limit
     relation.limit!(5)
 
@@ -227,12 +207,8 @@ class ElasticRecord::Relation::SearchMethodsTest < MiniTest::Spec
     assert_equal 'bar', relation.bar
   end
 
-  def test_none
-    assert_kind_of ElasticRecord::Relation::None, relation.none
-  end
-
   private
     def relation
       @relation ||= Widget.elastic_relation
     end
-end
+end

data/test/elastic_record/relation_test.rb

@@ -16,6 +16,8 @@ class ElasticRecord::RelationTest < MiniTest::Spec
   end
 
   def test_create_percolator
+    Widget.elastic_index.reset_percolator
+
     Widget.elastic_relation.filter(color: 'green').create_percolator('green')
     Widget.elastic_relation.filter(color: 'blue').create_percolator('blue')
     widget = Widget.new(color: 'green')

data/test/elastic_record/searches_many/reflection_test.rb

@@ -1,6 +1,11 @@
 require 'helper'
 
 class ElasticRecord::SearchesMany::ReflectionTest < MiniTest::Spec
+  def test_klass_name
+    assert_equal 'Product', reflection_class.new(Warehouse, :widgets, {class_name: 'Product'}).klass_name
+    assert_equal 'Widget', reflection_class.new(Warehouse, :widgets, {}).klass_name
+  end
+
   def test_touch_column
     assert_nil reflection_class.new(Warehouse, :widgets, {}).touch_column
     assert_equal :updated_at, reflection_class.new(Warehouse, :widgets, touch: true).touch_column
@@ -14,7 +19,9 @@ class ElasticRecord::SearchesMany::ReflectionTest < MiniTest::Spec
   end
 
   private
+
     def reflection_class
       ElasticRecord::SearchesMany::Reflection
     end
+
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 0.11.1
-  prerelease: 
+  version: 0.12.0
 platform: ruby
 authors:
 - Infogroup
@@ -10,40 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
   name: activemodel
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 description: Find your records with elastic search
 email: developer@matthewhiggins.com
 executables: []
@@ -63,6 +58,7 @@ files:
 - lib/elastic_record/config.rb
 - lib/elastic_record/connection.rb
 - lib/elastic_record/index.rb
+- lib/elastic_record/index/configurator.rb
 - lib/elastic_record/index/deferred.rb
 - lib/elastic_record/index/documents.rb
 - lib/elastic_record/index/manage.rb
@@ -94,6 +90,7 @@ files:
 - test/elastic_record/callbacks_test.rb
 - test/elastic_record/config_test.rb
 - test/elastic_record/connection_test.rb
+- test/elastic_record/index/configurator_test.rb
 - test/elastic_record/index/documents_test.rb
 - test/elastic_record/index/manage_test.rb
 - test/elastic_record/index/mapping_test.rb
@@ -124,26 +121,25 @@ files:
 homepage: http://github.com/data-axle/elastic_record
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.11
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Use Elastic Search with your objects
 test_files: []