datawow 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b374a165eb0735d634ea3cdffa68790023419fa02736cb6fa5d632d2a7ec18c
-  data.tar.gz: 11deb66ba61a1ba30701935f56bbabf5643aa5d5b3d4bcfc4c97b8820d0a48c3
+  metadata.gz: 194e56d69db61858af9f9877639298804d656214f1c7234264c6dc88580dc5b4
+  data.tar.gz: 4b52c38056dc6e8c582fadc71ca1e95af3c190424446414f80b7b4fa1b1f3b16
 SHA512:
-  metadata.gz: 13cd5d468aabddacd7fc149c14627297c8edcca925156b70042bc65e5296e4c501e314eeed5bcd4532559296970b38c311f4fc4134d4648476b856fac4e30d6b
-  data.tar.gz: 3c30f6acb2780ce4e8db3883538b12fb829a99e8c3d3e786390a1180bfe773338b4df87fdaee5ab2822c7801c1aa159730fc37da923a52175b190cc454cc5213
+  metadata.gz: b3975e22dec780e2c62c2a2d136bb55fd882438fd20262512f133ba32aa522ee5c7f070af6aed025774841289a5f071a0b57643139916c7f355a5ee1ed1a61b6
+  data.tar.gz: d2c947445ad4e0340de5cfaeea55193cb5eb9ac97d69a7c37f5a8f90fc0dcc657c9c09dff999b032c4632508efd2ebe17104308343d32c537233cd536b7e1fd4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    datawow (1.3.2)
+    datawow (1.4.3)
       json (~> 1.8, >= 1.8.3)
 
 GEM

data/README.md

@@ -6,7 +6,7 @@ HTTP RESTFul for calling DataWow APIs
 
 # Installation
 ```ruby
-gem 'datawow', '~> 1.4.2'
+gem 'datawow', '~> 1.4.3'
 ```
 
 ### Rails

data/datawow.gemspec

@@ -5,8 +5,8 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name          = 'datawow'
-  s.version       = '1.4.2'
-  s.date          = '2019-01-04'
+  s.version       = '1.4.3'
+  s.date          = '2019-02-13'
   s.summary       = 'HTTP RESTFul for calling DataWow APIs'
   s.description   = 'Moderation suite'
   s.post_install_message = File.read('INSTALL.md') if File.exist?('INSTALL.md')

data/lib/datawow.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require_relative 'datawow/client_response'
+require_relative 'datawow/response'
 require_relative 'datawow/connector'
 require_relative 'datawow/error'
 require_relative 'datawow/version'

data/lib/datawow/connector.rb

@@ -5,7 +5,7 @@ require 'net/https'
 require 'uri'
 require 'json'
 
-require File.expand_path('client_response.rb', __dir__)
+require File.expand_path('response.rb', __dir__)
 
 module Datawow
   # :nodoc:
@@ -21,34 +21,29 @@ module Datawow
     def post(data = {})
       @method = :POST
       response = send_request(data)
-
-      body = JSON.parse response.body
-
-      Response.new(body['data'], response.code, body['meta']['message'], body['meta'], 1)
+      response_body = JSON.parse response.body
+      Response.new(response_body, response.code)
     end
 
     def get(data = {}, query_str = true)
       @method = :GET
       response = send_request(data, query_str)
-      body = JSON.parse response.body
-
-      Response.new(body['data'], response.code, body['meta']['message'], body['meta'], body['meta']['total_count'])
+      response_body = JSON.parse response.body
+      Response.new(response_body, response.code)
     end
 
     def put(data = {})
       @method = :PUT
       response = send_request(data)
-      body = JSON.parse response.body
-
-      Response.new(body['data'], response.code, body['meta']['message'], body['meta'], 1)
+      response_body = JSON.parse response.body
+      Response.new(response_body, response.code)
     end
 
     def delete(data = {}, query_str = true)
       @method = :DELETE
       response = send_request(data, query_str)
-      body = JSON.parse response.body
-
-      Response.new(body['data'], response.code, body['meta']['message'], body['meta'], body['meta']['total_count'])
+      response_body = JSON.parse response.body
+      Response.new(response_body, response.code)
     end
 
     private
@@ -71,7 +66,7 @@ module Datawow
       https.use_ssl = true
       request = build_request(uri)
       request.body = data.to_json
-      response = https.request(request)
+      https.request(request)
     end
 
     def build_request(uri)
@@ -106,8 +101,8 @@ module Datawow
     def base_point(type)
       {
         image: 'https://kiyo-image.datawow.io/api',
-        ai:    'https://kiyo-image.datawow.io/api',
-        text:  'https://kiyo-text.datawow.io/api',
+        ai: 'https://kiyo-image.datawow.io/api',
+        text: 'https://kiyo-text.datawow.io/api',
         video: 'https://kiyo-image.datawow.io/api'
       }[type]
     end

data/lib/datawow/models/images/image_choices.rb

@@ -10,6 +10,7 @@ module Datawow
     def initialize
       @project_key = nil
       @type = :image
+      @query_str ||= nil
       @path = 'images/choices'
     end
   end

data/lib/datawow/models/images/image_closed_questions.rb

@@ -10,6 +10,7 @@ module Datawow
     def initialize
       @project_key = nil
       @type = :image
+      @query_str ||= nil
       @path = 'images/closed_questions'
     end
   end

data/lib/datawow/models/images/image_messages.rb

@@ -10,6 +10,7 @@ module Datawow
     def initialize
       @project_key = nil
       @type = :image
+      @query_str ||= nil
       @path = 'images/messages'
     end
   end

data/lib/datawow/models/images/image_photo_tags.rb

@@ -10,6 +10,7 @@ module Datawow
     def initialize
       @project_key = nil
       @type = :image
