ruby-druid 0.1.5 → 0.1.6

data/README.md

@@ -187,7 +187,7 @@ Druid::Query.new('service/source').filter{!dimension.eq(1)}
 
 #### Inclusion Filter
 
-This filter creates a set of equals filters in an and filter.
+This filter creates a set of equals filters in an or filter.
 
 ```ruby
 Druid::Query.new('service/source').filter{dimension.in(1,2,3)}
@@ -204,6 +204,14 @@ Druid::Query.new('service/source').time_series().long_sum([:aggregate1]).filter{
 Druid::Query.new('service/source').time_series().long_sum([:aggregate1]).filter{coordinates.in_circ [[53.0,13.0], 5.0]}
 ```
 
+#### Exclusion Filter
+
+This filter creates a set of not-equals fitlers in an and filter.
+
+```ruby
+Druid::Query.new('service/source').filter{dimension.nin(1,2,3)}
+```
+
 #### Hash syntax
 
 Sometimes it can be useful to use a hash syntax for filtering

data/lib/druid/console.rb

@@ -69,6 +69,6 @@ module Druid
       client.query(@source)
     end
 
-    def_delegators :query, :group_by, :sum, :long_sum, :double_sum, :postagg, :interval, :granularity, :filter, :time_series, :topn
+    def_delegators :query, :group_by, :sum, :long_sum, :double_sum, :count, :postagg, :interval, :granularity, :filter, :time_series, :topn
   end
 end

data/lib/druid/filter.rb

@@ -1,7 +1,7 @@
 module Druid
   class Filter
     (instance_methods + private_instance_methods).each do |method|
-      unless method.to_s =~ /^(__|instance_eval|instance_exec|initialize|object_id|raise|puts|inspect)/ || method.to_s =~ /\?/
+      unless method.to_s =~ /^(__|instance_eval|instance_exec|initialize|object_id|raise|puts|inspect|send)/ || method.to_s =~ /\?/
         undef_method method
       end
     end
@@ -13,7 +13,7 @@ module Druid
 
   class FilterParameter
     (instance_methods + private_instance_methods).each do |method|
-      unless method.to_s =~ /^(__|instance_eval|instance_exec|initialize|object_id|raise|puts|inspect|class)/ || method.to_s =~ /\?/
+      unless method.to_s =~ /^(__|instance_eval|instance_exec|initialize|object_id|raise|puts|inspect|class|send)/ || method.to_s =~ /\?/
         undef_method method
       end
     end
@@ -55,7 +55,6 @@ module Druid
 
     alias :'==' :eq
 
-
     def neq(value)
       return !self.in(value)
     end
@@ -64,20 +63,12 @@ module Druid
 
     def in(*args)
       values = args.flatten
-      raise "Must provide non-empty array in in()" if values.empty?
-
-      if (values.length == 1)
-        return self.eq(values[0])
-      end
+      filter_multiple(values, 'or', :eq)
+    end
 
-      filter_or = FilterOperator.new('or', true)
-      values.each do |value|
-        raise "query is too complex" if value.is_a? FilterParameter
-        param = FilterDimension.new(@name)
-        param.eq value
-        filter_or.add param
-      end
-      filter_or
+    def nin(*args)
+      values = args.flatten
+      filter_multiple(values, 'and', :neq)
     end
 
     def &(other)
@@ -145,6 +136,20 @@ module Druid
       end
       hash
     end
+
+    private
+
+    def filter_multiple(values, operator, method)
+      raise 'Values cannot be empty' if values.empty?
+      return self.send(method, values[0]) if values.length == 1
+
+      filter = FilterOperator.new(operator, true)
+      values.each do |value|
+        raise 'Value cannot be a parameter' if value.is_a?(FilterParameter)
+        filter.add(FilterDimension.new(@name).send(method, value))
+      end
+      filter
+    end
   end
 
   class FilterOperator < FilterParameter

data/lib/druid/query.rb

@@ -68,9 +68,9 @@ module Druid
       self
     end
 
-    [:long_sum, :double_sum].each do |method_name|
+    [:long_sum, :double_sum, :count].each do |method_name|
       agg_type = method_name.to_s.split('_')
-      agg_type[1].capitalize!
+      agg_type[1].capitalize! if agg_type.length > 1
       agg_type = agg_type.join
 
       define_method method_name do |*metrics|

data/ruby-druid.gemspec

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

data/spec/lib/query_spec.rb

@@ -315,6 +315,16 @@ end
     "type" => "or"}
   end
 
+  it 'creates a nin statement with and filter' do
+    @query.filter{a.nin [1,2,3]}
+    JSON.parse(@query.to_json)['filter'].should ==  {"fields" => [
+      {"field"=>{"type"=>"selector", "dimension"=>"a", "value"=>1},"type" => "not"},
+      {"field"=>{"type"=>"selector", "dimension"=>"a", "value"=>2},"type" => "not"},
+      {"field"=>{"type"=>"selector", "dimension"=>"a", "value"=>3},"type" => "not"}
+    ],
+    "type" => "and"}
+  end
+
   it 'creates a javascript with > filter' do
     @query.filter{a > 100}
     JSON.parse(@query.to_json)['filter'].should == {
@@ -366,7 +376,7 @@ end
   end
 
   it 'does not accept in with empty array' do
-    expect { @query.filter{a.in []} }.to raise_error "Must provide non-empty array in in()"
+    expect { @query.filter{a.in []} }.to raise_error "Values cannot be empty"
   end
 
   it 'does raise on invalid filter statement' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-druid
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zk
@@ -86,12 +86,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3649172061711800760
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3649172061711800760
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25