datawow 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ab7e943518feee57c144e25d9f384a3336dea35767a70857e98689833d6f26f
-  data.tar.gz: 57eb64866865b7e7d35a6f1e23be00cbd6de32b48f09a423a312173d7a94df28
+  metadata.gz: 187a5c97f2c538e9f4a465ec2f639f87095ae07de3095ae18acd99bea2e87459
+  data.tar.gz: 7412151b8a8ca09502c4e50d7ea3baf54dbe2627d2146546443338115144a24f
 SHA512:
-  metadata.gz: 63e3ab17bd9b5163934a30dd4b29acc6980f2416b48bd680d8533a88876dd243cc3ef40e4510b601b094949786fed7acf1051ad364bbfc2ff073ba811644e82d
-  data.tar.gz: 903c6b7a47a6c8aa6003358f8dfcce8e1d2342f2fe1528ab4eb12c53177ebbe785d6aaad7e219ee447f0f0c0c6c4b0088dda3d4861629ebe880e56f673e323f1
+  metadata.gz: 91c660c19fcb1da84921a70caaf55bb660ec1d206c1e09895014c7bb9e988e9755dde8c3d73a4750920720c066270a9d57f83b2948c6d27f7566b79070952a8d
+  data.tar.gz: 412a95f8ec985fb456b34622cb1cf9203e404af61e20ecd3e8fa4503d439d06d417c3a73c717c7ea0f63bf8e40abf80ba6bcb53df3d5a6d953075919844a7306

data/.gitignore

@@ -1 +1,2 @@
 coverage
+datawow-*

data/Gemfile.lock

@@ -1,9 +1,7 @@
 PATH
   remote: .
   specs:
-    datawow (1.2.0)
-      faraday (~> 0.13.1, >= 0.13.1)
-      faraday_middleware (~> 0.12.2, >= 0.12.2)
+    datawow (1.2.1)
       json (~> 1.8, >= 1.8.3)
 
 GEM
@@ -11,26 +9,12 @@ GEM
   specs:
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    byebug (10.0.2)
-    coderay (1.1.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     docile (1.1.5)
-    faraday (0.13.1)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.12.2)
-      faraday (>= 0.7.4, < 1.0)
     hashdiff (0.3.7)
     json (1.8.6)
-    method_source (0.9.2)
     minitest (5.11.3)
