influxer 0.2.4 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a70e770a10a4ba180183d675081265ed34c96a18
-  data.tar.gz: ce6d3d39937bc7eeabc4b4076bb9095e6b9eac59
+  metadata.gz: ed8a85c7e2c801bd415689ccfbf4bddf020df2b6
+  data.tar.gz: 9b42fc50e6dec5f287f193e0dbdb26ad983e533f
 SHA512:
-  metadata.gz: 23a20e2f8130fa8ad58c1ad961afd71f8bfa3a55ed744dc999857c6dd505b69ddcfa659cc2a885175a6e21005f836e1ee1f6d01850e9fbf898234e8ff6108562
-  data.tar.gz: 0373880b57e571673420d63297b81d4ffd8af6dee289adb2c9ccc8332447e736b841c92a0b2f6b11ec04e72ddd066a7ede9742d545706d1607d0a6891e3037b4
+  metadata.gz: 11ce8b4eb589f2a701603271b219f9c69004ed3854bc6c00cffb3b34ea7fd67faecfa5596c93af95b33f335c8105e390d2b9d5bf649164a1cf5b293cf3a79f36
+  data.tar.gz: c6711090feeef17151a69282a42d8db28ca4b90115571d17023b44b93453d5a843cd0200d4fa5b586807f86d682146ef77236d6c1665396ac7ce74224a2f1511

data/.gitignore

@@ -32,5 +32,6 @@ spec/dummy/db/*.sqlite3-journal
 spec/dummy/tmp/
 
 Gemfile.lock
+Gemfile.local
 .rspec
 *.gem

data/.rubocop.yml

@@ -11,6 +11,12 @@ AllCops:
   DisplayCopNames: true
   StyleGuideCopsOnly: false
 
+Style/AccessorMethodName:
+  Enabled: false
+
+Style/TrivialAccessors:
+  Enabled: false
+
 Style/Documentation:
   Exclude:
     - 'spec/**/*.rb'
@@ -18,10 +24,16 @@ Style/Documentation:
 Style/StringLiterals: 
   Enabled: false
 
+Style/SpaceInsideStringInterpolation:
+  EnforcedStyle: no_space
+
 Style/BlockDelimiters:
   Exclude:
     - 'spec/**/*.rb'
 
+Lint/AmbiguousRegexpLiteral:
+  Enabled: false
+
 Metrics/MethodLength:
   Exclude:
     - 'spec/**/*.rb'

data/.travis.yml

@@ -1,22 +1,6 @@
 language: ruby
 cache: bundler
-rvm:
-  - 2.0.0
-  - 2.1
-
-gemfile:
-  - Gemfile
-
 matrix:
   include:
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails40.gemfile
-
-    - rvm: 2.1
-      gemfile: gemfiles/rails40.gemfile
-
-    - rvm: 2.1
-      gemfile: gemfiles/rails41.gemfile
-
-    - rvm: 2.1
+    - rvm: 2.2.2
       gemfile: gemfiles/rails42.gemfile

data/Changelog.md

@@ -1,3 +1,10 @@
+## 0.3.1
+- Add order, soffset, slimit methods to Relation
+- Fix query statements order
+
+## 0.3.0
+- Upgrade to InfluxDB 0.9.x
+
 ## 0.2.3
 - Parse fanout queries points to handle _fanouted_ values
 - Add Rubocop config and cleanup code style

data/Gemfile

@@ -1,3 +1,10 @@
 source "https://rubygems.org"
 gemspec
 
+local_gemfile = 'Gemfile.local'
+
+if File.exist?(local_gemfile)
+  eval(File.read(local_gemfile)) # rubocop:disable Lint/Eval
+else
+  gem 'activerecord', '~>4.2'
+end

data/README.md

