grn2drn 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cec040fac46b1813f053d9feaf6abeef343cd7f
-  data.tar.gz: 36bfefe700a463b35150c50e57c6be01fbc10a8a
+  metadata.gz: 3e60d608aada1e0b439f28ec7a5b7628365c09b0
+  data.tar.gz: 2c66b85496f571eb94437b76408f2921c4b9452a
 SHA512:
-  metadata.gz: bbb67f5ba1273361e2d7e49ff47586196689ec0c983eaafab82b3cde6e6774fefb634e3e253ae31c1ff049defbbb8975530d5191ff1e81d254a9ec90496fc68c
-  data.tar.gz: 50f5531f959060b404f0ce406d6b3801397596f267bc0b499c877583292301624981cbb13431d36f7665db551f13e95c4d93dae6a38643c2dc88bb723387b9a8
+  metadata.gz: afd6e187ba5588f78dc3348fde7013434fdb4cc26cba905ae543bb408c0aa72cd9f074a7b6077331a79a9aba3d74b8395146c83d7e5d6ce5f558bb78b0d5e9f4
+  data.tar.gz: 35eafde72a0833c6b71e54caa4155183da57eff182c6881a91bb204b8f14da1c76588a1b3ba7deb224a5a4fc83f3f2391024fd6e717b98b57f4cb82681735597

data/lib/grn2drn/command-converter.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013-2014 Droonga Project
+# Copyright (C) 2013-2015 Droonga Project
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -32,15 +32,8 @@ module Grn2Drn
 
     def convert(input, &block)
       @command_parser.on_command do |command|
-        case command.name
-        when "table_create"
-          yield create_table_create_command(command)
-        when "table_remove"
-          yield create_table_remove_command(command)
-        when "column_create"
-          yield create_column_create_command(command)
-        when "select"
-          yield create_select_command(command)
+        unless command.name == "load"
+          yield create_message(command.name, command_to_body(command))
         end
       end
 
@@ -69,14 +62,15 @@ module Grn2Drn
         @count += 1
       end
 
-      {
+      message = {
         "id" => id,
         "date" => format_date(@options[:date] || Time.now),
-        "replyTo" => @options[:reply_to],
         "dataset" => @options[:dataset],
         "type" => type,
         "body" => body,
       }
+      message["replyTo"] = @options[:reply_to] if @options[:reply_to]
+      message
     end
 
     def new_unique_id
@@ -86,8 +80,10 @@ module Grn2Drn
       Digest::SHA1.hexdigest("#{now_msec}:#{random_string}")
     end
 
+    MICRO_SECONDS_DECIMAL_PLACE = 6
+
     def format_date(time)
-      time.iso8601
+      time.utc.iso8601(MICRO_SECONDS_DECIMAL_PLACE)
     end
 
     def stringify_keys(hash)
@@ -102,18 +98,6 @@ module Grn2Drn
       stringify_keys(command.arguments)
     end
 
-    def create_table_create_command(command)
-      create_message("table_create", command_to_body(command))
-    end
-
-    def create_table_remove_command(command)
-      create_message("table_remove", command_to_body(command))
-    end
-
-    def create_column_create_command(command)
-      create_message("column_create", command_to_body(command))
-    end
-
     def create_add_command(command, columns, record)
       table = command[:table]
       body = {
@@ -139,9 +123,5 @@ module Grn2Drn
 
       create_message("add", body)
     end
-
-    def create_select_command(command)
-      create_message("select", command_to_body(command))
-    end
   end
 end

data/lib/grn2drn/version.rb

@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Grn2Drn
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: grn2drn
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Droonga Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: groonga-command-parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: packnga
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: ''
@@ -137,12 +137,12 @@ 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: []
@@ -152,3 +152,4 @@ signing_key:
 specification_version: 4
 summary: Grn2drn is a command to convert a *.grn dump file to a JSONs file for Droonga.
 test_files: []
+has_rdoc: