influxer 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7fc8c72105e35542e5c818fa97fc55b49c6c068
-  data.tar.gz: eb461ecfc644cdf6a34789d940398ceda66c418e
+  metadata.gz: a56f1b17d497e12281a8ae86939c49f83d2037dc
+  data.tar.gz: c64d0f15b9a76e2fdd8190be12914c315651d166
 SHA512:
-  metadata.gz: d470618c9e5f329ba66ba8f1c9da6ba330075c6ee5be825f527c0feab3c3995827b44a5a92fd3f133456896df4b25417b42f2abc2197702117930572d36d8c64
-  data.tar.gz: 425b73368fafb1ff3e82dc6bab1ab005ab14ce9a2e1aac623359feb8eac763660aa13697a7dd3e8e9c018bfb6565b10109c66f7272fd34069ea4e38fdc35a830
+  metadata.gz: c2250060657155d5454d9a4603a1cb5d589f5ce3b66d66091c2d0267ec0e50968ebd0851811bb10bce1f655ab88a239741eb979343321fc4b30b8bd779e4e25a
+  data.tar.gz: 1ada172a89d606bb1d19399318c0976108ff5c7084ed68d274df07954550484dca58d2ec82474e1b3d11f54d6de98425441ccdc7883d1071a96acb196b7aae8c

data/.rubocop.yml

@@ -7,10 +7,12 @@ AllCops:
   Exclude:
     - 'bin/**/*'
     - 'spec/dummy/**/*'
-  RunRailsCops: true
   DisplayCopNames: true
   StyleGuideCopsOnly: false
 
+Rails:
+  Enabled: true
+
 Style/AccessorMethodName:
   Enabled: false
 
@@ -47,4 +49,4 @@ Rails/Date:
   Enabled: false
 
 Rails/TimeZone:
-  Enabled: false
+  Enabled: false

data/.travis.yml

@@ -2,5 +2,5 @@ language: ruby
 cache: bundler
 matrix:
   include:
-    - rvm: 2.2.2
+    - rvm: 2.3.0
       gemfile: gemfiles/rails42.gemfile

data/Changelog.md

@@ -1,3 +1,8 @@
+## master
+- Fix whitespace around operators
+- Add `Relation#from` method to redefine series
+- Handle nil values for tags in #where clause
+
 ## 0.5.0
 - Update `timestamp` support
 - Add `epoch` method

data/README.md

