embulk-parser-regex 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5334bd1ab64c181d169a2eb53c1ae9c0888ee8a2
-  data.tar.gz: 03e5d5c3d3183d2ce0bd26cd9dfcf1383fb5a5b3
+  metadata.gz: 180e9d8ef6ff872d1aa840f937972ba228b2762c
+  data.tar.gz: 5ae14fb13a5ac890f8f4c7224cf14fbe660ddb22
 SHA512:
-  metadata.gz: 3271593ae11fba49ce1b5171342492249ddfdda1f50c1ad9ca0bed0046fbebdba64efb109cd386bae3d9f3dfb1c24d309fa07d5c32b4a0abdb580810a9f30a1b
-  data.tar.gz: ebb736e2051d8604e4ec21f9ddcce9aa449dd36e4ac1bf4ccce4a9376220078597a1a4802204213f3c5ede5c9971f39b16df6303c1f00df37f851c634108fcb3
+  metadata.gz: bf0f5d97601bd217bc28b955d1046456d9231c9cbf7614c82fe90dfe70fb43716ce09ab3762e0bf2737ffc9a1e6774e23086e7a61c2b5526afc284619df89a0d
+  data.tar.gz: 7e1a23835f82c112616998ce5c121ddac25299ac0d91afb934b6a5f8218b295a561a7842446b261a79a83dea9d267dca1d60f827e3a72e99675c824b4ee40a7d

data/.gitignore

@@ -6,3 +6,5 @@
 /classpath/
 build/
 .idea
+*.iml
+*.gem

data/README.md

@@ -11,7 +11,7 @@ A simple parser Using Regular Expression.
 
 - **regex**: regular expression that must use [Named Capturing Group](https://blogs.oracle.com/xuemingshen/entry/named_capturing_group_in_jdk7)  (string, required)
 - **columns**: column definition (list of object)
-  - **regexName**: 'Named Capturing Group' can only include `[a-zA-Z0-9]`, so alias group name in regex can be specified (string, default: `<name> attr value`)
+  - **regex_name**: 'Named Capturing Group' can only include `[a-zA-Z0-9]`, so alias group name in regex can be specified (string, default: `<name> attr value`)
 - **skip_if_unmatch**: if false, when a line don't match the regex, raise RuntimeException. If true, skip the line.  (boolean, default: `false`)
 
 ## Example
@@ -23,7 +23,7 @@ in:
     type: regex
     regex: ^(?<remoteHost>[.:0-9]+) (?<identity>\S+) (?<user>\S+) \[(?<datetime>[^\]]*)\] "((?<method>\S+) (?<path>\S+) (?<protocol>HTTP/\d+\.\d+)|-)" (?<status>[0-9]+) (?<size>[0-9]+|-) "(?<referer>[^"]*)" "(?<userAgent>[^"]*)" (?<inByte>[0-9]+) (?<outByte>[0-9]+)$
     columns:
-    - {name: remote_host, type: string, regexName: remoteHost}
+    - {name: remote_host, type: string, regex_name: remoteHost}
     - {name: identity, type: string}
     - {name: user, type: string}
     - {name: datetime, type: timestamp, format: '%d/%b/%Y:%H:%M:%S %z'}
@@ -33,9 +33,9 @@ in:
     - {name: status, type: long}
     - {name: size, type: long}
     - {name: referer, type: string}
-    - {name: user_agent, type: string, regexName: userAgent}
-    - {name: in_byte, type: long, regexName: inByte}
-    - {name: out_byte, type: long, regexName: outByte}
+    - {name: user_agent, type: string, regex_name: userAgent}
+    - {name: in_byte, type: long, regex_name: inByte}
+    - {name: out_byte, type: long, regex_name: outByte}
 ```
 
 ### Guess

data/build.gradle

@@ -13,7 +13,7 @@ configurations {
     provided
 }
 
-version = "0.1.0"
+version = "0.2.0"
 
 dependencies {
     compile  "org.embulk:embulk-core:0.7.4"

data/lib/embulk/guess/regex.rb

@@ -26,12 +26,12 @@ module Embulk
 
       def apache_x_forwarded_for
         RegexApacheLogGuesser.new
-          .ip_or_minus(:x_forwarded_for, regexName: 'forwardedFor')
+          .ip_or_minus(:x_forwarded_for, regex_name: 'forwardedFor')
       end
 
       def apache_common(config, sample_lines)
         RegexApacheLogGuesser.new
-          .ip(:remote_host, regexName: 'remoteHost').token(:identity).token(:user)
+          .ip(:remote_host, regex_name: 'remoteHost').token(:identity).token(:user)
           .kakko(:datetime, format: '%d/%b/%Y:%H:%M:%S %z', type: 'timestamp')
           .method_path_protocol
           .integer(:status).integer_or_minus(:size)
@@ -39,12 +39,12 @@ module Embulk
 
       def apache_combined(config, sample_lines)
         apache_common(config, sample_lines)
-          .string(:referer).string(:user_agent, regexName: 'userAgent')
+          .string(:referer).string(:user_agent, regex_name: 'userAgent')
       end
 
       def apache_combinedio(config, sample_lines)
         apache_combined(config, sample_lines)
-          .integer(:in_byte, regexName: 'inByte').integer(:out_byte, regexName: 'outByte')
+          .integer(:in_byte, regex_name: 'inByte').integer(:out_byte, regex_name: 'outByte')
       end
     end
 
@@ -82,49 +82,49 @@ module Embulk
       end
 
       def ip(name, opts={})
-        @patterns << "(?<#{opts[:regexName] || name}>[.:0-9]+)"
+        @patterns << "(?<#{opts[:regex_name] || name}>[.:0-9]+)"
         @columns << {:name => name, :type => 'string'}.merge(opts)
         self
       end
 
       def ip_or_minus(name, opts={})
-        @patterns << "(?<#{opts[:regexName] || name}>[.:0-9]+|-)"
+        @patterns << "(?<#{opts[:regex_name] || name}>[.:0-9]+|-)"
         @columns << {:name => name, :type => 'string'}.merge(opts)
         self
       end
 
       def token(name, opts={})
-        @patterns << "(?<#{opts[:regexName] || name}>\\S+)"
+        @patterns << "(?<#{opts[:regex_name] || name}>\\S+)"
         @columns << {:name => name, :type => 'string'}.merge(opts)
         self
       end
 
       def string(name, opts={})
-        @patterns << "\"(?<#{opts[:regexName] || name}>[^\"]*)\""
+        @patterns << "\"(?<#{opts[:regex_name] || name}>[^\"]*)\""
         @columns << {:name => name, :type => 'string'}.merge(opts)
         self
       end
 
       def string_or_minus(name, opts={})
-        @patterns << "\"(?<#{opts[:regexName] || name}>[^\"]*|-)\""
+        @patterns << "\"(?<#{opts[:regex_name] || name}>[^\"]*|-)\""
         @columns << {:name => name, :type => 'string'}.merge(opts)
         self
       end
 
       def integer(name, opts={})
-        @patterns << "(?<#{opts[:regexName] || name}>[0-9]+)"
+        @patterns << "(?<#{opts[:regex_name] || name}>[0-9]+)"
         @columns << {:name => name, :type => 'long'}.merge(opts)
         self
       end
 
       def integer_or_minus(name, opts={})
-        @patterns << "(?<#{opts[:regexName] || name}>[0-9]+|-)"
+        @patterns << "(?<#{opts[:regex_name] || name}>[0-9]+|-)"
         @columns << {:name => name, :type => 'long'}.merge(opts)
         self
       end
 
       def kakko(name, opts={})
-        @patterns << "\\[(?<#{opts[:regexName] || name}>[^\\]]*)\\]"
+        @patterns << "\\[(?<#{opts[:regex_name] || name}>[^\\]]*)\\]"
         @columns << {:name => name, :type => 'string'}.merge(opts)
         self
       end

data/sample/apache_1/config.yml

@@ -7,7 +7,7 @@ in:
     type: regex
     regex: ^(?<remoteHost>[.:0-9]+) (?<identity>\S+) (?<user>\S+) \[(?<datetime>[^\]]*)\] "((?<method>\S+) (?<path>\S+) (?<protocol>HTTP/\d+\.\d+)|-)" (?<status>[0-9]+) (?<size>[0-9]+|-) "(?<referer>[^"]*)" "(?<userAgent>[^"]*)" (?<inByte>[0-9]+) (?<outByte>[0-9]+)$
     columns:
-    - {name: remote_host, type: string, regexName: remoteHost}
+    - {name: remote_host, type: string, regex_name: remoteHost}
     - {name: identity, type: string}
     - {name: user, type: string}
     - {name: datetime, type: timestamp, format: '%d/%b/%Y:%H:%M:%S %z'}
@@ -17,7 +17,7 @@ in:
     - {name: status, type: long}
     - {name: size, type: long}
     - {name: referer, type: string}
-    - {name: user_agent, type: string, regexName: userAgent}
-    - {name: in_byte, type: long, regexName: inByte}
-    - {name: out_byte, type: long, regexName: outByte}
+    - {name: user_agent, type: string, regex_name: userAgent}
+    - {name: in_byte, type: long, regex_name: inByte}
+    - {name: out_byte, type: long, regex_name: outByte}
 out: {type: stdout}

data/sample/apache_2/config.yml

@@ -7,8 +7,8 @@ in:
     type: regex
     regex: ^(?<forwardedFor>[.:0-9]+|-) (?<remoteHost>[.:0-9]+) (?<identity>\S+) (?<user>\S+) \[(?<datetime>[^\]]*)\] "((?<method>\S+) (?<path>\S+) (?<protocol>HTTP/\d+\.\d+)|-)" (?<status>[0-9]+) (?<size>[0-9]+|-) "(?<referer>[^"]*)" "(?<userAgent>[^"]*)"$
     columns:
-    - {name: x_forwarded_for, type: string, regexName: forwardedFor}
-    - {name: remote_host, type: string, regexName: remoteHost}
+    - {name: x_forwarded_for, type: string, regex_name: forwardedFor}
+    - {name: remote_host, type: string, regex_name: remoteHost}
     - {name: identity, type: string}
     - {name: user, type: string}
     - {name: datetime, type: timestamp, format: '%d/%b/%Y:%H:%M:%S %z'}
@@ -18,5 +18,5 @@ in:
     - {name: status, type: long}
     - {name: size, type: long}
     - {name: referer, type: string}
-    - {name: user_agent, type: string, regexName: userAgent}
+    - {name: user_agent, type: string, regex_name: userAgent}
 out: {type: stdout}

data/src/main/java/org/embulk/parser/regex/RegexParserPlugin.java

@@ -70,7 +70,7 @@ public class RegexParserPlugin implements ParserPlugin {
                         // TODO: How to Log?
                         continue;
                     } else {
-                        throw new RuntimeException("Unmatched Line: " + line);
+                        throw new DataException("Unmatched Line: " + line);
                     }
                 }
 
@@ -100,7 +100,7 @@ public class RegexParserPlugin implements ParserPlugin {
             String name = c.getName();
             Type type = c.getType();
             Column column = c.toColumn(index);
-            String regexName = c.getOption().get(String.class, "regexName", name);
+            String regexName = c.getOption().get(String.class, "regex_name", name);
 
             DefaultValueSetter defaultValue = new NullDefaultValueSetter();
             DynamicColumnSetter setter;

metadata

@@ -1,57 +1,54 @@
 --- !ruby/object:Gem::Specification
 name: embulk-parser-regex
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ken Morishita
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2015-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
-description: Parses lines using regular-expression in files read by other file input
-  plugins.
+  prerelease: false
+  type: :development
+description: Parses lines using regular-expression in files read by other file input plugins.
 email:
 - mokemokechicken@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - LICENSE.txt
 - README.md
 - build.gradle
-- classpath/embulk-parser-regex-0.1.0.jar
-- embulk-parser-regex.iml
 - gradle/wrapper/gradle-wrapper.jar
 - gradle/wrapper/gradle-wrapper.properties
 - gradlew
@@ -68,28 +65,29 @@ files:
 - sample/simple/data_simple_1.txt
 - src/main/java/org/embulk/parser/regex/RegexParserPlugin.java
 - src/test/java/org/embulk/parser/regex/TestRegexParserPlugin.java
+- classpath/embulk-parser-regex-0.2.0.jar
 homepage: https://github.com/mokemokechicken/embulk-parser-regex
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
 summary: Regex parser plugin for Embulk
 test_files: []

data/embulk-parser-regex.iml

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="embulk-parser-regex" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.1.0" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: org.embulk:embulk-core:0.7.4" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.inject:guice:4.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.inject.extensions:guice-multibindings:4.0" level="project" />
-    <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-annotations:2.5.3" level="project" />
-    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.3" level="project" />
-    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-databind:2.5.3" level="project" />
-    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.datatype:jackson-datatype-guava:2.5.3" level="project" />
-    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.5.3" level="project" />
-    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.module:jackson-module-guice:2.5.3" level="project" />
-    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.12" level="project" />
-    <orderEntry type="library" name="Gradle: org.jruby:jruby-complete:9.0.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.findbugs:annotations:3.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.yaml:snakeyaml:1.14" level="project" />
-    <orderEntry type="library" name="Gradle: javax.validation:validation-api:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.bval:bval-jsr303:0.5" level="project" />
-    <orderEntry type="library" name="Gradle: io.airlift:slice:0.9" level="project" />
-    <orderEntry type="library" name="Gradle: joda-time:joda-time:2.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.netty:netty-buffer:5.0.0.Alpha1" level="project" />
-    <orderEntry type="library" name="Gradle: org.fusesource.jansi:jansi:1.11" level="project" />
-    <orderEntry type="library" name="Gradle: com.ibm.icu:icu4j:54.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: aopalliance:aopalliance:1.0" level="project" />
-    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.bval:bval-core:0.5" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.netty:netty-common:5.0.0.Alpha1" level="project" />
-    <orderEntry type="library" name="Gradle: commons-beanutils:commons-beanutils-core:1.8.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-  </component>
-</module>