influxer 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bb445897c491a860d94249f174bc02e9ad6b61f
-  data.tar.gz: 011778f550be687a6d1503618f98ec70dd454c2a
+  metadata.gz: 41e9c97ead83ee84ac09bcbb5d4e4192513aa0cb
+  data.tar.gz: e8e98767913c3afa849d7f8a5bcc2215a18cd442
 SHA512:
-  metadata.gz: 85e6922159fc728186d5b3a0736ff1c9950f1af0a1d70f8452e91f6e1759e2508a1e1566d9f55482ffefe62a01b39d2843aea81aec8e5382217e015291b26dd5
-  data.tar.gz: 232e5a9108e36d1378134a1e26fbc9d25367a569cae4a3f7ab752c2c48f3da5ea47e395019032fd2896cc6ed90421c6e8b07283b94690453e2d8ec120b0fe144
+  metadata.gz: 9fcbb580a0e0907a441566aab7e6d23b7d63c5bc7e0ff08bdb8a68a9e1c1ecbe724d6028a9297751a72ffb75678fb83fcfa42043c62a7decb3fbb657c6e51538
+  data.tar.gz: 9548bbdf12e8c6b4354711814653faff335a88741dfc00e9a8344bb521b06010c9685f4bc9c68ecb11bfaa66607378cceca82b1eb2bf5113e628d610ccd490ee

data/Changelog.md

