resizing 0.1.3 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc0185b74fd4488a798b0a5da33379e54b9d95081ac7e1160a3d6e41aadc306e
-  data.tar.gz: b21eaae81ea5fc991ddec3fdefca7d73ec35b9c008057407547552c045b12c22
+  metadata.gz: a68f3747dc45de527ea32a40bb2586783a0ea14d76717bd85186aae178ef18bd
+  data.tar.gz: 5ecebffc8b0eb31c22e3bb408eea3d99db21b90bcdba5178e74f1f0704261ed5
 SHA512:
-  metadata.gz: 6e13ddf3fdb99165d35d73bd580fd45c316e93bc1e25769fc9cb7c6f28ed98dfdce57b22c15ee12dabbaeff27bc0156c3833adb79857853f41974ec0773b5ca5
-  data.tar.gz: e4b7d41e6b4e58fba560a73876913564c532101dc54c777ea994adf529fbc76088bb5ecd13f7dfa178fc198553abc504b8451b91141dc900b335737169438d13
+  metadata.gz: 233c87e03b19be35e89d373a4456aa81cdd82c110eea4cff47f2d8498a852ed203c0443567f0afb8b6d85bd419da49b6accb5e52038e823beddf40d88f84e94d
+  data.tar.gz: 66f18b1648e93a2cbdf73a2a457b9e2591262b795dfbebd232cd0388ca7787a755068a85c84f763f1c28fa7e10c61a4169915aff35184d1f602c6498cca8f63e

data/lib/resizing.rb

@@ -6,6 +6,7 @@ require 'json'
 
 module Resizing
   autoload :Client, 'resizing/client'
+  autoload :MockClient, 'resizing/mock_client'
   autoload :Configuration, 'resizing/configuration'
   autoload :CarrierWave, 'resizing/carrier_wave'
 
@@ -33,13 +34,11 @@ module Resizing
   end
 
   def self.post(file_or_binary, options)
-    client = Resizing::Client.new
-    client.post file_or_binary, options
+    self.client.post file_or_binary, options
   end
 
   def self.put(name, file_or_binary, options)
-    client = Resizing::Client.new
-    client.put name, file_or_binary, options
+    self.client.put name, file_or_binary, options
   end
 
   # TODO: refactoring
@@ -57,4 +56,12 @@ module Resizing
   def self.separate_public_id public_id
     public_id.match('/projects/(?<project_id>[0-9a-f-]+)/upload/images/(?<image_id>[0-9a-f-]+)(/v(?<version>[^/]+))?')
   end
+
+  def self.client
+    if self.configure.enable_mock
+      Resizing::MockClient.new
+    else
+      Resizing::Client.new
+    end
+  end
 end

data/lib/resizing/carrier_wave.rb

@@ -109,12 +109,21 @@ module Resizing
 
     # rubocop:disable Metrics/AbcSize
     def transform_string_from(processor)
-      case processor.first
+      action = processor.first
+      value = processor.second
+
+      case action
       when :resize_to_fill, :resize_to_limit, :resize_to_fit
-        name = processor.first.to_s.gsub(/resize_to_/, '')
-        { c: name, w: processor.second.first, h: processor.second.second }
+        name = action.to_s.gsub(/resize_to_/, '')
+        { c: name, w: value.first, h: value.second }
+      when :transformation
+        result = {}
+        result[:q] = value[:quality] if value[:quality]
+        result[:f] = value[:fetch_format] if value[:fetch_format]
+        result[:f] = value[:format] if value[:format]
+        result
       else
-        raise NotImplementedError, "#{processor.first} is not supported. #{processor.inspect}"
+        raise NotImplementedError, "#{action} is not supported. #{processor.inspect}"
       end.map do |key, value|
         next nil if value.nil?
 

data/lib/resizing/carrier_wave/storage/file.rb

@@ -28,6 +28,8 @@ module Resizing
 
         def delete
           public_id = model.send :read_attribute, serialization_column
