search_flip 3.8.0 → 4.0.0.beta

data/spec/search_flip/index_spec.rb

@@ -5,8 +5,8 @@ RSpec.describe SearchFlip::Index do
     subject { ProductIndex }
 
     methods = [
-      :all, :profile, :where, :where_not, :filter, :range, :match_all, :match_none,
-      :exists, :exists_not, :post_where, :post_where_not, :post_filter, :post_must,
+      :all, :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,
@@ -14,7 +14,7 @@ RSpec.describe SearchFlip::Index do
       :total_entries, :total_count, :terminate_after, :timeout, :records, :results,
       :must, :must_not, :should, :find_each_result,
       :find_results_in_batches, :preference, :search_type, :routing,
-      :track_total_hits, :explain, :http_timeout
+      :track_total_hits, :explain
     ]
 
     methods.each do |method|
@@ -77,7 +77,7 @@ RSpec.describe SearchFlip::Index do
         include SearchFlip::Index
       end
 
-      expect(klass.include_type_name?).to eq(klass.connection.distribution.nil? && klass.connection.version.to_i < 7)
+      expect(klass.include_type_name?).to eq(klass.connection.version.to_i < 7)
     end
 
     it "returns true if the type name is not equal to _doc" do
@@ -185,7 +185,7 @@ RSpec.describe SearchFlip::Index do
   end
 
   describe ".update_mapping" do
-    if TestIndex.connection.distribution || TestIndex.connection.version.to_i >= 7
+    if TestIndex.connection.version.to_i >= 7
       context "without type name" do
         it "delegates to connection" do
           TestIndex.create_index
@@ -211,21 +211,11 @@ RSpec.describe SearchFlip::Index do
         mapping = { properties: { id: { type: "long" } } }
 
         allow(TestIndex).to receive(:mapping).and_return(mapping)
-        allow(TestIndex.connection).to receive(:update_mapping)
+        allow(TestIndex.connection).to receive(:update_mapping).and_call_original
 
         TestIndex.update_mapping
 
-        if TestIndex.connection.distribution.nil? && TestIndex.connection.version.to_i < 8
-          expect(TestIndex.connection).to have_received(:update_mapping).with("test", { "test" => mapping }, type_name: "test")
-        else
-          expect(TestIndex.connection).to have_received(:update_mapping).with("test", mapping)
-        end
-      end
-
-      it "updates the mapping" do
-        TestIndex.create_index
-
-        expect(TestIndex.update_mapping).to eq(true)
+        expect(TestIndex.connection).to have_received(:update_mapping).with("test", { "test" => mapping }, type_name: "test")
       end
     end
   end
@@ -245,7 +235,7 @@ RSpec.describe SearchFlip::Index do
   end
 
   describe ".get_mapping" do
-    if TestIndex.connection.distribution || TestIndex.connection.version.to_i >= 7
+    if TestIndex.connection.version.to_i >= 7
       context "without type name" do
         it "delegates to connection" do
           allow(TestIndex).to receive(:include_type_name?).and_return(false)
@@ -268,22 +258,11 @@ RSpec.describe SearchFlip::Index do
         TestIndex.create_index
         TestIndex.update_mapping
 
-        allow(TestIndex.connection).to receive(:get_mapping)
+        allow(TestIndex.connection).to receive(:get_mapping).and_call_original
 
         TestIndex.get_mapping
 
-        if TestIndex.connection.distribution.nil? && TestIndex.connection.version.to_i < 8
-          expect(TestIndex.connection).to have_received(:get_mapping).with("test", type_name: "test")
-        else
-          expect(TestIndex.connection).to have_received(:get_mapping).with("test")
-        end
-      end
-
-      it "returns the mapping" do
-        TestIndex.create_index
-        TestIndex.update_mapping
-
-        expect(TestIndex.get_mapping).to be_present
+        expect(TestIndex.connection).to have_received(:get_mapping).with("test", type_name: "test")
       end
     end
   end
@@ -340,7 +319,7 @@ RSpec.describe SearchFlip::Index do
 
       TestIndex.type_url
 
-      expect(TestIndex.connection).to have_received(:type_url).with("test", TestIndex.connection.distribution.nil? && TestIndex.connection.version.to_i < 8 ? "test" : "_doc")
+      expect(TestIndex.connection).to have_received(:type_url).with("test", "test")
     end
   end
 
@@ -433,7 +412,7 @@ RSpec.describe SearchFlip::Index do
 
       products = create_list(:product, 2)
 
-      if ProductIndex.connection.distribution || ProductIndex.connection.version.to_i >= 5
+      if ProductIndex.connection.version.to_i >= 5
         expect { ProductIndex.create products, {}, routing: "r1" }.to(change { ProductIndex.total_count }.by(2))
 
         expect(ProductIndex.get(products.first.id, routing: "r1")["_routing"]).to eq("r1")
@@ -447,7 +426,7 @@ RSpec.describe SearchFlip::Index do
     it "allows respects class options" do
       products = create_list(:product, 2)
 
