embulk-filter-woothee 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e0f77ef080cf37f82f2b5e3da9fd99965d4e375
-  data.tar.gz: 86e16cbeedce578f3703c20cac9b4db7558410e1
+  metadata.gz: 29b01b60845eb6e721d785cf6e3f7ba92e8417bf
+  data.tar.gz: bbfc3a3bc6f53d60229bbcbe81e95806938a0198
 SHA512:
-  metadata.gz: b6af3deadae077225e9f44519653041293e947572612f5322e847d7297c94a890a0ae4a8d0a7037b64883d8fb58e6c722dde7a521502dd40f2c62d9373c90bdc
-  data.tar.gz: 50319ad8b1ed1ea352a5a7091f6d5457642fb1c374d7fda0e633992eeabc333975ea620ee0d3d5c0085023d9967fcb98bad6de28520cdc23c16b63e3e0498888
+  metadata.gz: 98ede3ff4cf315d83298117354d6ae000565abf5720de0ddaf14546988ba8bf8900fdfe62c45dd77f8112152fc01c5f8c0833a55b90b14e98acfd7f5897cf83e
+  data.tar.gz: 8e450339dfa94cf18e80c33e50b963a15484526b7ce09c0f1d8aa2d41d624401ff52b7d651707deb0acb065679eb7268057b31f08e3bcd3f3dd76b44bcfcab6a

data/build.gradle

@@ -13,14 +13,14 @@ configurations {
     provided
 }
 
-version = "0.2.2"
+version = "0.2.3"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
 dependencies {
-    compile  "org.embulk:embulk-core:0.7.1"
-    provided "org.embulk:embulk-core:0.7.1"
+    compile  "org.embulk:embulk-core:0.7.5"
+    provided "org.embulk:embulk-core:0.7.5"
     compile 'is.tagomor.woothee:woothee-java:1.2.0'
     testCompile "junit:junit:4.+"
 }

data/src/main/java/org/embulk/filter/WootheeFilterPlugin.java

@@ -108,39 +108,37 @@ public class WootheeFilterPlugin implements FilterPlugin
         
         return new PageOutput() {
             private PageReader reader = new PageReader(inputSchema);
+            private PageBuilder builder = new PageBuilder(Exec.getBufferAllocator(), outputSchema, output);
 
             @Override
             public void finish() {
-                output.finish();
+                builder.finish();
             }
             
             @Override
             public void close() {
-                output.close();
+                builder.close();
             }
             
             @Override
             public void add(Page page) {
                 reader.setPage(page);
 
-                try (final PageBuilder builder = new PageBuilder(Exec.getBufferAllocator(), outputSchema, output)) {
-                    while (reader.nextRecord()) {
-                        String userAgentString = reader.isNull(keyNameColumn) ? null : reader.getString(keyNameColumn);
-                        Map<String, String> ua = Classifier.parse(userAgentString);
-                        setValue(builder, ua);
-                        if (task.getFilterCategories().isPresent()) {
-                            if (task.getFilterCategories().orNull().contains(ua.get("category"))) {
-                                builder.addRecord();
-                            }
-                        } else if (task.getDropCategories().isPresent()) {
-                            if (!task.getDropCategories().orNull().contains(ua.get("category"))) {
-                                builder.addRecord();
-                            }
-                        } else {
+                while (reader.nextRecord()) {
+                    String userAgentString = reader.isNull(keyNameColumn) ? null : reader.getString(keyNameColumn);
+                    Map<String, String> ua = Classifier.parse(userAgentString);
+                    setValue(builder, ua);
+                    if (task.getFilterCategories().isPresent()) {
+                        if (task.getFilterCategories().orNull().contains(ua.get("category"))) {
                             builder.addRecord();
                         }
+                    } else if (task.getDropCategories().isPresent()) {
+                        if (!task.getDropCategories().orNull().contains(ua.get("category"))) {
+                            builder.addRecord();
+                        }
+                    } else {
+                        builder.addRecord();
                     }
-                    builder.finish();
                 }
             }
 

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-woothee
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - toyama0919
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: bundler
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-  name: bundler
-  prerelease: false
-  type: :development
-  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
-  requirement: !ruby/object:Gem::Requirement
+  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '10.0'
-  name: rake
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '10.0'
+  prerelease: false
+  type: :development
 description: Woothee filter plugin for Embulk
 email:
 - toyama0919@gmail.com
@@ -57,7 +57,7 @@ files:
 - lib/embulk/filter/woothee.rb
 - src/main/java/org/embulk/filter/WootheeFilterPlugin.java
 - src/test/java/org/embulk/filter/TestWootheeFilterPlugin.java
-- classpath/embulk-filter-woothee-0.2.2.jar
+- classpath/embulk-filter-woothee-0.2.3.jar
 - classpath/woothee-java-1.2.0.jar
 homepage: https://github.com/toyama0919/embulk-filter-woothee
 licenses: