embulk-input-redash 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 31d63e2c6b7fe8d3c5617b2533324d8be7f0bae1
-  data.tar.gz: a3da768233f4b5e93ce4178aacf3b115ab988c8d
+SHA256:
+  metadata.gz: ba9e913a42edcbc1693228e3394ea4d9e570ffb1992cecd293665b9b356e8ea1
+  data.tar.gz: 6fd28276e141cf81c7ad44de18d0f61a7590a89f262a7df476891ea94c5ea667
 SHA512:
-  metadata.gz: c54efef3dc804c4ee335d164a7711eb1c61c61573ae27a2f28c62fcea0960a8cc0de7d96170563adde1796cad3e2b75402a1bc31471fe3b14276e226d73d0132
-  data.tar.gz: f2ae77b038fbd46f3ee3b3d65e21ab311ee02ac4da49556058b31f3703d75b5bcdf86a8876ab98be0bed0b831cf6cc2ff8b9994fd74650bb3bed9e89148042c4
+  metadata.gz: d367bbffde661d1b63b0278ca644bf27fbb302badb5d63db5038693e233d2e1db77b3d19c056854eb25e52b6b830470ae9524e922215f38a7e3524d30a6cefa1
+  data.tar.gz: e5d675bcc6d04346cd66003233dba3f1895f6424e993c101867753966b2f4744b80cd39385a4554b5cbc72fbbc73e7183d6bf83009a61569713c5006db1c762a

data/.circleci/config.yml

@@ -0,0 +1,25 @@
+version: 2
+jobs:
+  build:
+    docker:
+       - image: circleci/ruby:2.4.1
+    working_directory: ~/repo
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+          - v1-dependencies-{{ checksum "Gemfile.lock" }}
+          # fallback to using the latest cache if no exact match is found
+          - v1-dependencies-
+      - run:
+          name: install dependencies
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+      - save_cache:
+          paths:
+            - ./vendor/bundle
+          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
+      - run:
+          name: run tests
+          command: |
+            bundle exec rake test

data/README.md

@@ -1,18 +1,21 @@
 # Redash input plugin for Embulk
 
+[![Gem Version](https://badge.fury.io/rb/embulk-input-redash.svg)](https://badge.fury.io/rb/embulk-input-redash)
+[![CircleCI](https://circleci.com/gh/ariarijp/embulk-input-redash.svg?style=svg)](https://circleci.com/gh/ariarijp/embulk-input-redash)
+
 embulk-input-redash is the Embulk input plugin for [Redash](https://redash.io).
 
 ## Overview
 
 * **Plugin type**: input
-* **Resume supported**: yes
-* **Cleanup supported**: yes
+* **Resume supported**: no
+* **Cleanup supported**: no
 * **Guess supported**: yes
 
 ## Configuration
 
-- **url**: description (string, required)
-- **api_key**: description (string, required)
+- **url**: URL of Query Result (string, required)
+- **api_key**: API Key (string, required)
 
 ## Example
 

data/Rakefile

@@ -1,3 +1,10 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
+end
 
 task default: :build

data/embulk-input-redash.gemspec

@@ -1,20 +1,21 @@
-
 Gem::Specification.new do |spec|
-  spec.name          = "embulk-input-redash"
-  spec.version       = "0.1.1"
-  spec.authors       = ["ariarijp"]
-  spec.summary       = "Redash input plugin for Embulk"
-  spec.description   = "Loads records from Redash."
-  spec.email         = ["takuya.arita@gmail.com"]
-  spec.licenses      = ["MIT"]
-  spec.homepage      = "https://github.com/ariarijp/embulk-input-redash"
+  spec.name = 'embulk-input-redash'
+  spec.version = '0.1.3'
+  spec.authors = ['ariarijp']
+  spec.summary = 'Redash input plugin for Embulk'
+  spec.description = 'Loads records from Redash.'
+  spec.email = ['takuya.arita@gmail.com']
+  spec.licenses = ['MIT']
+  spec.homepage = 'https://github.com/ariarijp/embulk-input-redash'
 
-  spec.files         = `git ls-files`.split("\n") + Dir["classpath/*.jar"]
-  spec.test_files    = spec.files.grep(%r{^(test|spec)/})
-  spec.require_paths = ["lib"]
+  spec.files = `git ls-files`.split("\n") + Dir['classpath/*.jar']
+  spec.test_files = spec.files.grep(%r{^(test|spec)/})
+  spec.require_paths = ['lib']
 
   spec.add_dependency 'rest-client'
-  spec.add_development_dependency 'embulk', ['>= 0.8.17']
   spec.add_development_dependency 'bundler', ['>= 1.10.6']
+  spec.add_development_dependency 'embulk', ['>= 0.8.39']
   spec.add_development_dependency 'rake', ['>= 10.0']
+  spec.add_development_dependency 'test-unit', ['>= 3.2.8']
+  spec.add_development_dependency 'webmock', ['>= 3.4.2']
 end

data/lib/embulk/input/redash.rb

@@ -2,6 +2,7 @@ require 'embulk/input/redash/plugin'
 
 module Embulk
   module Input
+    # A module for Redash input plugin for Embulk
     module Redash
     end
   end

data/lib/embulk/input/redash/client.rb

@@ -0,0 +1,17 @@
+require 'rest-client'
+
+module Embulk
+  module Input
+    module Redash
+      # Redash API client
+      class Client
+        def self.get_rows(url, api_key)
+          res = RestClient.get(url, params: { api_key: api_key })
+          data = JSON.parse(res.body)
+
+          data['query_result']['data']['rows']
+        end
+      end
+    end
+  end
+end

data/lib/embulk/input/redash/converter.rb

@@ -0,0 +1,17 @@
+module Embulk
+  module Input
+    module Redash
+      # Type converter
+      class Converter
+        def self.convert(type, value)
+          case type
+          when :timestamp
+            Time.parse(value)
+          else
+            value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/embulk/input/redash/plugin.rb

@@ -1,33 +1,31 @@
-require 'rest-client'
+require_relative './client'
+require_relative './converter'
 
 module Embulk
   module Input
     module Redash
+      # Redash input plugin for Embulk
       class Plugin < InputPlugin
         ::Embulk::Plugin.register_input('redash', self)
 
-        def self.transaction(config, &control)
+        def self.transaction(config, &_control)
           task = {
-            'url' => config.param('url', :string),
-            'api_key' => config.param('api_key', :string)
+            url: config.param('url', :string),
+            api_key: config.param('api_key', :string)
           }
 
           columns = embulk_columns(config)
 
-          resume(task, columns, 1, &control)
-        end
-
-        def self.resume(task, columns, count)
-          task_reports = yield(task, columns, count)
+          task_reports = yield(task, columns, 1)
 
-          next_config_diff = {}
-          next_config_diff
+          task_reports.first
         end
 
-        def self.guess(_config)
-          sample_records = get_rows(_config['url'], _config['api_key']).first(10)
+        def self.guess(config)
+          sample_records = Client.get_rows(config['url'], config['api_key'])
+                                 .first(10)
           columns = Guess::SchemaGuess.from_hash_records(sample_records)
-          { 'columns' => columns }
+          { columns: columns }
         end
 
         def init
@@ -36,46 +34,25 @@ module Embulk
         end
 
         def run
-          column_names = @schema.map(&:name)
-
-          Plugin.get_rows(@url, @api_key).each do |row|
+          Client.get_rows(@url, @api_key).each do |row|
             values = schema.map do |col|
-              convert(col.type, row[col.name])
+              Converter.convert(col.type, row[col.name])
             end
             page_builder.add(values)
           end
 
           page_builder.finish
 
-          task_report = {}
-
-          task_report
+          {}
         end
 
         def self.embulk_columns(config)
           config.param(:columns, :array).map do |column|
             name = column['name']
             type = column['type'].to_sym
+            format = column['format']
 
-            Column.new(nil, name, type, column['format'])
-          end
-        end
-
-        private
-
-        def self.get_rows(url, api_key)
-          res = RestClient.get(url, params: { 'api_key' => api_key })
-          data = JSON.parse(res.body)
-
-          data['query_result']['data']['rows']
-        end
-
-        def convert(type, value)
-          case type
-          when :timestamp
-            Time.parse(value)
-          else
-            value
+            Column.new(nil, name, type, format)
           end
         end
       end

data/test/client_test.rb

@@ -0,0 +1,41 @@
+require 'json'
+require 'test_helper'
+require 'embulk/input/redash/client'
+
+Client = Embulk::Input::Redash::Client
+
+class ClientTest < Test::Unit::TestCase
+  def test_get_rows
+    url = 'http://example.com/api/queries/123/results.json'
+    api_key = 'veryverysecret'
+
+    stub_body = {
+      'query_result' => {
+        'data' => {
+          'rows' => [
+            { 'foo' => 'hoge', 'bar' => 'fuga' }
+          ],
+          'columns' => [
+            {
+              'name' => 'foo',
+              'type' => 'string',
+              'friendly_name' => 'foo'
+            },
+            {
+              'name' => 'bar',
+              'type' => 'integer',
+              'friendly_name' => 'foo'
+            }
+          ]
+        },
+        'id' => 123,
+        'data_source_id' => 1
+      }
+    }
+
+    stub_request(:get, "#{url}?api_key=#{api_key}")
+      .to_return(status: 200, body: stub_body.to_json, headers: {})
+    expected = [{ 'foo' => 'hoge', 'bar' => 'fuga' }]
+    assert_equal(expected, Client.get_rows(url, api_key))
+  end
+end

data/test/converter_test.rb

@@ -0,0 +1,22 @@
+require 'test_helper'
+require 'time'
+require 'embulk/input/redash/converter'
+
+Converter = Embulk::Input::Redash::Converter
+
+class ConverterTest < Test::Unit::TestCase
+  data(
+    'boolean' => [true, :boolean, true],
+    'long' => [123, :long, 123],
+    'timestamp' => [Time.parse('2018-09-24 20:15:45'),
+                    :timestamp,
+                    '2018-09-24 20:15:45'],
+    'double' => [1.23, :double, 1.23],
+    'string' => ['embulk', :string, 'embulk']
+  )
+
+  def test_convert(data)
+    expected, type, value = data
+    assert_equal(expected, Converter.convert(type, value))
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,4 @@
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+
+require 'test/unit'
+require 'webmock/test_unit'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-redash
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - ariarijp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-11 00:00:00.000000000 Z
+date: 2018-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: embulk
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.17
+        version: 1.10.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.17
+        version: 1.10.6
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: embulk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.6
+        version: 0.8.39
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.6
+        version: 0.8.39
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.8
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.2
 description: Loads records from Redash.
 email:
 - takuya.arita@gmail.com
@@ -73,6 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".ruby-version"
 - Gemfile
@@ -81,7 +110,12 @@ files:
 - Rakefile
 - embulk-input-redash.gemspec
 - lib/embulk/input/redash.rb
+- lib/embulk/input/redash/client.rb
+- lib/embulk/input/redash/converter.rb
 - lib/embulk/input/redash/plugin.rb
+- test/client_test.rb
+- test/converter_test.rb
+- test/test_helper.rb
 homepage: https://github.com/ariarijp/embulk-input-redash
 licenses:
 - MIT
@@ -102,8 +136,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Redash input plugin for Embulk
-test_files: []
+test_files:
+- test/client_test.rb
+- test/converter_test.rb
+- test/test_helper.rb