resizing 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 447b0dda55d606eec4ec8133edd826cd206719ebe44c839c6a2628092ff8eaca
-  data.tar.gz: 8bb995ba29217cd573fc1eeaec86aad1a0f999513aa89cb598eec8ea168a5ef0
+  metadata.gz: 961f81c9e1882479073ee48e278c966ef695a81ea550bcf9d44d1c47b3e85f70
+  data.tar.gz: a1d9a4227b6bbd1b014d250bb85f7ab8d40a32ae2fdd55ff6df79a0ba75f7e7b
 SHA512:
-  metadata.gz: 9d899143122b31fc588b6c721f1fd889edf203a43de5b09a2e0164dd3a075d92b3fb3936f7d0e0c154b6c994dddc748e190c2e7ab8327690aed1b31a96bc886c
-  data.tar.gz: a621e2b3c388c3d9b6cea438589f2fe4474465ca6fe78aa4e97977c10857da4ef48c89883690c3db4b782b8b58871fa1fa37e8ff69bc8ce67f05b84cb95d80ec
+  metadata.gz: b3425a65764ce43cccf114f34344789f2690c308f8853ae5497d9cd5466da08fdc10aa96d57dec3edb86f777166c0f7eda6aedf12ebd0b400d6a07ed150121fa
+  data.tar.gz: d788fa2b2ce69001db90edcca01cc817e06f9bc3674b57e9ce066b7d9e67933c831f8df61aa95a0b31370db8ab0e80ae0ccac53400a573411277cc301656aa1a

