search_flip 3.5.0 → 4.0.0.beta

data/lib/search_flip/response.rb

@@ -156,8 +156,7 @@ module SearchFlip
     end
 
     # Returns the results, ie hits, wrapped in a SearchFlip::Result object
-    # which basically is a Hashie::Mash. Check out the Hashie docs for further
-    # details.
+    # which basically is a Hash with method-like access.
     #
     # @example
     #   CommentIndex.search("hello world").results
@@ -166,7 +165,7 @@ module SearchFlip
     # @return [Array] An array of results
 
     def results
-      @results ||= hits["hits"].map { |hit| Result.from_hit(hit) }
+      @results ||= hits["hits"].map { |hit| SearchFlip::Result.from_hit(hit) }
     end
 
     # Returns the named sugggetion, if a name is specified or alle suggestions.
@@ -304,13 +303,13 @@ module SearchFlip
 
       @aggregations[key] =
         if response["aggregations"].nil? || response["aggregations"][key].nil?
-          Result.new
+          SearchFlip::Result.new
         elsif response["aggregations"][key]["buckets"].is_a?(Array)
-          response["aggregations"][key]["buckets"].each_with_object({}) { |bucket, hash| hash[bucket["key"]] = Result.new(bucket) }
+          response["aggregations"][key]["buckets"].each_with_object({}) { |bucket, hash| hash[bucket["key"]] = SearchFlip::Result.convert(bucket) }
         elsif response["aggregations"][key]["buckets"].is_a?(Hash)
-          Result.new response["aggregations"][key]["buckets"]
+          SearchFlip::Result.convert(response["aggregations"][key]["buckets"])
         else
-          Result.new response["aggregations"][key]
+          SearchFlip::Result.convert(response["aggregations"][key])
         end
     end
   end

data/lib/search_flip/result.rb

@@ -1,29 +1,55 @@
 module SearchFlip
-  # The SearchFlip::Result class basically is a hash wrapper that uses
-  # Hashie::Mash to provide convenient method access to the hash attributes.
+  # The SearchFlip::Result class is a simple Hash, but extended with
+  # method-like access. Keys assigned via methods are stored as strings.
+  #
+  # @example method access
+  #   result = SearchFlip::Result.new
+  #   result["some_key"] = "value"
+  #   result.some_key # => "value"
 
-  class Result < Hashie::Mash
-    def self.disable_warnings?(*args)
-      true
-    end
+  class Result < Hash
+    def self.convert(hash)
+      res = self[hash]
 
-    # Creates a SearchFlip::Result object from a raw hit. Useful for e.g.
-    # top hits aggregations.
-    #
-    # @example
-    #   query = ProductIndex.aggregate(top_sales: { top_hits: "..." })
-    #   top_sales_hits = query.aggregations(:top_sales).top_hits.hits.hits
-    #
-    #   SearchFlip::Result.from_hit(top_sales_hits.first)
+      res.each do |key, value|
+        if value.is_a?(Hash)
+          res[key] = convert(value)
+        elsif value.is_a?(Array)
+          res[key] = convert_array(value)
+        end
+      end
 
-    def self.from_hit(hit)
-      raw_result = (hit["_source"] || {}).dup
+      res
+    end
 
-      raw_result["_hit"] = hit.each_with_object({}) do |(key, value), hash|
-        hash[key] = value if key != "_source"
+    def self.convert_array(arr)
+      arr.map do |obj|
+        if obj.is_a?(Hash)
+          convert(obj)
+        elsif obj.is_a?(Array)
+          convert_array(obj)
+        else
+          obj
+        end
       end
+    end
+
+    # rubocop:disable Lint/MissingSuper
 
-      new(raw_result)
+    def method_missing(name, *args, &block)
+      self[name.to_s]
+    end
+
+    # rubocop:enable Lint/MissingSuper
+
+    def respond_to_missing?(name, include_private = false)
+      key?(name.to_s) || super
+    end
+
+    def self.from_hit(hit)
+      res = convert(hit["_source"] || {})
+      res["_hit"] = convert(self[hit].tap { |hash| hash.delete("_source") })
+      res
     end
   end
 end

data/lib/search_flip/to_json.rb

@@ -1 +1,29 @@
-warn "[DEPRECATION] Using search_flip/to_json is not neccessary anymore"
+require "time"
+require "date"
+require "json"
+
+class Time
+  def to_json(*args)
+    iso8601(6).to_json
+  end
+end
+
+class Date
+  def to_json(*args)
+    iso8601.to_json
+  end
+end
+
+class DateTime
+  def to_json(*args)
+    iso8601(6).to_json
+  end
+end
+
+if defined?(ActiveSupport)
+  class ActiveSupport::TimeWithZone
+    def to_json(*args)
+      iso8601(6).to_json
+    end
+  end
+end

data/lib/search_flip/version.rb

@@ -1,3 +1,3 @@
 module SearchFlip
-  VERSION = "3.5.0"
+  VERSION = "4.0.0.beta"
 end

data/lib/search_flip.rb

@@ -1,9 +1,7 @@
 require "ruby2_keywords"
 require "forwardable"
 require "http"
-require "hashie"
 require "thread"
-require "json"
 require "oj"
 require "set"
 
@@ -33,15 +31,10 @@ require "search_flip/index"
 require "search_flip/model"
 
 module SearchFlip
-  class Error < StandardError; end
+  class NotSupportedError < StandardError; end
+  class ConnectionError < StandardError; end
 
-  class NotSupportedError < Error; end
-
-  class HttpError < Error; end
-  class ConnectionError < HttpError; end
-  class TimeoutError < HttpError; end
-
-  class ResponseError < Error
+  class ResponseError < StandardError
     attr_reader :code, :body
 
     def initialize(code:, body:)

data/search_flip.gemspec

@@ -35,9 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "timecop"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "hashie"
   spec.add_dependency "http"
-  spec.add_dependency "json"
   spec.add_dependency "oj"
   spec.add_dependency "ruby2_keywords"
 end

data/spec/search_flip/aggregation_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe SearchFlip::Aggregation do
         aggregation.where(title: "title").where(description: "description").aggregate(:category)
       end
 
-      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket[:key]] = bucket.doc_count }
+      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket["key"]] = bucket.doc_count }
 
       expect(aggregations).to eq("category1" => 2, "category2" => 1)
     end
@@ -36,7 +36,7 @@ RSpec.describe SearchFlip::Aggregation do
           .aggregate(:category)
       end
 
-      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket[:key]] = bucket.doc_count }
+      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket["key"]] = bucket.doc_count }
 
       expect(aggregations).to eq("category1" => 2, "category2" => 1)
     end
@@ -54,7 +54,7 @@ RSpec.describe SearchFlip::Aggregation do
         aggregation.where(title: "title1".."title3").where(price: 100..200).aggregate(:category)
       end
 
-      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket[:key]] = bucket.doc_count }
+      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket["key"]] = bucket.doc_count }
 
       expect(aggregations).to eq("category1" => 2, "category2" => 1)
     end
@@ -74,7 +74,7 @@ RSpec.describe SearchFlip::Aggregation do
         aggregation.where_not(title: "title4").where_not(title: "title5").aggregate(:category)
       end
 
-      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket[:key]] = bucket.doc_count }
+      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket["key"]] = bucket.doc_count }
 
       expect(aggregations).to eq("category1" => 2, "category2" => 1)
     end
@@ -94,7 +94,7 @@ RSpec.describe SearchFlip::Aggregation do
         aggregation.where_not(title: ["title1", "title2"]).where_not(title: ["title6", "title7"]).aggregate(:category)
       end
 
-      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket[:key]] = bucket.doc_count }
+      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket["key"]] = bucket.doc_count }
 
       expect(aggregations).to eq("category1" => 2, "category2" => 1)
     end
@@ -114,7 +114,7 @@ RSpec.describe SearchFlip::Aggregation do
         aggregation.where_not(price: 100..150).where_not(title: "title6".."title7").aggregate(:category)
       end
 
-      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket[:key]] = bucket.doc_count }
+      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket["key"]] = bucket.doc_count }
 
       expect(aggregations).to eq("category1" => 2, "category2" => 1)
     end
@@ -134,7 +134,7 @@ RSpec.describe SearchFlip::Aggregation do
         aggregation.filter(range: { price: { gte: 100, lte: 200 } }).filter(term: { title: "title" }).aggregate(:category)
       end
 
-      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket[:key]] = bucket.doc_count }
+      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket["key"]] = bucket.doc_count }
 
       expect(aggregations).to eq("category1" => 2, "category2" => 1)
     end