@@ -1,7 +1,8 @@
-[![Build Status](https://travis-ci.org/palkan/influxer.svg?branch=master)](https://travis-ci.org/palkan/influxer)
-
+[![Build Status](https://travis-ci.org/palkan/influxer.svg?branch=master)](https://travis-ci.org/palkan/influxer) [![Vexor Status](https://ci.vexor.io/projects/55e92786-f1de-4e69-8f58-889453c2d71c/status.svg)](https://ci.vexor.io/ui/projects/55e92786-f1de-4e69-8f58-889453c2d71c/builds)
 ## Influxer
 
+**NOTE**: Version 0.3.x supports InfluxDB >= 0.9.0. For InfluxDB 0.8.x use [version 0.2.5](https://github.com/palkan/influxer/tree/0.2.5).
+
 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\/.*/`.
@@ -14,6 +15,8 @@ Influxer provides an ActiveRecord-style way to work with [InfluxDB](https://infl
     ```ruby
     class Metrics < Influxer::Metrics
         default_scope -> { time(:hour).limit(1000) }
+        tags :account_id
+        attributes :value
         scope :unlimited, -> { limit(nil) }
         scope :by_account, -> (id) { where(account_id: id) if id.present? }
     end
@@ -25,23 +28,6 @@ Influxer provides an ActiveRecord-style way to work with [InfluxDB](https://infl
     # => select * from "metrics" group by time(1w) where account_id=1
 
     ```
-- Support for handling fanout series as one metrics.
-    ```ruby
-    class Metrics < Influxer::Metrics
-        fanout :account, :user, :page
-    end
-
-    Metrics.where(account: 1)
-    # => select * from "metrics_account_1" 
-
-
-    Metrics.where(page: 'home').where(user: 12)
-    # => select * from "metrics_user_12_page_home" 
-
-    Metrics.where(page: /(home|faq)/).where(account: 1).where(user: 12)
-    # => select * from /^metrics_account_1_user_12_page_(home|faq)$/ 
-
-    ``` 
 - Integrate with your model:
     ```ruby
     class UserVisits < Influxer::Metrics
@@ -59,4 +45,4 @@ Influxer provides an ActiveRecord-style way to work with [InfluxDB](https://infl
     #=> select * from user_visits where page_id='home'
     ```
     
-Find more on [Wiki](/palkan/influxer/wiki).
+Find more on [Wiki](https://github.com/palkan/influxer/wiki).

data/Rakefile

@@ -4,3 +4,7 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+task :console do
+  sh 'pry -r ./lib/influxer.rb'
+end

data/gemfiles/rails42.gemfile

@@ -2,6 +2,9 @@ source 'https://rubygems.org'
 
 gem 'sqlite3', platform: :mri
 gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
-gem 'rails', '~> 4.2.0'
+gem 'activerecord', '~> 4.2.0'
+
+# TEMP
+gem 'influxdb', github: 'influxdb/influxdb-ruby'
 
 gemspec path: '..'

data/influxer.gemspec

@@ -15,16 +15,16 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split($/)
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "rails", '~> 4.0'
-  s.add_dependency "influxdb", "~> 0.1.8"
-  s.add_dependency "anyway_config", "~>0.3"
+  s.add_dependency "activemodel", '>= 4.0'
+  s.add_dependency "influxdb", "~> 0.2.2"
+  s.add_dependency "anyway_config", "~>0.3.0"
 
   s.add_development_dependency "timecop"
   s.add_development_dependency "simplecov", ">= 0.3.8"
-
+  s.add_development_dependency 'rake', '~> 10.1'
   s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'pry'
+  s.add_development_dependency 'activerecord', '>= 4.0'
   s.add_development_dependency 'pry-byebug'
   s.add_development_dependency "rspec", "~> 3.1.0"
-  s.add_development_dependency "rspec-rails", "~> 3.1.0"
+  s.add_development_dependency "webmock", "~> 1.21.0"
 end

data/lib/influxer/client.rb

@@ -4,52 +4,12 @@ module Influxer
   # InfluxDB API client
   class Client < ::InfluxDB::Client
     def initialize
-      @instrumenter = ActiveSupport::Notifications.instrumenter
-      super Influxer.config.database, Influxer.config.as_json.symbolize_keys!
+      super Influxer.config.as_json.symbolize_keys!
     end
 
-    def cached_query(sql)
-      log(sql) do
-        if Influxer.config.cache == false
-          query(sql)
-        else
-          Rails.cache.fetch(normalized_cache_key(sql), cache_options(sql)) { query(sql) }
-        end
-      end
-    end
-
-    private
-
-    def log(sql)
-      return yield unless logger.debug?
-
-      start_ts = Time.now
-      res = yield
-      duration = (Time.now - start_ts) * 1000
-
-      name  = "InfluxDB SQL (#{duration.round(1)}ms)"
-
-      # bold black name and blue query string
-      msg = "\e[1m\e[30m#{name}\e[0m  \e[34m#{sql}\e[0m"
-      logger.debug msg
-      res
-    end
-
-    # if sql contains 'now()' set expires to 1 minute or :cache_now_for value
-    # of config.cache if defined
-    def cache_options(sql = nil)
-      options = Influxer.config.cache.dup
-      options[:expires_in] = (options[:cache_now_for] || 60) if sql =~ /\snow\(\)/
-      options
-    end
-
-    # add prefix; remove whitespaces
-    def normalized_cache_key(sql)
-      "influxer:#{sql.gsub(/\s*/, '')}"
-    end
-
-    def logger
-      Rails.logger
+    # Public #execute
+    def exec(sql)
+      execute(sql)
     end
   end
 end

data/lib/influxer/config.rb

@@ -5,20 +5,29 @@ module Influxer
   class Config < Anyway::Config
     config_name :influxdb
 
-    attr_config database: 'db',
-                host: 'localhost',
-                port: 8086,
-                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
+    # influxdb-ruby configuration parameters + cache option
+    attr_config :hosts,
+                :host,
+                :port,
+                :username,
+                :password,
+                :database,
+                :time_precision,
+                :use_ssl,
+                :verify_ssl,
+                :ssl_ca_cert,
+                :auth_method,
+                :initial_delay,
+                :max_delay,
+                :open_timeout,
+                :read_timeout,
+                :retry,
+                :prefix,
+                :denormalize,
+                :udp,
+                :async,
+                database: 'db',
+                cache: false
 
     def load
       super

data/lib/influxer/engine.rb

@@ -1,5 +1,4 @@
 require 'influxer'
-require 'rails'
 
 module Influxer
   class Engine < Rails::Engine # :nodoc:

data/lib/influxer/metrics/metrics.rb

@@ -1,6 +1,5 @@
 require 'influxer/metrics/relation'
 require 'influxer/metrics/scoping'
-require 'influxer/metrics/fanout'
 require 'active_model'
 
 module Influxer
@@ -8,13 +7,13 @@ module Influxer
   class MetricsInvalid < MetricsError; end
 
   # Base class for InfluxDB querying and writing
+  # rubocop:disable Metrics/ClassLength
   class Metrics
     include ActiveModel::Model
     include ActiveModel::Validations
     extend ActiveModel::Callbacks
 
     include Influxer::Scoping
-    include Influxer::Fanout
 
     define_model_callbacks :write
 
@@ -23,15 +22,16 @@ module Influxer
       delegate(
         *(
           [
-            :write, :select, :where, :group,
-            :merge, :time, :past, :since, :limit,
-            :fill, :delete_all
+            :write, :write!, :select, :where,
+            :group, :time, :past, :since,
+            :limit, :offset, :fill, :delete_all
           ] + Influxer::Calculations::CALCULATION_METHODS
         ),
         to: :all
       )
 
       attr_reader :series
+      attr_accessor :tag_names
 
       def attributes(*attrs)
         attrs.each do |name|
@@ -45,10 +45,23 @@ module Influxer
         end
       end
 
+      def tags(*attrs)
+        attributes(*attrs)
+        self.tag_names ||= []
+        self.tag_names += attrs.map(&:to_s)
+      end
+
+      def tag?(name)
+        tag_names.include?(name.to_s)
+      end
+
       def inherited(subclass)
         subclass.set_series
+        subclass.tag_names = tag_names.nil? ? [] : tag_names.dup
       end
 
+      # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/AbcSize
       def set_series(*args)
         if args.empty?
           matches = to_s.match(/^(.*)Metrics$/)
@@ -63,6 +76,8 @@ module Influxer
           @series = args
         end
       end
+      # rubocop:enable Metrics/MethodLength
+      # rubocop:enable Metrics/AbcSize
 
       def all
         if current_scope
@@ -72,6 +87,7 @@ module Influxer
         end
       end
 
+      # rubocop:disable Metrics/MethodLength
       def quoted_series(val = @series, instance = nil)
         case val
         when Regexp
@@ -80,7 +96,7 @@ module Influxer
           quoted_series(val.call(instance))
         when Array
           if val.length > 1
-            "merge(#{ val.map { |s| quoted_series(s) }.join(',') })"
+            "merge(#{val.map { |s| quoted_series(s) }.join(',')})"
           else
             quoted_series(val.first)
           end
@@ -88,8 +104,11 @@ module Influxer
           '"' + val.to_s.gsub(/\"/) { %q(\") } + '"'
         end
       end
+      # rubocop:enable Metrics/MethodLength
     end
 
+    delegate :tag_names, to: :class
+
     def initialize(attributes = {})
       @attributes = {}
       @persisted = false
@@ -113,7 +132,7 @@ module Influxer
     end
 
     def write_point
-      client.write_point unquote(series), @attributes
+      client.write_point unquote(series), values: values, tags: tags
       @persisted = true
     end
 
@@ -129,6 +148,20 @@ module Influxer
       Influxer.client
     end
 
+    def dup
+      self.class.new(@attributes)
+    end
+
+    # Returns hash with metrics values
+    def values
+      @attributes.reject { |k, _| tag_names.include?(k.to_s) }
+    end
+
+    # Returns hash with metrics tags
+    def tags
+      @attributes.select { |k, _| tag_names.include?(k.to_s) }
+    end
+
     attributes :time
 
     private

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

@@ -4,18 +4,24 @@ module Influxer
       [
         :count, :min, :max, :mean,
         :mode, :median, :distinct, :derivative,
-        :stddev, :sum, :first, :last, :difference,
-        :percentile, :histogram, :top, :bottom
+        :stddev, :sum, :first, :last
       ]
 
+    # rubocop:disable Metrics/LineLength
     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
+        def #{name}(val, alias_name = nil)                                                        # def count(val)
+          @values[:has_calculations] = true                                                       #   @values[:has_calculations] = true
+          select_values << "#{name}(\#\{val\})\#\{alias_name ? ' as '+alias_name.to_s : ''\}"     #   select_values << "count(\#\{val\})"
+          self                                                                                    #   self
+        end                                                                                       # end
       CODE
     end
+
+    def percentile(name, val, alias_name = nil)
+      @values[:has_calculations] = true
+      select_values << "percentile(#{name},#{val})#{alias_name ? ' as ' + alias_name.to_s : ''}"
+      self
+    end
   end
 end

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

@@ -4,11 +4,14 @@ module Influxer
       hour: '1h',
       minute: '1m',
       second: '1s',
-      ms: '1u',
+      ms: '1ms',
+      u: '1u',
       week: '1w',
       day: '1d',
       month: '30d'
-    }
+    }.freeze
+
+    FILL_RESERVED = %i(null previous none).freeze
 
     # Add group value to relation. To be used instead of `group("time(...)").
     # Accepts symbols and strings.
@@ -20,7 +23,6 @@ module Influxer
     #
     #    Metrics.time("4d", fill: 0)
     #    # select * from metrics group by time(4d) fill(0)
-
     def time(val, options = {})
       if val.is_a?(Symbol)
         @values[:time] = TIME_ALIASES[val] || '1' + val.to_s
@@ -28,9 +30,7 @@ module Influxer
         @values[:time] = val
       end
 
-      unless options[:fill].nil?
-        fill((options[:fill] == :null) ? 'null' : options[:fill].to_i)
-      end
+      build_fill(options[:fill])
       self
     end
 
@@ -45,11 +45,10 @@ module Influxer
     #
     #    Metrics.past(2.days)
     #    # select * from metrics where time > now() - 172800s
-
     def past(val)
       case val
       when Symbol
-        where("time > now() - #{ TIME_ALIASES[val] || ('1'+val.to_s) }")
+        where("time > now() - #{TIME_ALIASES[val] || ('1' + val.to_s)}")
       when String
         where("time > now() - #{val}")
       else
@@ -69,5 +68,12 @@ module Influxer
     def since(val)
       where("time > #{val.to_i}s")
     end
+
+    private
+
+    def build_fill(val)
+      return if val.nil?
+      fill(FILL_RESERVED.include?(val) ? val.to_s : val.to_i)
+    end
   end
 end

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

@@ -0,0 +1,62 @@
+module Influxer
+  module WhereClause #:nodoc:
+    # accepts hash or strings conditions
+    def where(*args, **hargs)
+      build_where(args, hargs, false)
+      self
+    end
+
+    def not(*args, **hargs)
+      build_where(args, hargs, true)
+      self
+    end
+
+    protected
+
+    def build_where(args, hargs, negate)
+      case
+      when (args.present? && args[0].is_a?(String))
+        where_values.concat args.map { |str| "(#{str})" }
+      when hargs.present?
+        build_hash_where(hargs, negate)
+      else
+        false
+      end
+    end
+
+    def build_hash_where(hargs, negate = false)
+      hargs.each do |key, val|
+        where_values << "(#{build_eql(key, val, negate)})"
+      end
+    end
+
+    def build_eql(key, val, negate)
+      case val
+      when Regexp
+        "#{key}#{negate ? '!~' : '=~'}#{val.inspect}"
+      when Array
+        build_in(key, val, negate)
+      when Range
+        build_range(key, val, negate)
+      else
+        "#{key}#{negate ? '<>' : '='}#{quoted(val, key)}"
+      end
+    end
+
+    def build_in(key, arr, negate)
+      buf = []
+      arr.each do |val|
+        buf << build_eql(key, val, negate)
+      end
+      "#{buf.join(negate ? ' and ' : ' or ')}"
+    end
+
+    def build_range(key, val, negate)
+      if negate
+        "#{key}<#{quoted(val.begin)} and #{key}>#{quoted(val.end)}"
+      else
+        "#{key}>#{quoted(val.begin)} and #{key}<#{quoted(val.end)}"
+      end
+    end
+  end
+end