embulk-parser-apache-custom-log 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e9175fc76d713c5e0cb3d94e76abfd1d5907381
-  data.tar.gz: b0b200ead1ca5153054ac23656bdef3257ef9ba9
+  metadata.gz: a611119f28f26ce8cb808909a503f932618d76e0
+  data.tar.gz: 41e5e19f807610e043852f777959f3befaaf9033
 SHA512:
-  metadata.gz: 9d31ad44accc1e444a1b27d5d0cb26e62c09d859ae1d25ab0fbcbabf1187810967ee22bc09347f1f0058e5172f4d942d46bf036bf4afdc726e920d30bb26f2a9
-  data.tar.gz: a8c7663f5b7084dfcc721b9b09ddb25e7a8f6365fe0db77536182dd9c914fe0028dc2efa27b9c36ed07d76aac6a7ec4430b1526807bfde2fc7c561225e24635f
+  metadata.gz: 23e9ce19522d43e95712997bd31cefe42c34296d5e7291281e36c147c1b70e01e84fc6ef23feb769789d23be79e423bf04505f6ed8b2eec3151517c129f29ed8
+  data.tar.gz: cc7fb0fb0be418b8ac5462f2309471e2646f19d08f1e01a1715f63c51e9872510d4b97d7bffd013459c51f09106a44e93e7de73e0133c089aa216d157190cf60

data/.gitignore

@@ -8,3 +8,4 @@ build/
 .idea
 /*.gem
 /*.iml
+/out/

data/build.gradle

@@ -12,7 +12,7 @@ configurations {
     provided
 }
 
-version = "0.4.0"
+version = "0.4.1"
 
 dependencies {
     compile  "org.embulk:embulk-core:0.7.4"
@@ -20,6 +20,7 @@ dependencies {
     // compile "YOUR_JAR_DEPENDENCY_GROUP:YOUR_JAR_DEPENDENCY_MODULE:YOUR_JAR_DEPENDENCY_VERSION"
     testCompile "junit:junit:4.+"
     testCompile "org.embulk:embulk-standards:0.7.4"
+    testCompile "org.embulk:embulk-core:0.7.4:tests"
 }
 
 task classpath(type: Copy, dependsOn: ["jar"]) {

data/src/main/java/org/embulk/parser/apache/log/TimestampLogElement.java

@@ -1,5 +1,8 @@
 package org.embulk.parser.apache.log;
 
+import org.embulk.config.ConfigSource;
+import org.embulk.config.Task;
+import org.embulk.spi.Exec;
 import org.embulk.spi.PageBuilder;
 import org.embulk.spi.time.Timestamp;
 import org.embulk.spi.time.TimestampParser;
@@ -16,9 +19,19 @@ public class TimestampLogElement extends LogElement<Timestamp> {
         this(task, name, regex, "%d/%b/%Y:%T %z");
     }
 
+    private static interface ParserIntlTask extends Task, TimestampParser.Task {}
+    private static interface ParserIntlColumnOption extends Task, TimestampParser.TimestampColumnOption {}
+
     public TimestampLogElement(TimestampParser.Task task, String name, String regex, String pattern) {
         super(name, regex, TIMESTAMP);
-        this.parser = new TimestampParser(task.getJRuby(), pattern, task.getDefaultTimeZone());
+        // TODO: Switch to a newer TimestampParser constructor after a reasonable interval.
+        // Traditional constructor is used here for compatibility.
+        final ConfigSource configSource = Exec.newConfigSource();
+        configSource.set("format", pattern);
+        configSource.set("timezone", task.getDefaultTimeZone());
+        this.parser = new TimestampParser(
+            Exec.newConfigSource().loadConfig(ParserIntlTask.class),
+            configSource.loadConfig(ParserIntlColumnOption.class));
     }
 
     @Override

data/src/test/java/org/embulk/parser/apache/log/LogFormatsTest.java

@@ -1,14 +1,20 @@
 package org.embulk.parser.apache.log;
 
-import junit.framework.TestCase;
+import org.embulk.EmbulkTestRuntime;
 import org.embulk.spi.time.TimestampParser;
 import org.joda.time.DateTimeZone;
 import org.jruby.embed.ScriptingContainer;
+import org.junit.Rule;
+import org.junit.Test;
 
 import java.util.regex.Pattern;
 
-public class LogFormatsTest extends TestCase {
+public class LogFormatsTest {
 
+    @Rule
+    public EmbulkTestRuntime runtime = new EmbulkTestRuntime();
+
+    @Test
     public void testLogFormat2Regexp() throws Exception {
 
         String format = "%!100<v %!100,200<v %100,200,300>v %!100,200,300>{hogeHoge}v %v %{X-Forwarded-For}i %t %{%D}t %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O %D";
@@ -36,4 +42,4 @@ public class LogFormatsTest extends TestCase {
 
 
     }
-}
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-parser-apache-custom-log
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Hiroyuki Sato
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2017-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -91,7 +91,7 @@ files:
 - src/test/resources/yml/test_combined2.yml
 - src/test/resources/yml/test_common.yml
 - src/test/resources/yml/test_custom_time_format.yml
-- classpath/embulk-parser-apache-custom-log-0.4.0.jar
+- classpath/embulk-parser-apache-custom-log-0.4.1.jar
 homepage: https://github.com/jami-i/embulk-parser-apache-custom-log
 licenses:
 - MIT