search_flip 1.1.0 → 2.0.0.beta

data/test/search_flip/http_client_test.rb

@@ -1,5 +1,5 @@
 
-require File.expand_path("../../test_helper", __FILE__)
+require File.expand_path("../test_helper", __dir__)
 
 class SearchFlip::HTTPClientTest < SearchFlip::TestCase
   [:get, :put, :delete, :post, :head].each do |method|

data/test/search_flip/index_test.rb

@@ -1,12 +1,34 @@
 
-require File.expand_path("../../test_helper", __FILE__)
+require File.expand_path("../test_helper", __dir__)
 
 class SearchFlip::IndexTest < SearchFlip::TestCase
-  should_delegate_methods :profile, :where, :where_not, :filter, :range, :match_all, :exists, :exists_not, :post_where,
-    :post_where_not, :post_filter, :post_range, :post_exists, :post_exists_not, :aggregate, :scroll, :source, :includes,
-    :eager_load, :preload, :sort, :resort, :order, :reorder, :offset, :limit, :paginate, :page, :per, :search,
-    :find_in_batches, :highlight, :suggest, :custom, :find_each, :failsafe, :total_entries, :total_count, :terminate_after,
-    :timeout, :should, :should_not, :must, :must_not, to: :criteria, subject: ProductIndex
+  should_delegate_methods :profile, :where, :where_not, :filter, :range, :match_all, :exists,
+    :exists_not, :post_where, :post_where_not, :post_filter, :post_must, :post_must_not,
+    :post_should, :post_range, :post_exists, :post_exists_not, :aggregate, :scroll, :source,
+    :includes, :eager_load, :preload, :sort, :resort, :order, :reorder, :offset, :limit,
+    :paginate, :page, :per, :search, :find_in_batches, :highlight, :suggest, :custom, :find_each,
+    :failsafe, :total_entries, :total_count, :terminate_after, :timeout, :should, :should_not,
+    :must, :must_not, to: :criteria, subject: ProductIndex
+
+  def test_serialize_exception
+    klass = Class.new do
+      include SearchFlip::Index
+    end
+
+    assert_raises SearchFlip::MethodNotImplemented do
+      klass.serialize(Hashie::Mash)
+    end
+  end
+
+  def test_type_name_exception
+    klass = Class.new do
+      include SearchFlip::Index
+    end
+
+    assert_raises SearchFlip::MethodNotImplemented do
+      klass.serialize(Hashie::Mash)
+    end
+  end
 
   def test_create_index
     assert TestIndex.create_index
@@ -75,10 +97,6 @@ class SearchFlip::IndexTest < SearchFlip::TestCase
     end
   end
 
-  def test_base_url
-    assert_equal "http://127.0.0.1:9200", ProductIndex.base_url
-  end
-
   def test_index_url
     assert_equal "http://127.0.0.1:9200/products", ProductIndex.index_url
 
@@ -151,7 +169,9 @@ class SearchFlip::IndexTest < SearchFlip::TestCase
       ProductIndex.import products
     end
 
-    assert_equal [3, 3], products.map { |product| ProductIndex.get(product.id)["_version"] }
+    actual = products.map { |product| ProductIndex.get(product.id)["_version"] }
+
+    assert_equal [3, 3], actual
   end
 
   def test_index_array
@@ -267,32 +287,38 @@ class SearchFlip::IndexTest < SearchFlip::TestCase
 
     products = create_list(:product, 2)
 
-    if SearchFlip.version.to_i >= 5
+    if ProductIndex.connection.version.to_i >= 5
       assert_difference "ProductIndex.total_entries", 2 do
         ProductIndex.create products, {}, routing: "r1"
       end
 
-      assert_equal "r1", ProductIndex.get(products.first.id, routing: "r1")["_routing"]
+      actual = ProductIndex.get(products.first.id, routing: "r1")["_routing"]
+
+      assert_equal "r1", actual
     else
       assert_difference "ProductIndex.total_entries", 2 do
         ProductIndex.create products, {}, version: 2, version_type: "external"
       end
 
