fluent-plugin-sakuraio 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5e9d59261a7e3f994e9f1f71e8dc15b1daf306cc
-  data.tar.gz: 829c7511c98f93f3de30a98f44a97afd05b28cd7
+SHA256:
+  metadata.gz: 5e4048610939f4ee51631219d5f0e08a43c4d66a339e5527a6f6fdcdcedc0ad2
+  data.tar.gz: 4cd1c9fb745886a0927276c88068f7252e25ae254fdab3dcfd5c040b79ebcf47
 SHA512:
-  metadata.gz: 30b2729b21454594fb0de8a06929b10d89b337f1e6b75766cb55e308e76d8d91f7814021983ab6f77681792e68664e23cae2346145ba28c0eebaa0ecba3c7199
-  data.tar.gz: 9e0b1a3e6dc1e49ff38e518a7683c7a251feadd69363c03bec10023707ea61f579665e7bacdeff3996f6e3d0ee239671d53e5913a32138d056bf1c3f4dbeb757
+  metadata.gz: a3e10d9c21538474d6b6a57cf6a729b874b796c23a7c9f1e260f213c64da43d196e7a87d08fe89d455388399267348802419840e151e54be00656a4b7fcf7f6a
+  data.tar.gz: 5c00a268963655a5508f62bc162c76e320d2dc465ebc0b4886f5e28daac09bbc5421199378ca70136b11452e33b455a1e1506badee6a35adb869629b7a3b3ee7

data/.rubocop.yml

@@ -0,0 +1,25 @@
+require:
+  - rubocop-performance
+
+AllCops:
+  TargetRubyVersion: 2.3
+
+Layout/LineLength:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - 'test/**/*'
+    - '*.gemspec'
+
+Metrics/ClassLength:
+  Max: 200
+
+Metrics/MethodLength:
+  Max: 20

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in fluent-plugin-sakuraio.gemspec

data/Rakefile

@@ -1,5 +1,7 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -7,4 +9,4 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-task :default => :test
+task default: :test

data/fluent-plugin-sakuraio.gemspec

@@ -1,10 +1,11 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'fluent-plugin-sakuraio'
-  spec.version       = '0.1.2'
+  spec.version       = '0.1.3'
   spec.authors       = ['Yuya Kusakabe']
   spec.email         = ['yuya.kusakabe@gmail.com']
 
@@ -20,15 +21,17 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.1'
+  spec.required_ruby_version = '>= 2.3'
 
   spec.add_runtime_dependency 'eventmachine'
   spec.add_runtime_dependency 'faye-websocket'
   spec.add_runtime_dependency 'fluentd', '>= 0.14', '< 2'
   spec.add_runtime_dependency 'yajl-ruby'
-  spec.add_development_dependency 'bundler', '~> 1.13'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'test-unit'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rack'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-performance'
+  spec.add_development_dependency 'test-unit'
   spec.add_development_dependency 'thin'
 end

data/lib/fluent/plugin/in_sakuraio.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fluent/plugin/input'
 require 'yajl'
 require 'faye/websocket'
@@ -26,6 +28,7 @@ module Fluent::Plugin
 
     def ensure_reactor_running
       return if EM.reactor_running?
+
       thread_create(:in_sakuraio_reactor) do
         EM.run
       end
@@ -45,13 +48,7 @@ module Fluent::Plugin
         end
 
         client.on :message do |event|
-          log.debug "sakuraio: received message #{event.data}"
-          records = parse(event.data)
-          unless records.empty?
-            records.each do |r|
-              router.emit(r['tag'], r['time'], r['record'])
-            end
-          end
+          handle_message(event)
         end
 
         client.on :error do |event|
@@ -64,16 +61,26 @@ module Fluent::Plugin
       end
     end
 
+    def handle_message(event)
+      log.debug "sakuraio: received message #{event.data}"
+      records = parse(event.data)
+      return if records.empty?
+
+      records.each do |r|
+        router.emit(r['tag'], r['time'], r['record'])
+      end
+    end
+
     def parse(text)
       parser = Yajl::Parser.new
       j = parser.parse(text)
       records = []
       case j['type']
-      when 'connection' then
+      when 'connection'
         parse_connection(records, j)
