carrierwave-upyun 0.1.6 → 0.1.7

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NjA0MzI2NThlYzM0YjUyM2MxOTU5NDRiZjkyYzZlZjJmN2JkZGM5Yg==
+  data.tar.gz: !binary |-
+    ZDQyZGE2YTk1YTlkMjViYzcyMTkxMmY5ZTc0Njg3NjY1NThiNGQ1ZQ==
+SHA512:
+  metadata.gz: !binary |-
+    YzdiMDExMjA0YjcxMGY2MTQ5Zjc4NzVhMmRmMWQxYTE3OGU5ZDViZGVhMWFh
+    YzBhMjBmNTIwMTNjZTAxZTY0ZmY3MTI2ZTVhMWQwOWYwMmI0Yjg3Zjg0ZDhm
+    Yjc3ODNlMmUzZTRkZThkMzgxYmRiMmY2NTEyY2EzNzY3YTU1ZjE=
+  data.tar.gz: !binary |-
+    ZWM2ZWE0NGI5MjZhMWM3YTg3Y2U0MjQzMTdmOGYzNTk1Y2M4ODUyMTRiYjQ5
+    NjAxZjdiYTBmODVmYzNhODdkN2JkYTAxZmFhYWEwODZkN2NhMDQxZmNjMWY4
+    YzM3YzJjNjI4MDQxZTFiMGQyM2IyNjg0MzllNDQxNjZkOTMxY2M=

data/Gemfile

@@ -1,12 +1,10 @@
-source :rubygems
-gem "rake"
+source "http://ruby.taobao.org/"
+
+gemspec
 
 group :test do
-  gem 'rails', '3.0.0'
-  gem 'sqlite3-ruby', :require => 'sqlite3'
-  gem 'carrierwave'
+  gem "rails", "~> 3.2.13"
+  gem 'sqlite3'
   gem 'mini_magick'
-  gem 'rest-client'
   gem 'rspec','~> 2.6.0'
-  gem 'mocha','0.10.0'
 end

data/Gemfile.lock

@@ -1,73 +1,85 @@
+PATH
+  remote: .
+  specs:
+    carrierwave-upyun (0.1.6)
+      carrierwave (>= 0.5.7)
+      rest-client (>= 1.6.7)
+
 GEM
-  remote: http://rubygems.org/
+  remote: http://ruby.taobao.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.0)
-      actionpack (= 3.0.0)
-      mail (~> 2.2.5)
-    actionpack (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      arel (~> 1.0.0)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    builder (2.1.2)
-    carrierwave (0.5.7)
-      activesupport (~> 3.0)
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.4)
+    carrierwave (0.8.0)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
     diff-lcs (1.1.3)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.4.2)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    erubis (2.7.0)
+    hike (1.2.2)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.7)
+    mail (2.5.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.17.2)
+    mime-types (1.23)
     mini_magick (3.3)
       subexec (~> 0.1.0)
-    mocha (0.10.0)
-      metaclass (~> 0.0.1)
+    multi_json (1.7.2)
     polyglot (0.3.3)
-    rack (1.2.4)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.0.0)
-      actionmailer (= 3.0.0)
-      actionpack (= 3.0.0)
-      activerecord (= 3.0.0)
-      activeresource (= 3.0.0)
-      activesupport (= 3.0.0)
-      bundler (~> 1.0.0)
-      railties (= 3.0.0)
-    railties (3.0.0)
-      actionpack (= 3.0.0)
-      activesupport (= 3.0.0)
-      rake (>= 0.8.4)
-      thor (~> 0.14.0)
-    rake (0.9.2.2)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
+      bundler (~> 1.0)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (0.9.6)
+    rdoc (3.12.2)
+      json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.6.0)
@@ -78,25 +90,26 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    sqlite3 (1.3.4)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.7)
     subexec (0.1.0)
-    thor (0.14.6)
-    treetop (1.4.10)
+    thor (0.18.1)
+    tilt (1.3.7)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.30)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  carrierwave
+  carrierwave-upyun!
   mini_magick
-  mocha (= 0.10.0)
-  rails (= 3.0.0)
-  rake
-  rest-client
+  rails (~> 3.2.13)
   rspec (~> 2.6.0)
-  sqlite3-ruby
+  sqlite3

data/README.md

@@ -21,7 +21,9 @@ CarrierWave.configure do |config|
   config.upyun_username = "xxxxxx"
   config.upyun_password = 'xxxxxx'
   config.upyun_bucket = "my_bucket"
-  config.upyun_bucket_domain = "my_bucket.files.example.com"
+  # upyun_bucket_domain 以后将会弃用，请改用 upyun_bucket_host
+  # config.upyun_bucket_domain = "my_bucket.files.example.com"
+  config.upyun_bucket_host = "http://my_bucket.files.example.com"
 end
 ```
 
@@ -40,7 +42,7 @@ class AvatarUploader < CarrierWave::Uploader::Base
   storage :upyun
 
   self.upyun_bucket = "avatars"
-  self.upyun_bucket_domain = "avatars.files.example.com"
+  self.upyun_bucket_host = "https://avatars.files.example.com"
 end
 ```
 

data/carrierwave-upyun.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "carrierwave-upyun"
-  s.version     = "0.1.6"
+  s.version     = "0.1.7"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Nowa Zhu"]
   s.email       = ["nowazhu@gmail.com"]
@@ -18,5 +18,4 @@ Gem::Specification.new do |s|
   s.add_dependency "carrierwave", [">= 0.5.7"]
   s.add_dependency "rest-client", [">= 1.6.7"]
   s.add_development_dependency "rspec", ["~> 2.6"]
-  s.add_development_dependency "rake", ["~> 0.9"]
 end

data/lib/carrierwave/storage/upyun.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'carrierwave'
+
 begin
   require 'rest_client'
   RestClient.log = nil
@@ -16,39 +17,48 @@ module CarrierWave
     #       config.upyun_username = "xxxxxx"
     #       config.upyun_password = "xxxxxx"
     #       config.upyun_bucket = "my_bucket"
-    #       config.upyun_bucket_domain = "https://my_bucket.files.example.com"
+    #       config.upyun_bucket_host = "https://my_bucket.files.example.com"
     #       config.upyun_api_host = "http://v0.api.upyun.com"
     #     end
     #
     #
     class UpYun < Abstract
-
       class Connection
-        def initialize(options={})
+        attr_reader :upyun_bucket
+        cattr_reader :shared_connections
+        @@shared_connections = {}
+
+        def self.find_or_initialize(bucket, options)
+          @@shared_connections[bucket.to_sym] ||= new(bucket, options)
+        end
+
+        def initialize(bucket, options = {})
+          @upyun_bucket   = bucket
           @upyun_username = options[:upyun_username]
           @upyun_password = options[:upyun_password]
-          @upyun_bucket = options[:upyun_bucket]
-          @connection_options     = options[:connection_options] || {}
+
           @host = options[:api_host] || 'http://v0.api.upyun.com'
-          @@http ||= RestClient::Resource.new("#{@host}/#{@upyun_bucket}",
-                                            :user => @upyun_username,
-                                            :password => @upyun_password)
+        end
+        private_class_method :new
+
+        def rest_client
+          @rest_client ||= RestClient::Resource.new("#{@host}/#{@upyun_bucket}", :user => @upyun_username, :password => @upyun_password)
         end
 
         def put(path, payload, headers = {})
-          @@http["#{escaped(path)}"].put(payload, headers)
+          rest_client[escaped(path)].put(payload, headers)
         end
 
         def get(path, headers = {})
-          @@http["#{escaped(path)}"].get(headers)
+          rest_client[escaped(path)].get(headers)
         end
 
         def delete(path, headers = {})
-          @@http["#{escaped(path)}"].delete(headers)
+          rest_client[escaped(path)].delete(headers)
         end
 
         def post(path, payload, headers = {})
-          @@http["#{escaped(path)}"].post(payload, headers)
+          rest_client[escaped(path)].post(payload, headers)
         end
 
         def escaped(path)
@@ -75,6 +85,14 @@ module CarrierWave
           @path
         end
 
+        def content_type
+          @content_type || ""
+        end
+
+        def content_type=(new_content_type)
+          @content_type = new_content_type
+        end
+
         ##
         # Reads the contents of the file from Cloud Files
         #
@@ -83,7 +101,7 @@ module CarrierWave
         # [String] contents of the file
         #
         def read
-          object = uy_connection.get(@path)
+          object = upyun_connection.get(@path)
           @headers = object.headers
           object.net_http_res.body
         end
@@ -93,7 +111,7 @@ module CarrierWave
         #
         def delete
           begin
-            uy_connection.delete(@path)
+            upyun_connection.delete(@path)
             true
           rescue Exception => e
             # If the file's not there, don't panic
@@ -110,8 +128,17 @@ module CarrierWave
         # [String] file's url
         #
         def url
+          if @uploader.upyun_bucket_host
+            return [@uploader.upyun_bucket_host, @path].join("/")
+          end
+          
           if @uploader.upyun_bucket_domain
-            "http://" + @uploader.upyun_bucket_domain + '/' + @path
+            puts "DEPRECATION: upyun_bucket_domain config is deprecated, please use upyun_bucket_host to insead."
+            if @uploader.upyun_bucket_domain.match(/^http/)
+              [@uploader.upyun_bucket_domain, @path].join("/")
+            else
+              ["http://",@uploader.upyun_bucket_domain, @path].join("/")
+            end
           else
             nil
           end
@@ -133,7 +160,7 @@ module CarrierWave
         # boolean
         #
         def store(data,headers={})
-          uy_connection.put(@path, data, {'Expect' => '', 'Mkdir' => 'true'}.merge(headers))
+          upyun_connection.put(@path, data, {'Expect' => '', 'Mkdir' => 'true'}.merge(headers))
           true
         end
 
@@ -141,7 +168,7 @@ module CarrierWave
 
           def headers
             @headers ||= begin
