influx_orm 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8a7b5578eb6a3f2fd54b4a2a957e2e44fecefaf
-  data.tar.gz: 926aad7a901cdb7aa68953a30704e2f669c8b745
+  metadata.gz: a7cfd03c923d45d9cac1d1aee1300767b044173e
+  data.tar.gz: eb5b2c4f5b3a429dd6f212ecc2e9fdd6220b7efa
 SHA512:
-  metadata.gz: 5d1f657aec7974ab2fe5f16eac459278e8b37e3707a38ac6e3ef0f4d5d39509cb3928d92d40dafebc13fde255d395be9e5a21f9f4dc4fb148c8e3e548339eb1b
-  data.tar.gz: e3fdffc820127be9810f2b5b0a07fa5977136124114bf3cd0f36203309755470f3e785b35bc0df15be20dc092137415652be697ef21d521c4b03f528927d8014
+  metadata.gz: 00300c22851953445452d9cfbae58559e0e3e26faa521c88c1b8f9c1b4d63af0721537dd9e9bef321a28648b4341d5c6a5999f4e6efac31e42e91affa28b9fd7
+  data.tar.gz: 77616be8dbfb53fd1e55213a652cc97572123f6bcbbb05e67bd71a802c3a735a580e6acccc1bace96e9c853c20cc33a44da1254f4f3eb9d9b6ad3ce3284b8a80

data/.gitignore

@@ -13,3 +13,5 @@
 
 *.swp
 spec/examples.txt
+
+*.gem

data/.travis.yml

@@ -1,5 +1,40 @@
-sudo: false
+sudo: enable
+dist: trusty
 language: ruby
+
+cache: bundler
+
 rvm:
+  - 2.1.10
+  - 2.2.7
+  - 2.3.4
   - 2.4.1
-before_install: gem install bundler -v 1.14.6
+
+gemfile:
+  - gemfiles/activesupport-4.0
+  - gemfiles/activesupport-4.1
+  - gemfiles/activesupport-4.2
+  - gemfiles/activesupport-5.0
+  - gemfiles/activesupport-5.1
+
+matrix:
+  exclude:
+    - {rvm: '2.1.10', gemfile: 'gemfiles/activesupport-5.0'}
+    - {rvm: '2.1.10', gemfile: 'gemfiles/activesupport-5.1'}
+    - {rvm: '2.4.1', gemfile: 'gemfiles/activesupport-4.0'}
+    - {rvm: '2.4.1', gemfile: 'gemfiles/activesupport-4.1'}
+
+addons:
+  apt:
+    sources:
+      - sourceline: 'deb https://repos.influxdata.com/ubuntu trusty stable'
+        key_url: 'https://repos.influxdata.com/influxdb.key'
+
+    packages:
+      influxdb
+
+before_install:
+  - sudo service influxdb start
+  - gem install bundler --no-doc
+
+script: bundle exec rspec

data/Gemfile

@@ -1,5 +1,4 @@
-# source 'https://rubygems.org'
-source 'https://gems.ruby-china.org'
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in influx_orm.gemspec
 gemspec

data/README.md

@@ -2,6 +2,8 @@
 
 A simple influxdb orm for ruby, base [influxdb-ruby](https://github.com/influxdata/influxdb-ruby)
 
+[![Build Status](https://travis-ci.org/xiejiangzhi/influx_orm.svg?branch=master)](https://travis-ci.org/xiejiangzhi/influx_orm)
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/gemfiles/activesupport-4.0

@@ -0,0 +1,7 @@
+# source 'https://rubygems.org'
+source 'https://gems.ruby-china.org'
+
+# Specify your gem's dependencies in influx_orm.gemspec
+gemspec path: '../'
+
+gem 'activesupport', '~> 4.0.0'

data/gemfiles/activesupport-4.1

@@ -0,0 +1,7 @@
+# source 'https://rubygems.org'
+source 'https://gems.ruby-china.org'
+
+# Specify your gem's dependencies in influx_orm.gemspec
+gemspec path: '../'
+
+gem 'activesupport', '~> 4.1.0'

data/gemfiles/activesupport-4.2

@@ -0,0 +1,7 @@
+# source 'https://rubygems.org'
+source 'https://gems.ruby-china.org'
+
+# Specify your gem's dependencies in influx_orm.gemspec
+gemspec path: '../'
+
+gem 'activesupport', '~> 4.2.0'

data/gemfiles/activesupport-5.0

@@ -0,0 +1,7 @@
+# source 'https://rubygems.org'
+source 'https://gems.ruby-china.org'
+
+# Specify your gem's dependencies in influx_orm.gemspec
+gemspec path: '../'
+
+gem 'activesupport', '~> 5.0.0'

data/gemfiles/activesupport-5.1

@@ -0,0 +1,7 @@
+# source 'https://rubygems.org'
+source 'https://gems.ruby-china.org'
+
+# Specify your gem's dependencies in influx_orm.gemspec
+gemspec path: '../'
+
+gem 'activesupport', '~> 5.1.0'

data/influx_orm.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "influxdb", "~> 0.3.14"
-  spec.add_dependency "activesupport", ">= 3.0"
+  spec.add_dependency "activesupport", ">= 4.0"
 
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/influx_orm/model.rb

@@ -30,7 +30,9 @@ module InfluxORM::Model
     # dependent class method: attrs_to_point
     def import(points_attrs)
       points = points_attrs.map do |point_attrs|
-        attrs_to_point(point_attrs).merge!({series: table_name})
+        r = attrs_to_point(point_attrs)
+        r[:series] ||= table_name
+        r
       end
       connection.import(points)
     end

data/lib/influx_orm/version.rb

@@ -1,3 +1,3 @@
 module InfluxORM
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/influx_orm.rb

@@ -3,6 +3,7 @@ require "influx_orm/version"
 require 'influxdb'
 
 require 'active_support'
+require 'active_support/core_ext/module/remove_method'
 require 'active_support/core_ext'
 
 module InfluxORM

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: influx_orm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - jiangzhi.xie
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -112,9 +112,13 @@ files:
 - bin/setup
 - examples/model.rb
 - examples/multiple_config.rb
+- gemfiles/activesupport-4.0
+- gemfiles/activesupport-4.1
+- gemfiles/activesupport-4.2
+- gemfiles/activesupport-5.0
+- gemfiles/activesupport-5.1
 - influx_orm.gemspec
 - lib/influx_orm.rb
-- lib/influx_orm/:noh
 - lib/influx_orm/attributes.rb
 - lib/influx_orm/configuration.rb
 - lib/influx_orm/connection.rb

data/lib/influx_orm/:noh

@@ -1,37 +0,0 @@
-module InfluxORM
-  class Connection
-    attr_reader :config, :database, :client_config, :configuration
-
-    def initialize(options, configuration)
-      @config = options.with_indifferent_access
-      @configuration = configuration
-    end
-
-    def db
-      @db ||= InfluxDB::Client.new(config)
-    end
-
-    def query(sql)
-      log(sql) { db.query(sql) }
-    end
-
-    def insert(table_name, point)
-      log("INSERT to #{table_name}: #{point.to_sql}") { db.write_point(table_name, point) }
-    end
-
-    def import(data)
-      db.write_points(data)
-    end
-
-    private
-
-    def log(log, &block)
-      t = Time.now
-      block.call
-    ensure
-      c = (Time.now - t) * 1000
-      configuration.logger.info("[InfluxORM] (%.3f ms) %s" % [c, log])
-    end
-  end
-end
-