RubyGems - embulk - Versions diffs - 0.8.22-java → 0.8.23-java - Mend

embulk 0.8.22-java → 0.8.23-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (23) hide show

data/embulk-docs/src/built-in.rst CHANGED

@@ -949,7 +949,7 @@ Example
       ...
 Preview executor
----------------
+----------------
 The preview executor is called by ``preview`` command. It tries to read sample buffer from a specified input source and writes them to Page objects. ``preview`` outputs the Page objects to console.

data/embulk-docs/src/index.rst CHANGED

@@ -6,7 +6,7 @@
 Embulk
 ==================================
-.. image:: _static/embulk-logo.png
+.. image:: _static/embulk-logo-v2/embulk-logo-v2-sq-tr-small.png
    :width: 512px
    :target: https://github.com/embulk/embulk
@@ -75,6 +75,8 @@ Documents
    release
+   logo
 For developers
 ---------------

data/embulk-docs/src/logo.rst ADDED

@@ -0,0 +1,27 @@
+Logo
+===========================
+Feel free to use these logos on your slides, blog posts, etc!
+Square
+------------------
+.. image:: _static/embulk-logo-v2/embulk-logo-v2-sq-tr.png
+   :scale: 30 %
+Horizontal
+------------------
+.. image:: _static/embulk-logo-v2/embulk-logo-v2-oneline-tr.png
+   :scale: 30 %
+Icon
+------------------
+.. image:: _static/embulk-logo-v2/embulk-logo-v2-symbol-tr.png
+   :scale: 30 %
+Links
+------------------
+* `Full list of files <https://github.com/embulk/embulk/tree/master/embulk-docs/src/_static/embulk-logo-v2/>`_

data/embulk-docs/src/release.rst CHANGED

@@ -4,6 +4,7 @@ Release Notes
 .. toctree::
     :maxdepth: 1
+    release/release-0.8.23
     release/release-0.8.22
     release/release-0.8.21
     release/release-0.8.20
@@ -90,4 +91,3 @@ Release Notes
     release/release-0.2.1
     release/release-0.2.0
     release/release-0.1.0

data/embulk-docs/src/release/release-0.8.23.rst ADDED

@@ -0,0 +1,14 @@
+Release 0.8.23
+==================================
+General Changes
+------------------
+* PageReader#get{String,Timestamp,Json} calls #isNull to return null. [#654]
+* Ignore JsonParseException in JSON guess if JsonGuessPlugin could parse at least one JSON. [#659]
+* Ignore JsonParseException in JSON preview if at least one JSON is already parsed. [#661]
+Release Date
+------------------
+2017-06-06

data/embulk-standards/src/main/java/org/embulk/standards/JsonParserPlugin.java CHANGED

@@ -65,6 +65,7 @@ public class JsonParserPlugin
         try (PageBuilder pageBuilder = newPageBuilder(schema, output);
                 FileInputInputStream in = new FileInputInputStream(input)) {
             while (in.nextFile()) {
+                boolean evenOneJsonParsed = false;
                 try (JsonParser.Stream stream = newJsonStream(in)) {
                     Value value;
                     while ((value = stream.next()) != null) {
@@ -76,6 +77,7 @@ public class JsonParserPlugin
                             pageBuilder.setJson(column, value);
                             pageBuilder.addRecord();
+                            evenOneJsonParsed = true;
                         }
                         catch (JsonRecordValidateException e) {
                             if (stopOnInvalidRecord) {
@@ -86,6 +88,12 @@ public class JsonParserPlugin
                     }
                 }
                 catch (IOException | JsonParseException e) {
+                    if (Exec.isPreview() && evenOneJsonParsed) {
+			// JsonParseException occurs when it cannot parse the last part of sampling buffer. Because
+			// the last part is sometimes invalid as JSON data. Therefore JsonParseException can be
+			// ignore in preview if at least one JSON is already parsed.
+                        break;
+                    }
                     throw new DataException(e);
                 }
             }

data/lib/embulk/guess/json.rb CHANGED

@@ -16,14 +16,24 @@ module Embulk
         # Use org.embulk.spi.json.JsonParser to respond to multi-line Json
         json_parser = new_json_parser(sample_buffer)
+        one_json_parsed = false
         begin
-          while json_parser.next
+          while (v = json_parser.next)
+            # "v" needs to be JSON object type (isMapValue) because:
+            # 1) Single-column CSV can be mis-guessed as JSON if JSON non-objects are accepted.
+            # 2) JsonParserPlugin accepts only the JSON object type.
+            raise JsonParseException.new("v must be JSON object type") unless v.isMapValue
+            one_json_parsed = true
           end
         rescue JsonParseException
-          return {}
+          # the exception is ignored
         end
-        return {"parser" => {"type" => "json"}}
+        if one_json_parsed
+          return {"parser" => {"type" => "json"}} # if JsonParser can parse even one JSON data
+        else
+          return {}
+        end
       end
       private

data/lib/embulk/version.rb CHANGED

@@ -3,7 +3,7 @@
 module Embulk
   @@warned = false
-  VERSION_INTERNAL = '0.8.22'
+  VERSION_INTERNAL = '0.8.23'
   DEPRECATED_MESSAGE = 'Embulk::VERSION in (J)Ruby is deprecated. Use org.embulk.EmbulkVersion::VERSION instead. If this message is from a plugin, please tell this to the author of the plugin!'
   def self.const_missing(name)

metadata CHANGED

@@ -1,127 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: embulk
 version: !ruby/object:Gem::Version
-  version: 0.8.22
+  version: 0.8.23
 platform: java
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.10.6
-  name: bundler
-  prerelease: false
-  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.10.6
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
-  name: msgpack
-  prerelease: false
-  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.6
-  name: liquid
-  prerelease: false
-  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.6
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: rjack-icu
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.54.1.1
-  name: rjack-icu
-  prerelease: false
-  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.54.1.1
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
-  name: rake
-  prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.9
-  name: test-unit
-  prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.9
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.7
-  name: yard
-  prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.7
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
-  name: kramdown
-  prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
+  prerelease: false
+  type: :development
 description: Embulk is an open-source, plugin-based bulk data loader to scale and simplify data management across heterogeneous data stores. It can collect and ship any kinds of data in high throughput with transaction control.
 email:
 - frsyuki@gmail.com
@@ -150,9 +150,9 @@ files:
 - classpath/commons-compress-1.10.jar
 - classpath/commons-lang-2.4.jar
 - classpath/commons-lang3-3.4.jar
-- classpath/embulk-cli-0.8.22.jar
-- classpath/embulk-core-0.8.22.jar
-- classpath/embulk-standards-0.8.22.jar
+- classpath/embulk-cli-0.8.23.jar
+- classpath/embulk-core-0.8.23.jar
+- classpath/embulk-standards-0.8.23.jar
 - classpath/guava-18.0.jar
 - classpath/guice-4.0.jar
 - classpath/guice-bootstrap-0.1.1.jar
@@ -401,13 +401,24 @@ files:
 - embulk-docs/make.bat
 - embulk-docs/push-gh-pages.sh
 - embulk-docs/src/_static/embulk-architecture.png
-- embulk-docs/src/_static/embulk-logo.png
+- embulk-docs/src/_static/embulk-logo-v2/embulk-logo-v2-oneline-tr.png
+- embulk-docs/src/_static/embulk-logo-v2/embulk-logo-v2-oneline-wt.png
+- embulk-docs/src/_static/embulk-logo-v2/embulk-logo-v2-oneline.ai
+- embulk-docs/src/_static/embulk-logo-v2/embulk-logo-v2-sq-tr-small.png
+- embulk-docs/src/_static/embulk-logo-v2/embulk-logo-v2-sq-tr.png
+- embulk-docs/src/_static/embulk-logo-v2/embulk-logo-v2-sq-wt.png
+- embulk-docs/src/_static/embulk-logo-v2/embulk-logo-v2-sq.ai
+- embulk-docs/src/_static/embulk-logo-v2/embulk-logo-v2-sq.svg
+- embulk-docs/src/_static/embulk-logo-v2/embulk-logo-v2-symbol-tr.png
+- embulk-docs/src/_static/embulk-logo-v2/embulk-logo-v2-symbol-wt.png
+- embulk-docs/src/_static/embulk-logo-v2/embulk-logo-v2-symbol.ai
 - embulk-docs/src/_static/embulk-logo.svg
 - embulk-docs/src/built-in.rst
 - embulk-docs/src/conf.py
 - embulk-docs/src/customization.rst
 - embulk-docs/src/developers/index.rst
 - embulk-docs/src/index.rst
+- embulk-docs/src/logo.rst
 - embulk-docs/src/recipe.rst
 - embulk-docs/src/recipe/scheduled-csv-load-to-elasticsearch-kibana5.rst
 - embulk-docs/src/release.rst
@@ -490,6 +501,7 @@ files:
 - embulk-docs/src/release/release-0.8.20.rst
 - embulk-docs/src/release/release-0.8.21.rst
 - embulk-docs/src/release/release-0.8.22.rst
+- embulk-docs/src/release/release-0.8.23.rst
 - embulk-docs/src/release/release-0.8.3.rst
 - embulk-docs/src/release/release-0.8.4.rst
 - embulk-docs/src/release/release-0.8.5.rst