influxer 1.1.6 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c454bccdf9c3272a5d359f23a8788a77c3b4a8475db929af0958eec10f5ca9b0
-  data.tar.gz: 2251b0e2015c90c1e1dbfd7bb3eb80d1838f4b16f897ebad8ac2b390e2c370fd
+  metadata.gz: 020023da263e0ad14394211eaab3b6388359a2ebd8de084182eeddca8b4f7569
+  data.tar.gz: 4648019961ea24ff2132d73b7975a801f0be0270380ba003223166191c4d924d
 SHA512:
-  metadata.gz: 7ad48550cca618b24d924856782ab1fe0af754c36e4eb340ccbde6976c467de958e1fa2b85fe040501140e6bf6935358e0bad59f9c202bd94e780c073bc63623
-  data.tar.gz: 7bbb917021cedd9a6e23a9ff635d9fa3b0e93a28cf5c9312806a9d471af6ed342e0424372d8cae843ad6c6c95aeb813f755d54a741d7b2db4d4cbbde3865433b
+  metadata.gz: 3215b0bc249ad3e927f9f77dafb417c29c915c6b32f8f2342c6507b4d165f2a46b9aae82fe815ac374a2785f46c19020b6dd2688e8a208a79cc2a7e7060eb42c
+  data.tar.gz: 70b27b50e9e98dcebde9b9ef4f16e1899c3f056770f31ece57af1c4c092a08ffa2484a4343e9c87795ffeca6b79553f9ab78a8dd431d40a75f0a2a808cf605b4

data/.rubocop.yml

@@ -1,81 +1,57 @@
+require:
+  - standard/cop/semantic_blocks
+  - rubocop-md
+
+inherit_gem:
+  standard: config/base.yml
+
 AllCops:
-  # Include gemspec and Rakefile
-  Include:
-    - 'lib/**/*.rb'
-    - 'lib/**/*.rake'
-    - 'spec/**/*.rb'
   Exclude:
-    - 'bin/**/*'
-    - 'spec/dummy/**/*'
+    - 'bin/*'
+    - 'tmp/**/*'
+    - 'docs/**/*'
+    - 'Gemfile'
     - 'vendor/**/*'
-    - 'gemfiles/vendor/**/*'
-    - '**/*.gemfile'
-    - Gemfile
-    - Rakefile
+    - 'gemfiles/**/*'
   DisplayCopNames: true
-  StyleGuideCopsOnly: false
-  TargetRubyVersion: 2.3
-
-Rails:
-  Enabled: false
+  TargetRubyVersion: 2.4
 
-Bundler/OrderedGems:
+Standard/SemanticBlocks:
   Enabled: false
 
-Style/SymbolArray:
-  Enabled: false
-
-Style/SafeNavigation:
-  Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: true
 
 Naming/AccessorMethodName:
   Enabled: false
 
-Style/TrivialAccessors:
-  Enabled: false
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: no_comma
 
-Style/Documentation:
-  Exclude:
-    - 'spec/**/*.rb'
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: no_comma
 
-Style/StringLiterals: 
-  Enabled: false
+Layout/AlignParameters:
+  EnforcedStyle: with_first_parameter
 
-Style/DateTime:
+Lint/Void:
   Exclude:
-    - 'spec/**/*.rb'
-
-Naming/SpaceInsideStringInterpolation:
-  EnforcedStyle: no_space
+    - '**/*.md'
 
-Style/BlockDelimiters:
+# See https://github.com/rubocop-hq/rubocop/issues/4222
+Lint/AmbiguousBlockAssociation:
   Exclude:
-    - 'spec/**/*.rb'
+    - 'spec/**/*'
+    - '**/*.md'
 
-Lint/MissingCopEnableDirective:
-  Enabled: false
-
-Lint/AmbiguousRegexpLiteral:
-  Enabled: false
-
-Metrics/BlockLength:
+Lint/DuplicateMethods:
   Exclude:
-    - 'spec/**/*.rb'
+    - '**/*.md'
 
-Metrics/MethodLength:
+Naming/FileName:
   Exclude:
-    - 'spec/**/*.rb'
+    - '**/*.md'
 
-Metrics/LineLength:
-  Max: 100
+Layout/InitialIndentation:
   Exclude:
-    - 'spec/**/*.rb'
-
-Rails/Date:
-  Enabled: false
-
-Rails/TimeZone:
-  Enabled: false
-
-Gemspec/OrderedDependencies:
-  Enabled: false
+    - 'CHANGELOG.md'

data/.travis.yml

@@ -2,9 +2,14 @@ language: ruby
 cache: bundler
 matrix:
   include:
-    - rvm: 2.2.1
+    - rvm: 2.4.2
       gemfile: gemfiles/rails32.gemfile
     - rvm: 2.4.3
       gemfile: gemfiles/rails42.gemfile
     - rvm: 2.5.0
       gemfile: gemfiles/rails5.gemfile
+    - rvm: 2.6.2
+      gemfile: gemfiles/rails6.gemfile
+  allow_failures:
+    - rvm: 2.4.2
+      gemfile: gemfiles/rails32.gemfile

data/Changelog.md

@@ -1,13 +1,17 @@
 # Change log
 
-## master
+## master (unreleased)
+
+## 1.2.0 (2019-05-20)
+
+- **Require Ruby 2.4+**
 
 ## 1.1.6
 
 - [Fixes [#41](https://github.com/palkan/influxer/issues/41)] Fix query building with empty arrays in `where` clause ([@dimiii][])
 
   [PR](https://github.com/palkan/influxer/pull/44)
-   
+
   **BREAKING:** `where.not` now returns non-empty result for an empty array.
 
 - Support of year alias in queries ([@dimiii][])

data/Gemfile

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

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2014 palkan
+Copyright 2014-2019 palkan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -3,48 +3,48 @@
 
 **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).
 
-**NOTE**: Influxer is Rails 4+ compatible!
+**NOTE**: Influxer is Rails 4+ compatible! (Rails 3.2 support is still included but no longer required to pass all the tests).
 
 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: 
+- Special query methods for InfluxDB:
   - `time` - group by time (e.g. `Metrics.time(:hour) => # select * ... group by time(1h)`);
   - `past` - get only points for last hour/minute/whatever (e.g. `Metrics.past(:day) => # select * ... where time > now() - 1d`);
   - `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) }
-    tags :account_id
-    attributes :value
-    scope :unlimited, -> { limit(nil) }
-    scope :by_account, -> (id) { where(account_id: id) if id.present? }
-  end
-
-  Metrics.by_account(1)
+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
+
+Metrics.by_account(1)
   # => select * from "metrics" group by time(1h) where account_id=1 limit 1000
 
-  Metrics.unlimited.by_account(1).time(:week)
+Metrics.unlimited.by_account(1).time(:week)
   # => select * from "metrics" group by time(1w) where account_id=1
 
   ```
 - Integrate with your model:
   ```ruby
-  class UserVisits < Influxer::Metrics
-  end
+class UserVisits < Influxer::Metrics
+end
 
-  class User < ActiveRecord::Base
-    has_metrics :visits
-  end
+class User < ActiveRecord::Base
+  has_metrics :visits
+end
 
-  user = User.find(1)
-  user.visits.write(page_id: 'home')
+user = User.find(1)
+user.visits.write(page_id: "home")
   #=> < creates point {user_id: 1, page_id: 'home'} in 'user_visits' series >
 
-  user.visits.where(page_id: 'home')
+user.visits.where(page_id: "home")
   #=> select * from user_visits where page_id='home'
   ```
-    
+
 Find more on [Wiki](https://github.com/palkan/influxer/wiki).

data/Rakefile

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
 require "rubocop/rake_task"
@@ -9,5 +11,5 @@ RuboCop::RakeTask.new
 task default: [:rubocop, :spec]
 
 task :console do
-  sh 'pry -r ./lib/influxer.rb'
+  sh "pry -r ./lib/influxer.rb"
 end

data/bin/console

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "influxer"
+require "pry"
+
+require "pry"
+Pry.start

data/gemfiles/rails32.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'sqlite3', platform: :mri
+gem 'sqlite3', '~> 1.3.0', platform: :mri
 gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
 gem 'activerecord', '~> 3.2.22'
 

data/gemfiles/rails42.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'sqlite3', platform: :mri
+gem 'sqlite3', '~> 1.3.0', platform: :mri
 gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
 gem 'activerecord', '~> 4.2.0'
 

data/gemfiles/rails5.gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'sqlite3', platform: :mri
+gem 'sqlite3', '~> 1.3.0', platform: :mri
 gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
-gem 'activerecord', '~> 5.0.0'
+gem 'activerecord', '~> 5.2'
 
 gemspec path: '..'

data/gemfiles/rails6.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'sqlite3', platform: :mri
+gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
+gem 'activerecord', '6.0.0.rc1'
+
+gemspec path: '..'

data/influxer.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-$LOAD_PATH.push File.expand_path('lib', __dir__)
+$LOAD_PATH.push File.expand_path("lib", __dir__)
 
 require "influxer/version"
 
@@ -17,17 +17,24 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   s.require_paths = ["lib"]
 
-  s.add_dependency "activemodel", '>= 3.2.0'
+  s.required_ruby_version = ">= 2.4.0"
+
+  s.metadata = {
+    "bug_tracker_uri" => "http://github.com/palkan/influxer/issues",
+    "changelog_uri" => "https://github.com/palkan/influxer/blob/master/Changelog.md",
+    "documentation_uri" => "http://github.com/palkan/influxer",
+    "homepage_uri" => "http://github.com/palkan/influxer",
+    "source_code_uri" => "http://github.com/palkan/influxer"
+  }
+
+  s.add_dependency "activemodel", ">= 3.2.0"
   s.add_dependency "influxdb", "~> 0.3"
-  s.add_dependency "anyway_config", "~> 1.0"
+  s.add_dependency "anyway_config", ">= 1.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 'activerecord', '>= 3.2.0'
-  s.add_development_dependency 'pry-byebug'
+  s.add_development_dependency "rake", "~> 10.1"
   s.add_development_dependency "rspec", ">= 3.1.0"
+  s.add_development_dependency "standard", "~> 0.0.39"
+  s.add_development_dependency "rubocop-md", "~> 0.2.0"
   s.add_development_dependency "webmock", "~> 2.1"
-  s.add_development_dependency "rubocop", "~> 0.52"
 end

data/lib/influxer.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-require 'influxer/version'
-require 'active_model'
+require "influxer/version"
+require "active_model"
+require "active_support/core_ext"
 
 # Rails client for InfluxDB
 module Influxer
@@ -9,16 +10,16 @@ module Influxer
     ActiveModel::VERSION::MAJOR == 3
   end
 
-  require 'influxer/config'
-  require 'influxer/client'
-  require 'influxer/metrics/metrics'
+  require "influxer/config"
+  require "influxer/client"
+  require "influxer/metrics/metrics"
 
   module Model # :nodoc:
-    require 'influxer/model'
+    require "influxer/model"
   end
 
-  require 'influxer/rails/client' if defined?(Rails)
-  require 'influxer/engine' if defined?(Rails)
+  require "influxer/rails/client" if defined?(Rails)
+  require "influxer/engine" if defined?(Rails)
 
   def self.config
     @config ||= Config.new
@@ -33,7 +34,7 @@ module Influxer
   end
 
   def self.reset!
-    @client.stop! unless @client.nil?
+    @client&.stop!
     @config = nil
     @client = nil
   end

data/lib/influxer/client.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'influxdb'
+require "influxdb"
 
 module Influxer
   # InfluxDB API client

data/lib/influxer/config.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'anyway_config'
+require "anyway_config"
 
 module Influxer
   # Influxer configuration
@@ -28,8 +28,8 @@ module Influxer
                 :denormalize,
                 :udp,
                 :async,
-                database: 'db',
-                time_precision: 'ns',
+                database: "db",
+                time_precision: "ns",
                 cache: false,
                 time_duration_suffix_enabled: false
 

data/lib/influxer/engine.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'influxer'
+require "influxer"
 
 module Influxer
   class Engine < Rails::Engine # :nodoc:

data/lib/influxer/metrics/active_model3/model.rb

@@ -5,10 +5,8 @@ module Influxer
     # Replacement of ActiveModel::Model for ActiveModel 3
     module Model
       def initialize(attributes = {})
-        if attributes
-          attributes.each do |attr, value|
-            public_send("#{attr}=", value)
-          end
+        attributes&.each do |attr, value|
+          public_send("#{attr}=", value)
         end
 
         super()