carrierwave-upyun 0.1.5 → 0.1.6

data/.gitignore

@@ -1,2 +1,3 @@
 .DS_Store
 *.gem
+uploads/

data/README.md

@@ -33,3 +33,56 @@ class AvatarUploader < CarrierWave::Uploader::Base
 end
 ```
 
+You can override configuration item in individual uploader like this:
+
+```ruby
+class AvatarUploader < CarrierWave::Uploader::Base
+  storage :upyun
+
+  self.upyun_bucket = "avatars"
+  self.upyun_bucket_domain = "avatars.files.example.com"
+end
+```
+
+## Configuration for use UpYun "Image Space"
+
+```ruby
+# The defined image name versions to limit use
+IMAGE_UPLOADER_ALLOW_IMAGE_VERSION_NAMES = %(320 640 800)
+class ImageUploader < CarrierWave::Uploader::Base
+  def store_dir
+    "#{model.class.to_s.underscore}/#{mounted_as}"
+  end
+
+  def default_url
+    # You can use FTP to upload a default image
+    "#{Setting.upload_url}/blank.png#{version_name}"
+  end
+
+  # Override url method to implement with "Image Space"
+  def url(version_name = "")
+    @url ||= super({})
+    version_name = version_name.to_s
+    return @url if version_name.blank?
+    if not version_name.in?(IMAGE_UPLOADER_ALLOW_IMAGE_VERSION_NAMES)
+      # To protected version name using, when it not defined, this will be give an error message in development environment
+      raise "ImageUploader version_name:#{version_name} not allow."
+    end
+    [@url,version_name].join("!") # thumb split with "!"
+  end
+
+  def extension_white_list
+    %w(jpg jpeg gif png)
+  end
+
+  def filename
+    if super.present?
+      model.uploader_secure_token ||= SecureRandom.uuid.gsub("-","")
+      Rails.logger.debug("(BaseUploader.filename) #{model.uploader_secure_token}")
+      "#{model.uploader_secure_token}.#{file.extension.downcase}"
+    end
+  end
+end
+```
+
+To see more details about use UpYun: [http://huacnlee.com/blog/rails-app-image-store-with-carrierwave-upyun/](http://huacnlee.com/blog/rails-app-image-store-with-carrierwave-upyun/)

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.5"
+  s.version     = "0.1.6"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Nowa Zhu"]
   s.email       = ["nowazhu@gmail.com"]

data/lib/carrierwave/storage/upyun.rb

@@ -22,7 +22,7 @@ module CarrierWave
     #
     #
     class UpYun < Abstract
-      
+
       class Connection
         def initialize(options={})
           @upyun_username = options[:upyun_username]
@@ -30,27 +30,27 @@ module CarrierWave
           @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, 
+          @@http ||= RestClient::Resource.new("#{@host}/#{@upyun_bucket}",
+                                            :user => @upyun_username,
                                             :password => @upyun_password)
         end
-        
+
         def put(path, payload, headers = {})
-          @http["#{escaped(path)}"].put(payload, headers)
+          @@http["#{escaped(path)}"].put(payload, headers)
         end
-        
+
         def get(path, headers = {})
-          @http["#{escaped(path)}"].get(headers)
+          @@http["#{escaped(path)}"].get(headers)
         end
-        
+
         def delete(path, headers = {})
-          @http["#{escaped(path)}"].delete(headers)
+          @@http["#{escaped(path)}"].delete(headers)
         end
-        
+
         def post(path, payload, headers = {})
-          @http["#{escaped(path)}"].post(payload, headers)
+          @@http["#{escaped(path)}"].post(payload, headers)
         end
-        
+
         def escaped(path)
           CGI.escape(path)
         end
@@ -116,7 +116,7 @@ module CarrierWave
             nil
           end
         end
-        
+
         def content_type
           headers[:content_type]
         end
@@ -155,8 +155,8 @@ module CarrierWave
             if @uy_connection
               @uy_connection
             else
-              config = {:upyun_username => @uploader.upyun_username, 
-                :upyun_password => @uploader.upyun_password, 
+              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)

data/spec/upload_spec.rb

@@ -46,11 +46,13 @@ describe "Upload" do
   context "Upload Image" do
     it "does upload image" do
       f = load_file("foo.jpg")
-      photo = Photo.create(:image => f)
-      photo.errors.count.should == 0
-      open(photo.image.url).should_not == nil
-      open(photo.image.url).size.should == f.size
-      open(photo.image.small.url).should_not == nil
+      puts Benchmark.measure {
+        @photo = Photo.create(:image => f)
+      }
+      @photo.errors.count.should == 0
+      open(@photo.image.url).should_not == nil
+      open(@photo.image.url).size.should == f.size
+      open(@photo.image.small.url).should_not == nil
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-upyun
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-10 00:00:00.000000000 Z
+date: 2012-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &70201535169360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 0.5.7
   type: :runtime
   prerelease: false
-  version_requirements: *70201535169360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.7
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70201535168860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70201535168860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.7
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70201535168380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70201535168380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70201535167900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +69,12 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70201535167900
+  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
@@ -95,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: UpYun Storage support for CarrierWave