ruby-druid 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02fc0eb65bd4e29f2358fd4b57b2dd9307b383b0
-  data.tar.gz: 14d2855760981c4e49243dfafbb1a1503cfe2bd8
+  metadata.gz: ef87663c236bf89b7937fef4c7709d3937e5f0e6
+  data.tar.gz: 82d29a256a0cebc175aeb9d88173f1455e9a8475
 SHA512:
-  metadata.gz: 959f3eb9b4c822c9f1cfb4ea2656d553a81c7082d456482456df041374a4da538311f8e55ac2ec2b46a98dc0e61f481621cadae4c0c6c1708048c5e2f25c9a6d
-  data.tar.gz: ab10bcf594ed6a080031b361455bd616426c95f5e0920064559e7833dfb8769d77ecac08955995161a72ae5b3c51b7be1ea36cef102b103ef64585656512dcf8
+  metadata.gz: a81d42c823310788cf35fcde9c683674fd863ea3f71557d1ab0e3c01d21f66cdeedd601a816deced10367b27db19d625fc19803d6463bfdaea3aa42f063f8875
+  data.tar.gz: 1a0c049e54420fc1c6773e489cbef4a118f751f4e5c9172377ace9474173dab10cba6d41253056e305e5c4156c02cc8594814f1138852ad7806272c249532583

data/lib/druid/dimension.rb

@@ -0,0 +1,54 @@
+module Druid
+  class Dimension
+    include ActiveModel::Model
+
+    attr_accessor :type
+    validates :type, inclusion: { in: %w(default extraction) }
+
+    attr_accessor :dimension
+    validates :dimension, presence: true
+
+    attr_accessor :outputName
+    validates :outputName, presence: true
+
+    class ExtractionFnValidator < ActiveModel::EachValidator
+      TYPES = %w(extraction)
+      def validate_each(record, attribute, value)
+        if TYPES.include?(record.type)
+          record.errors.add(attribute, 'may not be blank') if value.blank?
+        else
+          record.errors.add(attribute, "is not supported by type=#{record.type}") if value
+        end
+      end
+    end
+
+    attr_accessor :extractionFn
+    validates :extractionFn, extraction_fn: true
+
+    def initialize(params)
+      if params.is_a?(Hash)
+        super
+      else
+        super(type: 'default', dimension: params.to_s, outputName: params.to_s)
+      end
+    end
+
+    def as_json(options = {})
+      super(options.merge(except: %w(errors validation_context)))
+    end
+
+    def self.lookup(dimension, namespace, retain: true, injective: false)
+      new({
+        type: 'extraction',
+        dimension: dimension,
+        outputName: dimension,
+        extractionFn: {
+          type: 'registeredLookup',
+          lookup: namespace,
+          retainMissingValue: retain,
+          injective: injective,
+        },
+      })
+    end
+  end
+end

data/lib/druid/query.rb

@@ -5,6 +5,7 @@ require 'active_support/all'
 require 'active_model'
 
 require 'druid/granularity'
+require 'druid/dimension'
 require 'druid/aggregation'
 require 'druid/post_aggregation'
 require 'druid/filter'
@@ -80,7 +81,16 @@ module Druid
       TYPES = %w(groupBy select)
       def validate_each(record, attribute, value)
         if TYPES.include?(record.queryType)
-          record.errors.add(attribute, 'must be a list with at least one dimension') if !value.is_a?(Array) || value.blank?
+          if !value.is_a?(Array) || value.blank?
+            record.errors.add(attribute, 'must be a list with at least one dimension')
+          else
+            value.each(&:valid?) # trigger validation
+            value.each do |avalue|
+              avalue.errors.messages.each do |k, v|
+                record.errors.add(attribute, { k => v })
+              end
+            end
+          end
         else
           record.errors.add(attribute, "is not supported by type=#{record.queryType}") if value
         end
@@ -90,14 +100,34 @@ module Druid
     attr_accessor :dimensions
     validates :dimensions, dimensions: true
 
+    def dimensions
+      @dimensions ||= []
+    end
+
+    def dimensions=(value)
+      if value.is_a?(Array)
+        @dimensions = value.map do |x|
+          x.is_a?(Dimension) ? x : Dimension.new(x)
+        end
+      else
+        @dimensions = [
+          value.is_a?(Dimension) ? value : Dimension.new(value)
+        ]
+      end
+    end
+
     class AggregationsValidator < ActiveModel::EachValidator
       TYPES = %w(timeseries groupBy topN)
       def validate_each(record, attribute, value)
         if TYPES.include?(record.queryType)
-          value.each(&:valid?) # trigger validation
-          value.each do |avalue|
-            avalue.errors.messages.each do |k, v|
-              record.errors.add(attribute, { k => v })
+          if !value.is_a?(Array) || value.blank?
+            record.errors.add(attribute, 'must be a list with at least one aggregator')
+          else
+            value.each(&:valid?) # trigger validation
+            value.each do |avalue|
+              avalue.errors.messages.each do |k, v|
+                record.errors.add(attribute, { k => v })
+              end
             end
           end
         else
@@ -116,10 +146,12 @@ module Druid
     def aggregations=(value)
       if value.is_a?(Array)
         @aggregations = value.map do |x|
-          Aggregation.new(x)
+          x.is_a?(Aggregation) ? x : Aggregation.new(x)
         end
       else
-        @aggregations = [value]
+        @aggregations = [
+          value.is_a?(Aggregation) ? value : Aggregation.new(value)
+        ]
       end
     end
 
@@ -333,7 +365,9 @@ module Druid
 
       def group_by(*dimensions)
         query_type(:groupBy)
-        @query.dimensions = dimensions.flatten
+        @query.dimensions = dimensions.map do |dimension|
+          dimension.is_a?(Dimension) ? dimension : Dimension.new(dimension)
+        end
         self
       end
 

data/lib/druid/version.rb

@@ -1,3 +1,3 @@
 module Druid
-  VERSION = "0.9.1"
+  VERSION = "0.10.0"
 end

data/spec/lib/query_spec.rb

@@ -21,7 +21,9 @@ describe Druid::Query do
 
   it 'takes dimensions from group_by method' do
     @query.group_by(:a, :b, :c)
-    expect(JSON.parse(@query.query.to_json)['dimensions']).to eq(['a', 'b', 'c'])
+    expect(JSON.parse(@query.query.to_json)['dimensions']).to eq([{"type"=>"default", "dimension"=>"a", "outputName"=>"a"},
+                                                                  {"type"=>"default", "dimension"=>"b", "outputName"=>"b"},
+                                                                  {"type"=>"default", "dimension"=>"c", "outputName"=>"c"}])
   end
 
   it 'takes dimension, metric and threshold from topn method' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-druid
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Ruby Druid Community
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -177,6 +177,7 @@ files:
 - lib/druid/client.rb
 - lib/druid/context.rb
 - lib/druid/data_source.rb
+- lib/druid/dimension.rb
 - lib/druid/filter.rb
 - lib/druid/granularity.rb
 - lib/druid/having.rb
@@ -210,13 +211,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A Ruby client for Druid
 test_files:
+- spec/spec_helper.rb
 - spec/lib/client_spec.rb
 - spec/lib/data_source_spec.rb
-- spec/lib/query_spec.rb
 - spec/lib/zk_spec.rb
-- spec/spec_helper.rb
+- spec/lib/query_spec.rb