search_flip 2.0.0.beta2 → 2.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61c625b2c60157b40c9508e6847e9727b1a468e03910afe317f39fd9687310bd
-  data.tar.gz: bdfc1613945464bb559243cf3d98fe9d29308d35ab2c6133db065bd9efa70322
+  metadata.gz: 55f88fe9b429304c6f605a0175b3b711334cf47613facc78864511b012e2eb4e
+  data.tar.gz: 12c5e164eb18caaf72a361c7d1ba24f9b0324c412f2c7712f79f87e9248dbf1c
 SHA512:
-  metadata.gz: 24dbb5c4294827bd66b24d67a873adfb819eba35d74c393149afe5133f6b59339254e2d3348130035675b0e2ce40cdc223133db0ed52bd2e9ca34d87e9383992
-  data.tar.gz: 8066d64b3695d56fff2f4445602f7d4a86a815a536e825ed7a5287c5738193dfc2e4e8a81d6ea95c03e945cea564a7ff70be43c9fb97e3c30d96c972703ab57f
+  metadata.gz: 26842b8df4ee2014ee77f1429ab6438350f45458e150fe1786f654bb2d925c53524007d2ec88bed42f80d0983887b8720c19b617ec1e00de8de8964c70a602dd
+  data.tar.gz: 6976b12cd544bbc19f88fb69e855c6107badd49c565578b6b5a75b07d63d85ad4d85762e0e18b02010b9376123f44c8bb73dc81676e3f28cdd5b9ab9d237659c

data/.rubocop.yml

@@ -47,10 +47,10 @@ Layout/LeadingBlankLines:
   Enabled: false
 
 Metrics/LineLength:
-  Max: 150
+  Enabled: false
 
 Metrics/MethodLength:
-  Max: 60
+  Enabled: false
 
 Metrics/ModuleLength:
   Enabled: false
@@ -71,7 +71,7 @@ Metrics/CyclomaticComplexity:
   Enabled: false
 
 Metrics/BlockLength:
-  Max: 30
+  Enabled: false
 
 Metrics/BlockNesting:
   Enabled: false
@@ -108,3 +108,10 @@ Lint/UnusedMethodArgument:
 
 Layout/IndentArray:
   EnforcedStyle: consistent
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+Style/RedundantBegin:
+  Enabled: false
+

data/README.md

@@ -373,7 +373,7 @@ CommentIndex.highlight(title: { type: "fvh" })
 
 ```ruby
 query = CommentIndex.highlight(:title).search("hello")
-query.results[0].highlight.title # => "<em>hello</em> world"
+query.results[0]._hit.highlight.title # => "<em>hello</em> world"
 ```
 
 ### Advanced Criteria Methods
@@ -558,6 +558,27 @@ end
 This allows to use different clusters per index e.g. when migrating indices to
 new versions of Elasticsearch.
 
+## Routing and other index-time options
+
+Override `index_options` in case you want to use routing or pass other
+index-time options:
+
+```ruby
+class CommentIndex
+  include SearchFlip::Index
+
+  def self.index_options(comment)
+    {
+      routing: comment.user_id,
+      version: comment.version,
+      version_type: "external_gte"
+    }
+  end
+end
+```
+
+These options will be passed whenever records get indexed, deleted, etc.
+
 ## Non-ActiveRecord models
 
 SearchFlip ships with built-in support for ActiveRecord models, but using

data/UPDATING.md

@@ -3,7 +3,7 @@
 
 ## Update 1.x to 2.x
 
-* [BREAKING] Changed `SearchFlip::Index.base_url` to `SearchFlip::Index.connection`
+* **[BREAKING]** Changed `SearchFlip::Index.base_url` to `SearchFlip::Index.connection`
 
 1.x:
 
@@ -33,7 +33,7 @@ class MyIndex
 end
 ```
 
-* [BREAKING] Changed `SearchFlip.version` to `SearchFlip::Connection#version`
+* **[BREAKING]** Changed `SearchFlip.version` to `SearchFlip::Connection#version`
 
 1.x:
 
@@ -52,7 +52,7 @@ connection = SearchFlip::Connection.new(base_url: "...")
 connection.version
 ```
 
-* [BREAKING] Changed `SearchFlip.aliases` to `SearchFlip::Connection#update_aliases`
+* **[BREAKING]** Changed `SearchFlip.aliases` to `SearchFlip::Connection#update_aliases`
 
 1.x:
 
