ruby-druid 0.1.3 → 0.1.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!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=

data/README.md

@@ -215,11 +215,12 @@ $ bin/dripl
 >> metrics
 [
     [0] "actions"
+    [1] "words"
 ]
 
 >> dimensions
 [
-    [0] "actions"
+    [0] "type"
 ]
 
 >> long_sum(:actions)
@@ -229,21 +230,24 @@ $ bin/dripl
 |   98575 |
 +---------+
 
->> long_sum(:actions)[-7.days].granularity(:day)
-+-------------------------------+----------+
-| timestamp                     | actions  |
-+-------------------------------+----------+
-| 2013-03-28T00:00:00.000+01:00 |   93371  |
-| 2013-03-29T00:00:00.000+01:00 |   448200 |
-| 2013-03-30T00:00:00.000+01:00 |   117167 |
-| 2013-03-31T00:00:00.000+01:00 |   828321 |
-| 2013-04-01T00:00:00.000+02:00 |   261578 |
-| 2013-04-02T00:00:00.000+02:00 |   05149  |
-| 2013-04-03T00:00:00.000+02:00 |   27512  |
-| 2013-04-04T00:00:00.000+02:00 |   18897  |
-+-------------------------------+----------+
-
->> long_sum(:actions)[-7.days].granularity(:day).properties
+>> long_sum(:actions, :words)[-3.days].granularity(:day)
++---------------+---------------+
+| actions       | words         |
++---------------+---------------+
+| 2013-12-11T00:00:00.000+01:00 |
++---------------+---------------+
+| 537345        | 68974         |
++---------------+---------------+
+| 2013-12-12T00:00:00.000+01:00 |
++---------------+---------------+
+| 675431        | 49253         |
++---------------+---------------+
+| 2013-12-13T00:00:00.000+01:00 |
++---------------+---------------+
+| 749034        | 87542         |
++---------------+---------------+
+
+>> long_sum(:actions, :words)[-3.days].granularity(:day).properties
 {
       :dataSource => "events",
      :granularity => {
@@ -252,7 +256,7 @@ $ bin/dripl
         :timeZone => "Europe/Berlin"
     },
        :intervals => [
-        [0] "2013-03-28T00:00:00+01:00/2013-04-04T11:57:20+02:00"
+        [0] "2013-12-11T00:00:00+01:00/2013-12-13T09:41:10+01:00"
     ],
        :queryType => :groupBy,
     :aggregations => [
@@ -260,6 +264,11 @@ $ bin/dripl
                  :type => "longSum",
                  :name => :actions,
             :fieldName => :actions
+        },
+        [1] {
+                 :type => "longSum",
+                 :name => :words,
+            :fieldName => :words
         }
     ]
 }

data/lib/druid/console.rb

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

data/lib/druid/query.rb

@@ -53,6 +53,14 @@ module Druid
       @properties[:dimensions] = dimensions.flatten
       self
     end
+
+    def topn(dimension, metric, threshold)
+      query_type(:topN)
+      @properties[:dimension] = dimension
+      @properties[:metric] = metric
+      @properties[:threshold] = threshold
+      self
+    end
     
     def time_series(*aggregations)
       query_type(:timeseries)
@@ -67,15 +75,16 @@ module Druid
 
       define_method method_name do |*metrics|
         query_type(get_query_type())
-        aggregations = @properties[:aggregations] || []
-        aggregations.concat(metrics.flatten.map{ |metric|
-          {
+        @properties[:aggregations] = [] if @properties[:aggregations].nil?
+
+        metrics.flatten.each do |metric|
+          @properties[:aggregations] << {
             :type => agg_type,
             :name => metric.to_s,
             :fieldName => metric.to_s
-          }
-        }).uniq!
-        @properties[:aggregations] = aggregations
+          } unless contains_aggregation?(metric)
+        end
+
         self
       end
     end
@@ -171,5 +180,11 @@ module Druid
       to = DateTime.parse(to.to_s) unless to.respond_to? :iso8601
       "#{from.iso8601}/#{to.iso8601}"
     end
+
+    def contains_aggregation?(metric)
+      return false if @properties[:aggregations].nil?
+      @properties[:aggregations].index { |aggregation| aggregation[:fieldName] == metric.to_s }
+    end
   end
+
 end

data/ruby-druid.gemspec

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

data/spec/lib/query_spec.rb

@@ -31,6 +31,14 @@ describe Druid::Query do
     JSON.parse(@query.to_json)['dimensions'].should == ['a', 'b', 'c']
   end
 
+  it 'takes dimension, metric and threshold from topn method' do
+    @query.topn(:a, :b, 25)
+    result = JSON.parse(@query.to_json)
+    result['dimension'].should == 'a'
+    result['metric'].should == 'b'
+    result['threshold'].should == 25
+  end
+
   it 'build a post aggregation with a constant right' do
     @query.postagg{(a + 1).as ctr }
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ruby-druid
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.1.4
 platform: ruby
 authors:
 - LiquidM, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,33 +71,26 @@ 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'
-      segments:
-      - 0
-      hash: -4499616778972236254
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4499616778972236254
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby client for metamx druid
 test_files:
 - spec/lib/client_spec.rb