influxer 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9ee310f2d14e4f751007c7631ac2100b6bf32ac
-  data.tar.gz: cabdf7aff563d6ff739bf87dade3dd854902a215
+  metadata.gz: a9483ba238ca5ac211fc174ae7dd81c49fd5aa08
+  data.tar.gz: 1915d412dc2bd255e4460e7448d8e007ec9dadf2
 SHA512:
-  metadata.gz: 74c94e618b70f37cfd7ae18ab5c7d7f0b15ab812173edfe5e5a23a1707c8b2e9bbeb3abdd931e739a762829f5666d8cedfe6dc8a5a26bdcd2ecb8e695816cdc6
-  data.tar.gz: cf738ba3405153292bfd23336a81e2cff9cba551de404551bc6dd646271e529b4b3b03698107cfbc97c11495302028cacc2bef846cdb434daf9c9c4a38e9d0e4
+  metadata.gz: ba9f6fc956de4fbf97e30a4f7dcf2ed248082ef4f1260ae18080b6cfd4d606239a3bc82346cfe815b77d355fe739ca2fecfb61ee8ed0ff5f037f7f900283ebea
+  data.tar.gz: 89bf51a352e1c83bf5a02d793aa7d43c820dbbc3275ef0447f6195d7c15fe5d94242989e2f75f728b575a3de8c58d71702163776887964ddfd2f547c9ec68d24

data/.hound.yml

@@ -0,0 +1,2 @@
+ruby:
+  enabled: true

data/influxer.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   
   s.add_runtime_dependency "rails", '~> 4.0'
   s.add_dependency "influxdb", "~> 0.1.0", ">= 0.1.8"
-  s.add_dependency "anyway_config", "~> 0.3"
+  s.add_dependency "anyway_config", "~> 0.4"
 
   s.add_development_dependency "timecop"
   s.add_development_dependency "simplecov", ">= 0.3.8"

data/lib/influxer.rb

@@ -4,7 +4,6 @@ module Influxer
   require 'influxer/config'
   require 'influxer/client'
   require 'influxer/metrics/metrics'
-  require 'influxer/metrics/relation'
 
   module Model
     require 'influxer/model'

data/lib/influxer/metrics/metrics.rb

@@ -1,3 +1,4 @@
+require 'influxer/metrics/relation'
 require 'influxer/metrics/scoping'
 require 'influxer/metrics/fanout'
 
@@ -17,7 +18,13 @@ module Influxer
 
     class << self
       # delegate query functions to all
-      delegate :write, :select, :where, :group, :merge, :time, :past, :since, :limit, :fill, :delete_all, to: :all
+      delegate *(
+        [
+          :write, :select, :where, :group, 
+          :merge, :time, :past, :since, :limit, 
+          :fill, :delete_all
+        ]+Influxer::Calculations::CALCULATION_METHODS), 
+      to: :all
 
       def attributes(*attrs)
         attrs.each do |name|

data/lib/influxer/metrics/relation.rb

@@ -1,5 +1,6 @@
 require 'influxer/metrics/relation/time_query'
 require 'influxer/metrics/relation/fanout_query'
+require 'influxer/metrics/relation/calculations'
 
 module Influxer
   class Relation
@@ -7,6 +8,7 @@ module Influxer
 
     include Influxer::TimeQuery
     include Influxer::FanoutQuery
+    include Influxer::Calculations
     
     MULTI_VALUE_METHODS = [:select, :where, :group]
 

data/lib/influxer/metrics/relation/calculations.rb

@@ -0,0 +1,21 @@
+module Influxer
+  module Calculations
+    CALCULATION_METHODS = 
+      [
+        :count, :min, :max, :mean, 
+        :mode, :median, :distinct, :derivative, 
+        :stddev, :sum, :first, :last, :difference,
+        :percentile, :histogram, :top, :bottom
+      ]
+
+    CALCULATION_METHODS.each do |name|
+      class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name}(val, option=nil)                                                   # def count(val)
+          @values[:has_calculations] = true                                            #   @values[:has_calculations] = true 
+          select_values << "#{name}(\#\{val\}\#\{option ? ','+option.to_s : ''\})"     #   select_values << "count(\#\{val\})" 
+          self                                                                         #   self
+        end                                                                            # end
+      CODE
+    end
+  end
+end

data/lib/influxer/version.rb

@@ -1,3 +1,3 @@
 module Influxer
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/spec/metrics/relation_spec.rb

@@ -25,7 +25,7 @@ describe Influxer::Relation do
   specify { expect(rel).to respond_to :to_sql }
 
 
-  describe "merge relations" do
+  describe "#merge!" do
     it "should merge multi values" do
       r1 = rel.where(id: [1,2], dummy: 'qwe').time(:hour)
       r2 = Influxer::Relation.new(DummyMetrics).where.not(user_id: 0).group(:user_id)
@@ -49,7 +49,7 @@ describe Influxer::Relation do
       end
     end
 
-    describe "select" do
+    describe "#select" do
       it "should select array of symbols" do
         expect(rel.select(:user_id, :dummy_id).to_sql).to eq "select user_id,dummy_id from \"dummy\"" 
       end
@@ -59,7 +59,7 @@ describe Influxer::Relation do
       end
     end
 
