search_flip 4.0.0.beta15 → 4.0.0.beta16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbf6d1f0c653af6bc398768eff11d7715c1cea101a06f4eefb1c6078ad33abc1
-  data.tar.gz: c2568175d32374201ea212abfdebd709d8933c92c19cc646225b7bd90244498c
+  metadata.gz: d2798de7efc710284470e51213b456497e3f628ac666f2aeab4a32fd4c5aff63
+  data.tar.gz: 0e86b35dc0b09d8d7850b275e1b9529b93b6973b6a9dfd87f268d94557639ba0
 SHA512:
-  metadata.gz: 3f28cc23ad081e6345764799b2f70b957c9be97fab7781f22fbee580ed2c28b8da0bb0b3a9c4ef5d4ec200c94a6799a5c082489d9a62b2e24f94c49e29bcd4d1
-  data.tar.gz: 1f773fcf838215595db93760a66359acf77a19f63758447a9f30498be90dcce079a2ba21e2ce3350f2b6295e3906b3bb3ea3b5472f0804965b6003e61d94460d
+  metadata.gz: 5a254b6311f555f2885d739b0bf4e9689feef2fe50ebab59dd2a6217609141ab486d8df793962c9b07cf3979866509abf19284f78e1d0bbcbaa1337d35b86cef
+  data.tar.gz: 2039fd60ee8864c179eb5960d3b1299017181c5838e9c5515cfd78625492c9d3c54ae34abed37956521fbb28354bfbf4a2f31f723304a9891e7427d2e0ddae86

data/lib/search_flip/json.rb

@@ -5,7 +5,7 @@ module SearchFlip
     end
 
     def self.parse(json)
-      ::JSON.parse(json, object_class: SearchFlip::Result)
+      ::JSON.parse(json)
     end
   end
 end

data/lib/search_flip/response.rb

@@ -305,11 +305,11 @@ module SearchFlip
         if response["aggregations"].nil? || response["aggregations"][key].nil?
           SearchFlip::Result.new
         elsif response["aggregations"][key]["buckets"].is_a?(Array)
-          response["aggregations"][key]["buckets"].each_with_object({}) { |bucket, hash| hash[bucket["key"]] = 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)
-          response["aggregations"][key]["buckets"]
+          SearchFlip::Result.convert(response["aggregations"][key]["buckets"])
         else
-          response["aggregations"][key]
+          SearchFlip::Result.convert(response["aggregations"][key])
         end
     end
   end

data/lib/search_flip/result.rb

@@ -8,6 +8,32 @@ module SearchFlip
   #   result.some_key # => "value"
 
   class Result < Hash
+    def self.convert(hash)
+      res = self[hash]
+
+      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
+
+      res
+    end
+
+    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
+
     def method_missing(name, *args, &block)
       self[name.to_s]
     end
@@ -17,8 +43,8 @@ module SearchFlip
     end
 
     def self.from_hit(hit)
-      res = self[hit["_source"] || {}]
-      res["_hit"] = self[hit].tap { |hash| hash.delete("_source") }
+      res = convert(hit["_source"] || {})
+      res["_hit"] = convert(self[hit].tap { |hash| hash.delete("_source") })
       res
     end
   end

data/lib/search_flip/version.rb

@@ -1,3 +1,3 @@
 module SearchFlip
-  VERSION = "4.0.0.beta15"
+  VERSION = "4.0.0.beta16"
 end

data/spec/search_flip/json_spec.rb

@@ -39,7 +39,7 @@ RSpec.describe SearchFlip::JSON do
 
       described_class.parse(payload)
 
-      expect(JSON).to have_received(:parse).with(payload, object_class: SearchFlip::Result)
+      expect(JSON).to have_received(:parse).with(payload)
     end
   end
 end

data/spec/search_flip/result_spec.rb

@@ -1,17 +1,26 @@
 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["some_key" => "value"].some_key).to eq("value")
+      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["some_key" => nil].respond_to?(:some_key)).to eq(true)
-      expect(described_class["some_key" => nil].respond_to?(:other_key)).to eq(false)
+      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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: search_flip
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta15
+  version: 4.0.0.beta16
 platform: ruby
 authors:
 - Benjamin Vetter