@@ -1,3 +1,7 @@
+## 0.1.1
+- Add [anyway_config](https://github.com/palkan/anyway_config)
+- Add `empty?` method
+
 ## 0.1.0
 - Add logs
 - Add `foreign_key` param to `has_metrics` options

data/README.md

@@ -2,7 +2,7 @@
 
 ## Influxer
 
-ActiveRecord-like wrapper for [influxdb-ruby](https://github.com/influxdb/influxdb-ruby) with many useful features, such as:
+Influxer provides an ActiveRecord-style way to work with [InfluxDB](https://influxdb.com/) with many useful features, such as:
 - Familar query language (use `select`, `where`, `not`, `group` etc).
 - Support for Regex conditions: `where(page_id: /^home\/.*/) #=> select * ... where page_id=~/^home\/.*/`.
 - Special query methods for InfluxDB: 
@@ -11,7 +11,7 @@ ActiveRecord-like wrapper for [influxdb-ruby](https://github.com/influxdb/influx
     - `since` - get only points since date (e.g. `Metrics.since(Time.utc(2014,12,31)) => # select * ... where time > 1419984000s`);
     - `merge` - merge series.
 - Scopes support
-    ```
+    ```ruby
     class Metrics < Influxer::Metrics
         default_scope -> { time(:hour).limit(1000) }
         scope :unlimited, -> { limit(nil) }
@@ -26,7 +26,7 @@ ActiveRecord-like wrapper for [influxdb-ruby](https://github.com/influxdb/influx
 
     ```
 - Support for handling fanout series as one metrics.
-    ```
+    ```ruby
     class Metrics < Influxer::Metrics
         fanout :account, :user, :page
     end
@@ -43,7 +43,7 @@ ActiveRecord-like wrapper for [influxdb-ruby](https://github.com/influxdb/influx
 
     ``` 
 - Integrate with your model:
-    ```
+    ```ruby
     class UserVisits < Influxer::Metrics
     end
     
@@ -57,4 +57,6 @@ ActiveRecord-like wrapper for [influxdb-ruby](https://github.com/influxdb/influx
 
     user.visits.where(page_id: 'home')
     #=> select * from user_visits where page_id='home'
-    ```
+    ```
+    
+Find more on [Wiki](/palkan/influxer/wiki).

data/influxer.gemspec

@@ -17,6 +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.1"
 
   s.add_development_dependency "timecop"
   s.add_development_dependency "simplecov", ">= 0.3.8"

data/lib/influxer/config.rb

@@ -1,50 +1,26 @@
-module Influxer
-  class Config
-    attr_accessor :database,
-                  :host,
-                  :port,
-                  :username,
-                  :password,
-                  :use_ssl,
-                  :async,
-                  :cache,
-                  :retry,
-                  :time_precision,
-                  :initial_delay,
-                  :max_delay,
-                  :read_timeout,
-                  :write_timeout
-
-    def initialize
-      @database = 'db'
-      @host = 'localhost'
-      @port = 8083
-      @use_ssl = false
-      @async = true
-      @cache = false
-      @retry = false
-      @time_precision = 's'
-      @max_delay = 30
-      @initial_delay = 0.01
-      @read_timeout = 30
-      @write_timeout = 5 
-
-      config_path = Rails.root.join("config","influxdb.yml")
-      
-      config = {}
-
-      if File.file? config_path
-        config = YAML.load_file(config_path)[Rails.env] || {}
-      end
+require 'anyway'
 
-      unless Rails.application.try(:secrets).nil?
-        config.merge! Rails.application.secrets.influxdb
-      end
+module Influxer
+  class Config < Anyway::Config
+    config_name :influxdb
 
-      config.each do |key, val| 
-        self.send("#{key}=",val)
-      end
+    attr_config database: 'db', 
+                host: 'localhost',
+                port: 8083,
+                username: 'root',
+                password: 'root',
+                use_ssl: false,
+                async: true,
+                cache: false,
+                retry: false,
+                time_precision: 's',
+                initial_delay: 0.01,
+                max_delay: 30,
+                read_timeout: 30,
+                write_timeout: 5
 
+    def load
+      super
       # we want pass @cache value as options to cache store, so we want it to be a Hash
       if @cache == true
         @cache = {}

data/lib/influxer/metrics/metrics.rb

@@ -16,7 +16,8 @@ module Influxer
     define_model_callbacks :write
 
     class << self
-      delegate :select, :where, :group, :merge, :time, :past, :since, :limit, :fill, :delete_all, to: :all
+      # delegate query functions to all
+      delegate :write, :select, :where, :group, :merge, :time, :past, :since, :limit, :fill, :delete_all, to: :all
 
       def attributes(*attrs)
         attrs.each do |name|
@@ -76,6 +77,7 @@ module Influxer
       run_callbacks :write do
         self.write_point
       end
+      self
     end
 
     def write!

data/lib/influxer/metrics/relation.rb

@@ -60,6 +60,12 @@ module Influxer
       CODE
     end
 
+
+    class << self
+      # delegate array methods to to_a
+      delegate :to_xml, :to_yaml, :length, :collect, :map, :each, :all?, :include?, :to_ary, :join, to: :to_a
+    end
+
     # Initialize new Relation for 'klass' (Class) metrics.
     # 
     # Available params:
@@ -133,7 +139,6 @@ module Influxer
     def to_a
       return @records if loaded?
       load
-      @records
     end
 
     def inspect
@@ -143,8 +148,23 @@ module Influxer
       "#<#{self.class.name} [#{entries.join(', ')}]>"
     end
 
-    def as_json
-      to_a.as_json
+    def empty?
+      unless loaded?
+        # we don't need selects here
+        select_values.clear
+        limit(1).load
+      end
+      return @records.empty? 
+    end
+
+    def as_json(options=nil)
+      to_a.as_json(options)
+    end
+
+    def load
+      @records = get_points(@instance.client.cached_query(to_sql))
+      @loaded = true
+      @records
     end
 
     def delete_all
@@ -185,6 +205,7 @@ module Influxer
       self
     end
 
+
     protected
       def build_where(args, hargs, negate)
         case
@@ -236,11 +257,6 @@ module Influxer
         end  
       end
 
-      def load
-        @records = get_points(@instance.client.cached_query(to_sql))
-        @loaded = true
-      end
-
       def loaded?
         @loaded
       end

data/lib/influxer/version.rb

@@ -1,3 +1,3 @@
 module Influxer
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/metrics/metrics_spec.rb

@@ -62,17 +62,16 @@ describe Influxer::Metrics do
       end 
 
       it "should write successfully when all required attributes are set" do
-        expect(dummy_metrics.write).to be true
-        expect(dummy_metrics.persisted?).to be true
+        expect(dummy_metrics.write).to be_truthy
+        expect(dummy_metrics.persisted?).to be_truthy
       end 
 
       it "should raise error if you want to write twice" do
-        expect(dummy_metrics.write).to be true
+        expect(dummy_metrics.write).to be_truthy
         expect{dummy_metrics.write!}.to raise_error(StandardError)
       end 
     end
 
-
     describe "active_model callbacks on write" do
       it "should work" do
 
@@ -158,6 +157,19 @@ describe Influxer::Metrics do
       end
     end
 
+    describe "write method" do
+      it "should write data and return point" do
+        point = DummyMetrics.write(user_id: 1, dummy_id: 2)
+        expect(point.persisted?).to be_truthy
+        expect(point.user_id).to eq 1
+        expect(point.dummy_id).to eq 2
+      end 
+
+      it "should not write data and return false" do
+        expect(DummyMetrics.write(dummy_id: 2)).to be false
+      end 
+    end
+
     describe "all method" do
       it "should respond with relation" do
         expect(metrics_class.all).to be_an_instance_of Influxer::Relation

data/spec/metrics/relation_spec.rb

@@ -192,6 +192,21 @@ describe Influxer::Relation 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
+      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
   end
 
   describe "delete_all" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Vlad Dem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,6 +44,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.8
+- !ruby/object:Gem::Dependency
+  name: anyway_config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement