lib/hcloud/image_resource.rb in hcloud-0.1.0.pre.alpha4 vs lib/hcloud/image_resource.rb in hcloud-0.1.0

@@ -1,12 +1,10 @@
 module Hcloud
   class ImageResource < AbstractResource
-    include Enumerable
-
     def all
-      Oj.load(request("images").run.body)["images"].map do |x|
-        Image.new(x, self, client)
+      mj("images") do |j|
+        j.flat_map{|x| x["images"].map{ |x| Image.new(x, self, client) } }
       end
     end
     
     def [](arg)
       case arg
@@ -31,13 +29,11 @@
     def where(sort: nil, type: nil, bound_to: nil, name: nil)
       query = {}
       method(:where).parameters.inject(query) do |r,x| 
         (var = eval(x.last.to_s)).nil? ? r : r.merge!(x.last => var)
       end
-      Oj.load(
-        request("images", q: query).run.body
-      )["images"].map do |x|
-        Image.new(x, self, client)
+      mj("images", q: query) do |j|
+        j.flat_map{|x| x["images"].map{ |x| Image.new(x, self, client) } }
       end
     end
 
     def find_by(name:)
       j = Oj.load(request("images", q: {name: name}).run.body)["images"]