influxer 0.5.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cec9cd466a9efd8fae51deb50a907b6414f0a91
-  data.tar.gz: e5f8a42ee86a15d2a771bdce69c816cbedd5d765
+  metadata.gz: 117d8b97d33b7cd7f38c38effae7184c9a4ec602
+  data.tar.gz: 3ae53237115bec8868ebe4db4840c98bf57e18b8
 SHA512:
-  metadata.gz: bae2a0c3b78427f808a13cf53cefb320c2ef6e8ff62ece027962c65b06fc0c4db27716193781cc6b0a6be619884e73eb795d4fd96505ea45d7250fb949b3c3fa
-  data.tar.gz: 45d12dc4e1f446a0d33c217adbb0fd37cb9dc0bd917a2698741698397e5d2c34e539c0c20311284670fe9c5239efe77d1c69a2653d9589fa4f980d35e7341eec
+  metadata.gz: b791f7e55f2c096ebb5d269be7498680fce388638f22abd92f0c2e3128da31bbc46302d028b642dac2de93d29d256124b8b9d7d4bcc82437e50ffb54f6721282
+  data.tar.gz: 3a1e42dda73963b45641386b227c24cc893cbc0a9ccc9823d6e04cb171f46d0f7a593fb9a5d0c99d7639837a11aca119e0ec7ceb33238f4392ab744b0804caca

data/.travis.yml

@@ -2,8 +2,9 @@ language: ruby
 cache: bundler
 matrix:
   include:
+    - rvm: 2.2.1
+      gemfile: gemfiles/rails32.gemfile
     - rvm: 2.3.0
       gemfile: gemfiles/rails42.gemfile
     - rvm: 2.3.1
       gemfile: gemfiles/rails5.gemfile
-      

data/gemfiles/rails32.gemfile

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

data/influxer.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split($/)
   s.require_paths = ["lib"]
 
-  s.add_dependency "activemodel", '>= 4.0'
+  s.add_dependency "activemodel", '>= 3.2.0'
   s.add_dependency "influxdb", "~> 0.3"
   s.add_dependency "anyway_config", "~>0.3.0"
 
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   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', '>= 4.0'
+  s.add_development_dependency 'activerecord', '>= 3.2.0'
   s.add_development_dependency 'pry-byebug'
   s.add_development_dependency "rspec", ">= 3.1.0"
   s.add_development_dependency "webmock", "~> 1.21.0"

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

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

data/lib/influxer/metrics/metrics.rb

@@ -1,5 +1,6 @@
 require 'influxer/metrics/relation'
 require 'influxer/metrics/scoping'
+require 'influxer/metrics/active_model3/model'
 require 'active_model'
 
 module Influxer
@@ -10,7 +11,13 @@ module Influxer
   # rubocop:disable Metrics/ClassLength
   class Metrics
     TIME_FACTOR = 1_000_000_000
-    include ActiveModel::Model
+
+    if Influxer.active_model3?
+      include Influxer::ActiveModel3::Model
+    else
+      include ActiveModel::Model
+    end
+
     include ActiveModel::Validations
     extend ActiveModel::Callbacks
 
@@ -122,7 +129,6 @@ module Influxer
       # rubocop:enable Metrics/MethodLength
     end
 
-    delegate :tag_names, to: :class
     attr_accessor :timestamp
 
     def initialize(attributes = {})
@@ -178,6 +184,10 @@ module Influxer
       @attributes.select { |k, _| tag_names.include?(k.to_s) }
     end
 
+    def tag_names
+      self.class.tag_names
+    end
+
     private
 
     # rubocop:disable Metrics/MethodLength

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

@@ -0,0 +1,46 @@
+require 'active_support/per_thread_registry'
+
+module Influxer
+  module Scoping
+    module CurrentScope
+      # Clone of current_scope methods for newer versions of ActiveModel
+      def current_scope
+        ScopeRegistry.value_for(:current_scope, name)
+      end
+
+      def current_scope=(scope)
+        ScopeRegistry.set_value_for(:current_scope, name, scope)
+      end
+
+      class ScopeRegistry # :nodoc:
+        extend ActiveSupport::PerThreadRegistry
+
+        VALID_SCOPE_TYPES = [:current_scope].freeze
+
+        def initialize
+          @registry = Hash.new { |hash, key| hash[key] = {} }
+        end
+
+        # Obtains the value for a given +scope_name+ and +variable_name+.
+        def value_for(scope_type, variable_name)
+          raise_invalid_scope_type!(scope_type)
+          @registry[scope_type][variable_name]
+        end
+
+        # Sets the +value+ for a given +scope_type+ and +variable_name+.
+        def set_value_for(scope_type, variable_name, value)
+          raise_invalid_scope_type!(scope_type)
+          @registry[scope_type][variable_name] = value
+        end
+
+        private
+
+        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
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module Influxer
+  module Scoping
+    # Clone of current_scope methods for older versions of ActiveModel
+    module CurrentScope
+      def current_scope
+        Thread.current["#{self}_current_scope"]
+      end
+
+      def current_scope=(scope)
+        Thread.current["#{self}_current_scope"] = scope
+      end
+    end
+  end
+end