+          return if public_id.nil? # do nothing
+
           # TODO:
           # refactoring
           separted = Resizing.separate_public_id(public_id)

data/lib/resizing/client.rb

@@ -11,7 +11,7 @@ module Resizing
   #   }
   #   client = Resizing::Client.new(options)
   #   file = File.open('sample.jpg', 'r')
-  #   response = client.post(file)
+  #   response = client.post(file, content_type: 'image/jpeg')
   #   {
   #     "id"=>"fde443bb-0b29-4be2-a04e-2da8f19716ac",
   #     "project_id"=>"098a2a0d-0000-0000-0000-000000000000",

data/lib/resizing/configuration.rb

@@ -16,7 +16,7 @@ module Resizing
   #++
   class Configuration
     attr_reader :host, :project_id, :secret_token, :open_timeout, :response_timeout, :enable_mock
-    DEFAULT_HOST = 'https://www.resizing.net'
+    DEFAULT_HOST = 'https://img.resizing.net'
     DEFAULT_OPEN_TIMEOUT = 2
     DEFAULT_RESPONSE_TIMEOUT = 10
 

data/lib/resizing/mock_client.rb

@@ -17,7 +17,12 @@ module Resizing
     private
 
     def load_yaml filename
-      YAML.load_file(filename)['http_interactions'].first['response']['body']
+      path = "#{library_root}/#{filename}"
+      YAML.load_file(path)['http_interactions'].first['response']['body']
+    end
+
+    def library_root
+      File.join(File.dirname(__FILE__), '..', '..')
     end
   end
 end

data/lib/resizing/version.rb

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

data/resizing.gemspec

@@ -23,12 +23,12 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0")
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.add_runtime_dependency 'faraday', '~> 0.13'
+  spec.add_runtime_dependency 'faraday', '~> 1.0.1'
   spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'carrierwave'
   spec.add_development_dependency 'fog-aws'
@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   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 'rails', '~> 5.2.3'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'timecop'
   spec.add_development_dependency 'vcr'

data/test/resizing/carrier_wave/storage/file_test.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Resizing
+  module CarrierWave
+    module Storage
+      class FileTest < Minitest::Test
+        def setup
+          # NOP
+        end
+
+        def teardown
+          # NOP
+        end
+
+        def test_store
+          # f = Resizing::CarrierWave::Storage::File.new(uploader)
+          # upload_file = File.new(uploader, path)
+          # f.store(upload_file)
+          # f.save!
+        end
+
+        def uploader
+          MiniTest::Mock.expect(:cache_path)
+        end
+      end
+    end
+  end
+end

data/test/resizing/carrier_wave_test.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Resizing
+  class CarrierWaveTest < Minitest::Test
+    def setup
+      TestModel.delete_all
+
+      @configuration_template = {
+        host: 'http://192.168.56.101:5000',
+        project_id: '098a2a0d-c387-4135-a071-1254d6d7e70a',
+        secret_token: '4g1cshg2lq8j93ufhvqrpjswxmtjz12yhfvq6w79jpwi7cr7nnknoqgwzkwerbs6',
+        open_timeout: 10,
+        response_timeout: 20
+      }
+      Resizing.configure = @configuration_template
+    end
+
+    def teardown; end
+
+    def test_remove_resizing_picture
+      model = prepare_model
+
+      VCR.use_cassette 'carrier_wave_test/remove_resizing_picture' do
+        SecureRandom.stub :uuid, '28c49144-c00d-4cb5-8619-98ce95977b9c' do
+          model.remove_resizing_picture!
+
+          assert_nil model.resizing_picture_url
+        end
+      end
+    end
+
+    def test_do_not_raise_if_empty_column_is_removed
+      model = prepare_model
+
+      VCR.use_cassette 'carrier_wave_test/remove_resizing_picture' do
+        SecureRandom.stub :uuid, '28c49144-c00d-4cb5-8619-98ce95977b9c' do
+          model.resizing_picture.remove!
+        end
+      end
+    end
+
+    def test_picture_url_return_correct_value_and_when_model_reloaded
+      model = prepare_model
+      model.save!
+      assert_equal(expect_url, model.resizing_picture_url)
+
+      model.reload
+      assert_equal(expect_url, model.resizing_picture_url)
+    end
+
+    def expect_url
+      'http://192.168.56.101:5000/projects/098a2a0d-c387-4135-a071-1254d6d7e70a/'+
+        'upload/images/28c49144-c00d-4cb5-8619-98ce95977b9c/v1Id850__tqNsnoGWWUibtIBZ5NgjV45M/c_limit,w_1000'
+    end
+
+    def prepare_model
+      VCR.use_cassette 'carrier_wave_test/save' do
+        SecureRandom.stub :uuid, '28c49144-c00d-4cb5-8619-98ce95977b9c' do
+          model = TestModel.new
+          file = File.open('test/data/images/sample1.jpg', 'r')
+          uploaded_file = ActionDispatch::Http::UploadedFile.new(
+            filename: File.basename(file.path),
+            type: 'image/jpeg',
+            tempfile: file
+          )
+
+          model.resizing_picture = uploaded_file
+          return model
+        end
+      end
+    end
+  end
+end

data/test/resizing/client_test.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Resizing
+  class ClientTest < Minitest::Test
+    def setup
+      # NOP
+      @configuration_template = {
+        host: 'http://192.168.56.101:5000',
+        project_id: '098a2a0d-c387-4135-a071-1254d6d7e70a',
+        secret_token: '4g1cshg2lq8j93ufhvqrpjswxmtjz12yhfvq6w79jpwi7cr7nnknoqgwzkwerbs6',
+        open_timeout: 10,
+        response_timeout: 20
+      }
+    end
+
+    def teardown
+      # NOP
+    end
+
+    def test_that_it_is_initialized
+      Resizing.configure = @configuration_template
+
+      client = Resizing::Client.new
+      assert(!client.config.nil?)
+      assert_equal(client.config, Resizing.configure)
+    end
+
+    def test_that_it_is_initialized_with_configuration
+      config = Resizing::Configuration.new(@configuration_template)
+      client = Resizing::Client.new(config)
+      assert(!client.config.nil?)
+      assert_equal(client.config, config)
+    end
+
+    def test_that_it_postable_file
+      Resizing.configure = @configuration_template
+
+      client = Resizing::Client.new
+      VCR.use_cassette 'client/post' do
+        f = File.open('test/data/images/sample1.jpg', 'r')
+        r = client.post(f, content_type: 'image/jpeg')
+        assert_equal(r['id'], 'bfdaf2b3-7ec5-41f4-9caa-d53247dd9666')
+        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_equal(r['public_id'], '/projects/098a2a0d-c387-4135-a071-1254d6d7e70a/upload/images/bfdaf2b3-7ec5-41f4-9caa-d53247dd9666/vAyWaxx96gLaAzB9Bq.VbX1_pxfXJ0Jcq')
+      end
+    end
+
+    def test_that_it_putable_file
+      Resizing.configure = @configuration_template
+
+      client = Resizing::Client.new
+      VCR.use_cassette 'client/put' do
+        f = File.open('test/data/images/sample1.jpg', 'r')
+        name = 'AWEaewfAreaweFAFASfwe'
+        r = client.put(name, f, content_type: 'image/jpeg')
+        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_equal(
+          r['public_id'],
+          "/projects/098a2a0d-c387-4135-a071-1254d6d7e70a/upload/images/#{name}/v6Ew3HmDAYfb3NMRdLxR45i_gXMbLlGyi"
+        )
+      end
+    end
+  end
+end

data/test/resizing/configuration_test.rb