data/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## [Unreleased](https://github.com/jksy/resizing-gem/tree/v0.8.0)
+
+[Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.7.0...v0.8.0)
+
+**Merged pull requests:**
+
+- Add supporting API of videos [\#47](https://github.com/jksy/resizing-gem/pull/47) ([jksy](https://github.com/jksy))
+- update changelog and add rake task [\#44](https://github.com/jksy/resizing-gem/pull/44) ([jksy](https://github.com/jksy))
+
+## [v0.7.0](https://github.com/jksy/resizing-gem/tree/v0.7.0) (2020-12-11)
+
+[Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.6.0...v0.7.0)
+
+**Merged pull requests:**
+
+- v0.7.0 [\#43](https://github.com/jksy/resizing-gem/pull/43) ([jksy](https://github.com/jksy))
+- APIError\#decoded\_body return hash always [\#42](https://github.com/jksy/resizing-gem/pull/42) ([jksy](https://github.com/jksy))
+
+## [v0.6.0](https://github.com/jksy/resizing-gem/tree/v0.6.0) (2020-12-08)
+
+[Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.5.3...v0.6.0)
+
+**Merged pull requests:**
+
+- return error message [\#41](https://github.com/jksy/resizing-gem/pull/41) ([jksy](https://github.com/jksy))
+
 ## [v0.5.3](https://github.com/jksy/resizing-gem/tree/v0.5.3) (2020-10-15)
 
 [Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.5.2...v0.5.3)
@@ -7,6 +33,7 @@
 **Merged pull requests:**
 
 - Feature/fix raise error [\#40](https://github.com/jksy/resizing-gem/pull/40) ([jksy](https://github.com/jksy))
+- save original filename [\#37](https://github.com/jksy/resizing-gem/pull/37) ([jksy](https://github.com/jksy))
 
 ## [v0.5.2](https://github.com/jksy/resizing-gem/tree/v0.5.2) (2020-10-11)
 
@@ -39,7 +66,6 @@
 
 **Merged pull requests:**
 
-- save original filename [\#37](https://github.com/jksy/resizing-gem/pull/37) ([jksy](https://github.com/jksy))
 - columnがnilの時はdefault\_urlを返す \#33 [\#34](https://github.com/jksy/resizing-gem/pull/34) ([jksy](https://github.com/jksy))
 
 ## [v0.2.1](https://github.com/jksy/resizing-gem/tree/v0.2.1) (2020-09-29)
@@ -90,6 +116,7 @@
 
 - version 0.2.0 [\#21](https://github.com/jksy/resizing-gem/pull/21) ([jksy](https://github.com/jksy))
 - support f\_auto, q\_auto parameter [\#20](https://github.com/jksy/resizing-gem/pull/20) ([jksy](https://github.com/jksy))
+- add mock client for test environments [\#14](https://github.com/jksy/resizing-gem/pull/14) ([jksy](https://github.com/jksy))
 
 ## [v0.1.4](https://github.com/jksy/resizing-gem/tree/v0.1.4) (2020-08-08)
 
@@ -111,10 +138,6 @@
 
 [Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.1.1...v0.1.2)
 
-**Merged pull requests:**
-
-- ignore response if delete method is received 404 status code [\#17](https://github.com/jksy/resizing-gem/pull/17) ([jksy](https://github.com/jksy))
-
 ## [v0.1.1](https://github.com/jksy/resizing-gem/tree/v0.1.1) (2020-06-12)
 
 [Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.1.0...v0.1.1)
@@ -122,7 +145,6 @@
 **Merged pull requests:**
 
 - Feature/fix raise error [\#16](https://github.com/jksy/resizing-gem/pull/16) ([jksy](https://github.com/jksy))
-- change mysql port on docker-compose [\#9](https://github.com/jksy/resizing-gem/pull/9) ([jksy](https://github.com/jksy))
 
 ## [v0.1.0](https://github.com/jksy/resizing-gem/tree/v0.1.0) (2020-06-07)
 
@@ -130,11 +152,12 @@
 
 **Merged pull requests:**
 
-- add mock client for test environments [\#14](https://github.com/jksy/resizing-gem/pull/14) ([jksy](https://github.com/jksy))
+- ignore response if delete method is received 404 status code [\#17](https://github.com/jksy/resizing-gem/pull/17) ([jksy](https://github.com/jksy))
 - Feature/add test test for remove xxx [\#13](https://github.com/jksy/resizing-gem/pull/13) ([jksy](https://github.com/jksy))
 - add rubocop & fix some tests [\#12](https://github.com/jksy/resizing-gem/pull/12) ([jksy](https://github.com/jksy))
 - fix the column cant be update by null value [\#11](https://github.com/jksy/resizing-gem/pull/11) ([jksy](https://github.com/jksy))
 - fix empty url when model is reload [\#10](https://github.com/jksy/resizing-gem/pull/10) ([jksy](https://github.com/jksy))
+- change mysql port on docker-compose [\#9](https://github.com/jksy/resizing-gem/pull/9) ([jksy](https://github.com/jksy))
 - fix return invalid url when model is reloaded [\#8](https://github.com/jksy/resizing-gem/pull/8) ([jksy](https://github.com/jksy))
 - add circleci [\#7](https://github.com/jksy/resizing-gem/pull/7) ([jksy](https://github.com/jksy))
 - divide some classes and add tests [\#6](https://github.com/jksy/resizing-gem/pull/6) ([jksy](https://github.com/jksy))

data/Gemfile

@@ -6,4 +6,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'minitest', '~> 5.0'
-gem 'rake', '~> 12.0'
+gem 'rake', '~> 13.0'

data/Rakefile

@@ -2,6 +2,7 @@
 
 require 'bundler/gem_tasks'
 require 'rake/testtask'
+require 'github_changelog_generator/task'
 
 Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
@@ -9,4 +10,11 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/*_test.rb']
 end
 
+GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+  config.user = 'jksy'
+  config.project = 'resizing-gem'
+  config.since_tag = 'v0.1.0'
+  config.future_release = Resizing::VERSION
+end
+
 task default: :test

data/lib/resizing.rb

@@ -5,11 +5,15 @@ require 'faraday'
 require 'json'
 
 module Resizing
+  autoload :Constants, 'resizing/constants'
+  autoload :Configurable, 'resizing/configurable'
+  autoload :HttpClientable, 'resizing/http_clientable'
   autoload :Client, 'resizing/client'
   autoload :MockClient, 'resizing/mock_client'
   autoload :Configuration, 'resizing/configuration'
   autoload :CarrierWave, 'resizing/carrier_wave'
   autoload :PublicId, 'resizing/public_id'
+  autoload :Video, 'resizing/video'
 
   class Error < StandardError; end
   class ConfigurationError < Error; end

data/lib/resizing/client.rb

@@ -24,21 +24,12 @@ module Resizing
   #
   #++
   class Client
-    # TODO
-    # to use standard constants
-    HTTP_STATUS_OK = 200
-    HTTP_STATUS_CREATED = 201
-    HTTP_STATUS_NOT_FOUND = 404
+    include Resizing::Constants
+    include Resizing::Configurable
+    include Resizing::HttpClientable
 
-    attr_reader :config
     def initialize(*attrs)
-      @config = if attrs.first.is_a? Configuration
-                  attrs.first
-                elsif attrs.first.nil?
-                  Resizing.configure
-                else
-                  Configuration.new(*attrs)
-                end
+      initialize_config(*attrs)
     end
 
     def get(image_id)
@@ -57,14 +48,14 @@ module Resizing
         image: Faraday::UploadIO.new(body, options[:content_type], filename)
       }
 
-      response = http_client.post(url, params) do |request|
-        request.headers['X-ResizingToken'] = config.generate_auth_header
+      response = handle_faraday_error do
+        http_client.post(url, params) do |request|
+          request.headers['X-ResizingToken'] = config.generate_auth_header
+        end
       end
 
       result = handle_create_response(response)
       result
-    rescue Faraday::TimeoutError => e
-      handle_timeout_error e
     end
 
     def put(image_id, file_or_binary, options)
@@ -79,40 +70,40 @@ module Resizing
         image: Faraday::UploadIO.new(body, options[:content_type], filename)
       }
 
-      response = http_client.put(url, params) do |request|
-        request.headers['X-ResizingToken'] = config.generate_auth_header
+      response = handle_faraday_error do
+        http_client.put(url, params) do |request|
+          request.headers['X-ResizingToken'] = config.generate_auth_header
+        end
       end
 
       result = handle_create_response(response)
       result
-    rescue Faraday::TimeoutError => e
-      handle_timeout_error e
     end
 
     def delete(image_id)
       url = build_delete_url(image_id)
 
-      response = http_client.delete(url) do |request|
-        request.headers['X-ResizingToken'] = config.generate_auth_header
+      response = handle_faraday_error do
+        http_client.delete(url) do |request|
+          request.headers['X-ResizingToken'] = config.generate_auth_header
+        end
       end
 
       result = handle_delete_response(response)
       result
-    rescue Faraday::TimeoutError => e
-      handle_timeout_error e
     end
 
     def metadata(image_id, options = {})
       url = build_metadata_url(image_id)
 
-      response = http_client.get(url) do |request|
-        request.headers['X-ResizingToken'] = config.generate_auth_header
+      response = handle_faraday_error do
+        http_client.get(url) do |request|
+          request.headers['X-ResizingToken'] = config.generate_auth_header
+        end
       end
 
       result = handle_metadata_response(response)
       result
-    rescue Faraday::TimeoutError => e
-      handle_timeout_error e
     end
 
     private
@@ -142,15 +133,6 @@ module Resizing
       "#{config.host}/projects/#{config.project_id}/upload/images/#{image_id}/metadata"
     end
 
-    def http_client
-      @http_client ||= Faraday.new(url: config.host) do |builder|
-        builder.options[:open_timeout] = config.open_timeout
-        builder.options[:timeout] = config.response_timeout
-        builder.request :multipart
-        builder.request :url_encoded
-        builder.adapter Faraday.default_adapter
-      end
-    end
 
     def to_io(data)
       return data.to_io if data.respond_to? :to_io
@@ -208,10 +190,5 @@ module Resizing
         raise err
       end
     end
-
-    def handle_timeout_error error
-      # error: Faraday::TimeoutError
-      raise APIError.new("TimeoutError: #{error.inspect}")
-    end
   end
 end

data/lib/resizing/configurable.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Resizing
+  module Configurable
+    def self.included mod
+      mod.send(:attr_reader, :config)
+    end
+
+    def initialize_config *attrs
+      config = if attrs.first.is_a? Configuration
+                 attrs.first
+               elsif attrs.first.nil?
+                 Resizing.configure
+               else
+                 Configuration.new(*attrs)
+               end
+
+      instance_variable_set :@config, config
+    end
+  end
+end

data/lib/resizing/constants.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Resizing
+  module Constants
+    HTTP_STATUS_OK = 200
+    HTTP_STATUS_CREATED = 201
+    HTTP_STATUS_NOT_FOUND = 404
+  end
+end

data/lib/resizing/http_clientable.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Resizing
+  module HttpClientable
+    def http_client
+      @http_client ||= Faraday.new(url: config.host) do |builder|
+        builder.options[:open_timeout] = config.open_timeout
+        builder.options[:timeout] = config.response_timeout
+        builder.request :multipart
+        builder.request :url_encoded
+        builder.adapter Faraday.default_adapter
+      end
+    end
+
+    def handle_faraday_error &block
+      yield
+    rescue Faraday::TimeoutError => e
+      handle_timeout_error e
+    end
+
+    def handle_timeout_error error
+      raise APIError.new("TimeoutError: #{error.inspect}")
+    end
+  end
+end

data/lib/resizing/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Resizing
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

data/lib/resizing/video.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Resizing
+  module Video
+    autoload :Client, 'resizing/video/client'
+  end
+end
+

data/lib/resizing/video/client.rb

@@ -0,0 +1,105 @@
+# frozen_string_literal: true
+
+module Resizing
+  module Video
+    class Client
+      include Resizing::Constants
+      include Resizing::Configurable
+      include Resizing::HttpClientable
+
+      def initialize(*attrs)
+        initialize_config(*attrs)
+      end
+
+      def prepare
+        url = build_prepare_url
+
+        response = handle_faraday_error do
+          http_client.post(url) do |request|
+            request.headers['X-ResizingToken'] = config.generate_auth_header
+          end
+        end
+        handle_prepare_response response
+      end
+
+      def upload_completed response_or_url
+        url = url_from response_or_url, 'upload_completed_url'
+
+        response = handle_faraday_error do
+          http_client.put(url) do |request|
+            request.headers['X-ResizingToken'] = config.generate_auth_header
+          end
+        end
+        handle_upload_completed_response response
+      end
+
+      def metadata response_or_url
+        url = url_from response_or_url, 'self_url'
+
+        response = handle_faraday_error do
+          http_client.get(url) do |request|
+            request.headers['X-ResizingToken'] = config.generate_auth_header
+          end
+        end
+        handle_metadata_response response
+      end
+
+      private
+
+      def build_prepare_url
+        "#{config.host}/projects/#{config.project_id}/upload/videos/prepare"
+      end
+
+      def url_from response_or_url, name
+        if response_or_url.kind_of? String
+          response_or_url
+        elsif response_or_url.kind_of? Hash
+          response_or_url[name.to_s] || response_or_url[name.intern]
+        else
+          raise ArgumentError, "upload_completed is require Hash or String"
+        end
+      end
+
+
+      def handle_prepare_response response
+        raise APIError, "no response is returned" if response.nil?
+
+        case response.status
+        when HTTP_STATUS_OK, HTTP_STATUS_CREATED
+          JSON.parse(response.body)
+        else
+          handle_error_response response
+        end
+      end
+
+      def handle_upload_completed_response response
+        raise APIError, "no response is returned" if response.nil?
+
+        case response.status
+        when HTTP_STATUS_OK
+          JSON.parse(response.body)
+        else
+          handle_error_response response
+        end
+      end
+
+      def handle_metadata_response response
+        raise APIError, "no response is returned" if response.nil?
+
+        case response.status
+        when HTTP_STATUS_OK
+          JSON.parse(response.body)
+        else
+          handle_error_response response
+        end
+      end
+
+      def handle_error_response response
+        result = JSON.parse(response.body) rescue {}
+        err = APIError.new("invalid http status code #{response.status}")
+        err.decoded_body = result
+        raise err
+      end
+    end
+  end
+end

data/resizing.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.add_runtime_dependency 'faraday', '~> 1.0.1'
+  spec.add_runtime_dependency 'faraday', '>= 1.0.1', '< 1.4.0'
   spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'carrierwave'
   spec.add_development_dependency 'fog-aws'
@@ -40,4 +40,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'timecop'
   spec.add_development_dependency 'vcr'
+  spec.add_development_dependency 'github_changelog_generator'
 end

data/test/resizing/client_test.rb

@@ -5,7 +5,6 @@ require 'test_helper'
 module Resizing
   class ClientTest < Minitest::Test
     def setup
-      # NOP
       @configuration_template = {
         host: 'http://192.168.56.101:5000',
         project_id: 'e06e710d-f026-4dcf-b2c0-eab0de8bb83f',
@@ -53,6 +52,16 @@ module Resizing
       end
     end
 
+    def test_is_timeout_with_post_method
+      Resizing.configure = @configuration_template.merge(project_id: 'timeout_project_id')
+
+      client = Resizing::Client.new
+      f = File.open('test/data/images/sample1.jpg', 'r')
+      assert_raises Resizing::APIError do
+        client.post(f, content_type: 'image/jpeg')
+      end
+    end
+
     def test_is_putable_file
       Resizing.configure = @configuration_template
 
@@ -75,6 +84,18 @@ module Resizing
       end
     end
 
+    def test_is_timeout_with_put_method
+      Resizing.configure = @configuration_template.merge(project_id: 'timeout_project_id')
+
+      client = Resizing::Client.new
+      name = 'AWEaewfAreaweFAFASfwe'
+      f = File.open('test/data/images/sample1.jpg', 'r')
+
+      assert_raises Resizing::APIError do
+        r = client.put(name, f, content_type: 'image/jpeg')
+      end
+    end
+
     def test_raise_error
       Resizing.configure = @configuration_template
 
@@ -117,12 +138,12 @@ module Resizing
         assert_equal(r['id'], name)
         assert_equal(r['project_id'], Resizing.configure.project_id)
         assert_equal(r['content_type'], 'image/jpeg')
-        assert(!r['latest_version_id'].nil?)
-        assert(!r['latest_etag'].nil?)
-        assert(!r['created_at'].nil?)
-        assert(!r['updated_at'].nil?)
-        assert(!r['height'].nil?)
-        assert(!r['width'].nil?)
+        assert(r['latest_version_id'] != nil)
+        assert(r['latest_etag'] != nil)
+        assert(r['created_at'] != nil)
+        assert(r['updated_at'] != nil)
+        assert(r['height'] != nil)
+        assert(r['width'] != nil)
         assert_equal(
           r['public_id'],
           "/projects/e06e710d-f026-4dcf-b2c0-eab0de8bb83f/upload/images/87263920-2081-498e-a107-9625f4fde01b/vHg9VFvdI6HRzLFbV495VdwVmHIspLRCo"

data/test/resizing/video/client_test.rb

@@ -0,0 +1,149 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Resizing
+  module Video
+    class ClientTest < Minitest::Test
+      def setup
+        # TODO
+        # refactoring
+        @configuration_template = {
+          host: 'http://192.168.56.101:5000',
+          project_id: 'f11dfad4-2247-4220-b3b2-efeb82864a97',
+          secret_token: 'xn2fkkrrp2uiragliaigkx3mwnmjis6dg35sa3kya12sq133t3xjp36s7iwamp64',
+          open_timeout: 10,
+          response_timeout: 20
+        }
+      end
+
+      def teardown
+        # NOP
+      end
+
+      def test_is_initialized
+        Resizing.configure = @configuration_template
+
+        client = Resizing::Video::Client.new
+        assert(!client.config.nil?)
+        assert_equal(client.config, Resizing.configure)
+      end
+
+      def test_is_initialized_with_configuration
+        config = Resizing::Configuration.new(@configuration_template)
+        client = Resizing::Video::Client.new(config)
+        assert(!client.config.nil?)
+        assert_equal(client.config, config)
+      end
+
+      def test_is_callable_prepare
+        Resizing.configure = @configuration_template
+
+        client = Resizing::Video::Client.new
+        VCR.use_cassette 'video/prepare/success', record: :once  do
+          base_url = 'http://192.168.56.101:5000/projects/f11dfad4-2247-4220-b3b2-efeb82864a97/upload/videos/3a101d25-e03f-4fac-a4ee-dbe882c6139d'
+          r = client.prepare
+          assert_equal(r['id'], '3a101d25-e03f-4fac-a4ee-dbe882c6139d')
+          assert_equal(r['project_id'], Resizing.configure.project_id)
+          assert_equal(r['state'], 'initialized')
+          assert_nil(r['deleted_at'])
+          # assert_nil(r['source_uri']) # TODO: remove
+          assert(r['s3_presigned_url'] != nil)
+          assert_nil(r['converted_uri']) # TODO:remove
+          assert(r['created_at'] != nil)
+          assert(r['updated_at'] != nil)
+          assert(r['upload_completed_url'], "#{base_url}/upload_completed")
+          assert(r['self_url'], "#{base_url}.json")
+          assert_nil(r['m3u8_url'])
+          assert_nil(r['avc_url'])
+          assert_nil(r['hevc_url'])
+          assert_includes(r['thumbnail_url'], 'now-converting')
+        end
+      end
+
+      def test_is_timeout_with_prepare_method
+        Resizing.configure = @configuration_template.merge(project_id: 'timeout_project_id')
+
+        client = Resizing::Video::Client.new
+        assert_raises Resizing::APIError do
+          client.prepare
+        end
+      end
+
+      def test_is_callable_upload_complete_with_response
+        Resizing.configure = @configuration_template
+
+        client = Resizing::Video::Client.new
+        r = nil
+        VCR.use_cassette 'video/prepare/success', record: :once  do
+          r = client.prepare
+        end
+
+        VCR.use_cassette 'video/upload_completed/success', record: :once  do
+          r = client.upload_completed r
+          assert_upload_completed_response r
+        end
+      end
+
+      def test_is_callable_upload_complete_with_string
+        Resizing.configure = @configuration_template
+
+        client = Resizing::Video::Client.new
+        r = nil
+        VCR.use_cassette 'video/prepare/success', record: :once  do
+          r = client.prepare
+        end
+
+        VCR.use_cassette 'video/upload_completed/success', record: :once  do
+          r = client.upload_completed r['upload_completed_url']
+          assert_upload_completed_response r
+        end
+      end
+
+      def test_is_callable_metadata_with_response
+        Resizing.configure = @configuration_template
+
+        client = Resizing::Video::Client.new
+        r = nil
+        VCR.use_cassette 'video/prepare/success', record: :once  do
+          r = client.prepare
+        end
+
+        completed_response = nil
+        VCR.use_cassette 'video/upload_completed/success', record: :once  do
+          completed_response = client.upload_completed r['upload_completed_url']
+        end
+
+        VCR.use_cassette 'video/metadata/success', record: :once  do
+          r = client.metadata r
+          assert_equal(completed_response, r)
+        end
+      end
+
+      def assert_upload_completed_response r
+        base_url = 'http://192.168.56.101:5000/projects/f11dfad4-2247-4220-b3b2-efeb82864a97/upload/videos/3a101d25-e03f-4fac-a4ee-dbe882c6139d'
+        assert_equal(r['id'], '3a101d25-e03f-4fac-a4ee-dbe882c6139d')
+        assert_equal(r['project_id'], Resizing.configure.project_id)
+        assert_equal(r['state'], 'uploaded')
+        assert_nil(r['deleted_at'])
+        # assert(r['source_uri'] != nil) # TODO: remove
+        assert(r['s3_presigned_url'] != nil)
+        # assert_equal(r['converted_uri'], "#{base_url}/") # TODO:remove
+        assert(r['created_at'] != nil)
+        assert(r['updated_at'] != nil)
+        assert(r['upload_completed_url'], "#{base_url}/upload_completed")
+        assert(r['self_url'], "#{base_url}.json")
+        assert_nil(r['m3u8_url'])
+        assert_nil(r['avc_url'])
+        assert_nil(r['hevc_url'])
+        assert_includes(r['thumbnail_url'], 'now-converting')
+        assert_equal(r['job_state']['id'], 'a586d38f-bdc3-4af2-9dbc-e0c18d2d54c5')
+        assert_equal(r['job_state']['upload_video_id'], '3a101d25-e03f-4fac-a4ee-dbe882c6139d')
+        assert_equal(r['job_state']['state'], 'initialized')
+        assert_equal(r['job_state']['job_percent_complete'], 0)
+        assert(r['job_state']['created_at'] != nil)
+        assert(r['job_state']['updated_at'] != nil)
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -18,6 +18,11 @@ VCR.configure do |c|
   c.cassette_library_dir = 'test/vcr'
   c.hook_into :faraday
   c.allow_http_connections_when_no_cassette = false
+
+  # raise Faraday::TimeoutError, when project_id is timeout_project_id
+  c.before_http_request(lambda {|r| URI(r.uri).path.match? %r(/projects/timeout_project_id) } ) do
+    raise Faraday::TimeoutError
+  end
 end
 
 ActiveRecord::Base.establish_connection(

data/test/vcr/video/metadata/success.yml

@@ -0,0 +1,47 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://192.168.56.101:5000/projects/f11dfad4-2247-4220-b3b2-efeb82864a97/upload/videos/3a101d25-e03f-4fac-a4ee-dbe882c6139d.json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v1.0.1
+      X-ResizingToken:
+      - v1,1611308558,a02cf32edef894208f6d1bc17cc6182783728e2b2edfdca1bf6b3109fe37a58d
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      x-frame-options:
+      - SAMEORIGIN
+      x-xss-protection:
+      - 1; mode=block
+      x-content-type-options:
+      - nosniff
+      x-download-options:
+      - noopen
+      x-permitted-cross-domain-policies:
+      - none
+      referrer-policy:
+      - strict-origin-when-cross-origin
+      content-type:
+      - application/json; charset=utf-8
+      etag:
+      - W/"f2386fd24b9a80cecab7721608aa8902"
+      cache-control:
+      - max-age=0, private, must-revalidate
+      x-request-id:
+      - 84895278-9508-45c0-a7dc-d1087dc68813
+      x-runtime:
+      - '0.023674'
+      transfer-encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: '{"id":"3a101d25-e03f-4fac-a4ee-dbe882c6139d","project_id":"f11dfad4-2247-4220-b3b2-efeb82864a97","state":"uploaded","source_uri":"s3://resizing-bucket-development-video/videos/uploading/f11dfad4-2247-4220-b3b2-efeb82864a97/3a101d25-e03f-4fac-a4ee-dbe882c6139d/1dc40aae-29ab-4369-87da-10b146371fb8","deleted_at":null,"s3_presigned_url":"https://resizing-bucket-development-video.s3.ap-northeast-1.amazonaws.com/videos/uploading/f11dfad4-2247-4220-b3b2-efeb82864a97/3a101d25-e03f-4fac-a4ee-dbe882c6139d/1dc40aae-29ab-4369-87da-10b146371fb8?X-Amz-Algorithm=AWS4-HMAC-SHA256\u0026X-Amz-Credential=AKIXXXXXXXXXX%2F20210122%2Fap-northeast-1%2Fs3%2Faws4_request\u0026X-Amz-Date=20210122T094237Z\u0026X-Amz-Expires=900\u0026X-Amz-SignedHeaders=host\u0026X-Amz-Signature=c847ca1bfc20b7caeefcb999697df3cfd531aa2b7f0aa13f9066f289f693c22d","converted_uri":"s3://resizing-bucket-development-video/videos/converted/f11dfad4-2247-4220-b3b2-efeb82864a97/3a101d25-e03f-4fac-a4ee-dbe882c6139d/1dc40aae-29ab-4369-87da-10b146371fb8","created_at":"2021-01-22T09:42:37.670Z","updated_at":"2021-01-22T09:42:37.878Z","upload_completed_url":"http://192.168.56.101:5000/projects/f11dfad4-2247-4220-b3b2-efeb82864a97/upload/videos/3a101d25-e03f-4fac-a4ee-dbe882c6139d/upload_completed","self_url":"http://192.168.56.101:5000/projects/f11dfad4-2247-4220-b3b2-efeb82864a97/upload/videos/3a101d25-e03f-4fac-a4ee-dbe882c6139d.json","m3u8_url":null,"hevc_url":null,"avc_url":null,"thumbnail_url":"/assets/videos/now-converting-8a05d294385c14270a3662e01df5e50578cabcd2787123c18057ac06b101344c.png","job_state":{"id":"a586d38f-bdc3-4af2-9dbc-e0c18d2d54c5","upload_video_id":"3a101d25-e03f-4fac-a4ee-dbe882c6139d","state":"initialized","job_percent_complete":0,"created_at":"2021-01-22T09:42:38.501Z","updated_at":"2021-01-22T09:42:38.501Z"}}'
+  recorded_at: Fri, 22 Jan 2021 09:42:38 GMT
+recorded_with: VCR 6.0.0

data/test/vcr/video/prepare/success.yml

@@ -0,0 +1,47 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://192.168.56.101:5000/projects/f11dfad4-2247-4220-b3b2-efeb82864a97/upload/videos/prepare
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v1.0.1
+      X-ResizingToken:
+      - v1,1611308557,6628235db472f228a7c3c6b309e081b6c32aac01890abbfd2f38230ff4105c1c
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      x-frame-options:
+      - SAMEORIGIN
+      x-xss-protection:
+      - 1; mode=block
+      x-content-type-options:
+      - nosniff
+      x-download-options:
+      - noopen
+      x-permitted-cross-domain-policies:
+      - none
+      referrer-policy:
+      - strict-origin-when-cross-origin
+      content-type:
+      - application/json; charset=utf-8
+      etag:
+      - W/"273d4e663c17e06deb0c69cc90bb79b6"
+      cache-control:
+      - max-age=0, private, must-revalidate
+      x-request-id:
+      - e586873a-9cc9-45a0-a216-5e62165cb9f1
+      x-runtime:
+      - '0.046932'
+      transfer-encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: '{"id":"3a101d25-e03f-4fac-a4ee-dbe882c6139d","project_id":"f11dfad4-2247-4220-b3b2-efeb82864a97","state":"initialized","source_uri":"s3://resizing-bucket-development-video/videos/uploading/f11dfad4-2247-4220-b3b2-efeb82864a97/3a101d25-e03f-4fac-a4ee-dbe882c6139d/1dc40aae-29ab-4369-87da-10b146371fb8","deleted_at":null,"s3_presigned_url":"https://resizing-bucket-development-video.s3.ap-northeast-1.amazonaws.com/videos/uploading/f11dfad4-2247-4220-b3b2-efeb82864a97/3a101d25-e03f-4fac-a4ee-dbe882c6139d/1dc40aae-29ab-4369-87da-10b146371fb8?X-Amz-Algorithm=AWS4-HMAC-SHA256\u0026X-Amz-Credential=AKIXXXXXXXXXXXXXX%2F20210122%2Fap-northeast-1%2Fs3%2Faws4_request\u0026X-Amz-Date=20210122T094237Z\u0026X-Amz-Expires=900\u0026X-Amz-SignedHeaders=host\u0026X-Amz-Signature=c847ca1bfc20b7caeefcb999697df3cfd531aa2b7f0aa13f9066f289f693c22d","converted_uri":null,"created_at":"2021-01-22T09:42:37.670Z","updated_at":"2021-01-22T09:42:37.670Z","upload_completed_url":"http://192.168.56.101:5000/projects/f11dfad4-2247-4220-b3b2-efeb82864a97/upload/videos/3a101d25-e03f-4fac-a4ee-dbe882c6139d/upload_completed","self_url":"http://192.168.56.101:5000/projects/f11dfad4-2247-4220-b3b2-efeb82864a97/upload/videos/3a101d25-e03f-4fac-a4ee-dbe882c6139d.json","m3u8_url":null,"hevc_url":null,"avc_url":null,"thumbnail_url":"/assets/videos/now-converting-8a05d294385c14270a3662e01df5e50578cabcd2787123c18057ac06b101344c.png","job_state":null}'
+  recorded_at: Fri, 22 Jan 2021 09:42:37 GMT
+recorded_with: VCR 6.0.0

data/test/vcr/video/upload_completed/success.yml

@@ -0,0 +1,47 @@
+---
+http_interactions:
+- request:
+    method: put
+    uri: http://192.168.56.101:5000/projects/f11dfad4-2247-4220-b3b2-efeb82864a97/upload/videos/3a101d25-e03f-4fac-a4ee-dbe882c6139d/upload_completed
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v1.0.1
+      X-ResizingToken:
+      - v1,1611308557,6628235db472f228a7c3c6b309e081b6c32aac01890abbfd2f38230ff4105c1c
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      x-frame-options:
+      - SAMEORIGIN
+      x-xss-protection:
+      - 1; mode=block
+      x-content-type-options:
+      - nosniff
+      x-download-options:
+      - noopen
+      x-permitted-cross-domain-policies:
+      - none
+      referrer-policy:
+      - strict-origin-when-cross-origin
+      content-type:
+      - application/json; charset=utf-8
+      etag:
+      - W/"f7ce780fcb3afdb5077ccfee0564b182"
+      cache-control:
+      - max-age=0, private, must-revalidate
+      x-request-id:
+      - 8a79b573-8db2-474c-a994-9e1ff59bc6c1
+      x-runtime:
+      - '0.830313'
+      transfer-encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: '{"project_id":"f11dfad4-2247-4220-b3b2-efeb82864a97","id":"3a101d25-e03f-4fac-a4ee-dbe882c6139d","state":"uploaded","source_uri":"s3://resizing-bucket-development-video/videos/uploading/f11dfad4-2247-4220-b3b2-efeb82864a97/3a101d25-e03f-4fac-a4ee-dbe882c6139d/1dc40aae-29ab-4369-87da-10b146371fb8","deleted_at":null,"s3_presigned_url":"https://resizing-bucket-development-video.s3.ap-northeast-1.amazonaws.com/videos/uploading/f11dfad4-2247-4220-b3b2-efeb82864a97/3a101d25-e03f-4fac-a4ee-dbe882c6139d/1dc40aae-29ab-4369-87da-10b146371fb8?X-Amz-Algorithm=AWS4-HMAC-SHA256\u0026X-Amz-Credential=AKIXXXXXXXXXX%2F20210122%2Fap-northeast-1%2Fs3%2Faws4_request\u0026X-Amz-Date=20210122T094237Z\u0026X-Amz-Expires=900\u0026X-Amz-SignedHeaders=host\u0026X-Amz-Signature=c847ca1bfc20b7caeefcb999697df3cfd531aa2b7f0aa13f9066f289f693c22d","converted_uri":"s3://resizing-bucket-development-video/videos/converted/f11dfad4-2247-4220-b3b2-efeb82864a97/3a101d25-e03f-4fac-a4ee-dbe882c6139d/1dc40aae-29ab-4369-87da-10b146371fb8","created_at":"2021-01-22T09:42:37.670Z","updated_at":"2021-01-22T09:42:37.878Z","upload_completed_url":"http://192.168.56.101:5000/projects/f11dfad4-2247-4220-b3b2-efeb82864a97/upload/videos/3a101d25-e03f-4fac-a4ee-dbe882c6139d/upload_completed","self_url":"http://192.168.56.101:5000/projects/f11dfad4-2247-4220-b3b2-efeb82864a97/upload/videos/3a101d25-e03f-4fac-a4ee-dbe882c6139d.json","m3u8_url":null,"hevc_url":null,"avc_url":null,"thumbnail_url":"/assets/videos/now-converting-8a05d294385c14270a3662e01df5e50578cabcd2787123c18057ac06b101344c.png","job_state":{"id":"a586d38f-bdc3-4af2-9dbc-e0c18d2d54c5","upload_video_id":"3a101d25-e03f-4fac-a4ee-dbe882c6139d","state":"initialized","job_percent_complete":0,"created_at":"2021-01-22T09:42:38.501Z","updated_at":"2021-01-22T09:42:38.501Z"}}'
+  recorded_at: Fri, 22 Jan 2021 09:42:38 GMT
+recorded_with: VCR 6.0.0

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: resizing
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Junichiro Kasuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-11 00:00:00.000000000 Z
+date: 2021-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +184,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'Client and utilities for Resizing '
 email:
 - junichiro.kasuya@gmail.com
@@ -203,10 +223,15 @@ files:
 - lib/resizing/carrier_wave/storage/file.rb
 - lib/resizing/carrier_wave/storage/remote.rb
 - lib/resizing/client.rb
+- lib/resizing/configurable.rb
 - lib/resizing/configuration.rb
+- lib/resizing/constants.rb
+- lib/resizing/http_clientable.rb
 - lib/resizing/mock_client.rb
 - lib/resizing/public_id.rb
 - lib/resizing/version.rb
+- lib/resizing/video.rb
+- lib/resizing/video/client.rb
 - resizing.gemspec
 - test/data/images/empty_file.jpg
 - test/data/images/sample1.jpg
@@ -216,6 +241,7 @@ files:
 - test/resizing/client_test.rb
 - test/resizing/configuration_test.rb
 - test/resizing/public_id_test.rb
+- test/resizing/video/client_test.rb
 - test/resizing_test.rb
 - test/test_helper.rb
 - test/vcr/carrier_wave_test/remove_resizing_picture.yml
@@ -225,6 +251,9 @@ files:
 - test/vcr/client/metadata.yml
 - test/vcr/client/post.yml
 - test/vcr/client/put.yml
+- test/vcr/video/metadata/success.yml
+- test/vcr/video/prepare/success.yml
+- test/vcr/video/upload_completed/success.yml
 homepage: https://github.com/jksy/resizing-gem
 licenses:
 - MIT