embulk-input-rediskeys 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5527062cdeec1dd043b1575d971b5b963d05d9bb
-  data.tar.gz: f9d04b386626c6441a0e7627133f4e3f9cee9fc4
+  metadata.gz: 41601c5fa9eda35e65873002cad2872a1aecc8ad
+  data.tar.gz: d787b379178986f2757693681e53f58d12f1ca18
 SHA512:
-  metadata.gz: 1119f58adbff986d095542f4f5fa9006021783de02a0abb719f348446bc13f3450ee83f810b6a79be9c14dc500edc5b31eadc6bc52de5831ee3d6ccd01f24a0d
-  data.tar.gz: ea95c97378cd2366fb4535e2b275ceb14b5506b960c2663af1b35e1d91b47c97471775a33e56724fe7a18e3fab8f3dfffbb9bdba304072ae95bac5021772c004
+  metadata.gz: 856d69a4322eb58a5ffe4857e7a44310f6a43f68801cdc89492ef1a163366523933322c2ea22a1dd0687f7a08f55ef96bffc7fdd96b04c526d322e8a3eef282d
+  data.tar.gz: 5e7e0f25da7d293ef9b706f9d7ad15b9af385b0aa1719444eca2cea85b5d4d5676e3a83bfdff31962c28f6a9de9a129903b3bb1ea4033d359f56977a23562b74

data/.ruby-version

@@ -1 +1 @@
-jruby-9.0.4.0
+jruby-9.1.2.0

data/Gemfile

@@ -1,2 +1,3 @@
 source 'https://rubygems.org/'
+gem 'embulk', '~> 0.8.0'
 gemspec

data/README.md

@@ -9,11 +9,19 @@
 
 ## Configuration
 
-- host: Redis hostname (string, default:localhost).
+- key_prefix: Prefix of column name to read (string, required).
+- host: Redis hostname (string, default: localhost).
 - port: Redis port number (int, default: 6379).
 - db: Number of Redis DB to dump columns (int, default: 0).
-- key_prefix: Prefix of column name to read (string, required).
-- encode: Type of eoncoding of data to read (string, default:json).
+- match_key_as_key: Use matche key for key (bool, default: true).
+- encode: Type of eoncoding of data to read (string, default: json).
+- colmuns: List of column name. Set match_key_as_key true, must be required(list, default: null).
+
+Supported encode type are:
+
+- json
+- list
+- hash
 
 ## Example
 

data/embulk-input-rediskeys.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-input-rediskeys"
-  spec.version       = "0.1.0"
+  spec.version       = "0.2.0"
   spec.authors       = ["dokuma"]
   spec.summary       = "Redis input plugin for Embulk"
   spec.description   = "Loads records from Redis."
@@ -13,8 +13,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'redis', ['>= 3.0.5']
-  spec.add_development_dependency 'embulk', ['>= 0.8.9']
-  spec.add_development_dependency 'bundler', ['>= 1.10.6']
-  spec.add_development_dependency 'rake', ['>= 10.0']
+  spec.add_dependency 'redis', ['~> 3.0']
+  spec.add_development_dependency 'embulk', ['~> 0.8']
+  spec.add_development_dependency 'bundler', ['~> 1.10']
+  spec.add_development_dependency 'rake', ['~> 10.0']
 end

data/lib/embulk/input/rediskeys.rb

@@ -14,6 +14,7 @@ module Embulk
           'port' => config.param('port', :integer, :default => 6379),
           'db' => config.param('db', :integer, :default => 0),
           'key_prefix' => config.param('key_prefix', :string, :default => ''),
+          'match_key_as_key' => config.param('match_key_as_key', :bool, :default => true),
           'encode' => config.param('encode', :string, :default => 'json')
         }
         
@@ -104,12 +105,14 @@ module Embulk
         end
       end
 
-      def run
+      def match_key_as_key
         records = []
         @redis.keys("#{@task['key_prefix']}*").each do |k|
           case @task['encode']
           when 'json'
             v = @redis.get(k)
+          when 'list'
+            v = @redis.lrange(k, 0, -1)
           when 'hash'
             v = @redis.hgetall(k).to_json
           end
@@ -119,6 +122,38 @@ module Embulk
           @rows += 1
         end
         @page_builder.add(records)
+      end
+
+      def expect_value_is_json
+        @redis.keys("#{@task['key_prefix']}*").each do |k|
+          case @task['encode']
+          when 'json'
+	    @page_builder.add(JSON.parse(@redis.get(k)).each_with_object({}) {|(key, value), new_hash|
+	      new_hash[key] = deserialize_element(key, value)
+	    }.values)
+            @rows += 1
+          when 'list'
+            @redis.lrange(k, 0, -1).each do |r|
+	      @page_builder.add(JSON.parse(r).each_with_object({}) {|(key, value), new_hash|
+		new_hash[key] = deserialize_element(key, value)
+	      }.values)
+              @rows += 1
+            end
+          when 'hash'
+	    @page_builder.add(JSON.parse(@redis.hgetall(k).to_json).each_with_object({}) {|(key, value), new_hash|
+	      new_hash[key] = deserialize_element(key, value)
+	    }.values)
+            @rows += 1
+          end
+        end
+      end
+
+      def run
+	if @task['match_key_as_key'] then
+	  match_key_as_key()
+	else
+	  expect_value_is_json()
+	end
         @page_builder.finish  # don't forget to call finish :-)
 
         task_report = {

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-rediskeys
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - dokuma
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-29 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.5
-  type: :runtime
+        version: '3.0'
+  name: redis
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: embulk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.9
-  type: :development
+        version: '0.8'
+  name: embulk
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.9
+        version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.6
-  type: :development
+        version: '1.10'
+  name: bundler
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.6
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Loads records from Redis.
@@ -85,7 +85,7 @@ homepage: https://github.com/dokuma/embulk-input-rediskeys
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -100,9 +100,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.4
+signing_key:
 specification_version: 4
 summary: Redis input plugin for Embulk
 test_files: []