@@ -156,7 +156,7 @@ RSpec.describe SearchFlip::Aggregation do
         aggregation.range(:price, gte: 100, lte: 200).range(:title, gte: "title1", lte: "title3").aggregate(:category)
       end
 
-      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket[:key]] = bucket.doc_count }
+      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket["key"]] = bucket.doc_count }
 
       expect(aggregations).to eq("category1" => 2, "category2" => 1)
     end
@@ -174,7 +174,7 @@ RSpec.describe SearchFlip::Aggregation do
         aggregation.match_all.aggregate(:category)
       end
 
-      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket[:key]] = bucket.doc_count }
+      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket["key"]] = bucket.doc_count }
 
       expect(aggregations).to eq("category1" => 2, "category2" => 1)
     end
@@ -194,7 +194,7 @@ RSpec.describe SearchFlip::Aggregation do
         aggregation.exists(:title).exists(:price).aggregate(:category)
       end
 
-      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket[:key]] = bucket.doc_count }
+      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket["key"]] = bucket.doc_count }
 
       expect(aggregations).to eq("category1" => 2, "category2" => 1)
     end
@@ -214,7 +214,7 @@ RSpec.describe SearchFlip::Aggregation do
         aggregation.exists_not(:title).exists_not(:price).aggregate(:category)
       end
 
-      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket[:key]] = bucket.doc_count }
+      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket["key"]] = bucket.doc_count }
 
       expect(aggregations).to eq("category1" => 2, "category2" => 1)
     end
@@ -244,21 +244,21 @@ RSpec.describe SearchFlip::Aggregation do
       expect(aggregations).to eq("category1" => 3, "category2" => 3)
 
       aggregations = query.aggregations(:category)["category1"].title.buckets.each_with_object({}) do |bucket, hash|
-        hash[bucket[:key]] = bucket.doc_count
+        hash[bucket["key"]] = bucket.doc_count
       end
 
       expect(aggregations).to eq("title1" => 2, "title2" => 1)
 
       aggregations = query.aggregations(:category)["category2"].title.buckets.each_with_object({}) do |bucket, hash|
-        hash[bucket[:key]] = bucket.doc_count
+        hash[bucket["key"]] = bucket.doc_count
       end
 
       expect(aggregations).to eq("title1" => 1, "title2" => 2)
 
-      expect(query.aggregations(:category)["category1"].title.buckets.detect { |bucket| bucket[:key] == "title1" }.price.value).to eq(30)
-      expect(query.aggregations(:category)["category1"].title.buckets.detect { |bucket| bucket[:key] == "title2" }.price.value).to eq(15)
-      expect(query.aggregations(:category)["category2"].title.buckets.detect { |bucket| bucket[:key] == "title1" }.price.value).to eq(30)
-      expect(query.aggregations(:category)["category2"].title.buckets.detect { |bucket| bucket[:key] == "title2" }.price.value).to eq(60)
+      expect(query.aggregations(:category)["category1"].title.buckets.detect { |bucket| bucket["key"] == "title1" }.price.value).to eq(30)
+      expect(query.aggregations(:category)["category1"].title.buckets.detect { |bucket| bucket["key"] == "title2" }.price.value).to eq(15)
+      expect(query.aggregations(:category)["category2"].title.buckets.detect { |bucket| bucket["key"] == "title1" }.price.value).to eq(30)
+      expect(query.aggregations(:category)["category2"].title.buckets.detect { |bucket| bucket["key"] == "title2" }.price.value).to eq(60)
     end
   end
 

data/spec/search_flip/criteria_spec.rb

@@ -97,8 +97,7 @@ RSpec.describe SearchFlip::Criteria do
       methods = [
         :profile_value, :failsafe_value, :terminate_after_value, :timeout_value,
         :offset_value, :limit_value, :scroll_args, :source_value, :preference_value,
-        :search_type_value, :routing_value, :track_total_hits_value, :explain_value,
-        :http_timeout_value
+        :search_type_value, :routing_value, :track_total_hits_value, :explain_value
       ]
 
       methods.each do |method|
@@ -192,22 +191,6 @@ RSpec.describe SearchFlip::Criteria do
     end
   end
 
