antbird 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56a81ea3bc3c0562a4cd6ddc1f28ca6bc4f5c0410b1000a993de1fc08359dfdc
-  data.tar.gz: 87dda0403daf7fb26da4300dc4c096b8ba0d927bfcd21e27b6d9792d57af98b9
+  metadata.gz: 2b134c730af7d5ff2f88b64158aba346bf92e412439de8501df3608bc52dba06
+  data.tar.gz: 75efcb9f9e87f3371ef48e793fbfd630a122213719e79c43d276cf48186ef69b
 SHA512:
-  metadata.gz: 5159c0f56e0d2155cc9e6dc731757c3469e98d866bc57c5c651de42f322e6069740233cd1dd3930640f7cf910d2df9988fa18ecbd78c7bced8da344eedd33806
-  data.tar.gz: 57255629436a0664cc68876e38f0c0219f372f45d41518422bc51a62328e0980bb91a48750fbe34355d7fea98416cbfd52c06f2f01f4da38f23ab6c7e9b114df
+  metadata.gz: 0d2b4cde70a9eefe2ca1e5776c6bb1743ec7c0a57d77bf8487fc3098f37499a12402597a18afd31b12d815bee7bedf08f808e3877aff490295a554b5365c904e
+  data.tar.gz: dea3a216fb467d5aa03be1ee51ad14f6955f4dfdc23653b122d574f373c94aabde8f31e385665ad15ba29aedbffc0e54205f55faac495fd0e29f9bc754a5c413

data/.rspec

@@ -1,4 +1,3 @@
 --format progress
---format Nc
 --color
 --require spec_helper

data/.travis.yml

@@ -1,5 +1,19 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.5.0
+  - 2.5.1
+env:
+  - ES_VERSION=6.2.4
+  - ES_VERSION=6.1.4
+  - ES_VERSION=5.6.9
+  - ES_VERSION=5.5.3
+
 before_install: gem install bundler -v 1.16.1
+install:
+  - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz
+  - tar -xzf elasticsearch-${ES_VERSION}.tar.gz
+  - ./elasticsearch-${ES_VERSION}/bin/elasticsearch &
+  - bundle install
+  - wget --quiet --waitretry=1 --retry-connrefused --timeout=10 --output-document=- http://127.0.0.1:9200
+
+script: bundle exec rspec

data/Guardfile

@@ -1,4 +1,4 @@
-guard :rspec, cmd: "bundle exec rspec" do
+guard :rspec, cmd: "bundle exec rspec --format progress --format Nc" do
   require "guard/rspec/dsl"
   dsl = Guard::RSpec::Dsl.new(self)
 

data/README.md

