claw_druid 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 461727d00ac8db182328f9173b4bb0c6192ac499
-  data.tar.gz: aacdcd629b320d2eb048fd63806f6ac7eeb9bc46
+  metadata.gz: 0fd57f6da684214c3d8d3971504b56b397f33f85
+  data.tar.gz: e691527e157378de94ee9e6d3180d4c849272ff1
 SHA512:
-  metadata.gz: 9ec24086c6e0953285cc4016a0d0440c9a2951b2127d4e013d2549dc1524ebfa53d7ac77f1c8373a9bcd3b3b808d774577839d7ee0b3b6ac5f772f6445b2b8a5
-  data.tar.gz: 56749616e555b261f2aa0e383d15a5748c4b5aeecc1dbc90beaea4fc32d4fec226c54e1ccce0660d10fad889b55e55f073cbfd95c53337247ddd87da824a203e
+  metadata.gz: 2b3ca5a109499ae7f6b74953f4fb0b237e26046d87fe21b9d1c0d4a2d0eae53512c05781e8cadea2b562a8c968945cc14374d86a54768a5d3a11327a53100d78
+  data.tar.gz: 5617939a490a191389d7683d83a70698b6cc2747fb28ef5901e207e9393eca800462428e43a04756c7ebcf385c1eae23f16284735201db8cc3fadfacff0d7cb3

data/lib/claw_druid.rb

@@ -21,6 +21,7 @@ class ClawDruid
   }
 
   TopN = "topN"
+  Select = "select"
   GroupBy = "groupBy"
   TimeSeries = "timeseries"
   TimeBoundary = "timeBoundary"
@@ -29,6 +30,7 @@ class ClawDruid
 
   Permit_Properties = {
     TopN => [:queryType, :dataSource, :intervals, :granularity, :filter, :aggregations, :postAggregations, :dimension, :threshold, :metric, :context],
+    Select => [:queryType, :dataSource, :intervals, :granularity, :descending, :filter, :dimensions, :metrics, :pagingSpec, :context],
     GroupBy => [:queryType, :dataSource, :dimensions, :limitSpec, :having, :granularity, :filter, :aggregations, :postAggregations, :intervals, :context],
     TimeSeries => [:queryType, :dataSource, :descending, :intervals, :granularity, :filter, :aggregations, :postAggregations, :context],
     TimeBoundary => [:queryType, :dataSource, :bound, :filter, :context],
@@ -38,7 +40,7 @@ class ClawDruid
 
   def initialize(params = {})
     @url        = params[:url]
-    @params     = {dataSource: params[:source], granularity: "all", queryType: "select"}
+    @params     = {dataSource: params[:source], granularity: "all", queryType: Select}
     @threshold  = params[:threshold] || THRESHOLD
 
     # The page_identifiers of every query, the key is the params.hash of the query, the value is a identifiers like "publisher_daily_report_2017-02-02T00:00:00.000Z_2017-02-04T00:00:00.000Z_2017-03-30T12:10:27.053Z"
@@ -56,6 +58,7 @@ class ClawDruid
     if dimensions && dimensions.count > 0
       @params[:dimensions] ||= []
       @params[:dimensions]  += dimensions.map(&:to_s).map(&:strip)
+      @params[:dimensions].uniq!
     end
     @params.delete(:metrics)
     self
@@ -81,6 +84,7 @@ class ClawDruid
     if columns && columns.count > 0
       @params[:metrics]    ||= []
       @params[:metrics]     += columns.map(&:to_s).map(&:strip)
+      @params[:metrics].uniq!
     end
     self
   end
@@ -145,6 +149,7 @@ class ClawDruid
         end
       }.compact
     elsif conditions[0].is_a?(String)
+      # Process the ('a = ? and b = ?', 1, 2)
       conditions[0].gsub!(" \?").each_with_index { |v, i| " #{conditions[i + 1]}" } if conditions[0][" \?"]
       conditions = [where_chain( conditions[0] )]
     else
@@ -165,18 +170,18 @@ class ClawDruid
       @params[:metric]   ||= []
       @params[:metric]    += columns.map{|column, direction| column }
       @params[:descending] = columns.any?{|column, direction| direction.to_s[/desc/]}
