fluent-plugin-mobile-carrier 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 211678f21ba539d46ac9c1ac103d04f0030ef9a0
-  data.tar.gz: d0f28df60642ae53bba779798a6ba1e53092a18e
+  metadata.gz: 20be1c78bf84e8b363f212e110a376e2bca311b2
+  data.tar.gz: 2d75667be13afef1b4a956eba1d0e6380db8f972
 SHA512:
-  metadata.gz: 9c08cc8c43d7be6abc8ad4ca7cc65cb00296abc0d9a118900d9d89e72970808e817c6120b7df0dfa3e0f6db9cc85d0e2de8d703a925c730b1f5b8ba178b5d5bf
-  data.tar.gz: b4457d79c197f4bcd2327d2c9522b3108bbeac8247e1373d936f69897a4e342c40450d96ad33649763fcd3d1989c0ab28a589eacb45bb604af512f1edcb5f21b
+  metadata.gz: 85d4a6a0d9a1d1677b6092fabb5032b78fa76151db1df89e481303a8b8d3427a3100e9e40484ae1b51080de2242b24f20179e3b5bb8e30c61e7161d521b9325c
+  data.tar.gz: 56e529ba4933c5d94820b94ee1306000c537921d21e5542b9033c81d1c158cb4f996f4ad55d241d5610361fb948f36a58bc2ac9dcd1dc8926830ba0baac66b4d

data/fluent-plugin-mobile-carrier.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = 'fluent-plugin-mobile-carrier'
-  gem.version       = '0.0.1'
+  gem.version       = '0.0.2'
   gem.authors       = ['HARUYAMA Seigo']
   gem.email         = ['haruyama@unixuser.org']
   gem.description   = %q{judge mobile carrier by ip address.}

data/lib/fluent/plugin/out_mobile_carrier.rb

@@ -19,9 +19,9 @@ class Fluent::MobileCarrierOutput < Fluent::Output
 
   def configure(conf)
     super
-
-    raise 'config_yaml is not set!' unless (@config_yaml)
-    @config = prepare_config(YAML.load_file(@config_yaml))
+    config =  YAML.load_file(@config_yaml)
+    raise 'invalid yaml' unless (config.is_a? Hash)
+    @config = parse_config(config)
 
     if !@tag && !@remove_prefix && !@add_prefix
       fail Fluent::ConfigError, 'missing both of remove_prefix and add_prefix'
@@ -55,7 +55,7 @@ class Fluent::MobileCarrierOutput < Fluent::Output
     end
   end
 
-  def prepare_config(raw_config)
+  def parse_config(raw_config)
     config = {}
     raw_config.each { |carrier, ip_address_list|
       config[carrier] = ip_address_list.map { |ip_address|

data/test/data/wrong.yaml

@@ -0,0 +1 @@
+vaofgewa

data/test/plugin/test_out_mobile_carrier.rb

@@ -19,6 +19,29 @@ config_yaml test/data/config1.yaml
 key_name ip
 unknown_carrier unknown
 out_key_mobile_carrier mc
+]
+
+  CONFIG_ERROR1 = %[
+type mobile_carrier
+remove_prefix test
+add_prefix merged
+key_name ip_address
+]
+
+  CONFIG_ERROR2 = %[
+type mobile_carrier
+remove_prefix test
+add_prefix merged
+key_name ip_address
+config_yaml test/data/not_found.yaml
+]
+
+  CONFIG_ERROR3 = %[
+type mobile_carrier
+remove_prefix test
+add_prefix merged
+key_name ip_address
+config_yaml test/data/wrong.yaml
 ]
 
   def create_driver(conf = CONFIG1, tag = 'test')
@@ -43,6 +66,18 @@ out_key_mobile_carrier mc
 
     assert_equal 'unknown', d.instance.unknown_carrier
     assert_equal 'mc',      d.instance.out_key_mobile_carrier
+
+    assert_raise_with_message(Fluent::ConfigError, "'config_yaml' parameter is required") do
+      d = create_driver CONFIG_ERROR1
+    end
+
+    assert_raise(Errno::ENOENT) do
+      d = create_driver CONFIG_ERROR2
+    end
+
+    assert_raise(RuntimeError) do
+      d = create_driver CONFIG_ERROR3
+    end
   end
 
   def test_tag_mangle

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mobile-carrier
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - HARUYAMA Seigo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -55,6 +55,7 @@ files:
 - lib/fluent/plugin/.rubocop.yml
 - lib/fluent/plugin/out_mobile_carrier.rb
 - test/data/config1.yaml
+- test/data/wrong.yaml
 - test/helper.rb
 - test/plugin/.rubocop.yml
 - test/plugin/test_out_mobile_carrier.rb
@@ -84,6 +85,7 @@ specification_version: 4
 summary: Fluentd plugin to judge mobile carrier by ip address.
 test_files:
 - test/data/config1.yaml
+- test/data/wrong.yaml
 - test/helper.rb
 - test/plugin/.rubocop.yml
 - test/plugin/test_out_mobile_carrier.rb