latias-influxdb 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 628887438811d27b302005eea23f65ef70c4f3d7d841b23feb4be41c839deadc
-  data.tar.gz: f1c53f167d7cf896ff38927d8e7e52f59a186972909284ce8641fd0379b3e8e4
+  metadata.gz: cc3e3a6225c4dcd1014d3fa9e7f6dfea88c06d67a29e0e0b2f9ae251e69891d6
+  data.tar.gz: 5dbc46576db10856c87812309fa326bf9b4c35d9fa079b194a0393ece51412a2
 SHA512:
-  metadata.gz: db9a7a7565326d5d51d60d5a33972d303bb2788d4b8533d25ae8565ba07be3c45ff92be3b993cd9d724f90ea8719c5a6a50575724e0db85761e2f164cc2731ef
-  data.tar.gz: df32c1c7092cb94c2ffdc8e28822844dda23da5915dae6ba238304e6432789157b1dbf05940a7b9b3a499b32e019d87ed70207d365f85f17b24c9df5ee5d1f6a
+  metadata.gz: 0c398d6da63502e753d75a273cf50d1961a50fecc38ca6616c96133accea9e585d78b7af8ec050d9dfc440b9214b42d35c056937d8710208e1935e196d08c5a2
+  data.tar.gz: e2693590650f6cffb0548c155c2d00175bf85b9db023b34714cca5211d98e26d370b110011532420b41678bd8db5f328c1e363f36081c3c46b9158590347e58b

data/README.md

@@ -108,6 +108,83 @@ mdb_energy_bucket.range('start: -1m').filter('fn: (r) => r["_measurement"] == "c
 mdb_energy_bucket.call
 ```
 
+And you can add methods in model
+
+```ruby
+
+class MdbEnergyBucket < Latias::Influxdb::Bucket
+  def initialize
+    @url = 'http://localhost:8086'
+    @token = 'your token'
+    @bucket = 'MDBEnergy'
+    @org = 'MDBEnergy'
+    @use_ssl = false
+    client_connection
+  end
+
+  def one_minute_before
+    range('start: -1m')
+  end
+
+  def find_cpu
+    filter('fn: (r) => r["_measurement"] == "cpu"')
+  end
+
+  def my_cpu_value
+    one_minute_before.find_cpu.call
+  end
+end
+
+mdb_energy_bucket = MdbEnergyBucket.new
+mdb_energy_bucket.one_minute_before.find_cpu.call
+# OR
+mdb_energy_bucket.my_cpu_value
+```
+
+## Method
+
+```ruby
+def yield(query)
+  merge_query('yield', query)
+end
+
+def range(query)
+  merge_query('range', query)
+end
+
+def filter(query)
+  merge_query('filter', query)
+end
+
+def duplicate(query)
+  merge_query('duplicate', query)
+end
+
+def merge_query(key, query)
+  raw_function "#{key}(#{query})"
+end
+
+def raw_function(function)
+  raw_query "#{new_command} #{function}"
+end
+
+def raw_query(query)
+  @query += query
+  self
+end
+
+def client_reconnection
+  client_connection
+end
+
+# And
+
+def execute(query)
+  @query = query
+end
+
+```
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/latias/influxdb.rb

@@ -4,6 +4,7 @@ require 'latias/influxdb/bucket'
 require 'latias/influxdb/version'
 require 'latias/influxdb/engine'
 require "latias/influxdb/configuration"
+require "latias/influxdb/action_bucket/base"
 
 module Latias
   # Influxdb

data/lib/latias/influxdb/action_bucket/base.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'influxdb-client'
+
+module Latias
+  # Influxdb
+  module Influxdb
+    # Bucket
+    module ActionBucket
+      # base
+      class Base
+        attr_reader :url, :token, :bucket, :org, :use_ssl, :verify_mode, :precision, :query, :client
+
+        def execute(query)
+          @query = query
+        end
+
+        def call
+          all_query = "from(bucket: \"#{use_value('bucket')}\") #{@query}"
+          @query = ''
+          @client.create_query_api.query(query: all_query, org: use_value('org'))
+        end
+
+        def client_connection
+          @query = ''
+          @client = InfluxDB2::Client.new(use_value('url'), use_value('token'),
+                                          use_ssl: use_value('use_ssl'),
+                                          verify_mode: use_value('verify_mode'),
+                                          precision: InfluxDB2::WritePrecision::NANOSECOND)
+          self
+        end
+
+        private
+
+        def use_value(key)
+          b = get_binding("self")
+          b.eval("@#{key}") || Latias::Influxdb.configuration.send(key)
+        end
+
+        def new_command
+          '|> '
+        end
+
+        def get_binding(param)
+          binding
+        end
+      end
+    end
+  end
+end

data/lib/latias/influxdb/bucket.rb

@@ -1,65 +1,43 @@
 # frozen_string_literal: true
 
-require 'influxdb-client'
+require "latias/influxdb/action_bucket/base"
 
 module Latias
   # Influxdb
   module Influxdb
     # Bucket
-    class Bucket
-      attr_reader :url, :token, :bucket, :org, :use_ssl, :verify_mode, :precision
-
-      def call
-        all_query = "from(bucket: \"#{use_value('bucket')}\") #{@query}"
-        @query = ''
-        @client.create_query_api.query(query: all_query, org: use_value('org'))
-      end
-
+    class Bucket < Latias::Influxdb::ActionBucket::Base
       def yield(query)
-        @query += "#{new_command} yield(#{query})"
-        self
+        merge_query('yield', query)
       end
 
       def range(query)
-        @query += "#{new_command} range(#{query})"
-        self
+        merge_query('range', query)
       end
 
       def filter(query)
-        @query += "#{new_command} filter(#{query})"
-        self
+        merge_query('filter', query)
       end
 
-      def real_query(query)
-        @query += query
+      def duplicate(query)
+        merge_query('duplicate', query)
       end
 
-      def client_connection
-        @query = ''
-        @client = InfluxDB2::Client.new(use_value('url'), use_value('token'),
-                                        use_ssl: use_value('use_ssl'),
-                                        verify_mode: use_value('verify_mode'),
-                                        precision: InfluxDB2::WritePrecision::NANOSECOND)
-        self
+      def merge_query(key, query)
+        raw_function "#{key}(#{query})"
       end
 
-      def client_reconnection
-        client_connection
-      end
-
-      private
-
-      def use_value(key)
-        b = get_binding("self")
-        b.eval("@#{key}") || Latias::Influxdb.configuration.send(key)
+      def raw_function(function)
+        raw_query "#{new_command} #{function}"
       end
 
-      def new_command
-        '|> '
+      def raw_query(query)
+        @query += query
+        self
       end
 
-      def get_binding(param)
-        binding
+      def client_reconnection
+        client_connection
       end
     end
   end

data/lib/latias/influxdb/version.rb

@@ -2,6 +2,6 @@
 
 module Latias
   module Influxdb
-    VERSION = '1.0.1'
+    VERSION = '1.1.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: latias-influxdb
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - nattanon
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0.pre.2765
+        version: 1.16.0.pre.2890
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0.pre.2765
+        version: 1.16.0.pre.2890
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -50,6 +50,7 @@ files:
 - Rakefile
 - config/routes.rb
 - lib/latias/influxdb.rb
+- lib/latias/influxdb/action_bucket/base.rb
 - lib/latias/influxdb/bucket.rb
 - lib/latias/influxdb/configuration.rb
 - lib/latias/influxdb/engine.rb