fluent-plugin-nicorepo 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a2dc10e30236f3ea0cea6b6742f035203c4230e
-  data.tar.gz: ea3c862aadb8c497c17223add433c8e4db47fb89
+  metadata.gz: 5255e192a3d1b9c375676acb31c9e7e4e425a2da
+  data.tar.gz: '06812ecca4547ca68d428c53ada56bf21894eee3'
 SHA512:
-  metadata.gz: 5d024c75ca6d5911636597d92e8633e6983d967b0a9590cdcf1a0d6ce50c225a479218262d58dfc8c85094e605ed1b890c4ab4d903d36cad83e75a6bc6682d89
-  data.tar.gz: d1ab68a85d62481453d751b0acb4300a83e6f51e39f98fb9fc9281cd4bc18a5c1a56b19cf1a07e71fb8ac7872ad78aa88bee0b48f9526f4c90c65ee205f40873
+  metadata.gz: 1a5c876c6d8b64c8e6f478f8de37480a09009fb3b3e3ec7bb96e40ef712f5caaab3b7f2a346d4e6bccf9504df61745171c348733f0f02f8ea228acf358440977
+  data.tar.gz: '0691577feb9aa6386109551ab962f6ff1f12948b2d34ea11ffd1d378d007be9c16e5e97f40a11fa773e72a55b6ef6f1c83141ade98e4008b3bf60aac7fd1bcb9'

data/README.md

@@ -24,14 +24,15 @@ You can also specify kind of reports by the optional attribute `kind`.
 ```
 <source>
   type nicorepo
-  mail your@email.com   # required: login mail address for nicovideo
-  pass password         # required: login password for nicovide
   interval 3h           # optional: interval to fetch reports from nicovideo (defualt: 10 min)
   kind videos           # optional: kind of reports to be filtered [all, videos, lives] (default: all)
   tag nicorepo.idobata
 </source>
 ```
 
+The login email and password for nicovideo are required to be specified in `~/.netrc`.
+See [nicorepo](https://github.com/upinetree/nicorepo) for the details.
+
 ## Contributing
 
 1. Fork it ( https://github.com/upinetree/fluent-plugin-nicorepo/fork )

data/fluent-plugin-nicorepo.gemspec

@@ -19,9 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "fluentd", "~> 0.12.37"
-  spec.add_runtime_dependency "nicorepo", "~> 0.0.8"
+  spec.add_runtime_dependency "nicorepo", "~> 1.0.0"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "test-unit", "~> 3.0"
+  spec.add_development_dependency "mocha", "~> 1.2"
 end

data/lib/fluent/plugin/in_nicorepo.rb

@@ -7,10 +7,6 @@ module Fluent
 
     desc 'The tag of the event'
     config_param :tag, :string
-    desc 'The login main address for nicovideo'
-    config_param :mail, :string
-    desc 'The login password for nicovideo'
-    config_param :pass, :string
     desc 'The interval of each fetching'
     config_param :interval, :time, default: 600
     desc 'Max logs number at once fetch'
@@ -21,7 +17,7 @@ module Fluent
     config_param :kind, :string, default: 'all'
 
     def configure(conf)
-      @nicorepo = Nicorepo.new
+      @client = Nicorepo::Client.new
       super
     end
 
@@ -43,11 +39,10 @@ module Fluent
     end
 
     def on_timer
-      reports = fetch_reports
-      reports.each do |report|
-        time = Time.now
-        record = report_to_hash(report)
-        router.emit(@tag, time, record)
+      time = Time.now
+
+      fetch_report.format.each do |log|
+        router.emit(@tag, time, log)
       end
     rescue => e
       log.error "unexpected error", error: e
@@ -55,30 +50,20 @@ module Fluent
 
     private
 
-    def fetch_reports
-      since = Time.now - @interval
-      @nicorepo.login(@mail, @pass)
+    def fetch_report
+      last_fetched_at = Time.now - @interval
 
       case @kind
       when 'all'
-        @nicorepo.all(@limit_num, since: since)
+        @client.all(@limit_num, to: last_fetched_at)
       when 'videos'
-        @nicorepo.videos(@limit_num, @limit_page, since: since)
+        @client.videos(@limit_num, limit_page: @limit_page, to: last_fetched_at)
       when 'lives'
-        @nicorepo.lives(@limit_num, @limit_page, since: since)
+        @client.lives(@limit_num, limit_page: @limit_page, to: last_fetched_at)
       else
         log.error "unsupported report kind: #{@kind}"
         []
       end
     end
-
-    def report_to_hash(report)
-      {
-        'body'  => report.body,
-        'title' => report.title,
-        'url'   => report.url,
-        'date'  => report.date
-      }
-    end
   end
 end

data/lib/fluent/plugin/nicorepo/version.rb

@@ -1,7 +1,7 @@
 module Fluent
   module Plugin
     module Nicorepo
-      VERSION = "0.0.2"
+      VERSION = "1.0.0"
     end
   end
 end

data/test/helper.rb

@@ -4,6 +4,6 @@ Bundler.setup
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-require 'pry'
-
 require "fluent/test"
+require 'mocha/test_unit'
+require 'pry'

data/test/plugin/test_in_nicorepo.rb

@@ -1,30 +1,18 @@
 require 'helper'
 require 'fluent/plugin/in_nicorepo'
 
-class NicorepoDouble
-  def login(*)
-    puts 'logined'
-  end
-
-  def all(*)
-    [OpenStruct.new({
-      body:  "report body",
-      title: "report title",
-      url:   "report url",
-      date:  "report date"
-    })]
-  end
-end
-
 class NicorepoInputTest < Test::Unit::TestCase
-  def setup
-    Fluent::Test.setup
-    Fluent::NicorepoInput.send(:const_set, :Nicorepo, NicorepoDouble)
-  end
+  DUMMY_REPORT = OpenStruct.new(
+    format: [{
+      sender:     "dummy_user",
+      topic:      "動画投稿",
+      title:      "dummy_title",
+      url:        "http://example.com",
+      created_at: Time.now
+    }]
+  )
 
   CONFIG = %[
-    mail dummy@mail.com
-    pass dummy_pass
     tag nicorepo.test
   ]
 
@@ -35,14 +23,17 @@ class NicorepoInputTest < Test::Unit::TestCase
     kind: 'all'
   }
 
+  def setup
+    Fluent::Test.setup
+    Nicorepo::Client.any_instance.stubs(:all).returns(DUMMY_REPORT)
+  end
+
   def create_driver(conf = CONFIG)
     Fluent::Test::InputTestDriver.new(Fluent::NicorepoInput).configure(conf, true)
   end
 
   def test_configure
     d = create_driver
-    assert_equal('dummy@mail.com', d.instance.mail)
-    assert_equal('dummy_pass', d.instance.pass)
     assert_equal('nicorepo.test', d.instance.tag)
     assert_equal(CONFIG_DEFAULTS[:interval], d.instance.interval)
     assert_equal(CONFIG_DEFAULTS[:limit_num], d.instance.limit_num)
@@ -51,12 +42,7 @@ class NicorepoInputTest < Test::Unit::TestCase
   end
 
   def test_emit
-    expected_record = {
-      'body'  => "report body",
-      'title' => "report title",
-      'url'   => "report url",
-      'date'  => "report date"
-    }
+    expected_record = DUMMY_REPORT.format.first
 
     d = create_driver
     d.run

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-nicorepo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - upinetree
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: Fluent input plugin for Nicorepo.
 email:
 - upinetree@gmail.com