latias-influxdb 0.2.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ed54fb50c1e6f28a7896a5991a251a9a80700121e46dde00d8b717ed3dcfc80
-  data.tar.gz: 18545511343c762ae0b5ec30f8fd728c2118abbde2d234398ec6676e1b275278
+  metadata.gz: cc3e3a6225c4dcd1014d3fa9e7f6dfea88c06d67a29e0e0b2f9ae251e69891d6
+  data.tar.gz: 5dbc46576db10856c87812309fa326bf9b4c35d9fa079b194a0393ece51412a2
 SHA512:
-  metadata.gz: e1b07cde58038611fecb11761473659969a2129db6753a2afdb36882058bfea7e4d82159f318ec5b46f28a8bfe8eb6d4c33ebe5cbee4746fe90fe98e388c3fd8
-  data.tar.gz: 3a9aa7122cd7c2618af27dd067bce534bb309261b17a6c130eee6eb38abc9a8f5bcd2fdbef4519f212ccc51743b37606cae4fe2d6552f6eaf0a6245b1e926499
+  metadata.gz: 0c398d6da63502e753d75a273cf50d1961a50fecc38ca6616c96133accea9e585d78b7af8ec050d9dfc440b9214b42d35c056937d8710208e1935e196d08c5a2
+  data.tar.gz: e2693590650f6cffb0548c155c2d00175bf85b9db023b34714cca5211d98e26d370b110011532420b41678bd8db5f328c1e363f36081c3c46b9158590347e58b

data/README.md

@@ -2,12 +2,81 @@
 
 Ruby lib for use influxdb version 2 on Ruby language
 
-## Usage
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'latias-influxdb'
+```
+
+And then execute:
+
+```bash
+$ bundle
+```
+
+Or install it yourself as:
+
+```bash
+$ gem install latias-influxdb
+```
+
+Check version
+
+```bash
+ rails latias:influxdb:verion
+```
+
+## Configuration & Usage
+
+### Configuration
+
+First generating config file
+
+```bash
+ rails g latias:influxdb:install
+```
+
+```ruby
+# config/initializers/latias_influxdb
+Latias::Influxdb.configure do |config|
+  # default
+  # config.url = 'http://localhost:8086'
+  # config.token = 'token'
+  # config.bucket = 'bucket'
+  # config.org = 'org'
+  # config.use_ssl = false
+  # config.verify_mode = OpenSSL::SSL::VERIFY_NONE
+end
+```
+
+### Usage
+
+You can use
+
+<!--
+
+  # config.url = 'http://188.166.252.165:8086'
+  # config.token = 'YyD4UGu4_Xn0CIVsycFdjaQVd7m1g5wRp0z2BCfBSyNL6-GHqqyZRePGy46B2m8Zg6jgqHAN_J6jyhCmvGeQRA=='
+  # config.bucket = 'MDBEnergy'
+  # config.org = 'MDBEnergy'
+
+-->
+
+```ruby
+  bucket = Latias::Influxdb::Bucket.new
+  bucket.client_connection
+  # or bucket = Latias::Influxdb::Bucket.new.client_connection
+  bucket.range('start: -1m').filter('fn: (r) => r["_measurement"] == "cpu"')
+  bucket.call
+```
+
+Or use with model
 
 <!-- ```ruby
 class MdbEnergyBucket < Latias::Influxdb::Bucket
   def initialize
-    super
     @url = 'http://188.166.252.165:8086'
     @token = 'YyD4UGu4_Xn0CIVsycFdjaQVd7m1g5wRp0z2BCfBSyNL6-GHqqyZRePGy46B2m8Zg6jgqHAN_J6jyhCmvGeQRA=='
     @bucket = 'MDBEnergy'
@@ -25,7 +94,6 @@ mdb_energy_bucket.call
 ```ruby
 class MdbEnergyBucket < Latias::Influxdb::Bucket
   def initialize
-    super
     @url = 'http://localhost:8086'
     @token = 'your token'
     @bucket = 'MDBEnergy'
@@ -40,36 +108,90 @@ mdb_energy_bucket.range('start: -1m').filter('fn: (r) => r["_measurement"] == "c
 mdb_energy_bucket.call
 ```
 
-## Installation
-
-Add this line to your application's Gemfile:
+And you can add methods in model
 
 ```ruby
-gem 'latias-influxdb'
-```
 
-And then execute:
+class MdbEnergyBucket < Latias::Influxdb::Bucket
+  def initialize
+    @url = 'http://localhost:8086'
+    @token = 'your token'
+    @bucket = 'MDBEnergy'
+    @org = 'MDBEnergy'
+    @use_ssl = false
+    client_connection
+  end
 
-```bash
-$ bundle
-```
+  def one_minute_before
+    range('start: -1m')
+  end
 
-Or install it yourself as:
+  def find_cpu
+    filter('fn: (r) => r["_measurement"] == "cpu"')
+  end
 
-```bash
-$ gem install latias-influxdb
+  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
 ```
 
-Check version
+## Method
 
-```bash
- rails latias:influxdb:verion
-```
+```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
 
-## Contributing
+def execute(query)
+  @query = query
+end
 
-Contribution directions go here.
+```
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+## Build and push GEM
+
+```bash
+gem build latias-influxdb.gemspec
+gem push latias-influxdb-xx.xx.xx.gem
+```

data/lib/latias/influxdb.rb

@@ -3,6 +3,8 @@
 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,64 +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 initialize
-        set_default
-      end
-
-      def call
-        all_query = "from(bucket: \"#{@bucket}\") #{@query}"
-        @query = ''
-        @client.create_query_api.query(query: all_query, org: @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
 
-      private
+      def merge_query(key, query)
+        raw_function "#{key}(#{query})"
+      end
 
-      def set_default
-        @query = ''
-        @url = 'http://localhost:8086'
-        @token = 'token'
-        @bucket = 'bucket'
-        @org = 'org'
-        @use_ssl = false
-        @verify_mode = OpenSSL::SSL::VERIFY_NONE
+      def raw_function(function)
+        raw_query "#{new_command} #{function}"
       end
 
-      def new_command
-        '|> '
+      def raw_query(query)
+        @query += query
+        self
       end
 
-      def client_connection
-        @client = InfluxDB2::Client.new(@url, @token,
-                                        use_ssl: @use_ssl,
-                                        verify_mode: @verify_mode.present? ? @verify_mode : OpenSSL::SSL::VERIFY_NONE,
-                                        precision: InfluxDB2::WritePrecision::NANOSECOND)
+      def client_reconnection
+        client_connection
       end
     end
   end

data/lib/latias/influxdb/configuration.rb

@@ -5,14 +5,19 @@ module Latias
   module Influxdb
     # Configuration
     class Configuration
-      attr_accessor :async
+      attr_accessor :url, :token, :bucket, :org, :use_ssl, :verify_mode, :precision
 
       def initialize
-        @async = true
+        @query = ''
+        @url = 'http://localhost:8086'
+        @token = 'token'
+        @bucket = 'bucket'
+        @org = 'org'
+        @use_ssl = false
+        @verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
     end
 
-    # Borrow syntax from Clearance: https://github.com/thoughtbot/clearance/blob/master/lib/clearance/configuration.rb
     def self.configuration
       @configuration ||= Configuration.new
     end

data/lib/latias/influxdb/version.rb

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

data/lib/rails/generators/latias/influxdb/install_generator.rb

@@ -0,0 +1,19 @@
+require 'rails/generators'
+
+module Latias
+  module Influxdb
+    class InstallGenerator < Rails::Generators::Base
+      desc "Description:\n  This creates a Rails initializer for latias::InfluxDB::Rails."
+
+      source_root File.expand_path('templates', __dir__)
+
+      def copy_initializer_file
+        template 'initializer.rb', 'config/initializers/latias_influxdb.rb'
+      end
+
+      def install
+        # nothing to do here
+      end
+    end
+  end
+end

data/lib/rails/generators/latias/influxdb/templates/initializer.rb

@@ -1,3 +1,9 @@
 Latias::Influxdb.configure do |config|
-  # Latias::Influxdb.configure
+  # default
+  # config.url = 'http://localhost:8086'
+  # config.token = 'token'
+  # config.bucket = 'bucket'
+  # config.org = 'org'
+  # config.use_ssl = false
+  # config.verify_mode = OpenSSL::SSL::VERIFY_NONE
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: latias-influxdb
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.1.1
 platform: ruby
 authors:
 - nattanon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-08 00:00:00.000000000 Z
+date: 2021-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: influxdb-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: 1.16.0.pre.2890
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: 1.16.0.pre.2890
 - !ruby/object:Gem::Dependency
-  name: influxdb-client
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0.pre.2765
-  type: :development
+        version: 6.1.4
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0.pre.2765
+        version: 6.1.4
 description:
 email:
 - nattanon@hospital-os.com
@@ -48,21 +48,14 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/assets/config/latias_influxdb_manifest.js
-- app/assets/stylesheets/latias/influxdb/application.css
-- app/controllers/latias/influxdb/application_controller.rb
-- app/helpers/latias/influxdb/application_helper.rb
-- app/jobs/latias/influxdb/application_job.rb
-- app/mailers/latias/influxdb/application_mailer.rb
-- app/models/latias/influxdb/application_record.rb
-- app/views/layouts/latias/influxdb/application.html.erb
 - 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
 - lib/latias/influxdb/version.rb
-- lib/rails/generators/latias/influxdb/influxdb_generator.rb
+- lib/rails/generators/latias/influxdb/install_generator.rb
 - lib/rails/generators/latias/influxdb/templates/initializer.rb
 - lib/tasks/latias/influxdb_tasks.rake
 homepage: https://gitlab.opensource-technology.com/nattanon/latias-influxdb

data/app/assets/config/latias_influxdb_manifest.js

@@ -1 +0,0 @@
-//= link_directory ../stylesheets/latias/influxdb .css

data/app/assets/stylesheets/latias/influxdb/application.css

@@ -1,15 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
- * files in this directory. Styles in this file should be added after the last require_* statement.
- * It is generally better to create a new file per style scope.
- *
- *= require_tree .
- *= require_self
- */

data/app/controllers/latias/influxdb/application_controller.rb

@@ -1,6 +0,0 @@
-module Latias
-  module Influxdb
-    class ApplicationController < ActionController::Base
-    end
-  end
-end

data/app/helpers/latias/influxdb/application_helper.rb

@@ -1,6 +0,0 @@
-module Latias
-  module Influxdb
-    module ApplicationHelper
-    end
-  end
-end

data/app/jobs/latias/influxdb/application_job.rb

@@ -1,6 +0,0 @@
-module Latias
-  module Influxdb
-    class ApplicationJob < ActiveJob::Base
-    end
-  end
-end

data/app/mailers/latias/influxdb/application_mailer.rb

@@ -1,8 +0,0 @@
-module Latias
-  module Influxdb
-    class ApplicationMailer < ActionMailer::Base
-      default from: 'from@example.com'
-      layout 'mailer'
-    end
-  end
-end

data/app/models/latias/influxdb/application_record.rb

@@ -1,7 +0,0 @@
-module Latias
-  module Influxdb
-    class ApplicationRecord < ActiveRecord::Base
-      self.abstract_class = true
-    end
-  end
-end

data/app/views/layouts/latias/influxdb/application.html.erb

@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Latias influxdb</title>
-  <%= csrf_meta_tags %>
-  <%= csp_meta_tag %>
-
-  <%= stylesheet_link_tag    "latias/influxdb/application", media: "all" %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>

data/lib/rails/generators/latias/influxdb/influxdb_generator.rb

@@ -1,15 +0,0 @@
-require 'rails/generators'
-
-class InfluxdbGenerator < Rails::Generators::Base
-  desc "Description:\n  This creates a Rails initializer for latias::InfluxDB::Rails."
-
-  source_root File.expand_path('templates', __dir__)
-
-  def copy_initializer_file
-    template 'initializer.rb', 'config/initializers/latias_influxdb.rb'
-  end
-
-  def install
-    # nothing to do here
-  end
-end