-  describe "#http_timeout" do
-    it "sets the query timeout" do
-      http_client = double("client").as_null_object
-      allow(http_client).to receive(:timeout).and_return(http_client)
-      allow(http_client).to receive(:post).and_raise(SearchFlip::TimeoutError)
-      allow(ProductIndex.connection).to receive(:http_client).and_return(http_client)
-
-      expect { ProductIndex.http_timeout(1).execute }.to raise_error(SearchFlip::TimeoutError)
-      expect(http_client).to have_received(:timeout).with(1)
-    end
-
-    it "executes without errors" do
-      expect { ProductIndex.http_timeout(1).execute }.not_to raise_error
-    end
-  end
-
   describe "#terminate_after" do
     it "sets the terminate after value" do
       query = ProductIndex.terminate_after(1)
@@ -433,18 +416,6 @@ RSpec.describe SearchFlip::Criteria do
     end
   end
 
-  describe "#match_none" do
-    it "does not match any documents" do
-      if ProductIndex.connection.version.to_i >= 5
-        ProductIndex.import create(:product)
-
-        query = ProductIndex.match_none
-
-        expect(query.records).to eq([])
-      end
-    end
-  end
-
   describe "#exists" do
     it "sets up the constraints correctly and is chainable" do
       product1 = create(:product, title: "title1", description: "description1")
@@ -1221,19 +1192,13 @@ RSpec.describe SearchFlip::Criteria do
   end
 
   describe "#failsafe" do
-    [SearchFlip::ConnectionError, SearchFlip::TimeoutError, SearchFlip::ResponseError.new(code: "code", body: "body")].each do |error|
-      it "prevents #{error}" do
-        http_client = double("client").as_null_object
-        allow(http_client).to receive(:post).and_raise(error)
-        allow(ProductIndex.connection).to receive(:http_client).and_return(http_client)
-
-        expect { ProductIndex.all.execute }.to raise_error(error)
+    it "prevents query syntax exceptions" do
+      expect { ProductIndex.search("syntax/error").records }.to raise_error(SearchFlip::ResponseError)
 
-        query = ProductIndex.failsafe(true)
+      query = ProductIndex.failsafe(true).search("syntax/error")
 
-        expect(query.records).to eq([])
-        expect(query.total_entries).to eq(0)
-      end
+      expect(query.records).to eq([])
+      expect(query.total_entries).to eq(0)
     end
   end
 
@@ -1336,7 +1301,7 @@ RSpec.describe SearchFlip::Criteria do
       ProductIndex.import create(:product)
 
       query = ProductIndex.match_all.explain(true)
-      expect(query.results.first._hit.key?(:_explanation)).to eq(true)
+      expect(query.results.first._hit.key?("_explanation")).to eq(true)
     end
   end
 

data/spec/search_flip/http_client_spec.rb

@@ -7,7 +7,7 @@ class HttpTestRequest
     self.calls = []
   end
 
-  [:headers, :via, :basic_auth, :auth, :timeout].each do |method|
+  [:via, :basic_auth, :auth].each do |method|
     define_method method do |*args|
       dup.tap do |request|
         request.calls = calls + [[method, args]]
@@ -20,7 +20,7 @@ RSpec.describe SearchFlip::HTTPClient do
   describe "delegation" do
     subject { SearchFlip::HTTPClient }
 
-    [:headers, :via, :basic_auth, :auth, :timeout].each do |method|
+    [:headers, :via, :basic_auth, :auth].each do |method|
       it { should delegate(method).to(:new) }
     end
 
@@ -56,12 +56,8 @@ RSpec.describe SearchFlip::HTTPClient do
     end
   end
 
-  [:headers, :via, :basic_auth, :auth, :timeout].each do |method|
+  [:via, :basic_auth, :auth].each do |method|
     describe "##{method}" do
-      it "is understood by HTTP" do
-        expect(HTTP.respond_to?(method)).to eq(true)
-      end
-
       it "creates a dupped instance" do
         client = SearchFlip::HTTPClient.new
         client.request = HttpTestRequest.new

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|
@@ -211,18 +211,12 @@ 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
 
         expect(TestIndex.connection).to have_received(:update_mapping).with("test", { "test" => mapping }, type_name: "test")
       end
-
-      it "updates the mapping" do
-        TestIndex.create_index
-
-        expect(TestIndex.update_mapping).to eq(true)
-      end
     end
   end
 
@@ -264,19 +258,12 @@ 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
 
         expect(TestIndex.connection).to have_received(:get_mapping).with("test", type_name: "test")
       end
-
-      it "returns the mapping" do
-        TestIndex.create_index
-        TestIndex.update_mapping
-
-        expect(TestIndex.get_mapping).to be_present
-      end
     end
   end
 

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/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