influx_orm 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7cfd03c923d45d9cac1d1aee1300767b044173e
-  data.tar.gz: eb5b2c4f5b3a429dd6f212ecc2e9fdd6220b7efa
+  metadata.gz: ab702af682f13573f863cab0e3573683fa0c6e74
+  data.tar.gz: 46d0f0263b2e5997ea0d40b94d0eb48156328c99
 SHA512:
-  metadata.gz: 00300c22851953445452d9cfbae58559e0e3e26faa521c88c1b8f9c1b4d63af0721537dd9e9bef321a28648b4341d5c6a5999f4e6efac31e42e91affa28b9fd7
-  data.tar.gz: 77616be8dbfb53fd1e55213a652cc97572123f6bcbbb05e67bd71a802c3a735a580e6acccc1bace96e9c853c20cc33a44da1254f4f3eb9d9b6ad3ce3284b8a80
+  metadata.gz: 139181ed1399d79a2730d8dfd789a3b19e01590f71ee2e8157d82fb71c90ee22b6dd59894ea909033f0617f1d64ef9489ae3113eb9920cb15704f9780da91db3
+  data.tar.gz: 40db7c74945f37a7151526b682e199a8139401708abe3ce817a289763ffee008f21965484b99657cf34eac16c285bb3c27b6d83ad4d44a49360cc0cc6e1322c4

data/README.md

@@ -26,7 +26,9 @@ Or install it yourself as:
 
 ```
 InfluxORM.setup(
-  database: 'xyz'
+  connection: { # For more, see InfluxDB::Client.new
+    database: 'xyz'
+  }
 )
 ```
 
@@ -64,8 +66,8 @@ Memory.select('mean(*)') \
   .where(host: 'A', time: {gte: Time.now - 10.day, lte: Time.now - 1.day}) \
   .group_by('time(1m) fill(0)').result
 
-Memory.where(host: 'B').limit(10).result
-Memory.where("host = 'a' AND time > now() - 1d")
+Memory.where(host: 'B').or(host: 'C').limit(10).result
+Memory.where("host = 'A' AND time > now() - 1d").where(free: {lt: 1024}).result
 
 query_obj = Memory.where(host: 'A').or(host: 'B')
 Memory.where(region: 'US').or(query_obj) # select * from memorys where region = 'US' OR (host = 'A' OR host = 'B')
@@ -83,6 +85,9 @@ Support query methods
 * `offset`: `offset(1)`
 * `soffset`: `soffset(1)`
 
+## Examples
+
+See `/examples`
 
 ## Structure
 
@@ -95,7 +100,7 @@ Support query methods
 `Model` forward query methods to `Query`, forward write to `@configuration.connection`
 
 `Attributes` define and format the model attributes
-```
+
 
 ## Development
 
@@ -105,7 +110,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/influx_orm.
+Bug reports and pull requests are welcome on GitHub at https://github.com/xiejiangzhi/influx_orm.
 
 
 ## License

data/examples/model.rb

@@ -13,7 +13,7 @@ class Book
 
   influx_tag :book_id
   influx_tag :category
-  influx_value :price
+  influx_value :price, :float
 end
 
 Book.insert(book_id: 1, category: 'A', price: 1.3)
@@ -27,3 +27,6 @@ Book.import([
 puts Book.select(mean: '*').where(time: {gte: 'now() - 3d'}) \
   .group_by('time(12h)', :category).fill(0).result
 
+puts Book.where(category: 'A').where(time: {gte: 'now() - 1d'}).result
+puts Book.where(category: 'A').or(category: 'B').result
+

data/influx_orm.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{A simple InfluxDB ORM}
   spec.description   = %q{A simple InfluxDB ORM}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/xiejiangzhi/influx_orm"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|

data/lib/influx_orm/query.rb

@@ -143,6 +143,8 @@ module InfluxORM
 
     def compare_cond_to_sql(name, hash)
       hash.map do |k, v|
+        v = format_query_val(v) if name.to_sym == :time
+
         case k.to_sym
         when :gt then "#{name} > #{v}"
         when :gte then "#{name} >= #{v}"
@@ -160,6 +162,17 @@ module InfluxORM
         "#{k} #{v}"
       end.join(', ')
     end
+
+    def format_query_val(val)
+      case val
+      when Time, DateTime
+        "'#{val.iso8601}'"
+      when Date
+        "'#{val.to_time.iso8601}'"
+      else
+        val
+      end
+    end
   end
 end
 

data/lib/influx_orm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influx_orm
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - jiangzhi.xie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-11 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: influxdb
@@ -127,7 +127,7 @@ files:
 - lib/influx_orm/model.rb
 - lib/influx_orm/query.rb
 - lib/influx_orm/version.rb
-homepage: ''
+homepage: https://github.com/xiejiangzhi/influx_orm
 licenses:
 - MIT
 metadata: {}
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: A simple InfluxDB ORM