influxer 1.1.6 → 1.2.0

data/lib/influxer/metrics/metrics.rb

@@ -1,16 +1,15 @@
 # frozen_string_literal: true
 
-require 'influxer/metrics/relation'
-require 'influxer/metrics/scoping'
-require 'influxer/metrics/quoting/timestamp'
-require 'influxer/metrics/active_model3/model'
+require "influxer/metrics/relation"
+require "influxer/metrics/scoping"
+require "influxer/metrics/quoting/timestamp"
+require "influxer/metrics/active_model3/model"
 
 module Influxer
   class MetricsError < StandardError; end
   class MetricsInvalid < MetricsError; end
 
   # Base class for InfluxDB querying and writing
-  # rubocop:disable Metrics/ClassLength
   class Metrics
     TIME_FACTOR = 1_000_000_000
     if Influxer.active_model3?
@@ -124,7 +123,7 @@ module Influxer
           quoted_series(val.call(instance), write: write)
         when Array
           if val.length > 1
-            "merge(#{val.map { |s| quoted_series(s, write: write) }.join(',')})"
+            "merge(#{val.map { |s| quoted_series(s, write: write) }.join(",")})"
           else
             quoted_series(val.first, write: write)
           end
@@ -132,7 +131,7 @@ module Influxer
           # Only add retention policy when selecting points
           # and not writing
           if !write && retention_policy.present?
-            [quote(@retention_policy), quote(val)].join('.')
+            [quote(@retention_policy), quote(val)].join(".")
           else
             quote(val)
           end
@@ -168,6 +167,7 @@ module Influxer
 
     def write!
       raise MetricsInvalid if invalid?
+
       write
     end
 
@@ -228,7 +228,7 @@ module Influxer
     end
 
     def unquote(name)
-      name.gsub(/(\A['"]|['"]\z)/, '')
+      name.gsub(/(\A['"]|['"]\z)/, "")
     end
   end
 end

data/lib/influxer/metrics/quoting/timestamp.rb

@@ -3,27 +3,27 @@
 module Influxer
   module TimestampQuoting #:nodoc:
     TIME_FACTORS = {
-      'ns' => 1_000_000_000,
-      'ms' => 1_000,
-      's' => 1
+      "ns" => 1_000_000_000,
+      "ms" => 1_000,
+      "s" => 1
     }.freeze
 
-    DEFAULT_PRECISION = 'ns'
+    DEFAULT_PRECISION = "ns"
 
     # Quote timestamp
     # rubocop: disable Metrics/MethodLength, Metrics/AbcSize
     def quote_timestamp(val, client)
       if Influxer.config.time_duration_suffix_enabled
-        precision = if TIME_FACTORS.keys.include?(client.time_precision)
-                      client.time_precision
-                    else
-                      DEFAULT_PRECISION
-                    end
+        precision = if TIME_FACTORS.key?(client.time_precision)
+          client.time_precision
+        else
+          DEFAULT_PRECISION
+        end
         return quote_timestamp_with_suffix(val, precision)
       end
 
-      if !TIME_FACTORS.keys.include?(client.time_precision) &&
-         !val.is_a?(Numeric)
+      if !TIME_FACTORS.key?(client.time_precision) &&
+          !val.is_a?(Numeric)
         warn(
           "Influxer doesn't automatically cast Time and String values " \
           "to '#{client.time_precision}' precision. " \
@@ -41,8 +41,8 @@ module Influxer
     end
 
     def quote_timestamp_for_write(val, client)
-      if !TIME_FACTORS.keys.include?(client.time_precision) &&
-         !val.is_a?(Numeric)
+      if !TIME_FACTORS.key?(client.time_precision) &&
+          !val.is_a?(Numeric)
         raise ArgumentError,
               "Influxer doesn't support quoting #{val} " \
               " with '#{client.time_precision}' precision. " \

data/lib/influxer/metrics/relation.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/module/delegation'
-require 'influxer/metrics/relation/time_query'
-require 'influxer/metrics/relation/calculations'
-require 'influxer/metrics/relation/where_clause'
-require 'influxer/metrics/quoting/timestamp'
+require "active_support/core_ext/module/delegation"
+require "influxer/metrics/relation/time_query"
+require "influxer/metrics/relation/calculations"
+require "influxer/metrics/relation/where_clause"
+require "influxer/metrics/quoting/timestamp"
 
 module Influxer
   # Relation is used to build queries
-  # rubocop:disable Metrics/ClassLength
   class Relation
     include Influxer::TimeQuery
     include Influxer::Calculations
@@ -144,17 +143,17 @@ module Influxer
 
       sql << "from #{build_series_name}"
 
-      sql << "where #{where_values.join(' and ')}" unless where_values.empty?
+      sql << "where #{where_values.join(" and ")}" unless where_values.empty?
 
       unless group_values.empty? && time_value.nil?
-        group_fields = (time_value.nil? ? [] : ['time(' + @values[:time] + ')']) + group_values
+        group_fields = (time_value.nil? ? [] : ["time(" + @values[:time] + ")"]) + group_values
         group_fields.uniq!
-        sql << "group by #{group_fields.join(', ')}"
+        sql << "group by #{group_fields.join(", ")}"
       end
 
       sql << "fill(#{fill_value})" unless fill_value.nil?
 
-      sql << "order by #{order_values.uniq.join(',')}" unless order_values.empty?
+      sql << "order by #{order_values.uniq.join(",")}" unless order_values.empty?
 
       sql << "limit #{limit_value}" unless limit_value.nil?
       sql << "offset #{offset_value}" unless offset_value.nil?
@@ -169,14 +168,15 @@ module Influxer
 
     def to_a
       return @records if loaded?
+
       load
     end
 
     def inspect
       entries = to_a.take(11).map!(&:inspect)
-      entries[10] = '...' if entries.size == 11
+      entries[10] = "..." if entries.size == 11
 
-      "#<#{self.class.name} [#{entries.join(', ')}]>"
+      "#<#{self.class.name} [#{entries.join(", ")}]>"
     end
 
     def empty?
@@ -209,7 +209,7 @@ module Influxer
 
       sql << "from #{@instance.series}"
 
-      sql << "where #{where_values.join(' and ')}" unless where_values.empty?
+      sql << "where #{where_values.join(" and ")}" unless where_values.empty?
 
       sql = sql.join " "
 
@@ -228,6 +228,7 @@ module Influxer
     # rubocop:disable Metrics/MethodLength
     def merge!(rel)
       return self if rel.nil?
+
       MULTI_VALUE_METHODS.each do |method|
         (@values[method] ||= []).concat(rel.values[method]).uniq! unless rel.values[method].nil?
       end
@@ -280,6 +281,7 @@ module Influxer
 
     def get_points(list)
       return list if normalized?
+
       list.reduce([]) do |a, e|
         a + e.fetch("values", []).map { |v| inject_tags(v, e["tags"] || {}) }
       end
@@ -291,11 +293,13 @@ module Influxer
 
     def method_missing(method, *args, &block)
       return super unless @klass.respond_to?(method)
+
       merge!(scoping { @klass.public_send(method, *args, &block) })
     end
 
     def respond_to_missing?(method, *args)
       return true if @klass.respond_to?(method)
+
       super
     end
   end

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

@@ -21,7 +21,7 @@ module Influxer
 
     def percentile(name, val, alias_name = nil)
       @values[:has_calculations] = true
-      select_values << "percentile(#{name}, #{val})#{alias_name ? ' as ' + alias_name.to_s : ''}"
+      select_values << "percentile(#{name}, #{val})#{alias_name ? " as " + alias_name.to_s : ""}"
       self
     end
   end

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

@@ -3,15 +3,15 @@
 module Influxer
   module TimeQuery #:nodoc:
     TIME_ALIASES = {
-      hour: '1h',
-      minute: '1m',
-      second: '1s',
-      ms: '1ms',
-      u: '1u',
-      week: '1w',
-      day: '1d',
-      month: '30d',
-      year: '365d'
+      hour: "1h",
+      minute: "1m",
+      second: "1s",
+      ms: "1ms",
+      u: "1u",
+      week: "1w",
+      day: "1d",
+      month: "30d",
+      year: "365d"
     }.freeze
 
     FILL_RESERVED = %i[null previous none].freeze
@@ -28,10 +28,10 @@ module Influxer
     #    # select * from metrics group by time(4d) fill(0)
     def time(val, options = {})
       @values[:time] = if val.is_a?(Symbol)
-                         TIME_ALIASES[val] || '1' + val.to_s
-                       else
-                         val
-                       end
+        TIME_ALIASES[val] || "1" + val.to_s
+      else
+        val
+      end
 
       build_fill(options[:fill])
       self
@@ -51,7 +51,7 @@ module Influxer
     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
@@ -76,6 +76,7 @@ module Influxer
 
     def build_fill(val)
       return if val.nil?
+
       fill(FILL_RESERVED.include?(val) ? val.to_s : val.to_i)
     end
   end

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

@@ -29,6 +29,7 @@ module Influxer
 
     def load
       return if @null_relation
+
       super
     end
 
@@ -57,14 +58,15 @@ module Influxer
       when NilClass
         build_eql(key, /.*/, !negate)
       when Regexp
-        "#{key}#{negate ? ' !~ ' : ' =~ '}#{val.inspect}"
+        "#{key}#{negate ? " !~ " : " =~ "}#{val.inspect}"
       when Array
         return build_none(negate) if val.empty?
+
         build_in(key, val, negate)
       when Range
         build_range(key, val, negate)
       else
-        "#{key}#{negate ? ' <> ' : ' = '}#{quoted(val, key)}"
+        "#{key}#{negate ? " <> " : " = "}#{quoted(val, key)}"
       end
     end
     # rubocop:enable Metrics/CyclomaticComplexity
@@ -75,7 +77,7 @@ module Influxer
       arr.each do |val|
         buf << build_eql(key, val, negate)
       end
-      buf.join(negate ? ' and ' : ' or ').to_s
+      buf.join(negate ? " and " : " or ").to_s
     end
 
     # rubocop: disable Metrics/AbcSize, Metrics/MethodLength, Style/IfInsideElse
@@ -100,7 +102,7 @@ module Influxer
 
     def build_none(negate = false)
       @null_relation = !negate
-      negate ? 'time >= 0' : 'time < 0'
+      negate ? "time >= 0" : "time < 0"
     end
   end
 end

data/lib/influxer/metrics/scoping.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'influxer/metrics/scoping/default'
-require 'influxer/metrics/scoping/named'
+require "influxer/metrics/scoping/default"
+require "influxer/metrics/scoping/named"
 
 if Influxer.active_model3?
-  require 'influxer/metrics/scoping/old_current_scope'
+  require "influxer/metrics/scoping/old_current_scope"
 else
-  require 'influxer/metrics/scoping/current_scope'
+  require "influxer/metrics/scoping/current_scope"
 end
 
 module Influxer

data/lib/influxer/metrics/scoping/current_scope.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/per_thread_registry'
+require "active_support/per_thread_registry"
 
 module Influxer
   module Scoping
@@ -39,6 +39,7 @@ module Influxer
 
         def raise_invalid_scope_type!(scope_type)
           return if VALID_SCOPE_TYPES.include?(scope_type)
+
           raise ArgumentError, "Invalid scope type '#{scope_type}' sent to the registry. \
         Scope types  must be included in VALID_SCOPE_TYPES"
         end

data/lib/influxer/metrics/scoping/default.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/concern'
+require "active_support/concern"
 
 module Influxer
   module Scoping

data/lib/influxer/metrics/scoping/named.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/concern'
+require "active_support/concern"
 
 module Influxer
   module Scoping
@@ -10,6 +10,7 @@ module Influxer
       module ClassMethods
         def scope(name, scope)
           raise "Scope not defined: #{name}" if scope.nil? || !scope.respond_to?(:call)
+
           singleton_class.send(:define_method, name) do |*args|
             rel = all
             rel.merge!(rel.scoping { scope.call(*args) })

data/lib/influxer/model.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support'
+require "active_support"
 
 module Influxer
   # Add `has_metrics` method to AR::Base
@@ -8,9 +8,6 @@ module Influxer
     extend ActiveSupport::Concern
 
     module ClassMethods # :nodoc:
-      # rubocop:disable Naming/PredicateName
-      # rubocop:disable Metrics/MethodLength
-      # rubocop:disable Metrics/AbcSize
       def has_metrics(*args, **params)
         metrics_name = args.empty? ? "metrics" : args.first.to_s
 
@@ -22,12 +19,10 @@ module Influxer
         foreign_key = params.fetch(:foreign_key, to_s.foreign_key)
 
         define_method(metrics_name) do
-          rel_attrs = foreign_key ? { foreign_key => id } : {}
+          rel_attrs = foreign_key ? {foreign_key => id} : {}
 
-          unless attrs.nil?
-            attrs.each do |key|
-              rel_attrs[key] = send(key)
-            end
+          attrs&.each do |key|
+            rel_attrs[key] = send(key)
           end
           Relation.new klass, attributes: rel_attrs
         end

data/lib/influxer/rails/client.rb

@@ -39,7 +39,7 @@ module Influxer
 
     # add prefix; remove whitespaces
     def normalized_cache_key(sql)
-      "influxer:#{sql.gsub(/\s*/, '')}"
+      "influxer:#{sql.gsub(/\s*/, "")}"
     end
 
     def logger

data/lib/influxer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Influxer # :nodoc:
-  VERSION = "1.1.6"
+  VERSION = "1.2.0"
 end

data/spec/cases/points_spec.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 describe DummyMetrics do
   before do
     stub_request(:get, "http://localhost:8086/query")
       .with(
-        query: { q: 'select * from "dummy"', u: "root", p: "root", precision: 'ns', db: 'db' }
+        query: {q: 'select * from "dummy"', u: "root", p: "root", precision: "ns", db: "db"}
       )
       .to_return(body: fixture_file)
   end
 
   context "single_series" do
-    let(:fixture_file) { File.read('./spec/fixtures/single_series.json') }
+    let(:fixture_file) { File.read("./spec/fixtures/single_series.json") }
 
     context "default format (values merged with tags)" do
       subject { described_class.all.to_a }
@@ -25,7 +25,7 @@ describe DummyMetrics do
   end
 
   context "empty result" do
-    let(:fixture_file) { File.read('./spec/fixtures/empty_result.json') }
+    let(:fixture_file) { File.read("./spec/fixtures/empty_result.json") }
 
     subject { described_class.all.to_a }