-    describe "where" do
+    describe "#where" do
       it "should generate valid conditions from hash" do
         Timecop.freeze(Time.now) do
           expect(rel.where(user_id: 1, dummy: 'q', timer: Time.now).to_sql).to eq "select * from \"dummy\" where (user_id=1) and (dummy='q') and (timer=#{Time.now.to_i}s)" 
@@ -83,7 +83,7 @@ describe Influxer::Relation do
       end
     end
 
-    describe "not" do
+    describe "#not" do
       it "should negate simple values" do
         expect(rel.where.not(user_id: 1, dummy: :a).to_sql).to eq "select * from \"dummy\" where (user_id<>1) and (dummy<>'a')"
       end
@@ -101,7 +101,7 @@ describe Influxer::Relation do
       end
     end
 
-    describe "merge" do
+    describe "#merge" do
       it "should merge with one series" do
         expect(rel.merge("dubby").to_sql).to eq "select * from \"dummy\" merge \"dubby\""
       end
@@ -111,7 +111,7 @@ describe Influxer::Relation do
       end
     end
 
-    describe "past" do
+    describe "#past" do
       it "should work with predefined symbols" do
          expect(rel.past(:hour).to_sql).to eq "select * from \"dummy\" where (time > now() - 1h)"
       end
@@ -129,18 +129,18 @@ describe Influxer::Relation do
       end
     end
 
-    describe "since" do
+    describe "#since" do
       it "should work with datetime" do
          expect(rel.since(Time.utc(2014,12,31)).to_sql).to eq "select * from \"dummy\" where (time > 1419984000s)"
       end
     end
 
-    describe "group" do
+    describe "#group" do
       it "should generate valid groups" do
         expect(rel.group(:user_id, "time(1m) fill(0)").to_sql).to eq "select * from \"dummy\" group by user_id,time(1m) fill(0)" 
       end
 
-      describe "group by time predefined values" do
+      context "group by time predefined values" do
         it "should group by hour" do
           expect(rel.time(:hour).to_sql).to eq "select * from \"dummy\" group by time(1h)"
         end
@@ -187,29 +187,53 @@ describe Influxer::Relation do
       end
     end
 
-    describe "limit" do
+    describe "#limit" do
       it "should generate valid limi" do
         expect(rel.limit(100).to_sql).to eq "select * from \"dummy\" limit 100" 
       end
     end
 
-    describe "empty?" do
-      after(:each) { Influxer.reset }
-      it "should return false if has points" do
-        Influxer.client.stub(:query) { {points: [{time: 1, id: 2}]} }
-        expect(rel.empty?).to be_falsey
-        expect(rel.present?).to be_truthy
+    describe "calculations" do
+      context "one arg calculation methods" do
+        [
+          :count, :min, :max, :mean, 
+          :mode, :median, :distinct, :derivative, 
+          :stddev, :sum, :first, :last, :difference, :histogram
+        ].each do |method|
+          describe "##{method}" do
+            it { expect(rel.where(user_id: 1).calc(method, :column_name).to_sql).to eq "select #{method}(column_name) from \"dummy\" where (user_id=1)"}
+          end
+        end
       end
 
-      it "should return true if no points" do
-        Influxer.client.stub(:query) { {} }
-        expect(rel.empty?).to be_truthy
-        expect(rel.present?).to be_falsey
+      context "two args calculation methods" do
+        [
+          :percentile, :histogram, :top, :bottom 
+        ].each do |method|
+          describe "##{method}" do
+            it { expect(rel.where(user_id: 1).calc(method, :column_name, 10).to_sql).to eq "select #{method}(column_name,10) from \"dummy\" where (user_id=1)"}
+          end
+        end
       end
     end
   end
 
-  describe "delete_all" do
+  describe "#empty?" do
+    after(:each) { Influxer.reset }
+    it "should return false if has points" do
+      Influxer.client.stub(:query) { {points: [{time: 1, id: 2}]} }
+      expect(rel.empty?).to be_falsey
+      expect(rel.present?).to be_truthy
+    end
+
+    it "should return true if no points" do
+      Influxer.client.stub(:query) { {} }
+      expect(rel.empty?).to be_truthy
+      expect(rel.present?).to be_falsey
+    end
+  end
+
+  describe "#delete_all" do
     it do
       Timecop.freeze(Time.now) do
         expect(rel.where(user_id: 1, dummy: 'q', timer: Time.now).delete_all).to eq "delete from \"dummy\" where (user_id=1) and (dummy='q') and (timer=#{Time.now.to_i}s)" 
@@ -217,7 +241,7 @@ describe Influxer::Relation do
     end
   end
 
-  describe "inspect" do
+  describe "#inspect" do
 
     after(:each) do
       Influxer.reset

data/spec/support/dummy_metrics.rb

@@ -4,4 +4,6 @@ class DummyMetrics < Influxer::Metrics
   validates_presence_of :dummy_id, :user_id
 
   before_write ->{ self.time = DateTime.now }
+
+  scope :calc, ->(method, *args) { send(method, *args) }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxer
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Vlad Dem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hound.yml"
 - ".travis.yml"
 - Changelog.md
 - Gemfile
@@ -181,6 +182,7 @@ files:
 - lib/influxer/metrics/fanout.rb
 - lib/influxer/metrics/metrics.rb
 - lib/influxer/metrics/relation.rb
+- lib/influxer/metrics/relation/calculations.rb
 - lib/influxer/metrics/relation/fanout_query.rb
 - lib/influxer/metrics/relation/time_query.rb
 - lib/influxer/metrics/scoping.rb