-    multipart-post (2.0.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
     public_suffix (3.0.3)
     rake (12.3.1)
     safe_yaml (1.0.4)
@@ -50,7 +34,6 @@ PLATFORMS
 DEPENDENCIES
   datawow!
   minitest (~> 5.11, >= 5.11.3)
-  pry-byebug (~> 3.6)
   rake (~> 12.3)
   simplecov (~> 0.15.1)
   webmock (~> 3.3)

data/README.md

@@ -6,7 +6,7 @@ HTTP RESTFul for calling DataWow APIs
 
 # Installation
 ```ruby
-gem 'datawow', '~> 1.2.0'
+gem 'datawow', '~> 1.2.1'
 ```
 
 #### Generate setting

data/datawow.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name          = 'datawow'
-  s.version       = '1.2.0'
+  s.version       = '1.2.1'
   s.date          = '2018-11-27'
   s.summary       = 'HTTP RESTFul for calling DataWow APIs'
   s.description   = 'Moderation suite'
@@ -17,11 +17,8 @@ Gem::Specification.new do |s|
   s.license       = 'Commercial'
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'faraday',            '~> 0.13.1', '>= 0.13.1'
-  s.add_runtime_dependency 'faraday_middleware', '~> 0.12.2', '>= 0.12.2'
   s.add_runtime_dependency 'json',               '~> 1.8',    '>= 1.8.3'
   s.add_development_dependency 'minitest',       '~> 5.11', '>= 5.11.3'
-  s.add_development_dependency 'pry-byebug',     '~> 3.6'
   s.add_development_dependency 'rake',           '~> 12.3'
   s.add_development_dependency 'simplecov',      '~> 0.15.1'
   s.add_development_dependency 'webmock',        '~> 3.3'

data/lib/datawow/connector.rb

@@ -3,6 +3,7 @@
 require 'net/http'
 require 'net/https'
 require 'uri'
+require 'json'
 
 require File.expand_path('client_response.rb', __dir__)
 

data/lib/datawow/version.rb

@@ -1,3 +1,3 @@
 module Datawow
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.2.1'.freeze
 end

data/lib/datawow.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
-require 'pry-byebug'
-
 require_relative 'datawow/client_response'
-require_relative 'datawow/connection'
 require_relative 'datawow/connector'
 require_relative 'datawow/error'
 require_relative 'datawow/version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datawow
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Jesdakorn Samittiauttakorn
@@ -10,46 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.13.1
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.13.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.13.1
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.13.1
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.2
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.2
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -90,20 +50,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.11.3
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -166,10 +112,8 @@ files:
 - datawow.gemspec
 - lib/datawow.rb
 - lib/datawow/client_response.rb
-- lib/datawow/connection.rb
 - lib/datawow/connector.rb
 - lib/datawow/error.rb
-- lib/datawow/faraday/raise_http_exception.rb
 - lib/datawow/models/images/image_choices.rb
 - lib/datawow/models/images/image_closed_questions.rb
 - lib/datawow/models/images/image_messages.rb
@@ -185,7 +129,6 @@ files:
 - lib/generators/datawow/install_generator.rb
 - lib/generators/templates/datawow_api.rb
 - test/datawow/client_response_test.rb
-- test/datawow/connection_test.rb
 - test/datawow/connector_test.rb
 - test/datawow/image_choices_test.rb
 - test/datawow/image_closed_questions_test.rb

data/lib/datawow/connection.rb

@@ -1,99 +0,0 @@
-# frozen_string_literal: true
-
-require File.expand_path('faraday/raise_http_exception.rb', __dir__)
-require File.expand_path('client_response.rb', __dir__)
-
-module Datawow
-  # :nodoc:
-  class Connection
-    def initialize(model:, version_api: 'v1')
-      @model = model
-      @version_api = version_api
-    end
-
-    def get(path, options = {})
-      @response = connection.get do |request|
-        request.url("#{@version_api}#{path}")
-        request.headers['Content-Type'] = 'application/json'
-        request.headers['Authorization'] = options[:token] unless options[:token].nil?
-        request.params = options[:path_param] ? params_url_options(options) : options
-      end
-      Response.new(data, status_code, message, meta, total)
-    rescue Error, Faraday::Error => e
-      handle_error(e)
-    end
-
-    def post(path, options = {}, query_params = {})
-      @response = connection.post do |request|
-        request.url("#{@version_api}#{path}")
-        request.headers['Content-Type'] = 'application/json'
-        request.headers['Authorization'] = options[:token] unless options[:token].nil?
-        request.params = query_params
-        request.body = options unless options.nil?
-      end
-      Response.new(data, status_code, message, meta, nil)
-    rescue Error, Faraday::Error => e
-      handle_error(e)
-    end
-
-    private
-
-    def connection
-      @connection ||= Faraday::Connection.new(base_point) do |connection|
-        connection.request :url_encoded
-        connection.request :json
-        connection.response :json
-        connection.use Datawow::FaradayMiddleware::RaiseHttpException
-        connection.use :gzip
-        connection.adapter Faraday.default_adapter
-      end
-    end
-
-    def data
-      @response.body['data']
-    end
-
-    def meta
-      @response.body['meta']
-    end
-
-    def status_code
-      meta['code'] unless meta.nil?
-    end
-
-    def message
-      meta['message'] unless meta.nil?
-    end
-
-    def total
-      meta['total_count'] unless meta.nil?
-    end
-
-    def handle_error(exception)
-      if exception.is_a?(Faraday::ConnectionFailed)
-        code = 599
-        message = 'Connection Failed'
-      else
-        code = exception.to_s.partition(':').first
-        message = exception.to_s.partition(':').last
-      end
-
-      Response.new(nil, code, message, nil)
-    end
-
-    def params_url_options(options)
-      %i[id path_param].each { |e| options.delete(e) }
-      options
-    end
-
-    def base_point
-      options = {
-        image: 'https://kiyo-image.datawow.io/api/',
-        ai: 'https://kiyo-image.datawow.io/api/',
-        text: 'https://kiyo-text.datawow.io/api/',
-        video: 'https://kiyo-image.datawow.io/api/'
-      }
-      options[@model]
-    end
-  end
-end

data/lib/datawow/faraday/raise_http_exception.rb

@@ -1,40 +0,0 @@
-require 'faraday_middleware'
-
-module Datawow
-  module FaradayMiddleware
-    class RaiseHttpException < Faraday::Middleware
-      def call(request_env)
-        @app.call(request_env).on_complete do |response|
-          case response[:status].to_i
-          when 200, 201
-            # nothing to do here
-          when 400
-            error_message = error_message(response[:body])
-            raise BadRequest, "#{response[:status]}: #{error_message}"
-          when 403
-            error_message = error_message(response[:body])
-            raise NotPermitted, "#{response[:status]}: #{error_message}"
-          when 404
-            error_message = error_message(response[:body])
-            raise NotFound, "#{response[:status]}: #{error_message}"
-          else
-            request_method = response[:method].to_s.upcase
-            request_url = response[:url].to_s
-            response_status = response[:status]
-            error_message = error_message(response[:body])
-            raise Error, "#{response_status}: #{request_method} #{request_url} #{error_message}"
-          end
-        end
-      end
-
-      private
-
-      def error_message(response_body)
-        if !response_body.nil? && response_body.is_a?(String)
-          response_body = JSON.parse(response_body)
-          response_body['message']
-        end
-      end
-    end
-  end
-end

data/test/datawow/connection_test.rb

@@ -1,85 +0,0 @@
-require 'test_helper'
-
-module Datawow
-  class ConnectionTest < Minitest::Test
-    def test_get_success
-      stub_request(:get, 'https://kiyo-image.datawow.io/api/v1/images')
-        .to_return(body: JSON.generate(data: 'foo', meta: { message: 'success', code: 200 }), status: 200)
-      response = connection.get('/images', {})
-      assert_instance_of(Response, response)
-      assert_equal(200, response.status)
-      assert_equal('success', response.message)
-      assert_equal('success', response.meta['message'])
-      assert_equal(200, response.status)
-    end
-
-    def test_get_failed
-      stub_request(:get, 'https://kiyo-image.datawow.io/api/v1/images')
-        .to_return(body: JSON.generate(data: '', meta: { message: 'Internal Server Error', code: 500 }), status: 500)
-      response = connection.get('/images', {})
-      assert_instance_of(Response, response)
-      assert_equal(500, response.status)
-    end
-
-    def test_post_success
-      stub_request(:post, 'https://kiyo-image.datawow.io/api/v1/images')
-        .to_return(body: JSON.generate(data: 'foo', meta: { code: 200 }), status: 200)
-      response = connection.post('/images', {})
-      assert_instance_of(Response, response)
-      assert_equal(200, response.status)
-    end
-
-    def test_post_failed
-      stub_request(:post, 'https://kiyo-image.datawow.io/api/v1/images')
-        .to_return(body: JSON.generate(data: '', meta: { code: 500, message: 'Internal Server Error' }), status: 500)
-      response = connection.post('/images', {})
-      assert_instance_of(Response, response)
-      assert_equal(500, response.status)
-    end
-
-    def test_connection_failed
-      stub_request(:get, 'https://kiyo-image.datawow.io/api/v1/images')
-        .to_raise(Faraday::ConnectionFailed.new('connection failed'))
-      response = connection.get('/images')
-      assert_instance_of(Response, response)
-    end
-
-    def test_bad_request_status
-      stub_request(:get, 'https://kiyo-image.datawow.io/api/v1/images')
-        .to_return(status: 400, body: JSON.generate(data: '', meta: { message: 'bad request', code: 400 }))
-      response = connection.get('/images', {})
-      assert_instance_of(Response, response)
-      assert_equal(400, response.status)
-    end
-
-    def test_forbidden_status
-      stub_request(:get, 'https://kiyo-image.datawow.io/api/v1/images')
-        .to_return(body: JSON.generate(data: '', meta: { message: 'forbidden', code: 403 }), status: 403)
-      response = connection.get('/images', {})
-      assert_instance_of(Response, response)
-      assert_equal(403, response.status)
-    end
-
-    def test_not_found_status
-      stub_request(:get, 'https://kiyo-image.datawow.io/api/v1/images')
-        .to_return(body: JSON.generate(data: '', meta: { message: 'not found', code: 404 }), status: 404)
-      response = connection.get('/images', {})
-      assert_instance_of(Response, response)
-      assert_equal(404, response.status)
-    end
-
-    def test_edge_case_error
-      stub_request(:get, 'https://kiyo-image.datawow.io/api/v1/images')
-        .to_return(body: JSON.generate(data: '', meta: { message: 'version not supported', code: 505 }), status: 505)
-      response = connection.get('/images', {})
-      assert_instance_of(Response, response)
-      assert_equal(505, response.status)
-    end
-
-    private
-
-    def connection
-      @connection ||= Datawow::Connection.new(model: :image)
-    end
-  end
-end