@@ -0,0 +1,128 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Resizing
+  class ConfigurationTest < Minitest::Test
+    def setup
+      @template = {
+        host: 'http://192.168.56.101:5000',
+        project_id: '098a2a0d-c387-4135-a071-1254d6d7e70a',
+        secret_token: '4g1cshg2lq8j93ufhvqrpjswxmtjz12yhfvq6w79jpwi7cr7nnknoqgwzkwerbs6',
+        open_timeout: 10,
+        response_timeout: 20
+      }.freeze
+    end
+
+    def teardown
+      # NOP
+    end
+
+    def test_that_it_has_default_host
+      template = @template.dup
+      template.delete(:host)
+      config = Resizing::Configuration.new template
+      assert_equal(config.host, Resizing::Configuration::DEFAULT_HOST)
+    end
+
+    def test_that_it_has_same_host_value
+      template = @template.dup
+      config = Resizing::Configuration.new template
+      assert_equal(config.host, template[:host])
+    end
+
+    def test_that_it_has_no_project_id
+      template = @template.dup
+      template.delete(:project_id)
+      assert_raises ConfigurationError do
+        Resizing::Configuration.new template
+      end
+    end
+
+    def test_that_it_has_same_project_id_value
+      template = @template.dup
+      config = Resizing::Configuration.new template
+      assert_equal(config.project_id, template[:project_id])
+    end
+
+    def test_that_it_has_no_secret_token
+      template = @template.dup
+      template.delete(:project_id)
+      assert_raises ConfigurationError do
+        Resizing::Configuration.new template
+      end
+    end
+
+    def test_that_it_has_same_secret_token_value
+      template = @template.dup
+      config = Resizing::Configuration.new template
+      assert_equal(config.secret_token, template[:secret_token])
+    end
+
+    def test_that_it_has_default_open_timeout
+      template = @template.dup
+      template.delete(:open_timeout)
+      config = Resizing::Configuration.new template
+      assert_equal(config.open_timeout, Resizing::Configuration::DEFAULT_OPEN_TIMEOUT)
+    end
+
+    def test_that_it_has_same_open_timeout
+      template = @template.dup
+      config = Resizing::Configuration.new template
+      assert_equal(config.open_timeout, template[:open_timeout])
+    end
+
+    def test_that_it_return_auth_header_token
+      Timecop.freeze(Time.parse('2020-05-29 05:40:00 +0900')) do
+        template = @template.dup
+        config = Resizing::Configuration.new template
+        assert_equal(
+          'v1,1590698400,2b35ee78cd6ce32edb9b4d97b69306c678ce8dea871638ff6144b7be0d26173c',
+          config.generate_auth_header
+        )
+      end
+    end
+
+    def test_that_it_return_image_url
+      template = @template.dup
+      image_id = 'some-image-id'
+      config = Resizing::Configuration.new template
+      assert_equal(
+        'http://192.168.56.101:5000/projects/098a2a0d-c387-4135-a071-1254d6d7e70a/upload/images/some-image-id',
+        config.generate_image_url(image_id)
+      )
+    end
+
+    def test_that_it_return_image_url_with_version_id
+      template = @template.dup
+      image_id = 'some-image-id'
+      version_id = 'version-id'
+      config = Resizing::Configuration.new template
+      assert_equal(
+        'http://192.168.56.101:5000/projects/098a2a0d-c387-4135-a071-1254d6d7e70a/upload/images/some-image-id/vversion-id',
+        config.generate_image_url(image_id, version_id)
+      )
+    end
+
+    def test_that_it_return_transformation_path
+      data = [
+        { args: { w: 100 }, path: 'w_100' },
+        { args: { h: 100 }, path: 'h_100' },
+        { args: { f: 'webp' }, path: 'f_webp' },
+        { args: { c: 'fill' }, path: 'c_fill' }
+      ]
+      config = Resizing::Configuration.new @template
+      data.each do |v|
+        assert_equal(
+          v[:path],
+          config.transformation_path(v[:args])
+        )
+      end
+    end
+
+    def test_that_it_generated_identifier_path
+      config = Resizing::Configuration.new @template
+      assert_match %r{/projects/#{config.project_id}/upload/images/[\da-z-]}, config.generate_identifier
+    end
+  end
+end