carrierwave-qiniu 1.2.1 → 1.2.2

data/lib/carrierwave/storage/qiniu_file.rb

@@ -0,0 +1,166 @@
+# encoding: utf-8
+
+module CarrierWave
+  module Storage
+    class QiniuFile
+
+      attr_reader :uploader, :path
+      attr_accessor :copy_from_path
+
+      def initialize(uploader, path)
+        @uploader, @path = uploader, path
+      end
+
+      ##
+      # Return qiniu URl, maybe with style
+      #
+      # === Parameters
+      # [options (Hash)] optional options hash, 图片样式 { version: :thumb } 或者 { style: "imageView2/1/w/200" }
+      #
+      # === Returns
+      #
+      # [String]
+      #
+      def url(options = {})
+        the_path = options.present? ? path_with_style(options) : @path
+        qiniu_connection.download_url(the_path)
+      end
+
+      def store(new_file)
+        if new_file.is_a?(self.class)
+          if new_file.respond_to?(:copy_from_path) && new_file.copy_from_path.present?
+            new_file.copy_from new_file.copy_from_path
+          else
+            new_file.copy_to @path
+          end
+        else
+          qiniu_connection.upload_file(new_file.path, @path)
+        end
+        true
+      end
+
+      def delete
+        qiniu_connection.delete @path
+      end
+
+      def exists?
+        return true if qiniu_connection.stat(@path).present?
+        false
+      end
+
+      #
+      # @note 从指定路径复制文件
+      # @param origin_path [String] 原文件路径
+      # @return [Boolean]
+      #
+      def copy_from(origin_path)
+        qiniu_connection.copy(origin_path, @path)
+      end
+
+      #
+      # @note 复制文件到指定路径
+      # @param new_path [String] 新路径
+      # @return [Boolean]
+      #
+      def copy_to(new_path)
+        qiniu_connection.copy(@path, new_path)
+        self.class.new(@uploader, new_path)
+      end
+
+      #
+      # @note 移动文件到指定路径
+      # @param new_path [String] 新路径
+      # @return [Boolean]
+      #
+      def move_to(new_path)
+        qiniu_connection.move(@path, new_path)
+        self.class.new(@uploader, new_path)
+      end
+
+      ##
+      # Reads the contents of the file from Cloud Files
+      #
+      # === Returns
+      #
+      # [String] contents of the file
+      #
+      def read
+        qiniu_connection.get(@path) if self.size > 0
+      end
+
+      def content_type
+        file_info["mimeType"] || "application/octet-stream".freeze
+      end
+
+      def size
+        file_info["fsize"] || 0
+      end
+
+      def extension
+        @path.split(".").last
+      end
+
+      def filename
+        ::File.basename(@path)
+      end
+
+      def original_filename
+        return @original_filename if @original_filename
+        if @file && @file.respond_to?(:original_filename)
+          @file.original_filename
+        elsif @path
+          ::File.basename(@path)
+        end
+      end
+
+      private
+
+      def qiniu_connection
+        config = {
+            :qiniu_access_key => @uploader.qiniu_access_key,
+            :qiniu_secret_key => @uploader.qiniu_secret_key,
+            :qiniu_bucket => @uploader.qiniu_bucket,
+            :qiniu_bucket_domain => @uploader.qiniu_bucket_domain,
+            :qiniu_bucket_private => @uploader.qiniu_bucket_private,
+            :qiniu_block_size => @uploader.qiniu_block_size,
+            :qiniu_protocol => @uploader.qiniu_protocol,
+            :qiniu_expires_in => @uploader.qiniu_expires_in,
+            :qiniu_up_host => @uploader.qiniu_up_host,
+            :qiniu_private_url_expires_in => @uploader.qiniu_private_url_expires_in,
+            :qiniu_callback_url => @uploader.qiniu_callback_url,
+            :qiniu_callback_body => @uploader.qiniu_callback_body,
+            :qiniu_persistent_notify_url => @uploader.qiniu_persistent_notify_url,
+            :qiniu_persistent_pipeline => @uploader.qiniu_persistent_pipeline,
+            :qiniu_style_separator => @uploader.qiniu_style_separator,
+            :qiniu_delete_after_days => @uploader.qiniu_delete_after_days,
+        }
+
+        if (@uploader.qiniu_persistent_ops.present? && @uploader.qiniu_persistent_ops.size > 0)
+          config[:qiniu_persistent_ops] = Array(@uploader.qiniu_persistent_ops).join(";")
+        else
+          # 适配老版本持久化参数 qiniu_async_ops
+          config[:qiniu_persistent_ops] = Array(@uploader.qiniu_async_ops).join(";") if (@uploader.respond_to?(:qiniu_async_ops) && @uploader.qiniu_async_ops.present? && @uploader.qiniu_async_ops.size > 0)
+        end
+        config[:qiniu_can_overwrite] = @uploader.try :qiniu_can_overwrite rescue false
+        @qiniu_connection = ::CarrierWave::Qiniu::Connection.new config
+      end
+
+      def file_info
+        @file_info ||= qiniu_connection.stat(@path)
+      end
+
+      def path_with_style(options)
+        return @path unless options
+        if options.has_key?(:version)
+          version = options[:version]
+          return "#{@path}#{@uploader.class.qiniu_style_separator}#{version}"
+        elsif options.has_key?(:style)
+          style = options[:style]
+          return "#{@path}?#{style}"
+        else
+          return @path
+        end
+      end
+    end
+  end
+end

data/lib/carrierwave/tasks/qiniu.rake

@@ -6,7 +6,7 @@ namespace :carrierwave do
         options.merge!(key => CarrierWave::Uploader::Base.public_send(key))
       end
       # Config Qiniu establish_connection
-      CarrierWave::Storage::Qiniu::Connection.new(options)
+      CarrierWave::Qiniu::Connection.new(options)
 
       bucket = CarrierWave::Uploader::Base.qiniu_bucket
       styles = CarrierWave::Uploader::Base.qiniu_styles

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-qiniu
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Marble Wu
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2020-01-19 00:00:00.000000000 Z
+date: 2020-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -28,22 +28,22 @@ dependencies:
   name: qiniu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.9.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.9.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.9.0
 description: Qiniu Storage support for CarrierWave
 email:
 - huobazi@gmail.com
@@ -51,32 +51,38 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".env.sample"
 - ".gitignore"
 - ".rspec"
+- ".rspec_status"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
-- LICENSE
+- LICENSE.txt
 - README.md
 - Rakefile
 - _config.yml
+- bin/console
+- bin/setup
 - carrierwave-qiniu.gemspec
 - lib/carrierwave-qiniu.rb
-- lib/carrierwave-qiniu/version.rb
 - lib/carrierwave/qiniu/configuration.rb
+- lib/carrierwave/qiniu/connection.rb
 - lib/carrierwave/qiniu/railtie.rb
 - lib/carrierwave/qiniu/style.rb
 - lib/carrierwave/qiniu/url.rb
+- lib/carrierwave/qiniu/version.rb
 - lib/carrierwave/storage/qiniu.rb
+- lib/carrierwave/storage/qiniu_file.rb
 - lib/carrierwave/tasks/qiniu.rake
-- lib/carrierwave/uploader/base.rb
-- spec/mm.jpg
-- spec/spec_helper.rb
-- spec/upload_spec.rb
 homepage: https://github.com/huobazi/carrierwave-qiniu
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/huobazi/carrierwave-qiniu
+  source_code_uri: https://github.com/huobazi/carrierwave-qiniu
+  changelog_uri: https://github.com/huobazi/carrierwave-qiniu/blob/master/CHANGELOG.md.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -85,18 +91,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Qiniu Storage support for CarrierWave
-test_files:
-- spec/mm.jpg
-- spec/spec_helper.rb
-- spec/upload_spec.rb
+test_files: []

data/LICENSE

@@ -1,22 +0,0 @@
-Copyright (c) 2012 Marble Wu
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/carrierwave/uploader/base.rb

@@ -1,21 +0,0 @@
-#encoding: utf-8
-module CarrierWave
-  class SanitizedFile
-    attr_accessor :copy_from_path
-  end
-
-  module Uploader
-    module Cache
-      alias_method :old_cache!, :cache!
-      def cache!(new_file = sanitized_file)
-        old_cache! new_file
-        if new_file.kind_of? CarrierWave::Storage::Qiniu::File
-          @file.copy_from_path = new_file.path
-        elsif new_file.kind_of? CarrierWave::Uploader::Base
-          return unless new_file.file.present?
-          @file.copy_from_path = new_file.file.path if @file.respond_to?(:copy_from_path)
-        end
-      end
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,53 +0,0 @@
-# encoding: utf-8
-require "rubygems"
-require "rails"
-require "active_record"
-require "carrierwave"
-require "carrierwave/orm/activerecord"
-require "dotenv"
-require "mini_magick"
-
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-
-require "carrierwave-qiniu"
-
-module Rails
-  class << self
-    def root
-      [File.expand_path(__FILE__).split("/")[0..-3].join("/"), "spec"].join("/")
-    end
-  end
-end
-
-the_gem = Gem::Specification.find_by_name("carrierwave")
-the_gem_root = the_gem.gem_dir
-the_gem_lib = the_gem_root + "/lib"
-the_gem_locale = the_gem_lib + "/carrierwave/locale/en.yml"
-I18n.load_path << the_gem_locale
-
-Dotenv.load
-
-ActiveRecord::Migration.verbose = false
-
-if [ActiveRecord::VERSION::MAJOR, ActiveRecord::VERSION::MINOR] == [4, 2]
-  ActiveRecord::Base.raise_in_transactional_callbacks = true
-end
-
-# 测试的时候载入环境变量
-# 或者在根目录下新建 `.env` 文件，包含 <key>=<value>
-::CarrierWave.configure do |config|
-  config.storage             = :qiniu
-  config.qiniu_access_key    = ENV["qiniu_access_key"]
-  config.qiniu_secret_key    = ENV["qiniu_secret_key"]
-
-  config.qiniu_bucket        = ENV["qiniu_bucket"]
-  config.qiniu_bucket_domain = ENV["qiniu_bucket_domain"]
-end
-
-def load_file(fname)
-  File.open([Rails.root, fname].join("/"))
-end
-
-RSpec.configure do |config|
-end

data/spec/upload_spec.rb

@@ -1,274 +0,0 @@
-# encoding: utf-8
-# thanks for https://github.com/nowa/carrierwave-upyun/blob/master/spec/upload_spec.rb
-require File.dirname(__FILE__) + '/spec_helper'
-require "open-uri"
-
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
-
-describe "CarrierWave Qiniu" do
-  def setup_db
-    ActiveRecord::Schema.define(:version => 1) do
-      create_table :photos do |t|
-        t.column :image, :string
-      end
-    end
-  end
-
-  def drop_db
-    ActiveRecord::Base.connection.tables.each do |table|
-      ActiveRecord::Base.connection.drop_table(table)
-    end
-  end
-
-  require 'carrierwave/processing/mini_magick'
-  class PhotoUploader < CarrierWave::Uploader::Base
-    include CarrierWave::MiniMagick
-
-    self.qiniu_can_overwrite = true
-
-    version :thumb do
-      process :resize_to_fill => [200, 200]
-    end
-
-    def store_dir
-      "carrierwave-qiniu-spec"
-    end
-
-    def filename
-      "images/#{secure_token(10)}.#{file.extension}" if original_filename.present?
-    end
-
-    # See
-    # https://github.com/qiniu/ruby-sdk/issues/48
-    # http://docs.qiniu.com/api/put.html#uploadToken
-    # http://docs.qiniutek.com/v3/api/io/#uploadToken-asyncOps
-    def qiniu_async_ops
-      commands = []
-      %W(small little middle large).each do |style|
-        commands << "http://#{self.qiniu_bucket_domain}/#{self.store_dir}/#{self.filename}/#{style}"
-      end
-      commands
-    end
-
-
-    protected
-    def secure_token(length = 16)
-      var = :"@#{mounted_as}_secure_token"
-      model.instance_variable_get(var) or model.instance_variable_set(var, SecureRandom.hex(length/2))
-    end
-  end
-
-  class Photo < ActiveRecord::Base
-    mount_uploader :image, PhotoUploader
-  end
-
-  before :all do
-    setup_db
-  end
-
-  after :all do
-    drop_db
-  end
-
-  context "Upload Image" do
-    it "should save failed" do
-      class WrongUploader < PhotoUploader
-        self.qiniu_bucket = 'not_exists'
-      end
-
-      class WrongPhoto < ActiveRecord::Base
-        self.table_name = 'photos'
-
-        mount_uploader :image, WrongUploader
-      end
-
-      f = load_file("mm.jpg")
-      photo = WrongPhoto.new(:image => f)
-      expect {
-        photo.save!
-      }.to raise_error
-    end
-
-    it "does upload image" do
-      f = load_file("mm.jpg")
-      photo = Photo.new(:image => f)
-      photo.save
-
-      puts photo.errors.full_messages if photo.errors.count > 0
-
-      photo.errors.count.should == 0
-
-      puts 'The image was uploaded to:'
-      puts photo.image.url
-
-      URI.open(photo.image.url).should_not be_nil
-
-      puts "The thumb image:"
-      puts photo.image.url(:thumb)
-
-      URI.open(photo.image.thumb.url).should_not be_nil
-
-    end
-
-    it 'does copy from image works' do
-      f = load_file("mm.jpg")
-
-      photo = Photo.new(image: f)
-
-      photo.save
-
-      photo2 = Photo.new
-
-      photo2.image = photo.image
-
-      photo2.save
-
-      puts "The image was copied from #{photo.image.url} to #{photo2.image.url}"
-
-      expect(photo2.image.url).not_to eq(photo.image.url)
-
-      URI.open(photo2.image.url).should_not be_nil
-    end
-
-    describe 'after remove' do
-      before(:each) do
-        f = load_file("mm.jpg")
-        @photo = Photo.new(image: f)
-        @photo.save
-        @photo.image.remove!
-      end
-
-      it 'will be not cached' do
-        expect(@photo.image).not_to be_cached
-      end
-
-      it 'file will be nil' do
-        expect(@photo.image.file).to be_nil
-      end
-
-      it 'url will be nil' do
-        expect(@photo.image.url).to be_nil
-      end
-    end
-  end
-
-  context "Styles" do
-    class StylesUploader < CarrierWave::Uploader::Base
-      use_qiniu_styles
-    end
-
-    class StyledPhoto < ActiveRecord::Base
-      self.table_name = 'photos'
-
-      mount_uploader :image, StylesUploader
-    end
-
-    class CustomStylesUploader < CarrierWave::Uploader::Base
-      use_qiniu_styles thumb2: 'imageView2/0/w/200'
-    end
-
-    class CustomStyledPhoto < ActiveRecord::Base
-      self.table_name = 'photos'
-
-      mount_uploader :image, CustomStylesUploader
-    end
-
-    let(:photo) {
-      f = load_file("mm.jpg")
-      photo = StyledPhoto.new(image: f)
-      photo.save
-      photo
-    }
-
-    context 'array styles' do
-      it 'style url' do
-        StylesUploader.qiniu_styles = [:thumb]
-        StylesUploader.use_qiniu_styles
-
-        photo.errors.count.should == 0
-
-        expect(photo.image.url).not_to be_nil
-        puts photo.image.url('thumb')
-        expect(photo.image.url('thumb').end_with?("mm.jpg-thumb")).to eq true
-      end
-
-      it 'global inline mode' do
-        StylesUploader.qiniu_styles = [:thumb]
-        StylesUploader.use_qiniu_styles
-        CarrierWave.configure {|config| config.qiniu_style_inline = true }
-
-        expect(photo.image.url('thumb', inline: true).end_with?("mm.jpg-thumb")).to eq true
-        CarrierWave.configure {|config| config.qiniu_style_inline = false }
-      end
-    end
-
-    context "Hash styles" do
-      before :each do
-        StylesUploader.qiniu_styles = { thumb: 'imageView2/0/w/200' }
-        StylesUploader.use_qiniu_styles
-      end
-
-      it 'style url' do
-        photo.errors.count.should == 0
-
-        expect(photo.image.url).not_to be_nil
-        puts photo.image.url('thumb')
-        expect(photo.image.url('thumb').end_with?("mm.jpg-thumb")).to eq true
-      end
-
-      it 'inline style url' do
-        puts photo.image.url('thumb', inline: true)
-        expect(photo.image.url('thumb', inline: true).end_with?("mm.jpg?imageView2/0/w/200")).to eq true
-      end
-
-      it 'global inline mode' do
-        CarrierWave.configure {|config| config.qiniu_style_inline = true }
-        expect(photo.image.url('thumb', inline: true).end_with?("mm.jpg?imageView2/0/w/200")).to eq true
-        CarrierWave.configure {|config| config.qiniu_style_inline = false }
-      end
-    end
-
-    context "Only Style param" do
-      it 'url' do
-        puts photo.image.url(style: 'imageView2/0/w/200')
-        expect(photo.image.url(style: 'imageView2/0/w/200').end_with?("mm.jpg?imageView2/0/w/200")).to eq true
-      end
-    end
-
-    context "Custom styles" do
-      let(:custom_photo) {
-        f = load_file("mm.jpg")
-        photo = CustomStyledPhoto.new(image: f)
-        photo.save
-        photo
-      }
-
-      it 'override default styles' do
-        photo = custom_photo
-        expect(CustomStylesUploader.qiniu_styles).to eq({ thumb2: 'imageView2/0/w/200' })
-        # Version thumb doesn't exist!
-        expect { photo.image.url('thumb') }.to raise_error
-      end
-
-      it 'style url' do
-        photo = custom_photo
-        expect(photo.image.url).not_to be_nil
-        puts photo.image.url('thumb2')
-        expect(photo.image.url('thumb2').end_with?("mm.jpg-thumb2")).to eq true
-      end
-
-      it 'inline style url' do
-        photo = custom_photo
-        puts photo.image.url('thumb2', inline: true)
-        expect(photo.image.url('thumb2', inline: true).end_with?("mm.jpg?imageView2/0/w/200")).to eq true
-      end
-
-      it 'global inline mode' do
-        photo = custom_photo
-        CarrierWave.configure {|config| config.qiniu_style_inline = true }
-        expect(photo.image.url('thumb2', inline: true).end_with?("mm.jpg?imageView2/0/w/200")).to eq true
-        CarrierWave.configure {|config| config.qiniu_style_inline = false }
-      end
-    end
-  end
-end