ruby-druid 0.1.4 → 0.1.5

data/README.md

@@ -192,6 +192,17 @@ This filter creates a set of equals filters in an and filter.
 ```ruby
 Druid::Query.new('service/source').filter{dimension.in(1,2,3)}
 ```
+#### Geographic filter
+
+These filters have to be combined with time_series and do only work when coordinates is a spatial dimension [GeographicQueries](http://druid.io/docs/0.6.73/GeographicQueries.html)
+
+```ruby
+Druid::Query.new('service/source').time_series().long_sum([:aggregate1]).filter{coordinates.in_rec [[50.0,13.0],[54.0,15.0]]}
+```
+
+```ruby
+Druid::Query.new('service/source').time_series().long_sum([:aggregate1]).filter{coordinates.in_circ [[53.0,13.0], 5.0]}
+```
 
 #### Hash syntax
 

data/lib/druid/console.rb

@@ -28,7 +28,9 @@ Ripl::Shell.class_eval do
 
   def format_result(result)
     if result.is_a?(Druid::Query)
+      start = Time.now.to_f
       puts format_query_result(result.send, result)
+      puts "Response Time: #{(Time.now.to_f - start).round(3)}s"
     else
       ap(result)
     end

data/lib/druid/filter.rb

@@ -38,6 +38,14 @@ module Druid
       @regexp = nil
     end
 
+    def in_rec(bounds)
+      RecFilter.new(@name, bounds)
+    end 
+
+    def in_circ(bounds)
+      CircFilter.new(@name, bounds)
+    end 
+
     def eq(value)
       return self.in(value) if value.is_a? Array
       return self.regexp(value) if value.is_a? Regexp
@@ -194,6 +202,46 @@ module Druid
       result
     end
   end
+  
+  class RecFilter < FilterDimension
+
+    def initialize(dimension, bounds)
+      @dimension = dimension
+      @bounds = bounds
+    end 
+
+    def to_hash
+      {
+      :type => "spatial",
+      :dimension => @dimension,
+      :bound =>{
+        :type => "rectangular",
+        :minCoords => @bounds.first,
+        :maxCoords => @bounds.last
+        }
+      }
+    end
+  end
+
+  class CircFilter < FilterDimension
+
+    def initialize(dimension, bounds)
+      @dimension = dimension
+      @bounds = bounds
+    end 
+
+    def to_hash
+      {
+      :type => "spatial",
+      :dimension => @dimension,
+      :bound =>{
+        :type => "radius",
+        :coords => @bounds.first,
+        :radius => @bounds.last
+        }
+      }
+    end
+  end
 
   class FilterJavascript < FilterDimension
     def initialize(dimension, expression)

data/ruby-druid.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "ruby-druid"
-  spec.version       = "0.1.4"
+  spec.version       = "0.1.5"
   spec.authors       = ["LiquidM, Inc."]
   spec.email         = ["opensource@liquidm.com"]
   spec.summary       = %q{Ruby client for metamx druid}

data/spec/lib/query_spec.rb

@@ -207,6 +207,32 @@ describe Druid::Query do
     }
   end
 
+  it 'creates a in_circ filter' do
+    @query.filter{a.in_circ [[52.0,13.0], 10.0]}
+    JSON.parse(@query.to_json)['filter'].should == {
+    "type" => "spatial",
+    "dimension" => "a",
+    "bound" => {
+        "type" => "radius",
+        "coords" => [52.0, 13.0],
+        "radius" =>  10.0
+      }
+    }
+  end
+
+  it 'creates a in_rec filter' do
+    @query.filter{a.in_rec [[10.0, 20.0], [30.0, 40.0]] }
+    JSON.parse(@query.to_json)['filter'].should == {
+    "type" => "spatial",
+    "dimension" => "a",
+    "bound" => {
+        "type" => "rectangular",
+        "minCoords" => [10.0, 20.0],
+        "maxCoords" => [30.0, 40.0]
+      }
+    }
+  end
+
   it 'creates an equals filter' do
     @query.filter{a.eq 1}
     JSON.parse(@query.to_json)['filter'].should == {"type"=>"selector", "dimension"=>"a", "value"=>1}

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: ruby-druid
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
+  prerelease: 
 platform: ruby
 authors:
 - LiquidM, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zk
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -71,26 +76,27 @@ files:
 homepage: https://github.com/liquidm/ruby-druid
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Ruby client for metamx druid
 test_files:
 - spec/lib/client_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTljYWNlZjVkNjI3OTg4MmRiNDViNDljNGE3YjQ1OTdmNmUxNWIyZA==
-  data.tar.gz: !binary |-
-    OTRmNjRmNTQ4YmU2ODg5YzY2ZDlmOTJjZmJkOTFlZTg2ZDY1MGE1ZQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MTc1Njk1NzZjNmUzMDg3ZDczNDkyZjIyYTY3Yzk2YzA0MmRlMzQ4ZWQ3NTRm
-    M2YzNDkwZTEyOGVjZjNiZjE5YzVjZTg2OWU5NjFjZGEwNjc2ZWM0Yjg5YTgy
-    ZTc4OThkZDFmMTE1OTA4YzNiMTAxMTM4ZDRlYzE5ZWUzMmNiYTY=
-  data.tar.gz: !binary |-
-    NDRkZTFkMTE3MTgxY2ViNTNjMDA2ZjI2MzM4ZGMzNGQ1MWUwYWRiM2Q4YjI4
-    NWI2NjM0ODdjZDAzNTA4YTYyM2EwODM5OGYwNmI0Y2RhOGY2N2M3N2M1YWU2
-    ZmRjODM5YjQ2NDZmMGNjMWFlNjU1YmI2YzkyNDQ2NmZlMTc2NDQ=