data/lib/influxer/metrics/scoping.rb

@@ -1,7 +1,12 @@
-require 'active_support/per_thread_registry'
 require 'influxer/metrics/scoping/default'
 require 'influxer/metrics/scoping/named'
 
+if Influxer.active_model3?
+  require 'influxer/metrics/scoping/old_current_scope'
+else
+  require 'influxer/metrics/scoping/current_scope'
+end
+
 module Influxer
   # Clone of ActiveRecord::Relation scoping
   module Scoping # :nodoc:
@@ -15,43 +20,7 @@ module Influxer
     end
 
     module ClassMethods # :nodoc:
-      def current_scope
-        ScopeRegistry.value_for(:current_scope, name)
-      end
-
-      def current_scope=(scope)
-        ScopeRegistry.set_value_for(:current_scope, name, scope)
-      end
-    end
-
-    class ScopeRegistry # :nodoc:
-      extend ActiveSupport::PerThreadRegistry
-
-      VALID_SCOPE_TYPES = [:current_scope].freeze
-
-      def initialize
-        @registry = Hash.new { |hash, key| hash[key] = {} }
-      end
-
-      # Obtains the value for a given +scope_name+ and +variable_name+.
-      def value_for(scope_type, variable_name)
-        raise_invalid_scope_type!(scope_type)
-        @registry[scope_type][variable_name]
-      end
-
-      # Sets the +value+ for a given +scope_type+ and +variable_name+.
-      def set_value_for(scope_type, variable_name, value)
-        raise_invalid_scope_type!(scope_type)
-        @registry[scope_type][variable_name] = value
-      end
-
-      private
-
-      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
+      include Influxer::Scoping::CurrentScope
     end
   end
 end

data/lib/influxer/version.rb

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

data/lib/influxer.rb

@@ -2,6 +2,10 @@ require 'influxer/version'
 
 # Rails client for InfluxDB
 module Influxer
+  def self.active_model3?
+    ActiveModel::VERSION::MAJOR == 3
+  end
+
   require 'influxer/config'
   require 'influxer/client'
   require 'influxer/metrics/metrics'

data/spec/metrics/metrics_spec.rb

@@ -32,7 +32,18 @@ describe Influxer::Metrics, :query do
     specify { is_expected.to respond_to :write! }
     specify { is_expected.to respond_to :persisted? }
     specify { is_expected.to respond_to :series }
-    specify { is_expected.to be_a ActiveModel::Model }
+    if Influxer.active_model3?
+      specify { is_expected.to be_a Influxer::ActiveModel3::Model }
+    else
+      specify { is_expected.to be_a ActiveModel::Model }
+    end
+  end
+
+  describe "#initialize" do
+    it "assigns initial values in constructor" do
+      m = DummyMetrics.new(dummy_id: 1)
+      expect(m.dummy_id).to eq 1
+    end
   end
 
   describe "#write" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxer
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Vlad Dem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: influxdb
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +180,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- gemfiles/rails32.gemfile
 - gemfiles/rails42.gemfile
 - gemfiles/rails5.gemfile
 - influxer.gemspec
@@ -187,14 +188,17 @@ files:
 - lib/influxer/client.rb
 - lib/influxer/config.rb
 - lib/influxer/engine.rb
+- lib/influxer/metrics/active_model3/model.rb
 - lib/influxer/metrics/metrics.rb
 - lib/influxer/metrics/relation.rb
 - lib/influxer/metrics/relation/calculations.rb
 - lib/influxer/metrics/relation/time_query.rb
 - lib/influxer/metrics/relation/where_clause.rb
 - lib/influxer/metrics/scoping.rb
+- lib/influxer/metrics/scoping/current_scope.rb
 - lib/influxer/metrics/scoping/default.rb
 - lib/influxer/metrics/scoping/named.rb
+- lib/influxer/metrics/scoping/old_current_scope.rb
 - lib/influxer/model.rb
 - lib/influxer/rails/client.rb
 - lib/influxer/version.rb