yandex_image_moderation 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef3579e7512a9cd9cfa60837f38badb5ec7e380d
-  data.tar.gz: b23f32d78f39be6df41ef40d363e0f26b5269e11
+  metadata.gz: 977b9fffdd34e001a55781b81075420928d2034e
+  data.tar.gz: f547314d0ab0edbbc45af907b7740dfbfd0264b9
 SHA512:
-  metadata.gz: 20ea97770c8d5796cf943c6e668e23d48a9b5ee2be9d62e3592d38d7a44baeaed225658a96e57d4f36c3295bb2ca7ba5f7397709cd73cb260a68b284f2488157
-  data.tar.gz: c0527d5796968f9f9d56877f87648984d68eecac14a3dfe8afc9d17bb226671bba6d1bb8f46fbd724bc8c6dbcf045490687723d1dcf108c834eee36f0d232748
+  metadata.gz: 93aa3c8c35059c7cfc409945f98f0f3e1a0113fbd1e44781a0805610f22aee166bdd55e8d78c306c8038895644d12f24726f32bf94cf9a9a71f83d4a27dde2a0
+  data.tar.gz: cd2e679417341e90acba517692986c09d63029afef98927549bef3f7c302dd2a795258ac7c18017c37bf6bc9813ffdefb1d2b91d17c83eb0ff267e675eafa11f

data/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'multipart-post'
+gem 'httpclient'
 
 gemspec

data/lib/yandex_image_moderation/client.rb

@@ -0,0 +1,20 @@
+require 'httpclient'
+
+# YandexImageModeration module part for HTTP Client
+module YandexImageModeration
+  # @!visibility private
+  # A basic HTTP Client that handles requests to Yandex.
+  #
+  class Client
+    def initialize(config)
+      raise(::YandexImageModeration::Error::InvalidConfig, 'missing url') if config.url.to_s.empty?
+      @http = ::HTTPClient.new base_url: config.url
+      @http.connect_timeout = config.open_timeout || config.connect_timeout || 60
+      @http.receive_timeout = config.read_timeout || config.receive_timeout || 60
+    end
+
+    def post(url, params)
+      @http.post(url, params)
+    end
+  end
+end

data/lib/yandex_image_moderation/version.rb

@@ -1,3 +1,3 @@
 module YandexImageModeration
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/yandex_image_moderation.rb

@@ -1,7 +1,7 @@
 require 'json'
 require 'yandex_image_moderation/version'
 require 'yandex_image_moderation/config'
-require 'yandex_image_moderation/http_client'
+require 'yandex_image_moderation/client'
 require 'yandex_image_moderation/result'
 
 # YandexImageModeration gem code
@@ -11,7 +11,7 @@ module YandexImageModeration
     #
     # @return [#post] an instance of a request handler
     def client
-      @client ||= ::YandexImageModeration::NetHTTPClient.new(config)
+      @client ||= ::YandexImageModeration::Client.new(config)
     end
 
     # Send a request for moderation
@@ -21,21 +21,21 @@ module YandexImageModeration
       return if file.nil? || !File.exist?(file)
 
       url = "#{config.url}?models=moderation,gender,pornography,ad"
-      parse_response client.post(url, prepare_body(file), {})
+      parse_response client.post(url, prepare_body(file))
     end
 
     protected
 
     def parse_response(response)
-      return unless response.code.to_i == 200
-      raise(::YandexImageModeration::Error::InvalidResult, 'empty response') if response.body.nil?
-      ::YandexImageModeration::Result.new JSON.parse(response.body)
+      return unless response.status == 200
+      raise(::YandexImageModeration::Error::InvalidResult, 'empty response') if response.content.nil?
+      ::YandexImageModeration::Result.new JSON.parse(response.content)
     end
 
     def prepare_body(file)
       {
-        'file' => UploadIO.new(file, 'image/jpeg', File.basename(file)),
-        'token' => @options.config.token
+        file: File.open(file, 'r'),
+        token: @options.config.token
       }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yandex_image_moderation
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Sergey Tsvetkov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -81,9 +81,9 @@ files:
 - README.md
 - Rakefile
 - lib/yandex_image_moderation.rb
+- lib/yandex_image_moderation/client.rb
 - lib/yandex_image_moderation/config.rb
 - lib/yandex_image_moderation/error.rb
-- lib/yandex_image_moderation/http_client.rb
 - lib/yandex_image_moderation/result.rb
 - lib/yandex_image_moderation/version.rb
 - yandex_image_moderation.gemspec
@@ -110,5 +110,5 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: yandex_image_moderation-0.1.1
+summary: yandex_image_moderation-0.2.0
 test_files: []

data/lib/yandex_image_moderation/http_client.rb

@@ -1,32 +0,0 @@
-require 'uri'
-require 'net/http'
-require 'net/http/post/multipart'
-
-# YandexImageModeration module part for HTTP Client
-module YandexImageModeration
-  # @!visibility private
-  # A basic HTTP Client that handles requests to Yandex.
-  #
-  class NetHTTPClient
-    def initialize(config)
-      uri = parse_url config
-      @http = Net::HTTP.new(uri.host, uri.port)
-      @http.open_timeout = config.open_timeout || 10
-      @http.read_timeout = config.read_timeout || 30
-      @http.use_ssl = !(config.url =~ /^https/i).nil?
-    end
-
-    def post(url, body, headers)
-      request = Net::HTTP::Post::Multipart.new(url, body)
-      headers.each { |k, v| request[k.to_s] = v } unless headers.nil? || !headers.is_a?(Hash)
-      @http.request(request)
-    end
-
-    protected
-
-    def parse_url(config)
-      raise(::YandexImageModeration::Error::InvalidConfig, 'missing url') if config.url.to_s.empty?
-      URI.parse(config.url)
-    end
-  end
-end