resizing 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 961f81c9e1882479073ee48e278c966ef695a81ea550bcf9d44d1c47b3e85f70
-  data.tar.gz: a1d9a4227b6bbd1b014d250bb85f7ab8d40a32ae2fdd55ff6df79a0ba75f7e7b
+  metadata.gz: 1384a3c771598b82c8431a7099658805b56001d64d5a6d5eef82c128093a70db
+  data.tar.gz: 716a43f90b50839b4f024e936316ac1184f65d00d26cd571ba48e3c7e09ac7ca
 SHA512:
-  metadata.gz: b3425a65764ce43cccf114f34344789f2690c308f8853ae5497d9cd5466da08fdc10aa96d57dec3edb86f777166c0f7eda6aedf12ebd0b400d6a07ed150121fa
-  data.tar.gz: d788fa2b2ce69001db90edcca01cc817e06f9bc3674b57e9ce066b7d9e67933c831f8df61aa95a0b31370db8ab0e80ae0ccac53400a573411277cc301656aa1a
+  metadata.gz: 4c197bbbd6916a416b43225ff52c7e198dcb947a6a92e1a40ee6bfa11e39e0fe33d31b38c31e856056dece662a853116fbee8af8c655c557514ac6d87026dce6
+  data.tar.gz: 312ce7a349404264bda32ea7f0c478bcf92d95f314883c4cbd194578ba84c8a1259b426746214ec7785f67b9a2b1f9436ec4ffcc4c309a8af5c0eb31b1087b6e

data/CHANGELOG.md

@@ -1,12 +1,25 @@
 # Changelog
 
-## [Unreleased](https://github.com/jksy/resizing-gem/tree/v0.8.0)
+## [v0.8.1](https://github.com/jksy/resizing-gem/tree/v0.8.1) (2021-03-06)
+
+[Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.8.0...v0.8.1)
+
+**Merged pull requests:**
+
+- version 0.8.1 [\#51](https://github.com/jksy/resizing-gem/pull/51) ([jksy](https://github.com/jksy))
+- fix test [\#50](https://github.com/jksy/resizing-gem/pull/50) ([jksy](https://github.com/jksy))
+- Feature/separate subdomain [\#49](https://github.com/jksy/resizing-gem/pull/49) ([jksy](https://github.com/jksy))
+
+## [v0.8.0](https://github.com/jksy/resizing-gem/tree/v0.8.0) (2021-02-21)
 
 [Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.7.0...v0.8.0)
 
 **Merged pull requests:**
 
+- Feature/update v0.8.0 [\#48](https://github.com/jksy/resizing-gem/pull/48) ([jksy](https://github.com/jksy))
 - Add supporting API of videos [\#47](https://github.com/jksy/resizing-gem/pull/47) ([jksy](https://github.com/jksy))
+- Update faraday requirement from ~\> 1.0.1 to \>= 1.0.1, \< 1.4.0 [\#46](https://github.com/jksy/resizing-gem/pull/46) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Update rake requirement from ~\> 12.0 to ~\> 13.0 [\#45](https://github.com/jksy/resizing-gem/pull/45) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 - 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)
@@ -15,8 +28,7 @@
 
 **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))
+- change version string when put request with mockclient [\#32](https://github.com/jksy/resizing-gem/pull/32) ([jksy](https://github.com/jksy))
 
 ## [v0.6.0](https://github.com/jksy/resizing-gem/tree/v0.6.0) (2020-12-08)
 
@@ -33,7 +45,6 @@
 **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)
 
@@ -53,6 +64,7 @@
 
 **Merged pull requests:**
 
+- v0.7.0 [\#43](https://github.com/jksy/resizing-gem/pull/43) ([jksy](https://github.com/jksy))
 - fix raise error if tempfile is assinged [\#38](https://github.com/jksy/resizing-gem/pull/38) ([jksy](https://github.com/jksy))
 
 ## [v0.4.1](https://github.com/jksy/resizing-gem/tree/v0.4.1) (2020-10-01)
@@ -66,6 +78,7 @@
 
 **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)
@@ -78,7 +91,7 @@
 
 **Merged pull requests:**
 
-- change version string when put request with mockclient [\#32](https://github.com/jksy/resizing-gem/pull/32) ([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))
 - add delete method [\#31](https://github.com/jksy/resizing-gem/pull/31) ([jksy](https://github.com/jksy))
 - Feature/add identifier to public [\#30](https://github.com/jksy/resizing-gem/pull/30) ([jksy](https://github.com/jksy))
 - add identifier [\#29](https://github.com/jksy/resizing-gem/pull/29) ([jksy](https://github.com/jksy))
@@ -92,10 +105,6 @@
 
 [Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.3.1...v0.3.2)
 
-**Merged pull requests:**
-
-- fix raise error when call remove! with nil column [\#23](https://github.com/jksy/resizing-gem/pull/23) ([jksy](https://github.com/jksy))
-
 ## [v0.3.1](https://github.com/jksy/resizing-gem/tree/v0.3.1) (2020-09-11)
 
 [Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.3.0...v0.3.1)
@@ -114,9 +123,9 @@
 
 **Merged pull requests:**
 
+- fix raise error when call remove! with nil column [\#23](https://github.com/jksy/resizing-gem/pull/23) ([jksy](https://github.com/jksy))
 - 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)
 
@@ -138,6 +147,10 @@
 
 [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)
@@ -152,7 +165,7 @@
 
 **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))
+- add mock client for test environments [\#14](https://github.com/jksy/resizing-gem/pull/14) ([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))

data/Gemfile

@@ -5,5 +5,8 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in resizing.gemspec
 gemspec
 
-gem 'minitest', '~> 5.0'
 gem 'rake', '~> 13.0'
+gem 'github_changelog_generator'
+gem 'mysql2'
+gem 'byebug'
+gem 'pry-byebug'

data/lib/resizing/carrier_wave.rb

@@ -48,7 +48,7 @@ module Resizing
     end
 
     def build_url
-      "#{Resizing.configure.host}#{model.read_attribute(serialization_column)}"
+      "#{Resizing.configure.image_host}#{model.read_attribute(serialization_column)}"
     end
 
     # need override this. if you want to return some url when target_column is nil

data/lib/resizing/client.rb

@@ -5,7 +5,8 @@ module Resizing
   #--
   # usage.
   #   options = {
-  #     host: 'https://www.resizing.net',
+  #     image_host: 'https://img.resizing.net',
+  #     video_host: 'https://video.resizing.net',
   #     project_id: '098a2a0d-0000-0000-0000-000000000000',
   #     secret_token: '4g1cshg......rbs6'
   #   }
@@ -109,11 +110,11 @@ module Resizing
     private
 
     def build_get_url(image_id)
-      "#{config.host}/projects/#{config.project_id}/upload/images/#{image_id}"
+      "#{config.image_host}/projects/#{config.project_id}/upload/images/#{image_id}"
     end
 
     def build_post_url
-      "#{config.host}/projects/#{config.project_id}/upload/images/"
+      "#{config.image_host}/projects/#{config.project_id}/upload/images/"
     end
 
     def gather_filename file_or_binary, options
@@ -122,15 +123,15 @@ module Resizing
     end
 
     def build_put_url(image_id)
-      "#{config.host}/projects/#{config.project_id}/upload/images/#{image_id}"
+      "#{config.image_host}/projects/#{config.project_id}/upload/images/#{image_id}"
     end
 
     def build_delete_url(image_id)
-      "#{config.host}/projects/#{config.project_id}/upload/images/#{image_id}"
+      "#{config.image_host}/projects/#{config.project_id}/upload/images/#{image_id}"
     end
 
     def build_metadata_url(image_id)
-      "#{config.host}/projects/#{config.project_id}/upload/images/#{image_id}/metadata"
+      "#{config.image_host}/projects/#{config.project_id}/upload/images/#{image_id}/metadata"
     end
 
 

data/lib/resizing/configuration.rb

@@ -15,8 +15,10 @@ module Resizing
   #   Resizing::Client.new(configuration)
   #++
   class Configuration
-    attr_reader :host, :project_id, :secret_token, :open_timeout, :response_timeout, :enable_mock
+    attr_reader :image_host, :video_host, :project_id, :secret_token, :open_timeout, :response_timeout, :enable_mock
     DEFAULT_HOST = 'https://img.resizing.net'
+    DEFAULT_IMAGE_HOST = 'https://img.resizing.net'
+    DEFAULT_VIDEO_HOST = 'https://video.resizing.net'
     DEFAULT_OPEN_TIMEOUT = 2
     DEFAULT_RESPONSE_TIMEOUT = 10
 
@@ -25,7 +27,12 @@ module Resizing
     def initialize(*attrs)
       case attr = attrs.first
       when Hash
-        raise_configiration_error if attr[:project_id].nil? || attr[:secret_token].nil?
+        if attr[:project_id].nil? || attr[:secret_token].nil?
+          raise_configiration_error
+        end
+        if attr[:host].present?
+          raise_configiration_error
+        end
 
         initialize_by_hash attr
         return
@@ -34,6 +41,11 @@ module Resizing
       raise_configiration_error
     end
 
+    def host
+      Kernel.warn "[DEPRECATED] The Configuration#host is deprecated. Use Configuration#image_host."
+      self.image_host
+    end
+
     def generate_auth_header
       current_timestamp = Time.now.to_i
       data = [current_timestamp, secret_token].join('|')
@@ -54,7 +66,7 @@ module Resizing
       parts << image_id
       parts << version if version
       parts << path unless path.empty?
-      "#{host}/projects/#{project_id}/upload/images/#{parts.join('/')}"
+      "#{image_host}/projects/#{project_id}/upload/images/#{parts.join('/')}"
     end
 
     # this method should be divided other class
@@ -79,7 +91,7 @@ module Resizing
     def ==(other)
       return false unless self.class == other.class
 
-      %i[host project_id secret_token open_timeout response_timeout].all? do |name|
+      %i[image_host video_host project_id secret_token open_timeout response_timeout].all? do |name|
         send(name) == other.send(name)
       end
     end
@@ -87,11 +99,13 @@ module Resizing
     private
 
     def raise_configiration_error
-      raise ConfigurationError, 'need hash and some keys like :host, :project_id, :secret_token'
+      raise ConfigurationError, 'need hash and some keys like :image_host, video_host, :project_id, :secret_token'
     end
 
     def initialize_by_hash(attr)
-      @host = attr[:host].dup.freeze || DEFAULT_HOST
+      # @host = attr[:host].dup.freeze || DEFAULT_HOST
+      @image_host = attr[:image_host].dup.freeze || DEFAULT_IMAGE_HOST
+      @video_host = attr[:video_host].dup.freeze || DEFAULT_VIDEO_HOST
       @project_id = attr[:project_id].dup.freeze
       @secret_token = attr[:secret_token].dup.freeze
       @open_timeout = attr[:open_timeout] || DEFAULT_OPEN_TIMEOUT

data/lib/resizing/http_clientable.rb

@@ -3,7 +3,7 @@
 module Resizing
   module HttpClientable
     def http_client
-      @http_client ||= Faraday.new(url: config.host) do |builder|
+      @http_client ||= Faraday.new do |builder|
         builder.options[:open_timeout] = config.open_timeout
         builder.options[:timeout] = config.response_timeout
         builder.request :multipart

data/lib/resizing/version.rb

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

data/lib/resizing/video/client.rb

@@ -33,6 +33,17 @@ module Resizing
         handle_upload_completed_response response
       end
 
+      def delete response_or_url
+        url = url_from response_or_url, 'destroy_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'
 
@@ -44,12 +55,12 @@ module Resizing
         handle_metadata_response response
       end
 
-      private
-
       def build_prepare_url
-        "#{config.host}/projects/#{config.project_id}/upload/videos/prepare"
+        "#{config.video_host}/projects/#{config.project_id}/upload/videos/prepare"
       end
 
+      private
+
       def url_from response_or_url, name
         if response_or_url.kind_of? String
           response_or_url

data/resizing.gemspec

@@ -29,16 +29,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
   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'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'minitest-ci'
-  spec.add_development_dependency 'mysql2'
-  spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rails', '~> 5.2.3'
   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/carrier_wave_test.rb

@@ -9,7 +9,8 @@ module Resizing
       TestJPGModel.delete_all
 
       @configuration_template = {
-        host: 'http://192.168.56.101:5000',
+        image_host: 'http://192.168.56.101:5000',
+        video_host: 'http://192.168.56.101:5000',
         project_id: 'e06e710d-f026-4dcf-b2c0-eab0de8bb83f',
         secret_token: 'ewbym2r1pk49x1d2lxdbiiavnqp25j2kh00hsg3koy0ppm620x5mhlmgl3rq5ci8',
         open_timeout: 10,

data/test/resizing/client_test.rb

@@ -6,7 +6,8 @@ module Resizing
   class ClientTest < Minitest::Test
     def setup
       @configuration_template = {
-        host: 'http://192.168.56.101:5000',
+        image_host: 'http://192.168.56.101:5000',
+        video_host: 'http://192.168.56.101:5000',
         project_id: 'e06e710d-f026-4dcf-b2c0-eab0de8bb83f',
         secret_token: 'ewbym2r1pk49x1d2lxdbiiavnqp25j2kh00hsg3koy0ppm620x5mhlmgl3rq5ci8',
         open_timeout: 10,

data/test/resizing/configuration_test.rb

@@ -6,7 +6,8 @@ module Resizing
   class ConfigurationTest < Minitest::Test
     def setup
       @template = {
-        host: 'http://192.168.56.101:5000',
+        image_host: 'http://192.168.56.101:5000',
+        video_host: 'http://192.168.56.101:5000',
         project_id: '098a2a0d-c387-4135-a071-1254d6d7e70a',
         secret_token: '4g1cshg2lq8j93ufhvqrpjswxmtjz12yhfvq6w79jpwi7cr7nnknoqgwzkwerbs6',
         open_timeout: 10,
@@ -18,17 +19,39 @@ module Resizing
       # NOP
     end
 
-    def test_that_it_has_default_host
+    def test_that_it_has_default_image_host
       template = @template.dup
-      template.delete(:host)
+      template.delete(:image_host)
       config = Resizing::Configuration.new template
-      assert_equal(config.host, Resizing::Configuration::DEFAULT_HOST)
+      assert_equal(config.host, Resizing::Configuration::DEFAULT_IMAGE_HOST)
+      assert_equal(config.image_host, Resizing::Configuration::DEFAULT_IMAGE_HOST)
     end
 
-    def test_that_it_has_same_host_value
+    def test_that_it_has_default_video_host
       template = @template.dup
+      template.delete(:video_host)
       config = Resizing::Configuration.new template
-      assert_equal(config.host, template[:host])
+      assert_equal(config.video_host, Resizing::Configuration::DEFAULT_VIDEO_HOST)
+    end
+
+    def test_that_it_need_raise_exception_if_host_presented
+      template = @template.dup
+      template[:host] = 'need raise execption if host is presented'
+      assert_raises ConfigurationError do
+        config = Resizing::Configuration.new template
+      end
+    end
+
+    def test_that_it_has_same_image_host_value
+      template = @template.dup
+      config = Resizing::Configuration.new template
+      assert_equal(config.image_host, template[:image_host])
+    end
+
+    def test_that_it_has_same_video_host_value
+      template = @template.dup
+      config = Resizing::Configuration.new template
+      assert_equal(config.video_host, template[:video_host])
     end
 
     def test_that_it_has_no_project_id

data/test/resizing/video/client_test.rb

@@ -9,7 +9,8 @@ module Resizing
         # TODO
         # refactoring
         @configuration_template = {
-          host: 'http://192.168.56.101:5000',
+          image_host: 'http://192.168.56.101:5000',
+          video_host: 'http://192.168.56.101:5000',
           project_id: 'f11dfad4-2247-4220-b3b2-efeb82864a97',
           secret_token: 'xn2fkkrrp2uiragliaigkx3mwnmjis6dg35sa3kya12sq133t3xjp36s7iwamp64',
           open_timeout: 10,
@@ -36,6 +37,14 @@ module Resizing
         assert_equal(client.config, config)
       end
 
+      def test_is_callable_build_prepare_url
+        Resizing.configure = @configuration_template
+
+        client = Resizing::Video::Client.new
+        url = client.build_prepare_url
+        assert_equal(url, 'http://192.168.56.101:5000/projects/f11dfad4-2247-4220-b3b2-efeb82864a97/upload/videos/prepare')
+      end
+
       def test_is_callable_prepare
         Resizing.configure = @configuration_template
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resizing
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Junichiro Kasuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-21 00:00:00.000000000 Z
+date: 2021-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -30,20 +30,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.4.0
-- !ruby/object:Gem::Dependency
-  name: byebug
-  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'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -100,34 +86,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  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'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  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'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -184,20 +142,6 @@ 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