-      when 'location' then
+      when 'location'
         parse_location(records, j)
-      when 'channels' then
+      when 'channels'
         parse_channels(records, j)
       else
         log.debug "unknown type: #{j['type']}: #{text}"
@@ -81,54 +88,57 @@ module Fluent::Plugin
       records
     end
 
-    def parse_connection(records, j)
+    def parse_connection(records, data)
       record = {
-        'tag' => j['module'] + '.connection',
+        'tag' => data['module'] + '.connection',
         'record' => {
-          'module' => j['module'],
-          'is_online' => j['payload']['is_online']
+          'module' => data['module'],
+          'is_online' => data['payload']['is_online']
         },
-        'time' => @time_parser.parse(j['datetime'])
+        'time' => @time_parser.parse(data['datetime'])
       }
       records.push(record)
       records
     end
 
-    def parse_location(records, j)
-      c = j['payload']['coordinate']
+    def parse_location(records, data)
+      c = data['payload']['coordinate']
       if c != 'null'
         record = {
-          'tag' => j['module'] + '.location',
+          'tag' => data['module'] + '.location',
           'record' => {
-            'module' => j['module'],
+            'module' => data['module'],
             'latitude' => c['latitude'],
             'longitude' => c['longitude'],
             'range_m' => c['range_m']
           },
-          'time' => @time_parser.parse(j['datetime'])
+          'time' => @time_parser.parse(data['datetime'])
         }
         records.push(record)
       end
       records
     end
 
-    def parse_channels(records, j)
-      message_time = @time_parser.parse(j['datetime'])
-      tag = j['module']
-      j['payload']['channels'].each do |c|
-        record = {
-          'tag' => tag + '.channels.' + c['channel'].to_s,
-          'record' => {
-            'module' => j['module'],
-            'channel' => c['channel'],
-            'type' => c['type'],
-            'value' => c['value']
-          },
-          'time' => @time_parser.parse(c['datetime']) || message_time
-        }
-        records.push(record)
+    def parse_channels(records, data)
+      msg_time = @time_parser.parse(data['datetime'])
+      mod = data['module']
+      data['payload']['channels'].each do |c|
+        records.push(parse_channel(mod, msg_time, c))
       end
       records
     end
+
+    def parse_channel(mod, msg_time, chan)
+      {
+        'tag' => mod + '.channels.' + chan['channel'].to_s,
+        'record' => {
+          'module' => mod,
+          'channel' => chan['channel'],
+          'type' => chan['type'],
+          'value' => chan['value']
+        },
+        'time' => @time_parser.parse(chan['datetime']) || msg_time
+      }
+    end
   end
 end

data/lib/fluent/plugin/out_sakuraio.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fluent/plugin/output'
 require 'yajl'
 require 'faye/websocket'
@@ -20,12 +22,13 @@ module Fluent::Plugin
 
     def ensure_reactor_running
       return if EM.reactor_running?
+
       thread_create(:out_sakuraio_reactor) do
         EM.run
       end
     end
 
-    def run()
+    def run
       @client = Faye::WebSocket::Client.new(@url)
       EM.next_tick do
         @client.on :open do
@@ -46,8 +49,8 @@ module Fluent::Plugin
       end
     end
 
-    def process(_tag, es)
-      es.each do |_time, record|
+    def process(_tag, events)
+      events.each do |_time, record|
         log.debug "sakuraio: process record #{record}"
         modules.each do |m|
           s = encode_record(m, record)
@@ -57,7 +60,7 @@ module Fluent::Plugin
       end
     end
 
-    def encode_record(m, record)
+    def encode_record(mod, record)
       data = []
       @channels.each do |ch, v|
         key, type = v
@@ -66,7 +69,7 @@ module Fluent::Plugin
                   'value' => record[key])
       end
       hash = { 'type' => 'channels',
-               'module' => m,
+               'module' => mod,
                'payload' => { 'channels' => data } }
       Yajl::Encoder.encode(hash)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sakuraio
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Yuya Kusakabe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-04 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -76,32 +76,60 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,7 +143,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -150,6 +178,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -171,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -179,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: fluentd plugin for sakura.io