elastic_record 2.0.2 → 3.0.0

data/test/elastic_record/log_subscriber_test.rb

@@ -16,25 +16,25 @@ class ElasticRecord::LogSubscriberTest < ActiveSupport::TestCase
   # end
 
   def test_request_notification
-    FakeWeb.register_uri(:any, %r[/test], status: ["200", "OK"], body: ActiveSupport::JSON.encode('the' => 'response'))
+    stub_request(:any, '/test').to_return(status: 200, body: Oj.dump('the' => 'response'))
     Widget.elastic_connection.json_get "/widgets", {'foo' => 'bar'}
 
     wait
 
     assert_equal 1, @logger.logged(:debug).size
     assert_match /GET (.*)widgets/, @logger.logged(:debug)[0]
-    assert_match %r['#{ActiveSupport::JSON.encode('foo' => 'bar')}'], @logger.logged(:debug)[0]
+    assert_match %r['#{Oj.dump('foo' => 'bar')}'], @logger.logged(:debug)[0]
   end
 
   def test_request_notification_escaping
-    FakeWeb.register_uri(:any, %r[/widgets?v=%DB], status: ["200", "OK"], body: ActiveSupport::JSON.encode('the' => 'response', 'has %DB' => 'odd %DB stuff'))
+    stub_request(:any, "#{Widget.elastic_connection.servers.first}/widgets?v=%DB").to_return(status: 200, body: Oj.dump('the' => 'response', 'has %DB' => 'odd %DB stuff'))
     Widget.elastic_connection.json_get "/widgets?v=%DB", {'foo' => 'bar', 'escape %DB ' => 'request %DB'}
 
     wait
 
     assert_equal 1, @logger.logged(:debug).size
     assert_match /GET (.*)widgets/, @logger.logged(:debug)[0]
-    assert_match %r['#{ActiveSupport::JSON.encode('foo' => 'bar', 'escape %DB ' => 'request %DB')}'], @logger.logged(:debug)[0]
+    assert_match %r['#{Oj.dump('foo' => 'bar', 'escape %DB ' => 'request %DB')}'], @logger.logged(:debug)[0]
   end
 
   def test_initializes_runtime

data/test/elastic_record/relation/batches_test.rb

@@ -50,43 +50,24 @@ class ElasticRecord::Relation::BatchesTest < MiniTest::Test
     assert_equal [['5', '10'].to_set], results.map(&:to_set)
   end
 
-  def test_find_offset_shards
-    create_additional_widgets
-
+  def test_find_with_batch_size
     results = []
     Widget.elastic_relation.find_ids_in_batches(batch_size: 1) do |ids|
       results << ids
     end
 
-    assert_equal 8, results.size
-    results.each do |r| assert_equal 1, r.size end
-    assert_equal ['5', '10', '15', '20', '25', '30', '35', '40'].to_set, results.flatten.to_set
-  end
-
-  def test_create_scan_search
-    scan_search = Widget.elastic_relation.create_scan_search
-
-    assert_equal 3, scan_search.total_hits
-    refute_nil scan_search.scroll_id
-    assert_equal 3, scan_search.request_more_ids.size
+    assert_equal 3, results.size
+    results.each { |r| assert_equal 1, r.size }
+    assert_equal ['5', '10', '15'].to_set, results.flatten.to_set
   end
 
   private
     def create_widgets
+      Widget.elastic_index.delete_all
       Widget.elastic_index.bulk_add [
         Widget.new(id: 5, color: 'red'),
         Widget.new(id: 10, color: 'blue'),
         Widget.new(id: 15, color: 'green'),
       ]
     end
-
-    def create_additional_widgets
-      Widget.elastic_index.bulk_add [
-          Widget.new(id: 20, color: 'yellow'),
-          Widget.new(id: 25, color: 'violet'),
-          Widget.new(id: 30, color: 'indigo'),
-          Widget.new(id: 35, color: 'orange'),
-          Widget.new(id: 40, color: 'black'),
-      ]
-    end
 end

data/test/elastic_record/relation/delegation_test.rb

@@ -2,8 +2,9 @@ require 'helper'
 
 class ElasticRecord::Relation::DelegationTest < MiniTest::Test
   def test_delegate_to_array
+    Widget.elastic_index.delete_all
     Widget.elastic_index.index_document('5', color: 'red')
-    
+
     records = []
     Widget.elastic_relation.each do |record|
       records << record
@@ -22,6 +23,6 @@ class ElasticRecord::Relation::DelegationTest < MiniTest::Test
     result = model.elastic_relation.filter('foo' => 'bar').do_it
 
     expected = {"query" => {"filtered" => {"filter" => {"term" => {"foo" => "bar"}}}}}
