influxer 0.0.1 → 0.1.0

data/spec/metrics/relation_spec.rb

@@ -1,78 +1,226 @@
 require 'spec_helper'
 
 describe Influxer::Relation do
-    let(:rel) { Influxer::Relation.new DummyMetrics}
-    
-    specify { expect(rel).to respond_to :write}
-    specify { expect(rel).to respond_to :build}
-
-    # read
-    specify { expect(rel).to respond_to :select }
-    specify { expect(rel).to respond_to :where }
-    specify { expect(rel).to respond_to :limit }
-    specify { expect(rel).to respond_to :group }
-    
-    #delete
-    specify { expect(rel).to respond_to :delete_all }
+  before do
+    allow_any_instance_of(Influxer::Client).to receive(:query) do |_, sql|    
+      sql
+    end
+  end
 
-    specify { expect(rel).to respond_to :to_sql }
+  let(:rel) { Influxer::Relation.new DummyMetrics}
+  let(:rel2) { Influxer::Relation.new DummyComplexMetrics}
+  
+  specify { expect(rel).to respond_to :write}
+  specify { expect(rel).to respond_to :build}
 
+  # read
+  specify { expect(rel).to respond_to :select }
+  specify { expect(rel).to respond_to :where }
+  specify { expect(rel).to respond_to :limit }
+  specify { expect(rel).to respond_to :group }
+  
+  #delete
+  specify { expect(rel).to respond_to :delete_all }
 
-    describe "sql generation" 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
+  specify { expect(rel).to respond_to :to_sql }
+
+
+  describe "merge relations" 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)
+      r1.merge!(r2)
+      expect(r1.to_sql).to eq "select * from \"dummy\" group by time(1h),user_id where (id=1 or id=2) and (dummy='qwe') and (user_id<>0)"
+    end
+
+    it "should merge single values" do
+      r1 = rel.time(:hour, fill: 0).limit(10)
+      r2 = Influxer::Relation.new(DummyMetrics).merge(:doomy).limit(5)
+      r1.merge!(r2)
+      expect(r1.to_sql).to eq "select * from \"dummy\" merge \"doomy\" group by time(1h) fill(0) limit 5"
+    end
+
+  end
 
-        it "should select string" do
-          expect(rel.select("count(user_id)").to_sql).to eq "select count(user_id) from dummy" 
+  describe "sql generation" do
+    describe "from clause" do
+      it "should generate valid from if no conditions" do
+        expect(rel.to_sql).to eq "select * from \"dummy\""
+      end
+    end
+
+    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
+
+      it "should select string" do
+        expect(rel.select("count(user_id)").to_sql).to eq "select count(user_id) from \"dummy\"" 
+      end
+    end
+
+    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)" 
         end
       end
 
-      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)" 
-          end
+      it "should generate valid conditions from strings" do
+        expect(rel.where("time > now() - 1d").to_sql).to eq "select * from \"dummy\" where (time > now() - 1d)" 
+      end
+
+      it "should handle regexps" do
+        expect(rel.where(user_id: 1, dummy: /^du.*/).to_sql).to eq "select * from \"dummy\" where (user_id=1) and (dummy=~/^du.*/)" 
+      end
+
+      it "should handle ranges" do
+        expect(rel.where(user_id: 1..4).to_sql).to eq "select * from \"dummy\" where (user_id>1 and user_id<4)" 
+      end
+
+      it "should handle arrays" do
+        expect(rel.where(user_id: [1,2,3]).to_sql).to eq "select * from \"dummy\" where (user_id=1 or user_id=2 or user_id=3)" 
+      end
+    end
+
+    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
+
+      it "should handle regexp" do
+        expect(rel.where.not(user_id: 1, dummy: /^du.*/).to_sql).to eq "select * from \"dummy\" where (user_id<>1) and (dummy!~/^du.*/)" 
+      end
+
+      it "should handle ranges" do
+        expect(rel.where.not(user_id: 1..4).to_sql).to eq "select * from \"dummy\" where (user_id<1 and user_id>4)" 
+      end
+
+      it "should handle arrays" do
+        expect(rel.where.not(user_id: [1,2,3]).to_sql).to eq "select * from \"dummy\" where (user_id<>1 and user_id<>2 and user_id<>3)" 
+      end
+    end
+
+    describe "merge" do
+      it "should merge with one series" do
+        expect(rel.merge("dubby").to_sql).to eq "select * from \"dummy\" merge \"dubby\""
+      end
+
+      it "should merge with one series as regexp" do
+        expect(rel.merge(/^du[1-6]+$/).to_sql).to eq "select * from \"dummy\" merge /^du[1-6]+$/"
+      end
+    end
+
+    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
+
+      it "should work with any symbols" do
+        expect(rel.past(:s).to_sql).to eq "select * from \"dummy\" where (time > now() - 1s)"
+      end
+
+      it "should work with strings" do
+        expect(rel.past("3d").to_sql).to eq "select * from \"dummy\" where (time > now() - 3d)"
+      end
+
+      it "should work with numbers" do
+         expect(rel.past(1.day).to_sql).to eq "select * from \"dummy\" where (time > now() - 86400s)"
+      end
+    end
+
+    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
+      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
+        it "should group by hour" do
+          expect(rel.time(:hour).to_sql).to eq "select * from \"dummy\" group by time(1h)"
         end
 