+      @query_str ||= nil
       @path ='images/photo_tags'
     end
   end

data/lib/datawow/models/images/nanameue_human.rb

@@ -10,6 +10,7 @@ module Datawow
     def initialize(token = nil)
       @project_key = token
       @type = :image
+      @query_str ||= nil
       @path = 'jobs/nanameue/consensuses'
     end
   end

data/lib/datawow/models/texts/text_categories.rb

@@ -10,6 +10,7 @@ module Datawow
     def initialize
       @project_key = nil
       @type = :text
+      @query_str ||= nil
       @path = 'text/text_categories'
     end
   end

data/lib/datawow/models/texts/text_closed_questions.rb

@@ -10,6 +10,7 @@ module Datawow
     def initialize
       @project_key = nil
       @type = :text
+      @query_str ||= nil
       @path = 'text/text_closed_questions'
     end
   end

data/lib/datawow/models/texts/text_conversations.rb

@@ -10,6 +10,7 @@ module Datawow
     def initialize
       @project_key = nil
       @type = :text
+      @query_str ||= nil
       @path = 'text/text_conversations'
     end
   end

data/lib/datawow/response.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Datawow
+  class Response
+    attr_reader :body, :code
+
+    def initialize(body, code)
+      @body = body
+      @code = code.to_i
+    end
+
+    def successful?
+      [200, 201].include? code
+    end
+
+    def data
+      body['data']
+    end
+
+    def status
+      code
+    end
+
+    def error
+      body['error'] unless successful?
+    end
+
+    def message
+      meta['message']
+    end
+
+    def meta
+      body['meta']
+    end
+
+    def total
+      meta['total_count'] || 0
+    end
+  end
+end

data/lib/datawow/version.rb

@@ -1,3 +1,3 @@
 module Datawow
-  VERSION = '1.4.2'.freeze
+  VERSION = '1.4.3'.freeze
 end

data/test/datawow/response_test.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Datawow
+  class ResponseTest < Minitest::Test
+    def test_new_success_response
+      response_body = {
+        'data' => 'anything',
+        'code' => 200,
+        'meta' => {
+          'message' => 'success',
+          'total_count' => 1
+        }
+      }
+
+      response = Response.new(response_body, response_body['code'])
+      refute_nil(response)
+      refute_nil(response.data)
+      assert_equal(true, response.successful?)
+      assert_equal('anything', response.data)
+      assert_equal('success', response.message)
+      assert_equal({ 'message' => 'success', 'total_count' => 1 }, response.meta)
+      assert_equal(1, response.total)
+    end
+
+    def test_failure_response
+      response_body = {
+        'data' => 'nothing',
+        'code' => 500,
+        'meta' => { 'message' => 'failure' }
+      }
+
+      response = Response.new(response_body, response_body['code'])
+      refute_nil(response)
+      refute_nil(response.data)
+      assert_equal(false, response.successful?)
+      assert_equal('nothing', response.data)
+      assert_equal('failure', response.message)
+      assert_equal({ 'message' => 'failure' }, response.meta)
+      assert_equal(0, response.total)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datawow
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Jesdakorn Samittiauttakorn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-04 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -111,7 +111,6 @@ files:
 - Rakefile
 - datawow.gemspec
 - lib/datawow.rb
-- lib/datawow/client_response.rb
 - lib/datawow/connector.rb
 - lib/datawow/error.rb
 - lib/datawow/models/images/document_verification.rb
@@ -127,10 +126,10 @@ files:
 - lib/datawow/models/texts/text_conversations.rb
 - lib/datawow/models/texts/text_ja.rb
 - lib/datawow/models/videos/video_classifications.rb
+- lib/datawow/response.rb
 - lib/datawow/version.rb
 - lib/generators/datawow/install_generator.rb
 - lib/generators/templates/datawow_api.rb
-- test/datawow/client_response_test.rb
 - test/datawow/connector_test.rb
 - test/datawow/image_choices_test.rb
 - test/datawow/image_closed_questions_test.rb
@@ -139,6 +138,7 @@ files:
 - test/datawow/image_photo_tags_test.rb
 - test/datawow/nanameue_human_test.rb
 - test/datawow/predictors_test.rb
+- test/datawow/response_test.rb
 - test/datawow/text_categories_test.rb
 - test/datawow/text_closed_questions_test.rb
 - test/datawow/text_conversations_test.rb

data/lib/datawow/client_response.rb

@@ -1,18 +0,0 @@
-module Datawow
-  class Response
-    attr_reader :total, :message, :status
-    attr_accessor :data, :meta
-
-    def initialize(data, response_code = '', response_message = 'success', meta = nil, total = 0)
-      @data = data
-      @status = response_code.to_i
-      @message = response_message
-      @meta = meta
-      @total = total unless total.nil?
-    end
-
-    def successful?
-      [200, 201].include? status
-    end
-  end
-end

data/test/datawow/client_response_test.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-module Datawow
-  class ResponseTest < Minitest::Test
-    def test_new_success_response
-      response = Response.new('response', 200, 'success', 'meta', 5)
-      refute_nil(response)
-      refute_nil(response.data)
-      assert_equal(true, response.successful?)
-      assert_equal('response', response.data)
-      assert_equal('success', response.message)
-      assert_equal('meta', response.meta)
-      assert_equal(5, response.total)
-    end
-
-    def test_failure_response
-      response = Response.new('response', 500, 'failure', 'meta')
-      refute_nil(response)
-      refute_nil(response.data)
-      assert_equal(false, response.successful?)
-      assert_equal('response', response.data)
-      assert_equal('failure', response.message)
-      assert_equal('meta', response.meta)
-      assert_equal(0, response.total)
-    end
-  end
-end