scnnr 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63bcc0cea5fbfb536f2ebd9b87623f7ec943b68e
-  data.tar.gz: 295d5b100e0cd86ffcaaad0e815f28276c063597
+  metadata.gz: 701520f0f2410d7300d04bac498aec68db34597f
+  data.tar.gz: 15d6e7b77a2ad5c91d96fa302d4eb1fc800792f3
 SHA512:
-  metadata.gz: 5659d4858fdce6480279c9d988f61813ccfd852c7eba5e366913ec4d7583d5eccd14f19182d54032f0eb91bb1eb0f1bdb1e1a524f8b7b36713c3121aab3db46b
-  data.tar.gz: 9880c8a857b3bd38ec11bd19c4b80d73a9f242cea72585ddc9f6108897f6be63890ccbda5e6306c45b2136a43bbc3196571feec63b90dce900ea5ca3e21e37e1
+  metadata.gz: 99379cccbdb705692acd048f32355638b4084c19071c7c2833604fb1356164a36982aab1e7aa505d66495650524faf1d88d492e2eb854308b38b052ed821d0c0
+  data.tar.gz: ab1d3a36414710519e793259a1a9f655da7c6333971ac145e834bbb62fe02257985092cfd54568c78dd6aa86b4947e5961c9270adf44618adae7a121dba6c62b

data/CHANGELOG.md

@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+
+## [1.0.0] - 2017-11-01
+### Added
+- Allow timeouts greater than 25s when recognising images.
+
+### Fixed
+- Fix that `Scnnr::Client#fetch` with a long timeout does not make multiple request.
+
+### Removed
+- Remove `async` from `Scnnr::Response`.
+
 ## [0.2.0] - 2017-10-20
 ### Added
 - Add reference links to README.

data/lib/scnnr/client.rb

@@ -16,19 +16,19 @@ module Scnnr
     end
 
     def recognize_image(image, options = {})
-      options = merge_options(options)
-      uri = construct_uri('recognitions', options)
-      # TODO: Use PollingManager to be accepted timeout > 25
-      response = post_connection(uri, options).send_stream(image)
-      handle_response(response, options)
+      PollingManager.start(self, merge_options(options)) do |opts|
+        uri = construct_uri('recognitions', opts)
+        response = post_connection(uri, opts).send_stream(image)
+        handle_response(response)
+      end
     end
 
     def recognize_url(url, options = {})
-      options = merge_options(options)
-      uri = construct_uri('remote/recognitions', options)
-      # TODO: Use PollingManager to be accepted timeout > 25
-      response = post_connection(uri, options).send_json({ url: url })
-      handle_response(response, options)
+      PollingManager.start(self, merge_options(options)) do |opts|
+        uri = construct_uri('remote/recognitions', opts)
+        response = post_connection(uri, opts).send_json({ url: url })
+        handle_response(response)
+      end
     end
 
     def fetch(recognition_id, options = {})
@@ -60,11 +60,11 @@ module Scnnr
       options = merge_options(options)
       uri = construct_uri("recognitions/#{recognition_id}", options)
       response = get_connection(uri, options).send_request
-      handle_response(response, options)
+      handle_response(response)
     end
 
-    def handle_response(response, options = {})
-      response = Response.new(response, options[:timeout].positive?)
+    def handle_response(response)
+      response = Response.new(response)
       response.build_recognition
     end
   end

data/lib/scnnr/polling_manager.rb

@@ -6,6 +6,19 @@ module Scnnr
 
     attr_accessor :timeout
 
+    def self.start(client, options, &block)
+      timeout = options.delete(:timeout)
+      used_timeout = [timeout, MAX_TIMEOUT].min
+      extra_timeout = timeout - used_timeout
+
+      recognition = block.call(options.merge(timeout: used_timeout))
+      if recognition.queued? && extra_timeout.positive?
+        new(extra_timeout).polling(client, recognition.id, options)
+      else
+        recognition
+      end
+    end
+
     def initialize(timeout)
       case timeout
       when Integer, Float::INFINITY then @timeout = timeout
@@ -14,16 +27,14 @@ module Scnnr
       end
     end
 
-    def remain_timeout?
-      self.timeout.positive?
-    end
-
     def polling(client, recognition_id, options = {})
       loop do
         timeout = [self.timeout, MAX_TIMEOUT].min
         self.timeout -= timeout
         recognition = client.fetch(recognition_id, options.merge(timeout: timeout, polling: false))
-        break recognition if recognition.finished? || !self.remain_timeout?
+
+        break recognition unless recognition.queued?
+        raise TimeoutError.new('recognition timed out', recognition) unless self.timeout.positive?
       end
     end
   end

data/lib/scnnr/response.rb

@@ -4,10 +4,9 @@ module Scnnr
   class Response
     SUPPORTED_CONTENT_TYPE = 'application/jp.cubki.scnnr.v1+json'
 
-    def initialize(response, async)
+    def initialize(response)
       raise UnexpectedError, response if response.content_type != SUPPORTED_CONTENT_TYPE
       @response = response
-      @async = async
     end
 
     def body
@@ -18,10 +17,6 @@ module Scnnr
       @parsed_body ||= JSON.parse(self.body)
     end
 
-    def async?
-      @async == true
-    end
-
     def build_recognition
       case @response
       when Net::HTTPSuccess
@@ -35,7 +30,6 @@ module Scnnr
     private
 
     def handle_recognition(recognition)
-      raise TimeoutError.new('recognition timed out', recognition) if recognition.queued? && async?
       return recognition unless recognition.error?
 
       case recognition.error['type']

data/lib/scnnr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Scnnr
-  VERSION = '0.2.0'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scnnr
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - NEWROPE Co. Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler