latias-influxdb 0.2.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1922c4c627f003a81bd378c4844a9285a44118abe5950954ae40d87055d6144
-  data.tar.gz: 2ed4cf9876fdc08ed9a25c60751989dd0749c6295ddc5ae8dbc24ef7e32ad314
+  metadata.gz: 628887438811d27b302005eea23f65ef70c4f3d7d841b23feb4be41c839deadc
+  data.tar.gz: f1c53f167d7cf896ff38927d8e7e52f59a186972909284ce8641fd0379b3e8e4
 SHA512:
-  metadata.gz: f6d25a50e23bcea9a13ffd6bf33ca59a0b03a05a838ea32b3a5d51478be1233a9c61593c740d6ef863a294a19e6e329be84a36bfc928ca0e7294c145dab076ee
-  data.tar.gz: f21959a4acbd90c6915e2c7b394ffa4c5cc101fb987f68820e4ad19c9cb7e06dae4d9b48978e620c0d17912136f475353dec13bab7408d4af96e7446398e6b75
+  metadata.gz: db9a7a7565326d5d51d60d5a33972d303bb2788d4b8533d25ae8565ba07be3c45ff92be3b993cd9d724f90ea8719c5a6a50575724e0db85761e2f164cc2731ef
+  data.tar.gz: df32c1c7092cb94c2ffdc8e28822844dda23da5915dae6ba238304e6432789157b1dbf05940a7b9b3a499b32e019d87ed70207d365f85f17b24c9df5ee5d1f6a

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,13 +94,12 @@ mdb_energy_bucket.call
 ```ruby
 class MdbEnergyBucket < Latias::Influxdb::Bucket
   def initialize
-    super
     @url = 'http://localhost:8086'
     @token = 'your token'
     @bucket = 'MDBEnergy'
     @org = 'MDBEnergy'
     @use_ssl = false
-    @client = client
+    client_connection
   end
 end
 
@@ -40,30 +108,13 @@ 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:
-
-```ruby
-gem 'latias-influxdb'
-```
-
-And then execute:
+## License
 
-```bash
-$ bundle
-```
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
 
-Or install it yourself as:
+## Build and push GEM
 
 ```bash
-$ gem install latias-influxdb
+gem build latias-influxdb.gemspec
+gem push latias-influxdb-xx.xx.xx.gem
 ```
-
-## Contributing
-
-Contribution directions go here.
-
-## 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

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

data/lib/latias/influxdb/bucket.rb

@@ -9,14 +9,10 @@ module Latias
     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}"
+        all_query = "from(bucket: \"#{use_value('bucket')}\") #{@query}"
         @query = ''
-        @client.create_query_api.query(query: all_query, org: @org)
+        @client.create_query_api.query(query: all_query, org: use_value('org'))
       end
 
       def yield(query)
@@ -38,27 +34,32 @@ module Latias
         @query += 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
+      end
+
+      def client_reconnection
+        client_connection
+      end
+
       private
 
-      def set_default
-        @query = ''
-        @url = 'http://localhost:8086'
-        @token = 'token'
-        @bucket = 'bucket'
-        @org = 'org'
-        @use_ssl = false
-        @verify_mode = OpenSSL::SSL::VERIFY_NONE
+      def use_value(key)
+        b = get_binding("self")
+        b.eval("@#{key}") || Latias::Influxdb.configuration.send(key)
       end
 
       def new_command
         '|> '
       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 get_binding(param)
+        binding
       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.0'
+    VERSION = '1.0.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

@@ -0,0 +1,9 @@
+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

data/lib/tasks/latias/influxdb_tasks.rake

@@ -1,4 +1,10 @@
-# desc "Explaining what the task does"
-# task :latias_influxdb do
-#   # Task goes here
-# end
+require 'latias/influxdb/version'
+
+namespace :latias do
+  namespace :influxdb do
+    desc 'check lib varsion'
+    task verion: :environment do
+      puts "Version: #{Latias::Influxdb::VERSION}"
+    end
+  end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: latias-influxdb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.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: influxdb-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.16.0.pre.2765
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.16.0.pre.2765
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -34,20 +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/bucket.rb
 - lib/latias/influxdb/configuration.rb
 - lib/latias/influxdb/engine.rb
 - lib/latias/influxdb/version.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
 licenses:

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>