@@ -77,7 +77,7 @@ connection.update_aliases(actions: [
 ])
 ```
 
-* [BREAKING] Changed `SearchFlip.msearch` to `SearchFlip::Connection#msearch`
+* **[BREAKING]** Changed `SearchFlip.msearch` to `SearchFlip::Connection#msearch`
 
 1.x:
 
@@ -96,7 +96,7 @@ connection = SearchFlip::Connection.new(base_url: "...")
 connection.msearch(queries)
 ```
 
-* [BREAKING] Removed `base_url` param from `SearchFlip::Critiera#execute`
+* **[BREAKING]** Removed `base_url` param from `SearchFlip::Critiera#execute`
 
 1.x:
 
@@ -111,3 +111,19 @@ connection = SearchFlip::Connection.new(base_url: "...")
 MyIndex.where(id: 1).with_settings(connection: connection).execute
 ```
 
+* **[BREAKING]** Move hit data within results in `_hit` namespace
+
+1.x:
+
+```ruby
+query = CommentIndex.highlight(:title).search("hello")
+query.results[0].highlight.title # => "<em>hello</em> world"
+```
+
+2.x:
+
+```ruby
+query = CommentIndex.highlight(:title).search("hello")
+query.results[0]._hit.highlight.title # => "<em>hello</em> world"
+```
+

data/lib/search_flip/bulk.rb

@@ -14,7 +14,7 @@ module SearchFlip
   class Bulk
     class Error < StandardError; end
 
-    attr_accessor :url, :count, :options, :ignore_errors
+    attr_accessor :url, :count, :options, :http_client, :ignore_errors
 
     # Builds and yields a new Bulk object, ie initiates the buffer, yields,
     # sends batches of records each time the buffer is full, and sends a final
@@ -40,11 +40,14 @@ module SearchFlip
     # @option options raise [Boolean] If you want the bulk requests to never
     #   raise any exceptions (fire and forget), you can pass false here.
     #   Default is true.
+    # @option options http_client [SearchFlip::HTTPClient] An optional http
+    #   client instance
 
     def initialize(url, count = 1_000, options = {})
       self.url = url
       self.count = count
       self.options = options
+      self.http_client = options[:http_client] || SearchFlip::HTTPClient.new
       self.ignore_errors = Array(options[:ignore_errors]).to_set if options[:ignore_errors]
 
       init
@@ -114,7 +117,7 @@ module SearchFlip
 
     def upload
       response =
-        SearchFlip::HTTPClient
+        http_client
           .headers(accept: "application/json", content_type: "application/x-ndjson")
           .put(url, body: @payload, params: ignore_errors ? {} : { filter_path: "errors" })
 

data/lib/search_flip/connection.rb

@@ -1,10 +1,19 @@
 
 module SearchFlip
   class Connection
-    attr_reader :base_url
+    attr_reader :base_url, :http_client
 
-    def initialize(base_url: SearchFlip::Config[:base_url])
+    # Creates a new connection.
+    #
+    # @example
+    #   SearchFlip::Connection.new(base_url: "http://elasticsearch.host:9200")
+    #
+    # @param base_url [String] The base url for the connection
+    # @param http_client [SearchFlip::HTTPClient] An optional http client instance
+
+    def initialize(base_url: SearchFlip::Config[:base_url], http_client: SearchFlip::HTTPClient.new)
       @base_url = base_url
+      @http_client = http_client
     end
 
     # Queries and returns the ElasticSearch version used.
@@ -15,7 +24,7 @@ module SearchFlip
     # @return [String] The ElasticSearch version
 
     def version
-      @version ||= SearchFlip::HTTPClient.get("#{base_url}/").parse["version"]["number"]
+      @version ||= http_client.headers(accept: "application/json").get("#{base_url}/").parse["version"]["number"]
     end
 
     # Uses the ElasticSearch Multi Search API to execute multiple search requests
@@ -42,7 +51,7 @@ module SearchFlip
       payload << "\n"
 
       raw_response =
-        SearchFlip::HTTPClient
+        http_client
           .headers(accept: "application/json", content_type: "application/x-ndjson")
           .post("#{base_url}/_msearch", body: payload)
 
@@ -65,7 +74,7 @@ module SearchFlip
     # @return [Hash] The raw response
 
     def update_aliases(payload)
-      SearchFlip::HTTPClient
+      http_client
         .headers(accept: "application/json", content_type: "application/json")
         .post("#{base_url}/_aliases", body: SearchFlip::JSON.generate(payload))
         .parse
@@ -84,10 +93,11 @@ module SearchFlip
     # @return [Hash] The raw response
 
     def get_aliases(index_name: "*", alias_name: "*")
-      res = SearchFlip::HTTPClient
-        .headers(accept: "application/json", content_type: "application/json")
-        .get("#{base_url}/#{index_name}/_alias/#{alias_name}")
-        .parse
+      res =
+        http_client
+          .headers(accept: "application/json", content_type: "application/json")
+          .get("#{base_url}/#{index_name}/_alias/#{alias_name}")
+          .parse
 
       Hashie::Mash.new(res)
     end
@@ -101,7 +111,7 @@ module SearchFlip
     # @return [Boolean] Whether or not the alias exists
 
     def alias_exists?(alias_name)
-      SearchFlip::HTTPClient
+      http_client
         .headers(accept: "application/json", content_type: "application/json")
         .get("#{base_url}/_alias/#{alias_name}")
 
@@ -121,7 +131,7 @@ module SearchFlip
     # @return [Array] The raw response
 
     def get_indices(name = "*")
-      SearchFlip::HTTPClient
+      http_client
         .headers(accept: "application/json", content_type: "application/json")
         .get("#{base_url}/_cat/indices/#{name}")
         .parse
@@ -136,7 +146,7 @@ module SearchFlip
     # @return [Boolean] Returns true or raises SearchFlip::ResponseError
 
     def create_index(index_name, index_settings = {})
-      SearchFlip::HTTPClient.put(index_url(index_name), json: index_settings)
+      http_client.put(index_url(index_name), json: index_settings)
 
       true
     end
@@ -150,7 +160,7 @@ module SearchFlip
     # @return [Boolean] Returns true or raises SearchFlip::ResponseError
 
     def update_index_settings(index_name, index_settings)
-      SearchFlip::HTTPClient.put("#{index_url(index_name)}/_settings", json: index_settings)
+      http_client.put("#{index_url(index_name)}/_settings", json: index_settings)
 
       true
     end
@@ -163,7 +173,7 @@ module SearchFlip
     # @return [Hash] The index settings
 
     def get_index_settings(index_name)
-      SearchFlip::HTTPClient.headers(accept: "application/json").get("#{index_url(index_name)}/_settings").parse
+      http_client.headers(accept: "application/json").get("#{index_url(index_name)}/_settings").parse
     end
 
     # Sends a refresh request to ElasticSearch. Raises
@@ -173,7 +183,7 @@ module SearchFlip
     # @return [Boolean] Returns true or raises SearchFlip::ResponseError
 
     def refresh(index_names = nil)
-      SearchFlip::HTTPClient.post("#{index_names ? index_url(Array(index_names).join(",")) : base_url}/_refresh", json: {})
+      http_client.post("#{index_names ? index_url(Array(index_names).join(",")) : base_url}/_refresh", json: {})
 
       true
     end
@@ -188,7 +198,7 @@ module SearchFlip
     # @return [Boolean] Returns true or raises SearchFlip::ResponseError
 
     def update_mapping(index_name, type_name, mapping)
-      SearchFlip::HTTPClient.put("#{type_url(index_name, type_name)}/_mapping", json: mapping)
+      http_client.put("#{type_url(index_name, type_name)}/_mapping", json: mapping)
 
       true
     end
@@ -201,7 +211,7 @@ module SearchFlip
     # @return [Hash] The current type mapping
 
     def get_mapping(index_name, type_name)
-      SearchFlip::HTTPClient.headers(accept: "application/json").get("#{type_url(index_name, type_name)}/_mapping").parse
+      http_client.headers(accept: "application/json").get("#{type_url(index_name, type_name)}/_mapping").parse
     end
 
     # Deletes the specified index from ElasticSearch. Raises
@@ -211,7 +221,7 @@ module SearchFlip
     # @return [Boolean] Returns true or raises SearchFlip::ResponseError
 
     def delete_index(index_name)
-      SearchFlip::HTTPClient.delete index_url(index_name)
+      http_client.delete index_url(index_name)
 
       true
     end
@@ -222,7 +232,7 @@ module SearchFlip
     # @return [Boolean] Whether or not the index exists
 
     def index_exists?(index_name)
-      SearchFlip::HTTPClient.headers(accept: "application/json").head(index_url(index_name))
+      http_client.headers(accept: "application/json").head(index_url(index_name))
 
       true
     rescue SearchFlip::ResponseError => e

data/lib/search_flip/criteria.rb

@@ -39,18 +39,18 @@ module SearchFlip
 
       fresh.tap do |criteria|
         criteria.profile_value = other.profile_value unless other.profile_value.nil?
-        criteria.source_value = (criteria.source_value || []) + other.source_value if other.source_value
-        criteria.sort_values = (criteria.sort_values || []) + other.sort_values if other.sort_values
-        criteria.highlight_values = (criteria.highlight_values || {}).merge(other.highlight_values) if other.highlight_values
-        criteria.suggest_values = (criteria.suggest_values || {}).merge(other.suggest_values) if other.suggest_values
+        criteria.failsafe_value = other.failsafe_value unless other.failsafe_value.nil?
+        criteria.terminate_after_value = other.terminate_after_value unless other.terminate_after_value.nil?
+        criteria.timeout_value = other.timeout_value unless other.timeout_value.nil?
         criteria.offset_value = other.offset_value if other.offset_value
         criteria.limit_value = other.limit_value if other.limit_value
+        criteria.scroll_args = other.scroll_args if other.scroll_args
+
+        criteria.source_value = (criteria.source_value || []) + other.source_value if other.source_value
+        criteria.sort_values = (criteria.sort_values || []) + other.sort_values if other.sort_values
         criteria.includes_values = (criteria.includes_values || []) + other.includes_values if other.includes_values
         criteria.preload_values = (criteria.preload_values || []) + other.preload_values if other.preload_values
         criteria.eager_load_values = (criteria.eager_load_values || []) + other.eager_load_values if other.eager_load_values
-        criteria.failsafe_value = other.failsafe_value unless other.failsafe_value.nil?
-        criteria.scroll_args = other.scroll_args if other.scroll_args
-        criteria.custom_value = (criteria.custom_value || {}).merge(other.custom_value) if other.custom_value
         criteria.search_values = (criteria.search_values || []) + other.search_values if other.search_values
         criteria.must_values = (criteria.must_values || []) + other.must_values if other.must_values
         criteria.must_not_values = (criteria.must_not_values || []) + other.must_not_values if other.must_not_values
@@ -61,9 +61,11 @@ module SearchFlip
         criteria.post_must_not_values = (criteria.post_must_not_values || []) + other.post_must_not_values if other.post_must_not_values
         criteria.post_should_values = (criteria.post_should_values || []) + other.post_should_values if other.post_should_values
         criteria.post_filter_values = (criteria.post_filter_values || []) + other.post_filter_values if other.post_filter_values
+
+        criteria.highlight_values = (criteria.highlight_values || {}).merge(other.highlight_values) if other.highlight_values
+        criteria.suggest_values = (criteria.suggest_values || {}).merge(other.suggest_values) if other.suggest_values
+        criteria.custom_value = (criteria.custom_value || {}).merge(other.custom_value) if other.custom_value
         criteria.aggregation_values = (criteria.aggregation_values || {}).merge(other.aggregation_values) if other.aggregation_values
-        criteria.terminate_after_value = other.terminate_after_value unless other.terminate_after_value.nil?
-        criteria.timeout_value = other.timeout_value unless other.timeout_value.nil?
       end
     end
 
@@ -175,7 +177,7 @@ module SearchFlip
       res = {}
 
       if must_values || search_values || must_not_values || should_values || filter_values
-        if target.connection.version.to_i >= 2
+        if connection.version.to_i >= 2
           res[:query] = {
             bool: {}
               .merge(must_values || search_values ? { must: (must_values || []) + (search_values || []) } : {})
@@ -213,7 +215,7 @@ module SearchFlip
       res[:aggregations] = aggregation_values if aggregation_values
 
       if post_must_values || post_search_values || post_must_not_values || post_should_values || post_filter_values
-        if target.connection.version.to_i >= 2
+        if connection.version.to_i >= 2
           res[:post_filter] = {
             bool: {}
               .merge(post_must_values || post_search_values ? { must: (post_must_values || []) + (post_search_values || []) } : {})
@@ -357,10 +359,10 @@ module SearchFlip
       dupped_request.delete(:from)
       dupped_request.delete(:size)
 
-      if target.connection.version.to_i >= 5
-        SearchFlip::HTTPClient.post("#{target.type_url}/_delete_by_query", json: dupped_request)
+      if connection.version.to_i >= 5
+        connection.http_client.post("#{target.type_url}/_delete_by_query", json: dupped_request)
       else
-        SearchFlip::HTTPClient.delete("#{target.type_url}/_query", json: dupped_request)
+        connection.http_client.delete("#{target.type_url}/_query", json: dupped_request)
       end
 
       target.refresh if SearchFlip::Config[:auto_refresh]
@@ -673,6 +675,32 @@ module SearchFlip
 
     alias_method :each, :find_each
 
+    # Fetches the results specified by the criteria in batches using the
+    # ElasticSearch scroll API and yields each result. The batch size and scroll
+    # API timeout can be specified. Checkout out the ElasticSearch docs for
+    # further details.
+    #
+    # @example
+    #   CommentIndex.search("hello world").find_each_result(batch_size: 100) do |result|
+    #     # ...
+    #   end
+    #
+    # @param options [Hash] The options to control the fetching of batches
+    # @option options batch_size [Fixnum] The number of records to fetch per
+    #   batch. Uses #limit to control the batch size.
+    # @option options timeout [String] The timeout per scroll request, ie how
+    #   long ElasticSearch will keep the request handle open.
+
+    def find_each_result(options = {})
+      return enum_for(:find_each_result, options) unless block_given?
+
+      find_results_in_batches options do |batch|
+        batch.each do |result|
+          yield result
+        end
+      end
+    end
+
     # Executes the search request for the current criteria, ie sends the
     # request to ElasticSearch and returns the response. Connection and
     # response errors will be rescued if you specify the criteria to be
@@ -685,19 +713,19 @@ module SearchFlip
 
     def execute
       @response ||= begin
-        http_request = SearchFlip::HTTPClient.headers(accept: "application/json")
+        http_request = connection.http_client.headers(accept: "application/json")
 
         http_response =
           if scroll_args && scroll_args[:id]
-            if target.connection.version.to_i >= 2
+            if connection.version.to_i >= 2
               http_request.post(
-                "#{target.connection.base_url}/_search/scroll",
+                "#{connection.base_url}/_search/scroll",
                 json: { scroll: scroll_args[:timeout], scroll_id: scroll_args[:id] }
               )
             else
               http_request
                 .headers(content_type: "text/plain")
-                .post("#{target.connection.base_url}/_search/scroll", params: { scroll: scroll_args[:timeout] }, body: scroll_args[:id])
+                .post("#{connection.base_url}/_search/scroll", params: { scroll: scroll_args[:timeout] }, body: scroll_args[:id])
             end
           elsif scroll_args
             http_request.post(
@@ -776,6 +804,8 @@ module SearchFlip
       :hits, :ids, :count, :size, :length, :took, :aggregations, :suggestions,
       :scope, :results, :records, :scroll_id, :raw_response
 
+    def_delegators :target, :connection
+
     private
 
     def yield_in_batches(options = {})

data/lib/search_flip/http_client.rb

@@ -7,42 +7,43 @@ module SearchFlip
   # with ElasticSearch.
 
   class HTTPClient
-    class Request
-      attr_accessor :headers_hash
+    attr_accessor :request
 
-      def headers(hash = {})
-        dup.tap do |request|
-          request.headers_hash = (request.headers_hash || {}).merge(hash)
-        end
-      end
-
-      [:get, :post, :put, :delete, :head].each do |method|
-        define_method method do |*args|
-          execute(method, *args)
-        end
-      end
-
-      private
+    def initialize
+      self.request = HTTP
+    end
 
-      def execute(method, *args)
-        response = HTTP.headers(headers_hash || {}).send(method, *args)
+    class << self
+      extend Forwardable
 
-        raise SearchFlip::ResponseError.new(code: response.code, body: response.body.to_s) unless response.status.success?
+      def_delegators :new, :headers, :via, :basic_auth, :auth
+      def_delegators :new, :get, :post, :put, :delete, :head
+    end
 
-        response
-      rescue HTTP::ConnectionError => e
-        raise SearchFlip::ConnectionError, e.message
+    [:headers, :via, :basic_auth, :auth].each do |method|
+      define_method method do |*args|
+        dup.tap do |client|
+          client.request = request.send(method, *args)
+        end
       end
     end
 
-    def self.request
-      Request.new
+    [:get, :post, :put, :delete, :head].each do |method|
+      define_method method do |*args|
+        execute(method, *args)
+      end
     end
 
-    class << self
-      extend Forwardable
+    private
+
+    def execute(method, *args)
+      response = request.send(method, *args)
+
+      raise SearchFlip::ResponseError.new(code: response.code, body: response.body.to_s) unless response.status.success?
 
-      def_delegators :request, :headers, :get, :post, :put, :delete, :head
+      response
+    rescue HTTP::ConnectionError => e
+      raise SearchFlip::ConnectionError, e.message
     end
   end
 end

data/lib/search_flip/index.rb

@@ -247,8 +247,8 @@ module SearchFlip
         :post_filter, :post_must, :post_must_not, :post_should, :aggregate, :scroll, :source,
         :includes, :eager_load, :preload, :sort, :resort, :order, :reorder, :offset, :limit, :paginate,
         :page, :per, :search, :highlight, :suggest, :custom, :find_in_batches, :find_results_in_batches,
-        :find_each, :failsafe, :total_entries, :total_count, :timeout, :terminate_after, :records,
-        :should, :should_not, :must, :must_not
+        :find_each, :find_each_result, :failsafe, :total_entries, :total_count, :timeout, :terminate_after,
+        :records, :results, :should, :should_not, :must, :must_not
 
       # Override to specify the type name used within ElasticSearch. Recap,
       # this gem uses an individual index for each index class, because
@@ -396,7 +396,7 @@ module SearchFlip
       # @return [Hash] The specified document
 
       def get(id, params = {})
-        SearchFlip::HTTPClient.headers(accept: "application/json").get("#{type_url}/#{id}", params: params).parse
+        connection.http_client.headers(accept: "application/json").get("#{type_url}/#{id}", params: params).parse
       end
 
       # Sends a index refresh request to ElasticSearch. Raises
@@ -532,7 +532,9 @@ module SearchFlip
       #   raise.
 
       def bulk(options = {})
-        SearchFlip::Bulk.new("#{type_url}/_bulk", SearchFlip::Config[:bulk_limit], options) do |indexer|
+        opts = { http_client: connection.http_client }.merge(options)
+
+        SearchFlip::Bulk.new("#{type_url}/_bulk", SearchFlip::Config[:bulk_limit], opts) do |indexer|
           yield indexer
         end
 

data/lib/search_flip/response.rb

@@ -167,7 +167,15 @@ module SearchFlip
     # @return [Array] An array of results
 
     def results
-      @results ||= hits["hits"].map { |hit| Result.new hit["_source"].merge(hit["highlight"] ? { highlight: hit["highlight"] } : {}) }
+      @results ||= hits["hits"].map do |hit|
+        raw_result = hit["_source"]
+
+        raw_result["_hit"] = hit.each_with_object({}) do |(key, value), hash|
+          hash[key] = value if key != "_source"
+        end
+
+        Result.new(raw_result)
+      end
     end
 
     # Returns the named sugggetion, if a name is specified or alle suggestions.

data/lib/search_flip/version.rb

@@ -1,5 +1,5 @@
 
 module SearchFlip
-  VERSION = "2.0.0.beta2"
+  VERSION = "2.0.0.beta3"
 end
 

data/search_flip.gemspec

@@ -19,12 +19,17 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.post_install_message = <<~MESSAGE
+    Thanks for using search_flip!
+    When upgrading from 1.x to 2.x, please check out
+    https://github.com/mrkamel/search_flip/blob/master/UPDATING.md
+  MESSAGE
+
   spec.add_development_dependency "activerecord", ">= 3.0"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "factory_bot"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "mocha"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "sqlite3", "~> 1.3.6"
   spec.add_development_dependency "timecop"
   spec.add_development_dependency "webmock"

data/spec/delegate_matcher.rb

@@ -0,0 +1,32 @@
+
+RSpec::Matchers.define :delegate do |method|
+  match do |delegator|
+    @method = method
+    @delegator = delegator
+
+    return false unless @delegator.respond_to?(@to)
+    return false unless @delegator.respond_to?(@method)
+
+    target = double
+
+    allow(@delegator).to receive(@to).and_return(target)
+    allow(target).to receive(@method).and_return(:called)
+
+    @delegator.send(@method) == :called
+  end
+
+  description do
+    "delegate :#{@method} to :#{@to}"
+  end
+
+  failure_message do
+    "expected #{@delegator} to delegate :#{@method} to :#{@to}"
+  end
+
+  failure_message_when_negated do
+    "expected #{@delegator} not to delegate :#{@method} to :#{@to}"
+  end
+
+  chain(:to) { |to| @to = to }
+end
+