@@ -33,7 +33,6 @@ client = Antbird::Client.new.scoped(index: 'test-index', type: 'test-type')
 
 client = Antbird::Client.new(
   url: 'http://localhost:9200',
-  version: '6.2.3'
   scope: {
     index: 'test-index',
     type: 'test-type'

data/lib/antbird/client/errors.rb

@@ -0,0 +1,22 @@
+module Antbird
+  class Client
+    class Error < StandardError; end
+
+    class ApiError < Error
+      def initialize(response)
+        @response = response
+        @status   = response.status
+
+        body = response.body
+        @error = body["error"] if body.is_a?(Hash) && body.key?("error")
+
+        message = @error || body.to_s
+        super message
+      end
+      attr_reader :response, :status
+    end
+
+    class ServerError < ApiError; end
+    class RequestError < ApiError; end
+  end
+end

data/lib/antbird/client.rb

@@ -1,27 +1,26 @@
 require 'faraday'
 require 'faraday_middleware'
+require 'antbird/client/errors'
 
 module Antbird
   class Client
-    DEFAULT_VERSION = '6.2.3'
-
     def initialize(
       scope: {},
       url: "http://localhost:9200",
-      version: DEFAULT_VERSION,
+      version: nil,
       read_timeout: 5,
-      open_timeout: 2
-    )
-      @scope     = scope.transform_keys(&:to_sym)
-      @url       = url
-      @version   = version
+      open_timeout: 2)
 
       @read_timeout = read_timeout
       @open_timeout = open_timeout
+      @url       = url
+
+      @scope     = scope.transform_keys(&:to_sym)
+      @version   = version || fetch_version
 
       @api_specs = {}
 
-      class_version = version.split('.')[0,2].join('_')
+      class_version = @version.split('.')[0,2].join('_')
 
       require "antbird/rest_api/rest_api_v#{class_version}"
       extend Antbird::RestApi.const_get "RestApiV#{class_version}"
@@ -41,6 +40,8 @@ module Antbird
     end
 
     def request(api_name, api_spec, params)
+      validate_params(api_spec, params)
+
       body   = extract_body(params)
       scopes = extract_scopes(params)
 
@@ -85,23 +86,20 @@ module Antbird
             req.options[:timeout] = read_timeout if read_timeout
           end
         else
-          raise ArgumentError, "unknown HTTP request method: #{method.inspect}"
+          raise ArgumentError, "Unknown HTTP request method: #{method.inspect}"
         end
 
       if method == :head
         case response.status
         when 200
-          true
+          return true
         when 404
-          false
-        else
-          raise 'error'
+          return false
         end
-      else
-        response.body
       end
 
-      # TODO: handle errors
+      handle_errors!(response)
+      response.body
     end
 
     def extract_scopes(params)
@@ -148,5 +146,28 @@ module Antbird
         conn.adapter Faraday.default_adapter
       end
     end
+
+    private
+
+    def handle_errors!(response)
+      if response.status >= 500
+        raise ServerError, response
+      elsif response.body.is_a?(Hash) && response.body.key?("error")
+        raise RequestError, response
+      end
+    end
+
+    def validate_params(api_spec, params)
+      # TODO case: required parameter is missing
+      # TODO case: invalid parameter name
+      # TODO case: invalid parameter format
+      if api_spec.dig('body', 'required') && !params.key?(:body)
+        raise ArgumentError, 'Body is missing'
+      end
+    end
+
+    def fetch_version
+      connection.get('/').body.dig('version', 'number')
+    end
   end
 end

data/lib/antbird/rest_api/rest_api_v5_5.rb

@@ -1,5 +1,5 @@
 # Generated REST API methods file - DO NOT EDIT!
-# Date: 2018-04-05
+# Date: 2018-04-20
 # ES version: 5.5.3
 
 module Antbird

data/lib/antbird/rest_api/rest_api_v5_6.rb

@@ -1,6 +1,6 @@
 # Generated REST API methods file - DO NOT EDIT!
-# Date: 2018-04-05
-# ES version: 5.6.8
+# Date: 2018-04-20
+# ES version: 5.6.9
 
 module Antbird
   module RestApi

data/lib/antbird/rest_api/rest_api_v6_1.rb

@@ -1,5 +1,5 @@
 # Generated REST API methods file - DO NOT EDIT!
-# Date: 2018-04-05
+# Date: 2018-04-20
 # ES version: 6.1.4
 
 module Antbird

data/lib/antbird/rest_api/rest_api_v6_2.rb

@@ -1,6 +1,6 @@
 # Generated REST API methods file - DO NOT EDIT!
-# Date: 2018-04-05
-# ES version: 6.2.3
+# Date: 2018-04-20
+# ES version: 6.2.4
 
 module Antbird
   module RestApi
@@ -475,7 +475,7 @@ module Antbird
       # http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-forcemerge.html
       def indices_forcemerge(params = {})
         api_name = 'indices.forcemerge'
-        api_spec = @api_specs[api_name] ||= {"documentation"=>"http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-forcemerge.html", "methods"=>["POST"], "url"=>{"path"=>"/_forcemerge", "paths"=>["/_forcemerge", "/{index}/_forcemerge"], "parts"=>{"index"=>{"type"=>"list", "description"=>"A comma-separated list of index names; use `_all` or empty string to perform the operation on all indices"}}, "params"=>{"flush"=>{"type"=>"boolean", "description"=>"Specify whether the index should be flushed after performing the operation (default: true)"}, "ignore_unavailable"=>{"type"=>"boolean", "description"=>"Whether specified concrete indices should be ignored when unavailable (missing or closed)"}, "allow_no_indices"=>{"type"=>"boolean", "description"=>"Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)"}, "expand_wildcards"=>{"type"=>"enum", "options"=>["open", "closed", "none", "all"], "default"=>"open", "description"=>"Whether to expand wildcard expression to concrete indices that are open, closed or both."}, "max_num_segments"=>{"type"=>"number", "description"=>"The number of segments the index should be merged into (default: dynamic)"}, "only_expunge_deletes"=>{"type"=>"boolean", "description"=>"Specify whether the operation should only expunge deleted documents"}, "wait_for_merge"=>{"type"=>"boolean", "description"=>"Specify whether the request should block until the merge process is finished (default: true)"}}}, "body"=>nil}
+        api_spec = @api_specs[api_name] ||= {"documentation"=>"http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-forcemerge.html", "methods"=>["POST"], "url"=>{"path"=>"/_forcemerge", "paths"=>["/_forcemerge", "/{index}/_forcemerge"], "parts"=>{"index"=>{"type"=>"list", "description"=>"A comma-separated list of index names; use `_all` or empty string to perform the operation on all indices"}}, "params"=>{"flush"=>{"type"=>"boolean", "description"=>"Specify whether the index should be flushed after performing the operation (default: true)"}, "ignore_unavailable"=>{"type"=>"boolean", "description"=>"Whether specified concrete indices should be ignored when unavailable (missing or closed)"}, "allow_no_indices"=>{"type"=>"boolean", "description"=>"Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)"}, "expand_wildcards"=>{"type"=>"enum", "options"=>["open", "closed", "none", "all"], "default"=>"open", "description"=>"Whether to expand wildcard expression to concrete indices that are open, closed or both."}, "max_num_segments"=>{"type"=>"number", "description"=>"The number of segments the index should be merged into (default: dynamic)"}, "only_expunge_deletes"=>{"type"=>"boolean", "description"=>"Specify whether the operation should only expunge deleted documents"}}}, "body"=>nil}
         request(api_name, api_spec, params)
       end
 

data/lib/antbird/version.rb

@@ -1,3 +1,3 @@
 module Antbird
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/antbird.rb

@@ -1,2 +1,2 @@
-require "antbird/version"
+require 'antbird/version'
 require 'antbird/client'

data/script/generate_api_methods

@@ -41,4 +41,8 @@ class ApiMethodsGenerator
   end
 end
 
-puts ApiMethodsGenerator.new(*ARGV).run
+travis_yaml = YAML.load_file('.travis.yml')
+versions = travis_yaml['env'].map { |v| v.scan(/ES_VERSION=([\d\.]+)/) }.flatten.uniq
+versions.each do |version|
+  ApiMethodsGenerator.new(version).run
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: antbird
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - fukayatsu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -157,6 +157,7 @@ files:
 - bin/setup
 - lib/antbird.rb
 - lib/antbird/client.rb
+- lib/antbird/client/errors.rb
 - lib/antbird/rest_api/rest_api_v5_5.rb
 - lib/antbird/rest_api/rest_api_v5_6.rb
 - lib/antbird/rest_api/rest_api_v6_1.rb