fluent-plugin-mobile-carrier 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37f66f0f03c0ed29abcf31b9a6c5174c529354ba
-  data.tar.gz: 5ad53ba37d32da1998c7a12178091ff73ad1fc02
+  metadata.gz: 77603c91b65cff28023d78f8e1a34e972c37128d
+  data.tar.gz: 4460ac4993a58655b27f59935f1f53193c5dd988
 SHA512:
-  metadata.gz: 02c8dd9d8878d00225e0db6a0b9e6f2c2b89a93f3224eb71ca032a89f852e62a7034a20c1dd0c3646b3a367229ab412e16fa48adb596e36c01bd0b54bd8bbe27
-  data.tar.gz: 13b2cabb3a75f5a9221ebf3aedfd756e189ec8888a689e63325f29c46d2cb7658639b78f8e8e9ac190e5e2c63aba1c90679d0ffd7febb6d7d9d1acbdd6d0a743
+  metadata.gz: b7774298d16984bbc1fdbe0a2104956dc51a1369ad8e6a79272cbd41a33534ba69fdea76a079630eb7fd3a1c967d49d51291e088dffd473c6ccc08d63251e612
+  data.tar.gz: 9e04069a767bc6a4f18c50493e8649cb0856488257bdc791679f26fffe2127eed4ecd92a699a69a8a060fc77f3551758d18586a6e234293fa1de591f1e2f2f4a

data/.rubocop.yml

@@ -0,0 +1,23 @@
+LineLength:
+  Enabled: false
+
+MethodLength:
+  Enabled: true
+  CountComments: false
+  Max: 50
+
+ClassAndModuleChildren:
+  EnforcedStyle: compact
+  SupportedStyles:
+    - nested
+    - compact
+
+CyclomaticComplexity:
+  Max: 10
+
+ClassLength:
+  CountComments: false
+  Max: 150
+
+GlobalVars:
+  AllowedVariables: [$log]

data/README.md

@@ -1,4 +1,4 @@
-# fluent-plugin-mobile-carrier
+# fluent-plugin-mobile-carrier, a plugin for [Fluentd](http://fluentd.org)
 
 ## MobileCarrierOutput
 

data/Rakefile

@@ -1,5 +1,5 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -8,4 +8,4 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-task :default => :test
+task default: :test

data/fluent-plugin-mobile-carrier.gemspec

@@ -1,18 +1,19 @@
 # -*- encoding: utf-8 -*-
+require 'English'
 
 Gem::Specification.new do |gem|
   gem.name          = 'fluent-plugin-mobile-carrier'
-  gem.version       = '0.0.3'
+  gem.version       = '0.0.4'
   gem.authors       = ['HARUYAMA Seigo']
   gem.email         = ['haruyama@unixuser.org']
-  gem.description   = %q{judge mobile carrier by ip address.}
-  gem.summary       = %q{Fluentd plugin to judge mobile carrier by ip address.}
+  gem.description   = %q(judge mobile carrier by ip address.)
+  gem.summary       = %q(Fluentd plugin to judge mobile carrier by ip address.)
   gem.homepage      = 'http://github.com/haruyama/fluent-plugin-mobile-carrier'
   gem.license       = 'APLv2'
 
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
+  gem.executables   = gem.files.grep(/^bin\//).map { |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(/^(test|spec|features)\//)
   gem.require_paths = ['lib']
 
   gem.add_development_dependency 'rake'

data/lib/fluent/plugin/out_mobile_carrier.rb

@@ -18,7 +18,7 @@ class Fluent::MobileCarrierOutput < Fluent::Output
   def configure(conf)
     super
     config =  YAML.load_file(@config_yaml)
-    raise 'invalid yaml' unless (config.is_a? Hash)
+    fail 'invalid yaml' unless config.is_a? Hash
     @config = parse_config(config)
 
     if !@tag && !@remove_prefix && !@add_prefix
@@ -55,20 +55,20 @@ class Fluent::MobileCarrierOutput < Fluent::Output
 
   def parse_config(raw_config)
     config = {}
-    raw_config.each { |carrier, ip_address_list|
-      config[carrier] = ip_address_list.map { |ip_address|
+    raw_config.each do |carrier, ip_address_list|
+      config[carrier] = ip_address_list.map do |ip_address|
         TubeAddress.new(ip_address)
-      }
-    }
+      end
+    end
     config
   end
 
   def judge_mobile_carrier(ip_address, config)
-    config.each { |carrier, ipaddr_list|
+    config.each do |carrier, ipaddr_list|
       if ipaddr_list.any? { |ipaddr| ipaddr.include? ip_address }
         return carrier
       end
-    }
+    end
     @unknown_carrier
   end
 
@@ -86,10 +86,10 @@ end
 
 # https://github.com/jordansissel/experiments/blob/master/ruby/ipaddr-is-slow/code.rb
 class TubeAddress
-  IPv4MASK = 0xFFFFFFFF # 255.255.255.255
+  IPV4MASK = 0xFFFFFFFF # 255.255.255.255
 
   def initialize(addr)
-    @address, cidr, _ = addr.split("/") + ["32"]
+    @address, cidr, _ = addr.split('/') + ['32']
 
     @address_int = self.class.ip_to_num(@address)
     @cidr = cidr.to_i
@@ -98,7 +98,7 @@ class TubeAddress
 
   def cidr_mask
     # Convert /24 to 0xffffff00, etc
-    @cidr_mask ||= IPv4MASK ^ ((1 << (32 - @cidr)) - 1)
+    @cidr_mask ||= IPV4MASK ^ ((1 << (32 - @cidr)) - 1)
   end
 
   def include?(addr)
@@ -107,11 +107,10 @@ class TubeAddress
   end
 
   def self.ip_to_num(addr)
-    return addr.split(".").reduce(0) { |s,c| s = (s << 8) + (c.to_i) }
+    addr.split('.').reduce(0) { |a, e| (a << 8) + (e.to_i) }
   end
 
   def to_s
-    return "#{@address}/#{@cidr}"
+    "#{@address}/#{@cidr}"
   end
 end
-

data/test/plugin/test_out_mobile_carrier.rb

@@ -3,15 +3,15 @@ require 'helper'
 # MobileCarrierOutput test
 class Fluent::MobileCarrierOutputTest < Test::Unit::TestCase
   # through & merge
-  CONFIG1 = %[
+  CONFIG1 = %(
 type mobile_carrier
 remove_prefix test
 add_prefix merged
 config_yaml test/data/config1.yaml
 key_name ip_address
-]
+  )
 
-  CONFIG2 = %[
+  CONFIG2 = %(
 type mobile_carrier
 remove_prefix test
 add_prefix merged
@@ -19,30 +19,30 @@ config_yaml test/data/config1.yaml
 key_name ip
 unknown_carrier unknown
 out_key_mobile_carrier mc
-]
+  )
 
-  CONFIG_ERROR1 = %[
+  CONFIG_ERROR1 = %(
 type mobile_carrier
 remove_prefix test
 add_prefix merged
 key_name ip_address
-]
+  )
 
-  CONFIG_ERROR2 = %[
+  CONFIG_ERROR2 = %(
 type mobile_carrier
 remove_prefix test
 add_prefix merged
 key_name ip_address
 config_yaml test/data/not_found.yaml
-]
+  )
 
-  CONFIG_ERROR3 = %[
+  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')
     Fluent::Test::OutputTestDriver.new(Fluent::MobileCarrierOutput, tag).configure(conf)
@@ -129,5 +129,4 @@ config_yaml test/data/wrong.yaml
     assert_equal 5,         m['value']
     assert_equal 'UNKNOWN', m['mobile_carrier']
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mobile-carrier
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - HARUYAMA Seigo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -46,18 +46,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - fluent-plugin-mobile-carrier.gemspec
-- 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
 homepage: http://github.com/haruyama/fluent-plugin-mobile-carrier
 licenses:
@@ -79,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to judge mobile carrier by ip address.
@@ -87,5 +86,4 @@ test_files:
 - test/data/config1.yaml
 - test/data/wrong.yaml
 - test/helper.rb
-- test/plugin/.rubocop.yml
 - test/plugin/test_out_mobile_carrier.rb

data/lib/fluent/plugin/.rubocop.yml

@@ -1,12 +0,0 @@
-LineLength:
-  Enabled: false
-
-CyclomaticComplexity:
-  Enabled: false
-
-MethodLength:
-  CountComments: false # count full line comments?
-  Max: 50
-
-GlobalVars:
-  Enabled: false

data/test/plugin/.rubocop.yml

@@ -1,25 +0,0 @@
-LineLength:
-  Enabled: false
-
-MethodLength:
-  Enabled: true
-  CountComments: false # count full line comments?
-  Max: 50
-
-FavorSprintf:
-  Enabled: false
-
-MultilineBlocks:
-  Enabled: false
-
-AvoidPerlBackrefs:
-  Enabled: false
-
-PercentLiterals:
-  Enabled: false
-
-BraceAfterPercent:
-  Enabled: false
-
-ClassLength:
-  Enabled: false