@@ -1,4 +1,4 @@
-[![Gem Version](https://badge.fury.io/rb/influxer.svg)](https://rubygems.org/gems/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)
+[![Gem Version](https://badge.fury.io/rb/influxer.svg)](https://rubygems.org/gems/influxer) [![Build Status](https://travis-ci.org/palkan/influxer.svg?branch=master)](https://travis-ci.org/palkan/influxer)
 ## 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).

data/gemfiles/rails42.gemfile

@@ -4,7 +4,4 @@ gem 'sqlite3', platform: :mri
 gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
 gem 'activerecord', '~> 4.2.0'
 
-# TEMP
-gem 'influxdb', github: 'influxdb/influxdb-ruby'
-
 gemspec path: '..'

data/influxer.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "activemodel", '>= 4.0'
-  s.add_dependency "influxdb", "~> 0.2.3"
+  s.add_dependency "influxdb", "~> 0.3"
   s.add_dependency "anyway_config", "~>0.3.0"
 
   s.add_development_dependency "timecop"

data/lib/influxer/metrics/metrics.rb

@@ -40,7 +40,7 @@ module Influxer
             @attributes[name] = val
           end
 
-          define_method("#{name}") do
+          define_method(name.to_s) do
             @attributes[name]
           end
         end
@@ -102,7 +102,7 @@ module Influxer
             quoted_series(val.first)
           end
         else
-          '"' + val.to_s.gsub(/\"/) { %q(\") } + '"'
+          '"' + val.to_s.gsub(/\"/) { '\"' } + '"'
         end
       end
       # rubocop:enable Metrics/MethodLength
@@ -118,9 +118,9 @@ module Influxer
     end
 
     def write
-      fail MetricsError if self.persisted?
+      raise MetricsError if persisted?
 
-      return false if self.invalid?
+      return false if invalid?
 
       run_callbacks :write do
         write_point
@@ -129,7 +129,7 @@ module Influxer
     end
 
     def write!
-      fail MetricsInvalid if self.invalid?
+      raise MetricsInvalid if invalid?
       write
     end
 
@@ -166,6 +166,8 @@ module Influxer
 
     private
 
+    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/AbcSize
     def parsed_timestamp
       return @timestamp unless client.time_precision == 'ns'
 
@@ -180,6 +182,8 @@ module Influxer
         (@timestamp.to_r * TIME_FACTOR).to_i
       end
     end
+    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/AbcSize
 
     def unquote(name)
       name.gsub(/(\A['"]|['"]\z)/, '')

data/lib/influxer/metrics/relation.rb

@@ -12,17 +12,17 @@ module Influxer
 
     attr_reader :values
 
-    SUPPORTED_EPOCH_FORMAT = [:h, :m, :s, :ms, :u, :ns]
+    SUPPORTED_EPOCH_FORMAT = %i(h m s ms u ns).freeze
 
-    MULTI_VALUE_METHODS = [:select, :where, :group, :order]
+    MULTI_VALUE_METHODS = %i(select where group order).freeze
 
-    MULTI_KEY_METHODS = [:fanout]
+    MULTI_KEY_METHODS = %i(fanout).freeze
 
-    SINGLE_VALUE_METHODS = [:fill, :time, :limit, :offset, :slimit, :soffset, :normalized]
+    SINGLE_VALUE_METHODS = %i(fill time limit offset slimit soffset from normalized).freeze
 
-    MULTI_VALUE_SIMPLE_METHODS = [:select, :group]
+    MULTI_VALUE_SIMPLE_METHODS = %i(select group).freeze
 
-    SINGLE_VALUE_SIMPLE_METHODS = [:fill, :limit, :offset, :slimit, :soffset]
+    SINGLE_VALUE_SIMPLE_METHODS = %i(fill limit offset slimit soffset from).freeze
 
     MULTI_VALUE_METHODS.each do |name|
       class_eval <<-CODE, __FILE__, __LINE__ + 1
@@ -100,7 +100,7 @@ module Influxer
       point
     end
 
-    alias_method :new, :build
+    alias new build
 
     def normalized
       @values[:normalized] = true
@@ -136,7 +136,7 @@ module Influxer
       sql = ["select"]
       select_values << "*" if select_values.empty?
 
-      sql << select_values.uniq.join(",")
+      sql << select_values.uniq.join(", ")
 
       sql << "from #{build_series_name}"
 
@@ -145,7 +145,7 @@ module Influxer
       unless group_values.empty? && time_value.nil?
         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?
@@ -189,7 +189,11 @@ module Influxer
     end
 
     def load
-      @records = get_points(@instance.client.query(to_sql, denormalize: !normalized?, epoch: @values[:epoch]))
+      @records = get_points(
+        @instance.client.query(
+          to_sql,
+          denormalize: !normalized?,
+          epoch: @values[:epoch]))
       @loaded = true
       @records
     end
@@ -207,7 +211,8 @@ module Influxer
     end
 
     def scoping
-      previous, @klass.current_scope = @klass.current_scope, self
+      previous = @klass.current_scope
+      @klass.current_scope = self
       yield
     ensure
       @klass.current_scope = previous
@@ -237,7 +242,7 @@ module Influxer
     protected
 
     def build_series_name
-      @instance.series
+      from_value.present? ? @klass.quoted_series(from_value) : @instance.series
     end
 
     def loaded?

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

@@ -5,9 +5,8 @@ module Influxer
         :count, :min, :max, :mean,
         :mode, :median, :distinct, :derivative,
         :stddev, :sum, :first, :last
-      ]
+      ].freeze
 
-    # rubocop:disable Metrics/LineLength
     CALCULATION_METHODS.each do |name|
       class_eval <<-CODE, __FILE__, __LINE__ + 1
         def #{name}(val, alias_name = nil)                                                        # def count(val)
@@ -20,7 +19,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

@@ -24,11 +24,11 @@ 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
-      else
-        @values[:time] = val
-      end
+      @values[:time] = if val.is_a?(Symbol)
+                         TIME_ALIASES[val] || '1' + val.to_s
+                       else
+                         val
+                       end
 
       build_fill(options[:fill])
       self

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

@@ -30,32 +30,38 @@ module Influxer
       end
     end
 
+    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/MethodLength
     def build_eql(key, val, negate)
       case val
+      when NilClass
+        build_eql(key, /.*/, !negate)
       when Regexp
-        "#{key}#{negate ? '!~' : '=~'}#{val.inspect}"
+        "#{key}#{negate ? ' !~ ' : ' =~ '}#{val.inspect}"
       when Array
         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
+    # rubocop:enable Metrics/MethodLength
 
     def build_in(key, arr, negate)
       buf = []
       arr.each do |val|
         buf << build_eql(key, val, negate)
       end
-      "#{buf.join(negate ? ' and ' : ' or ')}"
+      buf.join(negate ? ' and ' : ' or ').to_s
     end
 
     def build_range(key, val, negate)
       if negate
-        "#{key}<#{quoted(val.begin)} and #{key}>#{quoted(val.end)}"
+        "#{key} < #{quoted(val.begin)} and #{key} > #{quoted(val.end)}"
       else
-        "#{key}>#{quoted(val.begin)} and #{key}<#{quoted(val.end)}"
+        "#{key} > #{quoted(val.begin)} and #{key} < #{quoted(val.end)}"
       end
     end
   end

data/lib/influxer/metrics/scoping.rb

@@ -27,7 +27,7 @@ module Influxer
     class ScopeRegistry # :nodoc:
       extend ActiveSupport::PerThreadRegistry
 
-      VALID_SCOPE_TYPES = [:current_scope]
+      VALID_SCOPE_TYPES = [:current_scope].freeze
 
       def initialize
         @registry = Hash.new { |hash, key| hash[key] = {} }
@@ -49,7 +49,7 @@ module Influxer
 
       def raise_invalid_scope_type!(scope_type)
         return if VALID_SCOPE_TYPES.include?(scope_type)
-        fail ArgumentError, "Invalid scope type '#{scope_type}' sent to the registry. \
+        raise ArgumentError, "Invalid scope type '#{scope_type}' sent to the registry. \
         Scope types  must be included in VALID_SCOPE_TYPES"
       end
     end

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

@@ -7,7 +7,7 @@ module Influxer
 
       module ClassMethods
         def scope(name, scope)
-          fail "Scope not defined: #{name}" if scope.nil? || !scope.respond_to?(:call)
+          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

@@ -9,18 +9,15 @@ module Influxer
       # rubocop:disable Style/PredicateName
       # rubocop:disable Metrics/MethodLength
       # rubocop:disable Metrics/AbcSize
-      # rubocop:disable Metrics/CyclomaticComplexity
       def has_metrics(*args, **params)
         metrics_name = args.empty? ? "metrics" : args.first.to_s
 
         klass = params[:class_name].present? ? params[:class_name] : "#{self}Metrics"
         klass = klass.constantize
 
-        attrs = nil
-
         attrs = params[:inherits] if params[:inherits].present?
 
-        foreign_key = params.key?(:foreign_key) ? params[:foreign_key] : to_s.foreign_key
+        foreign_key = params.fetch(:foreign_key, to_s.foreign_key)
 
         define_method(metrics_name) do
           rel_attrs = foreign_key ? { foreign_key => id } : {}

data/lib/influxer/rails/client.rb

@@ -19,7 +19,7 @@ module Influxer
       res = yield
       duration = (Time.now - start_ts) * 1000
 
-      name  = "InfluxDB SQL (#{duration.round(1)}ms)"
+      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"

data/lib/influxer/version.rb

@@ -1,3 +1,3 @@
 module Influxer # :nodoc:
-  VERSION = "0.5.0"
+  VERSION = "0.5.1".freeze
 end

data/spec/metrics/metrics_spec.rb

@@ -193,8 +193,8 @@ describe Influxer::Metrics, :query do
       timestamp_test = Time.now
       expected_time = (timestamp_test.to_r * 1_000_000_000).to_i
 
-      expect(client).
-        to receive(:write_point).with("dummies", tags: { dummy_id: 2, host: 'test' }, values: { user_id: 1 }, timestamp: expected_time)
+      expect(client)
+        .to receive(:write_point).with("dummies", tags: { dummy_id: 2, host: 'test' }, values: { user_id: 1 }, timestamp: expected_time)
 
       point = dummy_metrics.write(user_id: 1, dummy_id: 2, host: 'test', timestamp: timestamp_test)
       expect(point.persisted?).to be_truthy
@@ -205,10 +205,10 @@ describe Influxer::Metrics, :query do
 
     it "test write data with string time" do
       base_time = Time.now
-      timestamp_test = "#{base_time.to_s}"
+      timestamp_test = base_time.to_s
 
-      expect(client).
-        to receive(:write_point).with("dummies", tags: { dummy_id: 2, host: 'test' }, values: { user_id: 1 }, timestamp: (base_time.to_i * 1_000_000_000).to_i)
+      expect(client)
+        .to receive(:write_point).with("dummies", tags: { dummy_id: 2, host: 'test' }, values: { user_id: 1 }, timestamp: (base_time.to_i * 1_000_000_000).to_i)
 
       point = dummy_metrics.write(user_id: 1, dummy_id: 2, host: 'test', timestamp: timestamp_test)
       expect(point.persisted?).to be_truthy

data/spec/metrics/relation_spec.rb

@@ -27,15 +27,15 @@ describe Influxer::Relation, :query do
       r2 = Influxer::Relation.new(DummyMetrics).where.not(user_id: 0).group(:user_id).order(user_id: :asc)
       r1.merge!(r2)
       expect(r1.to_sql)
-        .to eq "select * from \"dummy\" where (id=1 or id=2) and (dummy='qwe') and (user_id<>0) " \
-               "group by time(1h),user_id order by user_id asc"
+        .to eq "select * from \"dummy\" where (id = 1 or id = 2) and (dummy = 'qwe') and (user_id <> 0) " \
+               "group by time(1h), user_id order by user_id asc"
     end
 
     it "merge single values" do
       r1 = rel.time(:hour, fill: 0).slimit(10)
       r2 = Influxer::Relation.new(DummyMetrics).group(:dummy_id).offset(10).slimit(5)
       r1.merge!(r2)
-      expect(r1.to_sql).to eq "select * from \"dummy\" group by time(1h),dummy_id fill(0) offset 10 slimit 5"
+      expect(r1.to_sql).to eq "select * from \"dummy\" group by time(1h), dummy_id fill(0) offset 10 slimit 5"
     end
   end
 
@@ -44,11 +44,15 @@ describe Influxer::Relation, :query do
       it "generates valid from if no conditions" do
         expect(rel.to_sql).to eq "select * from \"dummy\""
       end
+
+      it "generates sql using custom from clause" do
+        expect(rel.from(:doomy).to_sql).to eq "select * from \"doomy\""
+      end
     end
 
     describe "#select" do
       it "select array of symbols" do
-        expect(rel.select(:user_id, :dummy_id).to_sql).to eq "select user_id,dummy_id from \"dummy\""
+        expect(rel.select(:user_id, :dummy_id).to_sql).to eq "select user_id, dummy_id from \"dummy\""
       end
 
       it "select string" do
@@ -63,7 +67,7 @@ describe Influxer::Relation, :query do
     describe "#where" do
       it "sgenerate valid conditions from hash" do
         Timecop.freeze(Time.now)
-        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)"
+        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 "generate valid conditions from strings" do
@@ -71,43 +75,53 @@ describe Influxer::Relation, :query do
       end
 
       it "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.*/)"
+        expect(rel.where(user_id: 1, dummy: /^du.*/).to_sql).to eq "select * from \"dummy\" where (user_id = 1) and (dummy =~ /^du.*/)"
       end
 
       it "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)"
+        expect(rel.where(user_id: 1..4).to_sql).to eq "select * from \"dummy\" where (user_id > 1 and user_id < 4)"
       end
 
       it "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)"
+        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
 
       context "with tags" do
         it "integer tag values" do
-          expect(rel.where(dummy_id: 10).to_sql).to eq "select * from \"dummy\" where (dummy_id='10')"
+          expect(rel.where(dummy_id: 10).to_sql).to eq "select * from \"dummy\" where (dummy_id = '10')"
         end
 
         it "array tag values" do
-          expect(rel.where(dummy_id: [10, 'some']).to_sql).to eq "select * from \"dummy\" where (dummy_id='10' or dummy_id='some')"
+          expect(rel.where(dummy_id: [10, 'some']).to_sql).to eq "select * from \"dummy\" where (dummy_id = '10' or dummy_id = 'some')"
+        end
+
+        it "nil value" do
+          expect(rel.where(dummy_id: nil).to_sql).to eq "select * from \"dummy\" where (dummy_id !~ /.*/)"
         end
       end
     end
 
     describe "#not" do
       it "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')"
+        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 "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.*/)"
+        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 "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)"
+        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 "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)"
+        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
+
+      context "with tags" do
+        it "nil value" do
+          expect(rel.not(dummy_id: nil).to_sql).to eq "select * from \"dummy\" where (dummy_id =~ /.*/)"
+        end
       end
     end
 
@@ -137,7 +151,7 @@ describe Influxer::Relation, :query do
 
     describe "#group" do
       it "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)"
+        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
 
       context "group by time predefined values" do
@@ -189,11 +203,11 @@ describe Influxer::Relation, :query do
       end
 
       it "group by time and other fields with fill zero" 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)"
+        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
 
       it "group by time and other fields with fill negative" do
-        expect(rel.time("4d", fill: -1).group(:dummy_id).to_sql).to eq "select * from \"dummy\" group by time(4d),dummy_id fill(-1)"
+        expect(rel.time("4d", fill: -1).group(:dummy_id).to_sql).to eq "select * from \"dummy\" group by time(4d), dummy_id fill(-1)"
       end
     end
 
@@ -241,7 +255,7 @@ describe Influxer::Relation, :query do
           describe "##{method}" do
             specify do
               expect(rel.where(user_id: 1).calc(method, :column_name).to_sql)
-                .to eq "select #{method}(column_name) from \"dummy\" where (user_id=1)"
+                .to eq "select #{method}(column_name) from \"dummy\" where (user_id = 1)"
             end
           end
         end
@@ -253,7 +267,7 @@ describe Influxer::Relation, :query do
         end
 
         it "select percentile as alias" do
-          expect(rel.percentile(:val, 90, 'p1').to_sql).to eq "select percentile(val,90) as p1 from \"dummy\""
+          expect(rel.percentile(:val, 90, 'p1').to_sql).to eq "select percentile(val, 90) as p1 from \"dummy\""
         end
       end
     end
@@ -261,19 +275,19 @@ describe Influxer::Relation, :query do
     context "complex queries" do
       it "group + where" do
         expect(rel.count('user_id').group(:traffic_source).fill(0).where(user_id: 123).past('28d').to_sql)
-          .to eq "select count(user_id) from \"dummy\" where (user_id=123) and (time > now() - 28d) " \
+          .to eq "select count(user_id) from \"dummy\" where (user_id = 123) and (time > now() - 28d) " \
                  "group by traffic_source fill(0)"
       end
 
       it "where + group + order + limit" do
         expect(rel.group(:user_id).where(account_id: 123).order(account_id: :desc).limit(10).offset(10).to_sql)
-          .to eq "select * from \"dummy\" where (account_id=123) group by user_id " \
+          .to eq "select * from \"dummy\" where (account_id = 123) group by user_id " \
                  "order by account_id desc limit 10 offset 10"
       end
 
       it "offset + slimit" do
         expect(rel.where(account_id: 123).slimit(10).offset(10).to_sql)
-          .to eq "select * from \"dummy\" where (account_id=123) " \
+          .to eq "select * from \"dummy\" where (account_id = 123) " \
                  "offset 10 slimit 10"
       end
     end
@@ -310,7 +324,7 @@ describe Influxer::Relation, :query do
 
     it "with tags" do
       expect(rel.where(dummy_id: 1, host: 'eu').delete_all)
-        .to eq "drop series from \"dummy\" where (dummy_id='1') and (host='eu')"
+        .to eq "drop series from \"dummy\" where (dummy_id = '1') and (host = 'eu')"
     end
   end
 

data/spec/metrics/scoping_spec.rb

@@ -42,14 +42,14 @@ describe Influxer::Metrics, :query do
 
     it "works with several defaults" do
       expect(dappy.where(user_id: 1).to_sql)
-        .to eq "select * from \"dummy\" where (user_id=1) group by time(1h) limit 100"
+        .to eq "select * from \"dummy\" where (user_id = 1) group by time(1h) limit 100"
     end
   end
 
   describe "named scope" do
     it "works with named scope" do
       expect(doomy.by_user(1).to_sql)
-        .to eq "select * from \"dummy\" where (user_id=1) group by time(1h) limit 100"
+        .to eq "select * from \"dummy\" where (user_id = 1) group by time(1h) limit 100"
     end
 
     it "works with named scope with empty relation" do
@@ -58,7 +58,7 @@ describe Influxer::Metrics, :query do
 
     it "works with several scopes" do
       expect(doomy.where(dummy_id: 100).by_user([1, 2, 3]).daily.to_sql)
-        .to eq "select * from \"dummy\" where (dummy_id=100) and (user_id=1 or user_id=2 or user_id=3) group by time(1d) limit 100"
+        .to eq "select * from \"dummy\" where (dummy_id = 100) and (user_id = 1 or user_id = 2 or user_id = 3) group by time(1d) limit 100"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxer
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Vlad Dem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: anyway_config
   requirement: !ruby/object:Gem::Requirement