-      assert_equal [2, 2], products.map { |product| ProductIndex.get(product.id)["_version"] }
+      actual = products.map { |product| ProductIndex.get(product.id)["_version"] }
+
+      assert_equal [2, 2], actual
     end
   end
 
   def test_create_with_class_options
     products = create_list(:product, 2)
 
-    if SearchFlip.version.to_i >= 5
+    if ProductIndex.connection.version.to_i >= 5
       ProductIndex.stubs(:index_options).returns(routing: "r1")
 
       assert_difference "ProductIndex.total_entries", 2 do
         ProductIndex.create products
       end
 
-      assert_equal ["r1", "r1"], products.map { |product| ProductIndex.get(product.id, routing: "r1")["_routing"] }
+      actual = products.map { |product| ProductIndex.get(product.id, routing: "r1")["_routing"] }
+
+      assert_equal ["r1", "r1"], actual
     else
       ProductIndex.stubs(:index_options).returns(version: 2, version_type: "external")
 
@@ -300,7 +326,9 @@ class SearchFlip::IndexTest < SearchFlip::TestCase
         ProductIndex.create products
       end
 
-      assert_equal [2, 2], products.map { |product| ProductIndex.get(product.id)["_version"] }
+      actual = products.map { |product| ProductIndex.get(product.id)["_version"] }
+
+      assert_equal [2, 2], actual
     end
   end
 
@@ -346,5 +374,9 @@ class SearchFlip::IndexTest < SearchFlip::TestCase
       end
     end
   end
+
+  def test_connection
+    assert_equal ProductIndex.connection.base_url, "http://127.0.0.1:9200"
+  end
 end
 

data/test/search_flip/model_test.rb

@@ -1,5 +1,5 @@
 
-require File.expand_path("../../test_helper", __FILE__)
+require File.expand_path("../test_helper", __dir__)
 
 class SearchFlip::ModelTest < SearchFlip::TestCase
   class TestProduct < Product

data/test/search_flip/response_test.rb

@@ -1,5 +1,5 @@
 
-require File.expand_path("../../test_helper", __FILE__)
+require File.expand_path("../test_helper", __dir__)
 
 class SearchFlip::ResponseTest < SearchFlip::TestCase
   def test_total_entries
@@ -124,10 +124,11 @@ class SearchFlip::ResponseTest < SearchFlip::TestCase
     ProductIndex.import [product1, product2, product3]
 
     query = ProductIndex.aggregate(:category) do |aggregation|
-      aggregation.aggregate(price_sum: { sum: { field: "price" }})
+      aggregation.aggregate(price_sum: { sum: { field: "price" } })
     end
 
-    assert_equal Hash["category1" => 2, "category2" => 1], query.aggregations(:category).each_with_object({}) { |(key, agg), hash| hash[key] = agg.doc_count }
+    assert_equal Hash["category1" => 2, "category2" => 1],
+      query.aggregations(:category).each_with_object({}) { |(key, agg), hash| hash[key] = agg.doc_count }
 
     assert_equal 40, query.aggregations(:category)["category1"].price_sum.value
     assert_equal 20, query.aggregations(:category)["category2"].price_sum.value

data/test/search_flip/to_json_test.rb

@@ -1,5 +1,5 @@
 
-require File.expand_path("../../test_helper", __FILE__)
+require File.expand_path("../test_helper", __dir__)
 require "search_flip/to_json"
 
 class SearchFlip::ToJsonTest < SearchFlip::TestCase

data/test/test_helper.rb

@@ -11,7 +11,7 @@ require "yaml"
 
 WebMock.allow_net_connect!
 
-ActiveRecord::Base.establish_connection YAML.load_file(File.expand_path("../database.yml", __FILE__))
+ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
 
 SearchFlip::Config[:auto_refresh] = true
 
@@ -23,7 +23,7 @@ ActiveRecord::Base.connection.create_table :products do |t|
   t.float :price
   t.string :category
   t.integer :version, default: 1
-  t.integer :rank, :default => 0
+  t.integer :rank, default: 0
   t.integer :user_id
   t.timestamps null: false
 end
@@ -99,7 +99,7 @@ class ProductIndex
   include SearchFlip::Index
 
   def self.mapping
-    if SearchFlip.version.to_i >= 5
+    if ProductIndex.connection.version.to_i >= 5
       {
         products: {
           properties: {
@@ -180,7 +180,7 @@ class SearchFlip::TestCase < MiniTest::Test
 
       assert target.respond_to?(as), "#{to} doesn't respond to #{as}"
 
-      params = subject.method(method).arity.abs.times.map { |i| "param-#{i}" }
+      params = Array.new(subject.method(method).arity.abs) { |i| "param-#{i}" }
 
       mock_target = mock
       mock_target.expects(as).with(*params)
@@ -198,7 +198,7 @@ class SearchFlip::TestCase < MiniTest::Test
   end
 
   def assert_difference(expressions, difference = 1, &block)
-    callables = Array(expressions).map { |e| lambda { eval(e, block.binding) } }
+    callables = Array(expressions).map { |e| -> { eval(e, block.binding) } }
 
     before = callables.map(&:call)
 

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: search_flip
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0.beta
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-19 00:00:00.000000000 Z
+date: 2019-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_bot
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,21 +95,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: http
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -186,18 +186,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- docker-compose.yml
 - lib/search_flip.rb
 - lib/search_flip/aggregatable.rb
 - lib/search_flip/aggregation.rb
 - lib/search_flip/bulk.rb
 - lib/search_flip/config.rb
+- lib/search_flip/connection.rb
 - lib/search_flip/criteria.rb
+- lib/search_flip/exceptions.rb
 - lib/search_flip/filterable.rb
 - lib/search_flip/http_client.rb
 - lib/search_flip/index.rb
@@ -209,16 +213,15 @@ files:
 - lib/search_flip/to_json.rb
 - lib/search_flip/version.rb
 - search_flip.gemspec
-- test/database.yml
 - test/search_flip/aggregation_test.rb
 - test/search_flip/bulk_test.rb
+- test/search_flip/connection_test.rb
 - test/search_flip/criteria_test.rb
 - test/search_flip/http_client_test.rb
 - test/search_flip/index_test.rb
 - test/search_flip/model_test.rb
 - test/search_flip/response_test.rb
 - test/search_flip/to_json_test.rb
-- test/search_flip_test.rb
 - test/test_helper.rb
 homepage: https://github.com/mrkamel/search_flip
 licenses:
@@ -235,24 +238,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Powerful ElasticSearch client library to easily build complex queries
 test_files:
-- test/database.yml
 - test/search_flip/aggregation_test.rb
 - test/search_flip/bulk_test.rb
+- test/search_flip/connection_test.rb
 - test/search_flip/criteria_test.rb
 - test/search_flip/http_client_test.rb
 - test/search_flip/index_test.rb
 - test/search_flip/model_test.rb
 - test/search_flip/response_test.rb
 - test/search_flip/to_json_test.rb
-- test/search_flip_test.rb
 - test/test_helper.rb

data/test/database.yml

@@ -1,4 +0,0 @@
-
-adapter: sqlite3
-database: ":memory:"
-

data/test/search_flip_test.rb

@@ -1,26 +0,0 @@
-
-require File.expand_path("../test_helper", __FILE__)
-
-class SearchFlipTest < SearchFlip::TestCase
-  def test_msearch
-    ProductIndex.import create(:product)
-    CommentIndex.import create(:comment)
-
-    responses = SearchFlip.msearch([ProductIndex.match_all, CommentIndex.match_all])
-
-    assert_equal 2, responses.size
-    assert_equal 1, responses[0].total_entries
-    assert_equal 1, responses[1].total_entries
-  end
-
-  def test_aliases
-    assert SearchFlip.aliases(actions: [
-      add: { index: "products", alias: "alias1" }
-    ])
-
-    assert SearchFlip.aliases(actions: [
-      remove: { index: "products", alias: "alias1" }
-    ])
-  end
-end
-