-    end
-    @params[:limitSpec] = {
-      type: "default",
-      limit: 500000,
-      columns: columns.map{|column, direction| 
+    else
+      @params[:limitSpec]         ||= {}
+      @params[:limitSpec][:type]  ||= "default"
+      @params[:limitSpec][:limit] ||= 500000
+      @params[:limitSpec][:columns] = columns.map{|column, direction| 
         {
           dimension: column.to_s,
           direction: direction.to_s[/desc/] ? "descending" : "ascending",
           dimensionOrder: "lexicographic"
         }
       }
-    }
+    end
     self
   end
 
@@ -198,12 +203,16 @@ class ClawDruid
     if page_count == 1
       @params[:pagingSpec] = {pagingIdentifiers: {}, threshold: @threshold}
     elsif page_count > 1
-      current = @params.hash
+      current = permit_params.reject{|key, value| key == :pagingSpec}.hash
       @paging_identifiers[current] ||= {0 => {}}
 
       (1..page_count-1).each do |current_page|
         if begin @paging_identifiers[current][current_page].nil? rescue true end
-          query(@params.merge(pagingSpec: {pagingIdentifiers: @paging_identifiers[current][current_page-1], threshold: @threshold}), current_page)
+          result = query(@params.merge(pagingSpec: {pagingIdentifiers: @paging_identifiers[current][current_page-1], threshold: @threshold}))
+          
+          # The pagingIdentifiers is something like { "publisher_daily_report_2017-03-01T00:00:00.000Z_2017-03-11T00:00:00.000Z_2017-04-17T21:04:30.804Z" => -10 }
+          @paging_identifiers[current]              ||= {}
+          @paging_identifiers[current][current_page]  = JSON.parse(result)[0]["result"]["pagingIdentifiers"].transform_values{|value| value + 1}
         end
       end if begin @paging_identifiers[current][page_count - 1].nil? rescue true end
 
@@ -213,33 +222,34 @@ class ClawDruid
   end
 
   def having(*conditions)
-    # Process the ('a = ? and b = ?', 1, 2)
-    conditions[0].gsub!(" \?").each_with_index { |v, i| " #{conditions[i + 1]}" }
+    if conditions[0].is_a?(Hash)
+      conditions = conditions[0]
 
-    havings = having_chain(conditions[0])
-    @params[:having] = havings unless havings.blank?
+      conditions = conditions.delete_if{|key, value| value.blank?}.map{|column, value|
+        { type: OPERATIONS["="], aggregation: column, value: value }
+      }.compact
+    elsif conditions[0].is_a?(String)
+      # Process the ('a = ? and b = ?', 1, 2)
+      conditions[0].gsub!(" \?").each_with_index { |v, i| " #{conditions[i + 1]}" }
+      conditions = [having_chain( conditions[0] )]
+    else
+      conditions = nil
+    end
+
+    unless conditions.blank?
+      @params[:having]               ||= { type: "and", havingSpecs: [] }
+      @params[:having][:havingSpecs]  += conditions
+    end
     
     self
   end
 
-  def query(params = @params, page_count = nil)
-    params = params.slice(*Permit_Properties[params[:queryType]])
+  def query(params = @params)
+    params = permit_params(params)
     ap params if ENV['DEBUG']
     puts params.to_json if ENV['DEBUG']
     result = HTTParty.post(@url, body: params.to_json, headers: { 'Content-Type' => 'application/json' })
     puts result.code if ENV['DEBUG']
-
-    # The result is a String, try to find the existence of substring 'pagingIdentifiers'.
-    if page_count && result["pagingIdentifiers"]
-      params.delete(:pagingSpec)
-      current = params.hash
-
-      # The pagingIdentifiers is something like { "publisher_daily_report_2017-03-01T00:00:00.000Z_2017-03-11T00:00:00.000Z_2017-04-17T21:04:30.804Z" => -10 }
-      @paging_identifiers[current]            ||= {}
-      @paging_identifiers[current][page_count]  = JSON.parse(result.body)[0]["result"]["pagingIdentifiers"].transform_values{|value| value + 1}
-    end
-    # ap JSON.parse(result) if ENV['DEBUG']
-    
     result.body
   end
 
@@ -275,7 +285,8 @@ class ClawDruid
   end
 
   def to_a
-    @params[:queryType] == SegmentMetaData ? JSON.parse(query)[0]["columns"] : JSON.parse(query)[0]["result"]["events"]
+    result = JSON.parse(query)
+    @params[:queryType] == SegmentMetaData ? result[0]["columns"] : begin result[0]["result"]["events"] rescue result end
   end
 
   def each(&block)
@@ -394,6 +405,7 @@ class ClawDruid
           retainMissingValue: true,
         }
       }
+      @params[:dimensions].uniq!
     end
   end
 
@@ -410,4 +422,8 @@ class ClawDruid
     sentences.all?{|sentence| sentence.scan("\(").count == sentence.scan("\)").count }
   end
 
+  def permit_params(params = @params)
+    params.slice(*Permit_Properties[params[:queryType]])
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: claw_druid
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Fan Jieqi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,15 +80,15 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.3
-description: The ruby client of Druid.
-email: fanjieqi@nibirutech.com
+description: A ruby client of Druid.
+email: fjqqiqi@163.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/array.rb
 - lib/claw_druid.rb
-homepage: http://galileo.tap4fun.com/fanjieqi/claw_druid
+homepage: https://github.com/fanjieqi/claw_druid
 licenses:
 - MIT
 metadata: {}
@@ -111,5 +111,5 @@ rubyforge_project:
 rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: The ruby client of Druid.
+summary: A ruby client of Druid.
 test_files: []