-        it "should generate valid conditions from strings" do
-          expect(rel.where("time > now() - 1d").to_sql).to eq "select * from dummy where (time > now() - 1d)" 
+        it "should group by minute" do
+          expect(rel.time(:minute).to_sql).to eq "select * from \"dummy\" group by time(1m)"
         end
-      end
 
-      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)" 
+        it "should group by second" do
+          expect(rel.time(:second).to_sql).to eq "select * from \"dummy\" group by time(1s)"
+        end
+
+        it "should group by millisecond" do
+          expect(rel.time(:ms).to_sql).to eq "select * from \"dummy\" group by time(1u)"
+        end
+
+        it "should group by day" do
+          expect(rel.time(:day).to_sql).to eq "select * from \"dummy\" group by time(1d)"
+        end
+
+        it "should group by week" do
+          expect(rel.time(:week).to_sql).to eq "select * from \"dummy\" group by time(1w)"
+        end
+
+        it "should group by month" do
+          expect(rel.time(:month).to_sql).to eq "select * from \"dummy\" group by time(30d)"
         end
-      end
 
-      describe "limit" do
-        it "should generate valid limi" do
-          expect(rel.limit(100).to_sql).to eq "select * from dummy limit 100" 
+        it "should group by hour and fill" do
+          expect(rel.time(:month, fill: 0).to_sql).to eq "select * from \"dummy\" group by time(30d) fill(0)"
         end
       end
-    end
 
-    describe "inspect" do
+      it "should group by time with string value" do
+        expect(rel.time("4d").to_sql).to eq "select * from \"dummy\" group by time(4d)"
+      end
 
-      after(:each) do
-        Influxer.reset
+      it "should group by time with string value and fill null" do
+        expect(rel.time("4d", fill: :null).to_sql).to eq "select * from \"dummy\" group by time(4d) fill(null)"
       end
-      
-      it "should return correct String represantation of empty relation" do
-        Influxer.client.stub(:query) { [] }
-        expect(rel.inspect).to eq "#<Influxer::Relation []>"  
+
+      it "should group by time and other fields with fill null" do
+        expect(rel.time("4d", fill: 0).group(:dummy_id).to_sql).to eq "select * from \"dummy\" group by time(4d),dummy_id fill(0)"
       end
+    end
 
-      it "should return correct String represantation of non-empty relation" do
-        Influxer.client.stub(:query){ [1,2,3] }
-        expect(rel.inspect).to eq "#<Influxer::Relation [1, 2, 3]>"  
+    describe "limit" do
+      it "should generate valid limi" do
+        expect(rel.limit(100).to_sql).to eq "select * from \"dummy\" limit 100" 
       end
+    end
+  end
 
-       it "should return correct String represantation of non-empty large (>11) relation" do
-        Influxer.client.stub(:query){ [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]}
-        expect(rel.inspect).to eq "#<Influxer::Relation [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, ...]>"  
+  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)" 
       end
-    end 
+    end
+  end
+
+  describe "inspect" do
+
+    after(:each) do
+      Influxer.reset
+    end
+    
+    it "should return correct String represantation of empty relation" do
+      Influxer.client.stub(:query) { {} }
+      expect(rel.inspect).to eq "#<Influxer::Relation []>"  
+    end
+
+    it "should return correct String represantation of non-empty relation" do
+      Influxer.client.stub(:query){ {"dummy" => [1,2,3]} }
+      expect(rel.inspect).to eq "#<Influxer::Relation [1, 2, 3]>"  
+    end
+
+     it "should return correct String represantation of non-empty large (>11) relation" do
+      Influxer.client.stub(:query){ {"dummy" => [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]} } 
+      expect(rel.inspect).to eq "#<Influxer::Relation [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, ...]>"  
+    end
+  end 
 end