-              uy_connection.get(@path).headers
+              upyun_connection.get(@path).headers
             rescue Excon::Errors::NotFound # Don't die, just return no headers
               {}
             end
@@ -151,19 +178,16 @@ module CarrierWave
             @base.connection
           end
 
-          def uy_connection
-            if @uy_connection
-              @uy_connection
-            else
-              config = {:upyun_username => @uploader.upyun_username,
-                :upyun_password => @uploader.upyun_password,
-                :upyun_bucket => @uploader.upyun_bucket
-              }
-              config[:api_host] = @uploader.upyun_api_host if @uploader.respond_to?(:upyun_api_host)
-              @uy_connection ||= CarrierWave::Storage::UpYun::Connection.new(config)
+          def upyun_connection
+            conn_options = {
+              :upyun_username => @uploader.upyun_username,
+              :upyun_password => @uploader.upyun_password
+            }
+            if @uploader.respond_to?(:upyun_api_host)
+              conn_options[:api_host] = @uploader.upyun_api_host
             end
+            CarrierWave::Storage::UpYun::Connection.find_or_initialize @uploader.upyun_bucket, conn_options
           end
-
       end
 
       ##
@@ -198,7 +222,6 @@ module CarrierWave
         CarrierWave::Storage::UpYun::File.new(uploader, self, uploader.store_path(identifier))
       end
 
-
     end # CloudFiles
   end # Storage
 end # CarrierWave

data/lib/carrierwave/upyun/configuration.rb

@@ -8,6 +8,7 @@ module CarrierWave
         add_config :upyun_bucket
         add_config :upyun_api_host
         add_config :upyun_bucket_domain
+        add_config :upyun_bucket_host
       end
     end
     

data/spec/spec_helper.rb

@@ -25,12 +25,12 @@ ActiveRecord::Migration.verbose = false
 # 测试的时候需要修改这个地方
 CarrierWave.configure do |config|
   config.storage = :upyun
-  config.upyun_username = "rspec"
-  config.upyun_password = 'spec123'
-  config.upyun_bucket = "rspec"
-  config.upyun_bucket_domain = "rspec.b0.upaiyun.com"
+  config.upyun_username = ENV['upyun_username'] || "rspec"
+  config.upyun_password = ENV['upyun_password'] || 'spec123'
+  config.upyun_bucket = ENV['upyun_bucket'] || "rspec"
+  config.upyun_bucket_domain = ENV['upyun_bucket_domain'] || "rspec.b0.upaiyun.com"
 end
 
 def load_file(fname)
   File.open([Rails.root,fname].join("/"))
-end
+end

data/spec/upload_spec.rb

@@ -1,6 +1,8 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 require "open-uri"
+require "sqlite3"
+
 ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
 
 describe "Upload" do
@@ -11,20 +13,20 @@ describe "Upload" do
       end
     end
   end
-  
+
   def drop_db
     ActiveRecord::Base.connection.tables.each do |table|
       ActiveRecord::Base.connection.drop_table(table)
     end
   end
-  
+
   class PhotoUploader < CarrierWave::Uploader::Base
     include CarrierWave::MiniMagick
 
     version :small do
       process :resize_to_fill => [120, 120]
     end
-    
+
     def store_dir
       "photos"
     end
@@ -33,16 +35,16 @@ describe "Upload" do
   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 "does upload image" do
       f = load_file("foo.jpg")
@@ -55,4 +57,24 @@ describe "Upload" do
       open(@photo.image.small.url).should_not == nil
     end
   end
+
+  context "Connection" do
+    it "create shared connection" do
+      expect {
+        CarrierWave::Storage::UpYun::Connection.find_or_initialize 'bucket0', :upyun_username => "foo"
+        CarrierWave::Storage::UpYun::Connection.find_or_initialize 'bucket0', :upyun_username => "foo"
+        CarrierWave::Storage::UpYun::Connection.find_or_initialize 'bucket1', :upyun_username => "foo"
+      }.to change{ CarrierWave::Storage::UpYun::Connection.shared_connections.size }.by(2)
+    end
+
+    it "create only one instance for same buckets" do
+      CarrierWave::Storage::UpYun::Connection.find_or_initialize 'bucket999', :upyun_username => "foo"
+      CarrierWave::Storage::UpYun::Connection.find_or_initialize 'bucket999', :upyun_username => "foo"
+      instances = []
+      ObjectSpace.each_object(CarrierWave::Storage::UpYun::Connection) do |conn|
+        instances << conn if conn.upyun_bucket == 'bucket999'
+      end
+      instances.should have(1).item
+    end
+  end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-upyun
 version: !ruby/object:Gem::Version
-  version: 0.1.6
-  prerelease: 
+  version: 0.1.7
 platform: ruby
 authors:
 - Nowa Zhu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-28 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,27 +48,10 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
 description: UpYun Storage support for CarrierWave
 email:
 - nowazhu@gmail.com
@@ -97,27 +74,26 @@ files:
 - spec/upload_spec.rb
 homepage: https://github.com/nowa/carrierwave-upyun
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: UpYun Storage support for CarrierWave
 test_files:
 - spec/foo.gif