-    assert_equal expected, result 
+    assert_equal expected, result
   end
-end
+end

data/test/elastic_record/relation/finder_methods_test.rb

@@ -69,6 +69,7 @@ class ElasticRecord::Relation::FinderMethodsTest < MiniTest::Test
   private
 
     def create_widgets
+      Widget.elastic_index.delete_all
       Widget.elastic_index.bulk_add [
         Widget.new(color: 'red', id: '05'),
         Widget.new(color: 'blue', id: '10'),

data/test/elastic_record/relation/search_methods_test.rb

@@ -57,80 +57,73 @@ class ElasticRecord::Relation::SearchMethodsTest < MiniTest::Test
     assert_equal expected, relation.as_elastic['query']
   end
 
-  def test_query_with_only_query
-    relation.query!('foo')
-
-    expected = {"query_string" => {"query" => "foo"}}
-
-    assert_equal expected, relation.as_elastic['query']
-  end
-
-  def test_query_with_both_filter_and_query
-    relation.query!('field' => {'name' => 'joe'})
-    relation.filter!(Widget.arelastic['name'].prefix "mat")
+  def test_filter_with_negation
+    scope = relation.filter.not("prefix" => {"name" => "Jo"})
 
     expected = {
       "filtered" => {
-        "query" => {
-          "field" => {
-            "name"=>"joe"
-          },
-        },
         "filter" => {
-          "prefix" => {
-            "name" => "mat"
+          "not" => {
+            "prefix" => {
+              "name" => "Jo"
+            }
           }
         }
       }
     }
 
-    assert_equal expected, relation.as_elastic['query']
+    assert_equal expected, scope.as_elastic['query']
   end
 
-  def test_facet_with_arelastic
-    relation.facet!(Widget.arelastic.facet['popular_tags'].histogram('field' => 'field_name', 'interval' => 100))
+  def test_filter_with_nested
+    scope = relation.filter.nested("contacts", "prefix" => {"contacts.name" => "Jo"})
 
     expected = {
-      "popular_tags" => {
-        "histogram" =>
-        {
-          "field" => "field_name",
-          "interval" => 100
+      "filtered" => {
+        "filter" => {
+          "nested" => {
+            "path" => "contacts",
+            "filter" => {
+              "prefix" => {
+                "contacts.name" => "Jo"
+              }
+            }
+          }
         }
       }
     }
 
-    assert_equal expected, relation.as_elastic['facets']
+    assert_equal expected, scope.as_elastic['query']
   end
 
-  def test_facet_bang_with_string
-    relation.facet!('tags', 'size' => 10)
+  def test_query_with_only_query
+    relation.query!('foo')
 
-    expected = {
-      "tags" => {
-        "terms" => {
-          "field" => "tags",
-          "size"  => 10
-        }
-      }
-    }
+    expected = {"query_string" => {"query" => "foo"}}
 
-    assert_equal expected, relation.as_elastic['facets']
+    assert_equal expected, relation.as_elastic['query']
   end
 
-  def test_facet_with_string
-    faceted = relation.facet('tags', 'size' => 10)
+  def test_query_with_both_filter_and_query
+    relation.query!('field' => {'name' => 'joe'})
+    relation.filter!(Widget.arelastic['name'].prefix "mat")
 
     expected = {
-      "tags" => {
-        "terms" => {
-          "field" => "tags",
-          "size"  => 10
+      "filtered" => {
+        "query" => {
+          "field" => {
+            "name"=>"joe"
+          },
+        },
+        "filter" => {
+          "prefix" => {
+            "name" => "mat"
+          }
         }
       }
     }
 
-    assert_equal expected, faceted.as_elastic['facets']
+    assert_equal expected, relation.as_elastic['query']
   end
 
   def test_aggregation_with_bang
@@ -171,6 +164,15 @@ class ElasticRecord::Relation::SearchMethodsTest < MiniTest::Test
     assert_equal expected, relation.as_elastic['sort']
   end
 
+  def test_search_type
+    relation.search_type! :count
+
+    Widget.elastic_index.index_record Widget.new(color: 'red')
+
+    assert_equal 1, relation.count
+    assert_equal [], relation.to_ids
+  end
+
   def test_reverse_order
     relation.order! 'foo' => {'missing' => '_last'}
     relation.order! 'bar' => 'desc'

data/test/elastic_record/relation_test.rb

@@ -2,23 +2,16 @@ require 'helper'
 
 class ElasticRecord::RelationTest < MiniTest::Test
   def test_count
+    original_count = Widget.elastic_relation.count
     create_widgets [Widget.new(id: 5, color: 'red'), Widget.new(id: 10, color: 'blue')]
 
-    assert_equal 2, Widget.elastic_relation.count
-  end
-
-  def test_facets
-    create_widgets [Widget.new(id: 5, color: 'red'), Widget.new(id: 10, color: 'blue')]
-
-    facets = Widget.elastic_relation.facet(Widget.arelastic.facet['popular_colors'].terms('color')).facets
-
-    assert_equal 2, facets['popular_colors']['total']
+    assert_equal 2, Widget.elastic_relation.count - original_count
   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
+    aggregations = Widget.elastic_relation.aggregate('popular_colors' => {'terms' => {'field' => 'color'}}).aggregations
 
     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
@@ -35,12 +28,14 @@ class ElasticRecord::RelationTest < MiniTest::Test
   end
 
   def test_to_ids
+    Widget.elastic_index.delete_all
     create_widgets [Widget.new(id: 5, color: 'red'), Widget.new(id: 10, color: 'blue')]
 
     assert_equal ['5', '10'].to_set, Widget.elastic_relation.to_ids.to_set
   end
 
   def test_to_a
+    Widget.elastic_index.delete_all
     create_widgets [Widget.new(id: 5, color: 'red'), Widget.new(id: 10, color: 'blue')]
 
     array = Widget.elastic_relation.to_a
@@ -49,6 +44,19 @@ class ElasticRecord::RelationTest < MiniTest::Test
     assert array.first.is_a?(Widget)
   end
 
+  def test_delete_all
+    project_red = Project.create! name: 'Red'
+    project_blue = Project.create! name: 'Blue'
+
+    Project.elastic_relation.filter(name: 'Red').delete_all
+
+    assert_nil Project.find_by(id: project_red.id)
+    assert_equal 0, Project.elastic_relation.filter(name: 'Red').count
+
+    refute_nil Project.find_by(id: project_blue.id)
+    assert_equal 1, Project.elastic_relation.filter(name: 'Blue').count
+  end
+
   def test_equal
     create_widgets [Widget.new(id: 5, color: 'red'), Widget.new(id: 10, color: 'blue')]
 

data/test/helper.rb

@@ -1,15 +1,16 @@
 ENV["RAILS_ENV"] = "test"
 
-require File.expand_path("../../test/dummy/config/environment.rb",  __FILE__)
+require File.expand_path("../../test/dummy/config/environment.rb", __FILE__)
 
 require 'minitest/autorun'
+require 'webmock/minitest'
 
-FakeWeb.allow_net_connect = %r[^https?://127.0.0.1]
+WebMock.disable_net_connect!(allow_localhost: true)
 
 module MiniTest
   class Test
     def setup
-      FakeWeb.clean_registry
+      WebMock.reset!
 
       ElasticRecord::Config.models.each do |model|
         model.elastic_index.enable_deferring!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Infogroup
@@ -9,48 +9,54 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-description: Find your records with elastic search
+description: Find your records with Elasticsearch
 email: developer@matthewhiggins.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.rdoc
+- README.md
 files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - elastic_record.gemspec
 - lib/elastic_record.rb
@@ -67,6 +73,7 @@ files:
 - lib/elastic_record/index/percolator.rb
 - lib/elastic_record/index/settings.rb
 - lib/elastic_record/index/warmer.rb
+- lib/elastic_record/json.rb
 - lib/elastic_record/log_subscriber.rb
 - lib/elastic_record/lucene.rb
 - lib/elastic_record/model.rb
@@ -83,6 +90,8 @@ files:
 - lib/elastic_record/relation/value_methods.rb
 - lib/elastic_record/searching.rb
 - lib/elastic_record/tasks/index.rake
+- test/dummy/.env.example
+- test/dummy/.env.test
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/assets/images/.keep
@@ -106,7 +115,6 @@ files:
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
-- test/dummy/config/database.yml
 - test/dummy/config/elasticsearch.yml
 - test/dummy/config/environment.rb
 - test/dummy/config/environments/development.rb
@@ -124,6 +132,7 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
+- test/dummy/db/migrate/20151211225259_create_projects.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.keep
 - test/dummy/log/.keep
@@ -177,8 +186,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: Use Elastic Search with your objects
+summary: An Elasticsearch querying ORM
 test_files: []

data/README.rdoc

@@ -1,146 +0,0 @@
-= ElasticRecord
-{<img src="https://secure.travis-ci.org/data-axle/elastic_record.png?rvm=2.0.0" />}[http://travis-ci.org/data-axle/elastic_record]
-{<img src="https://codeclimate.com/github/data-axle/elastic_record.png" />}[https://codeclimate.com/github/data-axle/elastic_record]
-
-ElasticRecord is an elasticsearch ORM.
-
-== Setup
-
-The usual Gemfile addition:
-
-  gem 'elastic_record'
-
-
-Include ElasticRecord into your model:
-
-  class Product < ActiveRecord::Base
-    include ElasticRecord::Model
-  end
-
-== Searching
-
-ElasticRecord adds the method 'elastic_search' to your models. It works similar to active_record scoping:
-
-  search = Product.elastic_search
-
-=== Filtering
-
-If a simple hash is passed into filter, a term or terms query is created:
-
-  search.filter(color: 'red')         # Creates a 'term' filter
-  search.filter(color: %w(red blue))  # Creates a 'terms' filter
-  search.filter(color: nil)           # Creates a 'missing' filter
-
-If a hash containing hashes is passed into filter, it is used directly as a filter DSL expression:
-
-  search.filter(prefix: { name: "Sca" }) # Creates a prefix filter
-
-An Arelastic object can also be passed in, working similarily to Arel:
-
-  # Name starts with 'Sca'
-  search.filter(Product.arelastic[:name].prefix("Sca"))
-
-  # Name does not start with 'Sca'
-  search.filter(Product.arelastic[:name].prefix("Sca").negated)
-
-  # Size is greater than 5
-  search.filter(Product.arelastic[:size].gt(5))
-
-  # Name is 'hola' or name is missing
-  search.filter(Product.arelastic[:name].eq("hola").or(Product.arelastic[:name].missing))
-
-Helpful Arel builders can be found at https://github.com/matthuhiggins/arelastic/blob/master/lib/arelastic/builders/filter.rb.
-
-=== Querying
-
-To create a query string, pass a string to search.query:
-
-  search.query("red AND fun*") # Creates {query_string: {"red AND fun*"}}
-
-Complex queries are done using either a hash or an arelastic object:
-
-  search.query(match: {description: "amazing"})
-
-=== Ordering
-
-  search.order(:price)          # sort by price
-  search.order(:color, :price)  # sort by color, then price
-  search.order(price: :desc)    # sort by price in descending order
-
-=== Offsets and Limits
-
-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}
-
-=== Aggregations
-
-Aggregations are added with the aggregate method:
-
-  search.aggregate('popular_colors' => {'terms' => {'field' => 'color'}})
-
-It is important to note that adding aggregations to a query is different than retrieving the results of the query:
-
-  search = search.aggregate('popular_colors' => {'terms' => {'field' => 'color'}})
-  search.aggregations
-  #=> {"popular_colors" => {"buckets" => ...}}
-
-=== Getting Results
-
-A search object behaves similar to an active_record scope, implementing a few methods of its own and delegating the rest to Array, and your class.
-
-  search.count        # Return the number of search results
-  search.first        # Limit results to 1 and return the first result or nil
-  search.find(id)     # Add an ids filter to the existing query
-  search.as_elastic   # Return the json hash that will be sent to elastic search.
-
-The search object behaves like an array when necessary:
-
-  search.each do |product|
-    ...
-  end
-
-Class methods can be executed within scopes:
-
-  class Product
-    def self.increase_prices
-      all.each do { |product| product.increment(:price, 10) }
-    end
-  end
-
-  # Increase the price of all red products by $10.
-  Product.filter(color: 'red').increase_prices
-
-== Configuration
-
-While elastic search automatically maps fields, you may wish to override the defaults:
-
-  class Product < ActiveRecord::Base
-    elastic_index.configure do
-      property :status, type: "string", index: "not_analyzed"
-    end
-  end
-
-You can also directly access Product.elastic_index.mapping and Product.elastic_index.settings:
-
-  class Product
-    elastic_index.mapping = {
-      properties: {
-        name: {type: "string", index: "analyzed"}
-        status: {type: "string", index: "not_analyzed"}
-      }
-    }
-  end
-
-Create the index:
-
-  rake index:create
-
-== Index Administration
-
-Core and Index APIs can be accessed with Product.elastic_index. Some examples include:
-
-  Production.elastic_index.create_and_deploy  # Create a new index
-  Production.elastic_index.reset              # Delete related indexes and deploy a new one
-  Production.elastic_index.refresh            # Call the refresh API
-  Production.elastic_index.get_mapping        # Get the index mapping defined by elastic search