added rudimentary conditions support, renamed Resource#json to #to_hash

Author: fx

lib/esdb.rb

@@ -9,6 +9,14 @@ def initialize(stats)
           values = value.join(',')
         elsif value === true
           values = 'avg'
+        elsif value.is_a?(Hash)
+          values = value.collect{|calc, conds| 
+            if conds[0].is_a?(Array)
+              conds.collect{|_conds| "#{calc}:[#{_conds.join(',')}]"}.join(',')
+            else
+              "#{calc}:[#{conds.join(',')}]"
+            end
+          }.join(',')
         else
           values = value
         end

lib/esdb/resource.rb

@@ -40,7 +40,7 @@ def get!(*args)
       @response = get(*args)
     end
 
-    def json
+    def to_hash
       get! unless @response
       JSON.parse(@response)
     end