data/spec/metrics/scoping_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe Influxer::Metrics do
+  before do
+    allow_any_instance_of(Influxer::Client).to receive(:query) do |_, sql|    
+      sql
+    end
+  end
+
+  let(:klass) do
+    Class.new(Influxer::Metrics) do
+      set_series 'dummy'
+    end
+  end
+
+  let(:dummy) do
+    Class.new(klass) do
+      default_scope -> { time(:hour) }
+    end
+  end
+
+  let(:dappy) do
+    Class.new(dummy) do
+      default_scope -> { limit(100) }
+    end
+  end
+
+  let(:doomy) do
+    Class.new(dappy) do
+      scope :by_user, -> (id) { where(user_id: id) if id.present? }
+      scope :hourly, -> { time(:hour) }
+      scope :daily, -> { time(:day) }
+    end
+  end
+
+
+  describe "default scope" do
+    it "should work without default scope" do
+      expect(klass.all.to_sql).to eq "select * from \"dummy\""
+    end
+
+    it "should work with default scope" do
+      expect(dummy.all.to_sql).to eq "select * from \"dummy\" group by time(1h)"
+    end
+
+    it "should work with unscoped" do
+      expect(dummy.unscoped.to_sql).to eq "select * from \"dummy\""
+    end
+
+    it "should work with several defaults" do
+      expect(dappy.where(user_id:1).to_sql).to eq "select * from \"dummy\" group by time(1h) where (user_id=1) limit 100"
+    end
+  end
+
+  describe "named scope" do
+    it "should work with named scope" do
+      expect(doomy.by_user(1).to_sql).to eq "select * from \"dummy\" group by time(1h) where (user_id=1) limit 100"
+    end
+
+    it "should work with named scope with empty relation" do
+      expect(doomy.by_user(nil).to_sql).to eq "select * from \"dummy\" group by time(1h) limit 100"
+    end
+
+    it "should work with several scopes" do
+      expect(doomy.where(dummy_id: 100).by_user([1,2,3]).daily.to_sql).to eq "select * from \"dummy\" group by time(1d) where (dummy_id=100) and (user_id=1 or user_id=2 or user_id=3) limit 100"
+    end
+  end
+end

data/spec/model/testo_spec.rb

@@ -1,18 +1,27 @@
 require 'spec_helper'
 
-
 describe Testo do
   let(:testo) {  Testo.new receipt_id: 10}
   specify { expect(testo).to respond_to :metrics } 
-  specify { expect(testo).to respond_to :testo_metrics }  
+  specify { expect(testo).to respond_to :testo_metrics } 
+  specify { expect(testo).to respond_to :testo2_metrics }  
+  specify { expect(testo).to respond_to :custom_metrics }  
 
   describe "metrics attributes" do
-
     it "should add foreign key and inherits" do
       expect(testo.metrics.build.testo_id).to eq testo.id
       expect(testo.testo_metrics.build.testo_id).to eq testo.id
       expect(testo.testo_metrics.build.receipt_id).to eq 10
     end
 
+    it "should add custom foreign key" do
+      expect(testo.testo2_metrics.build.testo).to eq testo.id
+    end
+
+    it "should add nil foreign key" do
+      expect(testo.custom_metrics.build.testo_id).to be_nil
+      expect(testo.custom_metrics.build.testo).to be_nil
+      expect(testo.custom_metrics.build.receipt_id).to be_nil
+    end
   end
 end

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@ ENV["RAILS_ENV"] ||= 'test'
 # SimpleCov.start
 
 require 'rspec'
-
+require 'pry'
 require 'rails/all'
 require 'rspec/rails'
 require 'timecop'

metadata

@@ -1,105 +1,147 @@
 --- !ruby/object:Gem::Specification
 name: influxer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Vlad Dem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: influxdb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.8
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.8
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 description: InfluxDB the Rails way
 email:
 - dementiev.vm@gmail.com
@@ -107,21 +149,29 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
+- Changelog.md
 - Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
 - gemfiles/rails40.gemfile
 - gemfiles/rails41.gemfile
+- gemfiles/rails42.gemfile
 - influxer.gemspec
 - lib/influxer.rb
 - lib/influxer/client.rb
 - lib/influxer/config.rb
 - lib/influxer/engine.rb
+- lib/influxer/metrics/fanout.rb
 - lib/influxer/metrics/metrics.rb
 - lib/influxer/metrics/relation.rb
+- lib/influxer/metrics/relation/fanout_query.rb
+- lib/influxer/metrics/relation/time_query.rb
+- lib/influxer/metrics/scoping.rb
+- lib/influxer/metrics/scoping/default.rb
+- lib/influxer/metrics/scoping/named.rb
 - lib/influxer/model.rb
 - lib/influxer/version.rb
 - lib/tasks/influxer_tasks.rake
@@ -173,8 +223,10 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/metrics/fanout_spec.rb
 - spec/metrics/metrics_spec.rb
 - spec/metrics/relation_spec.rb
+- spec/metrics/scoping_spec.rb
 - spec/model/testo_spec.rb
 - spec/spec_helper.rb
 - spec/support/dummy_metrics.rb
@@ -188,18 +240,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: InfluxDB support for Rails
+summary: InfluxDB for Rails
 test_files: []