Prefer merge to reverse_merge

Casecommons · Sep 2, 2012 · ea05d59 · ea05d59
1 parent 781d2c9
commit ea05d59
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/pg_search/configuration.rb b/lib/pg_search/configuration.rb
@@ -6,7 +6,7 @@ class Configuration
     attr_reader :model
 
     def initialize(options, model)
-      @options = options.reverse_merge(default_options)
+      @options = default_options.merge(options)
       @model = model
 
       assert_valid_options(@options)

diff --git a/lib/pg_search/document.rb b/lib/pg_search/document.rb
@@ -18,9 +18,10 @@ def self.logger
       options = if PgSearch.multisearch_options.respond_to?(:call)
         PgSearch.multisearch_options.call(*args)
       else
-        PgSearch.multisearch_options.reverse_merge(:query => args.first)
+        {:query => args.first}.merge(PgSearch.multisearch_options)
       end
-      options.reverse_merge(:against => :content)
+
+      {:against => :content}.merge(options)
     }
 
     private