resizing 0.3.2 → 0.5.3

data/lib/resizing/configuration.rb

@@ -69,9 +69,11 @@ module Resizing
     # たぶんここにおくものではない
     # もしくはキャッシュしない
     def generate_identifier
-      @image_id ||= ::SecureRandom.uuid
+      "/projects/#{project_id}/upload/images/#{generate_image_id}"
+    end
 
-      "/projects/#{project_id}/upload/images/#{@image_id}"
+    def generate_image_id
+      ::SecureRandom.uuid
     end
 
     def ==(other)

data/lib/resizing/mock_client.rb

@@ -3,17 +3,37 @@
 module Resizing
   class MockClient
     def post(file_or_binary, options = {})
-      load_yaml('test/vcr/client/post.yml')
+      r = load_yaml('test/vcr/client/post.yml')
+      JSON.parse(r['string'])
     end
 
     def put(name, file_or_binary, options)
-      load_yaml('test/vcr/client/put.yml')
+      r = load_yaml('test/vcr/client/put.yml')
+      result = JSON.parse(r['string'])
+      # replace name, public_id and version by name argument
+      result['id'] = name
+      result['public_id'].gsub!(/AWEaewfAreaweFAFASfwe/, name)
+      result['public_id'].gsub!(/v6Ew3HmDAYfb3NMRdLxR45i_gXMbLlGyi/, "v#{Time.now.to_f}")
+      result
     end
 
     def delete(name)
-      load_yaml('test/vcr/client/delete.yml')
+      r = load_yaml('test/vcr/client/delete.yml')
+      result = JSON.parse(r['string'])
+      # replace name and public_id by name argument
+      result['id'] = name
+      result['public_id'].gsub!(/28c49144-c00d-4cb5-8619-98ce95977b9c/, name)
+      result
     end
 
+    def metadata(name)
+      r = load_yaml('test/vcr/client/metadata.yml')
+      result = JSON.parse(r['string'])
+      # replace name and public_id by name argument
+      result['id'] = name
+      result['public_id'].gsub!(/bfdaf2b3-7ec5-41f4-9caa-d53247dd9666/, name)
+      result
+    end
     private
 
     def load_yaml filename
@@ -22,7 +42,7 @@ module Resizing
     end
 
     def library_root
-      File.join(File.dirname(__FILE__), '..', '..')
+      @library_root ||= File.expand_path('../../../', __FILE__)
     end
   end
 end

data/lib/resizing/public_id.rb

@@ -0,0 +1,50 @@
+module Resizing
+  class PublicId
+    def initialize public_id
+      @public_id = public_id
+      parsed
+    end
+
+    def empty?
+      @public_id.to_s.empty?
+    end
+
+    def image_id
+      parsed[:image_id] if parsed
+    end
+
+    def project_id
+      parsed[:project_id] if parsed
+    end
+
+    def version
+      parsed[:version] if parsed
+    end
+
+    # temporary
+    def filename
+      image_id
+    end
+
+    def identifier
+      "/projects/#{project_id}/upload/images/#{image_id}"
+    end
+
+    def to_s
+      @public_id.to_s
+    end
+
+    private
+
+    def parsed
+      return nil if @public_id.nil?
+      unless defined? @parsed
+        @parsed = Resizing.separate_public_id(@public_id)
+        raise "type error #{@public_id}" if @parsed == nil
+      end
+      @parsed
+    end
+
+    private
+  end
+end

data/lib/resizing/version.rb

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

data/test/resizing/carrier_wave_test.rb

@@ -6,11 +6,12 @@ module Resizing
   class CarrierWaveTest < Minitest::Test
     def setup
       TestModel.delete_all
+      TestJPGModel.delete_all
 
       @configuration_template = {
         host: 'http://192.168.56.101:5000',
-        project_id: '098a2a0d-c387-4135-a071-1254d6d7e70a',
-        secret_token: '4g1cshg2lq8j93ufhvqrpjswxmtjz12yhfvq6w79jpwi7cr7nnknoqgwzkwerbs6',
+        project_id: 'e06e710d-f026-4dcf-b2c0-eab0de8bb83f',
+        secret_token: 'ewbym2r1pk49x1d2lxdbiiavnqp25j2kh00hsg3koy0ppm620x5mhlmgl3rq5ci8',
         open_timeout: 10,
         response_timeout: 20
       }
@@ -20,7 +21,7 @@ module Resizing
     def teardown; end
 
     def test_remove_resizing_picture
-      model = prepare_model
+      model = prepare_model TestModel
 
       VCR.use_cassette 'carrier_wave_test/remove_resizing_picture' do
         SecureRandom.stub :uuid, '28c49144-c00d-4cb5-8619-98ce95977b9c' do
@@ -32,7 +33,7 @@ module Resizing
     end
 
     def test_do_not_raise_if_empty_column_is_removed
-      model = prepare_model
+      model = prepare_model TestModel
 
       VCR.use_cassette 'carrier_wave_test/remove_resizing_picture' do
         SecureRandom.stub :uuid, '28c49144-c00d-4cb5-8619-98ce95977b9c' do
@@ -42,23 +43,60 @@ module Resizing
     end
 
     def test_picture_url_return_correct_value_and_when_model_reloaded
-      model = prepare_model
+      model = prepare_model TestModel
       model.save!
-      assert_equal(expect_url, model.resizing_picture_url)
+      assert_equal("#{expect_url}/", model.resizing_picture_url)
 
       model.reload
-      assert_equal(expect_url, model.resizing_picture_url)
+      assert_equal("#{expect_url}/", model.resizing_picture_url)
+    end
+
+    def test_picture_url_return_with_transform_strings
+      model = prepare_model TestModel
+      model.save!
+      assert_equal("#{expect_url}/c_fill,w_40,h_40", model.resizing_picture_url(:small))
+    end
+
+    def test_format_method_is_callable
+      model = prepare_model TestModel
+      model.save!
+      assert_nil model.resizing_picture.format
+    end
+
+    def test_format_method_is_return_jpg_with_overriden
+      model = prepare_model TestJPGModel
+      model.save!
+      model.resizing_picture.format
+      assert_equal('jpg', model.resizing_picture.format)
+    end
+
+    def test_url_is_return_default_url_as_nil
+      model = TestModel.new
+      model.save!
+      assert_nil model.resizing_picture_url
+    end
+
+    def test_url_is_return_default_url
+      model = TestModelWithDefaultURL.new
+      model.save!
+      assert_equal('http://example.com/test.jpg', model.resizing_picture_url)
+    end
+
+    def test_is_successful
+      model = prepare_model_with_tempfile TestModel
+      model.save!
+      # assert_equal('http://192.168.56.101:5000/projects/098a2a0d-c387-4135-a071-1254d6d7e70a/upload/images/28c49144-c00d-4cb5-8619-98ce95977b9c/v1Id850__tqNsnoGWWUibtIBZ5NgjV45M/', 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'
+      'http://192.168.56.101:5000/projects/e06e710d-f026-4dcf-b2c0-eab0de8bb83f/'+
+        'upload/images/14ea7aac-a194-4330-931f-6b562aec413d/v_8c5lEhDB5RT3PZp1Fn5PYGm9YVx_x0e'
     end
 
-    def prepare_model
-      VCR.use_cassette 'carrier_wave_test/save' do
+    def prepare_model model
+      VCR.use_cassette 'carrier_wave_test/save', record: :once do
         SecureRandom.stub :uuid, '28c49144-c00d-4cb5-8619-98ce95977b9c' do
-          model = TestModel.new
+          model = model.new
           file = File.open('test/data/images/sample1.jpg', 'r')
           uploaded_file = ActionDispatch::Http::UploadedFile.new(
             filename: File.basename(file.path),
@@ -71,5 +109,16 @@ module Resizing
         end
       end
     end
+
+    def prepare_model_with_tempfile model
+      VCR.use_cassette 'carrier_wave_test/save', record: :once do
+        SecureRandom.stub :uuid, '28c49144-c00d-4cb5-8619-98ce95977b9c' do
+          model = model.new
+          file = File.open('test/data/images/sample1.jpg', 'r')
+          model.resizing_picture = file
+          return model
+        end
+      end
+    end
   end
 end

data/test/resizing/client_test.rb

@@ -8,8 +8,8 @@ module Resizing
       # NOP
       @configuration_template = {
         host: 'http://192.168.56.101:5000',
-        project_id: '098a2a0d-c387-4135-a071-1254d6d7e70a',
-        secret_token: '4g1cshg2lq8j93ufhvqrpjswxmtjz12yhfvq6w79jpwi7cr7nnknoqgwzkwerbs6',
+        project_id: 'e06e710d-f026-4dcf-b2c0-eab0de8bb83f',
+        secret_token: 'ewbym2r1pk49x1d2lxdbiiavnqp25j2kh00hsg3koy0ppm620x5mhlmgl3rq5ci8',
         open_timeout: 10,
         response_timeout: 20
       }
@@ -19,7 +19,7 @@ module Resizing
       # NOP
     end
 
-    def test_that_it_is_initialized
+    def test_is_initialized
       Resizing.configure = @configuration_template
 
       client = Resizing::Client.new
@@ -27,36 +27,37 @@ module Resizing
       assert_equal(client.config, Resizing.configure)
     end
 
-    def test_that_it_is_initialized_with_configuration
+    def test_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
+    def test_is_postable_file
       Resizing.configure = @configuration_template
 
       client = Resizing::Client.new
-      VCR.use_cassette 'client/post' do
+      VCR.use_cassette 'client/post', record: :once  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['id'], '87263920-2081-498e-a107-9625f4fde01b')
         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')
+        assert_equal(r['public_id'], '/projects/e06e710d-f026-4dcf-b2c0-eab0de8bb83f/upload/images/87263920-2081-498e-a107-9625f4fde01b/vHg9VFvdI6HRzLFbV495VdwVmHIspLRCo')
+        assert_equal(r['filename'], 'sample1.jpg')
       end
     end
 
-    def test_that_it_putable_file
+    def test_is_putable_file
       Resizing.configure = @configuration_template
 
       client = Resizing::Client.new
-      VCR.use_cassette 'client/put' do
+      VCR.use_cassette 'client/put', record: :once do
         f = File.open('test/data/images/sample1.jpg', 'r')
         name = 'AWEaewfAreaweFAFASfwe'
         r = client.put(name, f, content_type: 'image/jpeg')
@@ -69,7 +70,32 @@ module Resizing
         assert(!r['updated_at'].nil?)
         assert_equal(
           r['public_id'],
-          "/projects/098a2a0d-c387-4135-a071-1254d6d7e70a/upload/images/#{name}/v6Ew3HmDAYfb3NMRdLxR45i_gXMbLlGyi"
+          "/projects/e06e710d-f026-4dcf-b2c0-eab0de8bb83f/upload/images/#{name}/vfztekhN_WoeXo8ZkCZ4i5jcQvmPpZewR"
+        )
+      end
+    end
+
+    def test_get_the_metadata
+      # TODO
+
+      Resizing.configure = @configuration_template
+
+      client = Resizing::Client.new
+      VCR.use_cassette 'client/metadata', record: :once do
+        name = '87263920-2081-498e-a107-9625f4fde01b'
+        r = client.metadata(name)
+        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_equal(
+          r['public_id'],
+          "/projects/e06e710d-f026-4dcf-b2c0-eab0de8bb83f/upload/images/87263920-2081-498e-a107-9625f4fde01b/vHg9VFvdI6HRzLFbV495VdwVmHIspLRCo"
         )
       end
     end

data/test/resizing/public_id_test.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Resizing
+  class PublicIdTest < Minitest::Test
+    def setup
+      @project_id = '098a2a0d-c387-4135-a071-1254d6d7e70a'
+      @image_id = '28c49144-c00d-4cb5-8619-98ce95977b9c'
+      @version = '1Id850q34fgsaer23w'
+      @public_id_as_string = "/projects/#{@project_id}/upload/images/#{@image_id}/v#{@version}"
+    end
+
+    def teardown; end
+
+    def test_expect_equal_project_id
+      public_id = Resizing::PublicId.new @public_id_as_string
+      assert_equal @project_id, public_id.project_id
+    end
+
+    def test_expect_equal_image_id
+      public_id = Resizing::PublicId.new @public_id_as_string
+      assert_equal @image_id, public_id.image_id
+    end
+
+    def test_expect_equal_version
+      public_id = Resizing::PublicId.new @public_id_as_string
+      assert_equal @version, public_id.version
+    end
+
+    def test_expect_equal_identifier
+      public_id = Resizing::PublicId.new @public_id_as_string
+      assert_equal @public_id_as_string.gsub(/\/v.*$/, ''), public_id.identifier
+    end
+
+    def test_expect_equal_public_id
+      public_id = Resizing::PublicId.new @public_id_as_string
+      assert_equal @public_id_as_string, public_id.to_s
+    end
+  end
+end

data/test/test_helper.rb

@@ -32,17 +32,49 @@ ActiveRecord::Base.establish_connection(
 
 ActiveRecord::Schema.define do
   self.verbose = false
-  connection.execute 'drop table if exists test_models'
 
-  create_table :test_models do |t|
-    t.string :resizing_picture, null: true, default: nil
+  %i(test_models test_jpg_models test_model_with_default_urls).each do |model_name|
+    connection.execute "drop table if exists #{model_name}"
+
+    create_table model_name do |t|
+      t.string :resizing_picture, null: true, default: nil
+    end
   end
 end
 
 class ResizingUploader < CarrierWave::Uploader::Base
   include Resizing::CarrierWave
 
+  version :small do
+    process resize_to_fill: [40, 40]
+  end
+
+  process resize_to_limit: [1000]
+end
+
+class ResizingJPGUploader < CarrierWave::Uploader::Base
+  include Resizing::CarrierWave
+
   process resize_to_limit: [1000]
+
+  # override Resizing::CarrierWave#default_format
+  def default_format
+    'jpg'
+  end
+
+  def default_url
+    'http://example.com/test.jpg'
+  end
+end
+
+class ResizingUploaderWithDefaultURL < CarrierWave::Uploader::Base
+  include Resizing::CarrierWave
+
+  process resize_to_limit: [1000]
+
+  def default_url
+    'http://example.com/test.jpg'
+  end
 end
 
 class TestModel < ::ActiveRecord::Base
@@ -50,3 +82,15 @@ class TestModel < ::ActiveRecord::Base
 
   mount_uploader :resizing_picture, ResizingUploader
 end
+
+class TestJPGModel < ::ActiveRecord::Base
+  extend CarrierWave::Mount
+
+  mount_uploader :resizing_picture, ResizingJPGUploader
+end
+
+class TestModelWithDefaultURL < ::ActiveRecord::Base
+  extend CarrierWave::Mount
+
+  mount_uploader :resizing_picture, ResizingUploaderWithDefaultURL
+end