-      if ProductIndex.connection.distribution || ProductIndex.connection.version.to_i >= 5
+      if ProductIndex.connection.version.to_i >= 5
         allow(ProductIndex).to receive(:index_options).and_return(routing: "r1")
 
         expect { ProductIndex.create products }.to(change { ProductIndex.total_count }.by(2))

data/spec/search_flip/json_spec.rb

@@ -2,16 +2,6 @@ require File.expand_path("../spec_helper", __dir__)
 
 RSpec.describe SearchFlip::JSON do
   describe ".generate" do
-    it "encodes timestamps correctly" do
-      Timecop.freeze "2020-06-01 12:00:00 UTC" do
-        expect(described_class.generate(timestamp: Time.now.utc)).to eq('{"timestamp":"2020-06-01T12:00:00.000Z"}')
-      end
-    end
-
-    it "encodes bigdecimals as string" do
-      expect(described_class.generate(value: BigDecimal(1))).to eq('{"value":"1.0"}')
-    end
-
     it "delegates to Oj" do
       allow(Oj).to receive(:dump)
 
@@ -19,7 +9,7 @@ RSpec.describe SearchFlip::JSON do
 
       described_class.generate(payload)
 
-      expect(Oj).to have_received(:dump).with(payload, mode: :custom, use_to_json: true, time_format: :xmlschema, bigdecimal_as_decimal: false)
+      expect(Oj).to have_received(:dump).with(payload, mode: :custom, use_to_json: true)
     end
 
     it "generates json" do
@@ -28,18 +18,14 @@ RSpec.describe SearchFlip::JSON do
   end
 
   describe ".parse" do
-    it "returns the parsed json payload" do
-      expect(described_class.parse('{"key":"value"}')).to eq("key" => "value")
-    end
-
-    it "delegates to JSON" do
-      allow(JSON).to receive(:parse)
+    it "delegates to Oj" do
+      allow(Oj).to receive(:load)
 
       payload = '{"key":"value"}'
 
       described_class.parse(payload)
 
-      expect(JSON).to have_received(:parse).with(payload)
+      expect(Oj).to have_received(:load).with(payload)
     end
   end
 end

data/spec/search_flip/null_instrumenter_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe SearchFlip::NullInstrumenter do
     it "calls start" do
       allow(subject).to receive(:start)
 
-      subject.instrument("name", { key: "value" }) { true }
+      subject.instrument("name", { key: "value" }) {}
 
       expect(subject).to have_received(:start)
     end
@@ -15,7 +15,7 @@ RSpec.describe SearchFlip::NullInstrumenter do
     it "calls finish" do
       allow(subject).to receive(:finish)
 
-      subject.instrument("name", { key: "value" }) { true }
+      subject.instrument("name", { key: "value" }) {}
 
       expect(subject).to have_received(:finish)
     end

data/spec/search_flip/response_spec.rb

@@ -82,7 +82,7 @@ RSpec.describe SearchFlip::Response do
 
       ProductIndex.import products
 
-      expect(ProductIndex.match_all.results.to_set(&:id)).to eq(products.to_set(&:id))
+      expect(ProductIndex.match_all.results.map(&:id).to_set).to eq(products.map(&:id).to_set)
     end
   end
 
@@ -126,7 +126,7 @@ RSpec.describe SearchFlip::Response do
 
       response = ProductIndex.match_all.response
 
-      expect(response.ids.to_set).to eq(products.map(&:id).to_set(&:to_s))
+      expect(response.ids.to_set).to eq(products.map(&:id).map(&:to_s).to_set)
       expect(response.ids).to eq(response.raw_response["hits"]["hits"].map { |hit| hit["_id"] })
     end
   end

data/spec/search_flip/result_spec.rb

@@ -1,6 +1,29 @@
 require File.expand_path("../spec_helper", __dir__)
 
 RSpec.describe SearchFlip::Result do
+  describe ".convert" do
+    it "deeply converts hashes and arrays" do
+      result = described_class.convert("parent" => { "child" => [{ "key1" => "value" }, { "key2" => 3 }] })
+
+      expect(result.parent.child[0].key1).to eq("value")
+      expect(result.parent.child[1].key2).to eq(3)
+    end
+  end
+
+  describe "#method_missing" do
+    it "returns the value of the key equal to the message name" do
+      expect(described_class.convert("some_key" => "value").some_key).to eq("value")
+      expect(described_class.new.some_key).to be_nil
+    end
+  end
+
+  describe "#responds_to_missing?" do
+    it "returns true/false if the key equal to the message name is present or not" do
+      expect(described_class.convert("some_key" => nil).respond_to?(:some_key)).to eq(true)
+      expect(described_class.convert("some_key" => nil).respond_to?(:other_key)).to eq(false)
+    end
+  end
+
   describe ".from_hit" do
     it "adds a _hit key into _source and merges the hit keys into it" do
       result = SearchFlip::Result.from_hit("_score" => 1.0, "_source" => { "name" => "Some name" })
@@ -8,12 +31,6 @@ RSpec.describe SearchFlip::Result do
       expect(result).to eq("name" => "Some name", "_hit" => { "_score" => 1.0 })
     end
 
-    it "allows deep method access" do
-      result = SearchFlip::Result.from_hit("_source" => { "key1" => [{ "key2" => "value" }] })
-
-      expect(result.key1[0].key2).to eq("value")
-    end
-
     it "works with the _source being disabled" do
       result = SearchFlip::Result.from_hit("_id" => 1)
 

data/spec/search_flip/to_json_spec.rb

@@ -0,0 +1,28 @@
+require File.expand_path("../spec_helper", __dir__)
+require "search_flip/to_json"
+
+RSpec.describe "to_json" do
+  it "uses the correct format for Time" do
+    Timecop.freeze Time.parse("2018-01-01 12:00:00 UTC") do
+      expect(Time.now.utc.to_json).to eq("\"2018-01-01T12:00:00.000000Z\"")
+    end
+  end
+
+  it "uses the correct format for Date" do
+    Timecop.freeze Time.parse("2018-01-01 12:00:00 UTC") do
+      expect(Date.today.to_json).to eq("\"2018-01-01\"")
+    end
+  end
+
+  it "uses the correct format for DateTime" do
+    Timecop.freeze Time.parse("2018-01-01 12:00:00 UTC") do
+      expect(Time.now.utc.to_json).to eq("\"2018-01-01T12:00:00.000000Z\"")
+    end
+  end
+
+  it "uses the correct format for TimeWithZone" do
+    Timecop.freeze Time.parse("2018-01-01 12:00:00 UTC") do
+      expect(Time.find_zone("UTC").now.to_json).to eq("\"2018-01-01T12:00:00.000000Z\"")
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -16,8 +16,6 @@ RSpec.configure do |config|
     TestIndex.delete_index if TestIndex.index_exists?
     ProductIndex.match_all.delete
     Product.delete_all
-    CommentIndex.match_all.delete
-    Comment.delete_all
   end
 end
 
@@ -86,7 +84,7 @@ class CommentIndex
   include SearchFlip::Index
 
   def self.type_name
-    connection.distribution.nil? && connection.version.to_i < 8 ? "comments" : "_doc"
+    "comments"
   end
 
   def self.index_name
@@ -113,7 +111,7 @@ class ProductIndex
   include SearchFlip::Index
 
   def self.mapping
-    if ProductIndex.connection.distribution || ProductIndex.connection.version.to_i >= 5
+    if ProductIndex.connection.version.to_i >= 5
       {
         properties: {
           category: {
@@ -136,7 +134,7 @@ class ProductIndex
   end
 
   def self.type_name
-    connection.distribution.nil? && connection.version.to_i < 8 ? "products" : "_doc"
+    "products"
   end
 
   def self.index_name
@@ -177,7 +175,7 @@ class TestIndex
   end
 
   def self.type_name
-    connection.distribution.nil? && connection.version.to_i < 8 ? "test" : "_doc"
+    "test"
   end
 
   def self.index_name

metadata

@@ -1,23 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: search_flip
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 4.0.0.beta
 platform: ruby
 authors:
 - Benjamin Vetter
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-19 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -25,13 +39,69 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: http
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_bot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -39,7 +109,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -138,14 +250,12 @@ files:
 - spec/search_flip/null_instrumenter_spec.rb
 - spec/search_flip/response_spec.rb
 - spec/search_flip/result_spec.rb
+- spec/search_flip/to_json_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/mrkamel/search_flip
 licenses:
 - MIT
-metadata:
-  homepage_uri: https://github.com/mrkamel/search_flip
-  source_code_uri: https://github.com/mrkamel/search_flip
-  changelog_uri: https://github.com/mrkamel/search_flip/blob/master/CHANGELOG.md
+metadata: {}
 post_install_message: |
   Thanks for using search_flip!
   When upgrading to 3.x, please check out
@@ -160,12 +270,27 @@ 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: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Full-Featured Elasticsearch Ruby Client with a Chainable DSL
-test_files: []
+test_files:
+- spec/delegate_matcher.rb
+- spec/search_flip/aggregation_spec.rb
+- spec/search_flip/aws_sigv4_plugin_spec.rb
+- spec/search_flip/bulk_spec.rb
+- spec/search_flip/connection_spec.rb
+- spec/search_flip/criteria_spec.rb
+- spec/search_flip/http_client_spec.rb
+- spec/search_flip/index_spec.rb
+- spec/search_flip/json_spec.rb
+- spec/search_flip/model_spec.rb
+- spec/search_flip/null_instrumenter_spec.rb
+- spec/search_flip/response_spec.rb
+- spec/search_flip/result_spec.rb
+- spec/search_flip/to_json_spec.rb
+- spec/spec_helper.rb