Less deps [skip ci]

Andrew Kane
1 parent 176afba3
Showing 2 changed files with 36 additions and 19 deletions Show diff stats
lib/searchkick/hash_wrapper.rb
test/sql_test.rb
 module Searchkick
-  # Subclass of `Hashie::Mash` to wrap Hash-like structures
-  # (responses from Elasticsearch)
-  #
-  # The primary goal of the subclass is to disable the
-  # warning being printed by Hashie for re-defined
-  # methods, such as `sort`.
-  #
-  class HashWrapper < ::Hashie::Mash
-    disable_warnings if respond_to?(:disable_warnings)
+  class HashWrapper
+    def initialize(data)
+      @data = data
+    end
+
+    def method_missing(m, *args, &block)
+      if @data.key?(m.to_s)
+        raise ArgumentError, "wrong number of arguments (given #{args.size}, expected 0)" if args.any?
+        @data[m.to_s]
+      else
+        super
+      end
+    end
+
+    def respond_to?(m, include_private = false)
+      @data.key?(m.to_s) || super
+    end
+
+    def to_h
+      @data
+    end
+
+    def inspect
+      str = @data.map { |k, v| "#{k}=#{v.inspect}" }.join(" ")
+      "#<Searchkick::HashWrapper #{str}>"
+    end
   end
 end
@@ -68,7 +68,7 @@ class SqlTest &lt; Minitest::Test
   def test_load_false
     store_names ["Product A"]
-    assert_kind_of Hash, Product.search("product", load: false).first
+    assert_kind_of Searchkick::HashWrapper, Product.search("product", load: false).first
   end
   def test_load_false_methods
@@ -78,7 +78,7 @@ class SqlTest &lt; Minitest::Test
   def test_load_false_with_includes
     store_names ["Product A"]
-    assert_kind_of Hash, Product.search("product", load: false, includes: [:store]).first
+    assert_kind_of Searchkick::HashWrapper, Product.search("product", load: false, includes: [:store]).first
   end
   def test_load_false_nested_object
@@ -92,7 +92,7 @@ class SqlTest &lt; Minitest::Test
   def test_select
     store [{name: "Product A", store_id: 1}]
     result = Product.search("product", load: false, select: [:name, :store_id]).first
-    assert_equal %w(id name store_id), result.keys.reject { |k| k.start_with?("_") }.sort
+    assert_equal %w(id name store_id), result.to_h.keys.reject { |k| k.start_with?("_") }.sort
     assert_equal "Product A", result.name
     assert_equal 1, result.store_id
   end
@@ -106,9 +106,9 @@ class SqlTest &lt; Minitest::Test
   def test_select_single_field
     store [{name: "Product A", store_id: 1}]
     result = Product.search("product", load: false, select: :name).first
-    assert_equal %w(id name), result.keys.reject { |k| k.start_with?("_") }.sort
+    assert_equal %w(id name), result.to_h.keys.reject { |k| k.start_with?("_") }.sort
     assert_equal "Product A", result.name
-    assert_nil result.store_id
+    assert !result.respond_to?(:store_id)
   end
   def test_select_all
@@ -129,15 +129,15 @@ class SqlTest &lt; Minitest::Test
   def test_select_includes
     store [{name: "Product A", user_ids: [1, 2]}]
     result = Product.search("product", load: false, select: {includes: [:name]}).first
-    assert_equal %w(id name), result.keys.reject { |k| k.start_with?("_") }.sort
+    assert_equal %w(id name), result.to_h.keys.reject { |k| k.start_with?("_") }.sort
     assert_equal "Product A", result.name
-    assert_nil result.store_id
+    assert !result.respond_to?(:store_id)
   end
   def test_select_excludes
     store [{name: "Product A", user_ids: [1, 2], store_id: 1}]
     result = Product.search("product", load: false, select: {excludes: [:name]}).first
-    assert_nil result.name
+    assert !result.respond_to?(:name)
     assert_equal [1, 2], result.user_ids
     assert_equal 1, result.store_id
   end
@@ -147,8 +147,8 @@ class SqlTest &lt; Minitest::Test
     store [{name: "Product A", user_ids: [1, 2], store_id: 1}]
     result = Product.search("product", load: false, select: {includes: [:store_id], excludes: [:name]}).first
     assert_equal 1, result.store_id
-    assert_nil result.name
-    assert_nil result.user_ids
+    assert !result.respond_to?(:name)
+    assert !result.respond_to?(:user_ids)
   end
   # nested
1	module Searchkick	1	module Searchkick
2	- # Subclass of `Hashie::Mash` to wrap Hash-like structures
3	- # (responses from Elasticsearch)
4	- #
5	- # The primary goal of the subclass is to disable the
6	- # warning being printed by Hashie for re-defined
7	- # methods, such as `sort`.
8	- #
9	- class HashWrapper < ::Hashie::Mash
10	- disable_warnings if respond_to?(:disable_warnings)	2	+ class HashWrapper
		3	+ def initialize(data)
		4	+ @data = data
		5	+ end
		6	+
		7	+ def method_missing(m, *args, &block)
		8	+ if @data.key?(m.to_s)
		9	+ raise ArgumentError, "wrong number of arguments (given #{args.size}, expected 0)" if args.any?
		10	+ @data[m.to_s]
		11	+ else
		12	+ super
		13	+ end
		14	+ end
		15	+
		16	+ def respond_to?(m, include_private = false)
		17	+ @data.key?(m.to_s) \|\| super
		18	+ end
		19	+
		20	+ def to_h
		21	+ @data
		22	+ end
		23	+
		24	+ def inspect
		25	+ str = @data.map { \|k, v\| "#{k}=#{v.inspect}" }.join(" ")
		26	+ "#<Searchkick::HashWrapper #{str}>"
		27	+ end
11	end	28	end
12	end	29	end