paperclip-qiniu 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 21288b60900a5b121be0bc783dfbbdecbdbf2df4
+  data.tar.gz: ce73d61101dceba176a921a243f610fdaa970b84
+SHA512:
+  metadata.gz: 5c118af4f1ce0de1ceb3d0921cf3011e8a0d7a96d5ff51eaa128df577bb8a7c3dd1d7ca68d0a752b68bad998dd50bfee58dd86457517f37fc07955ad5cc5aa9d
+  data.tar.gz: 7e36ce9a617ca4fde6398b1eb59b86286bad5f637eec79c792961827ba5126617e96f3b721ca8a95a60a6bb43b95d2f18d5593947eefb756d93a1a6905b29b53

data/Gemfile.lock

@@ -1,55 +1,63 @@
 PATH
   remote: .
   specs:
-    paperclip-qiniu (0.1.0)
+    paperclip-qiniu (0.2.0)
       paperclip
-      qiniu-rs (~> 3.0)
+      qiniu (~> 6.4.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.0)
-    cocaine (0.3.0)
-    diff-lcs (1.1.3)
-    i18n (0.6.1)
-    json (1.7.5)
-    mime-types (1.19)
-    multi_json (1.3.6)
-    paperclip (3.1.4)
+    activemodel (4.2.0)
+      activesupport (= 4.2.0)
+      builder (~> 3.1)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    builder (3.2.2)
+    climate_control (0.0.3)
+      activesupport (>= 3.0)
+    cocaine (0.5.5)
+      climate_control (>= 0.0.3, < 1.0)
+    diff-lcs (1.2.5)
+    i18n (0.7.0)
+    json (1.8.2)
+    mime-types (2.4.3)
+    minitest (5.5.1)
+    netrc (0.10.2)
+    paperclip (4.2.1)
       activemodel (>= 3.0.0)
-      activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
-      cocaine (>= 0.0.2)
+      cocaine (~> 0.5.3)
       mime-types
-    qiniu-rs (3.0.5)
-      json (~> 1.7.5)
-      mime-types (~> 1.19)
-      rest-client (~> 1.6.7)
-      ruby-hmac (~> 0.4.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
+    qiniu (6.4.1)
+      json (~> 1.7)
+      mime-types (~> 2.4.3)
+      rest-client (~> 1.6)
+      ruby-hmac (~> 0.4)
+    rest-client (1.7.2)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.1)
     ruby-hmac (0.4.0)
-    tzinfo (0.3.33)
+    thread_safe (0.3.4)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -4,7 +4,9 @@ storage [paperclip](https://github.com/thoughtbot/paperclip/) attachments to htt
 
 example project: https://github.com/lidaobing/paperclip-qiniu-example
 
-example site: http://stark-cloud-4321.herokuapp.com/
+example site: http://paperclip-qiniu-example.herokuapp.com/
+
+if you are using Rails 3, please use version  0.1.0: https://rubygems.org/gems/paperclip-qiniu/versions/0.1.0
 
 ## Usage
 
@@ -15,25 +17,22 @@ example site: http://stark-cloud-4321.herokuapp.com/
 ```ruby
 gem 'paperclip'
 gem 'paperclip-qiniu'
+# or get the latest version
+# gem 'paperclip-qiniu', :git => "git://github.com/lidaobing/paperclip-qiniu"
 ```
 
-* edit your `config/application.rb`
+* create `config/initializers/paperclip.rb`
 
 ```ruby
-module PaperclipQiniuExample
-  class Application < Rails::Application
-    # ....
-    config.paperclip_defaults = {:storage => :qiniu,
-      :qiniu_credentials => {
-        :access_key => ENV['QINIU_ACCESS_KEY'] || raise("set env QINIU_ACCESS_KEY"),
-        :secret_key => ENV['QINIU_SECRET_KEY'] || raise("set env QINIU_SECRET_KEY")
-      },
-      :bucket => "paperclip-qiniu-example",
-      :use_timestamp => false,         # required, and must be set to false
-      :qiniu_host => "cdn.example.com" # optional
-    }
-  end
-end
+Paperclip::Attachment.default_options[:storage] = :qiniu
+Paperclip::Attachment.default_options[:qiniu_credentials] = {
+  :access_key => ENV['QINIU_ACCESS_KEY'] || raise("set env QINIU_ACCESS_KEY"),
+  :secret_key => ENV['QINIU_SECRET_KEY'] || raise("set env QINIU_SECRET_KEY")
+}
+Paperclip::Attachment.default_options[:bucket] = 'paperclip-qiniu-example'
+Paperclip::Attachment.default_options[:use_timestamp] = false
+Paperclip::Attachment.default_options[:qiniu_host] =
+  'http://cdn.example.com'
 ```
 
 for more information on `qiniu_host`, read http://docs.qiniutek.com/v2/sdk/ruby/#publish
@@ -45,6 +44,7 @@ class Image < ActiveRecord::Base
   attr_accessible :file
   has_attached_file :file, :path => ":class/:attachment/:id/:basename.:extension"
   validates :file, :attachment_presence => true
+  validates_attachment_content_type :file, :content_type => /\Aimage\/.*\Z/
 end
 ```
 
@@ -68,6 +68,10 @@ support options: `thumbnail`, `gravity`, `crop`, `quality`, `rotate`, `format`,
 
 ## CHANGELOG
 
+### 0.1.1 (2015-01-06)
+
+* upgrade Ruby SDK from `qiniu-rs` to `6.4.1`
+
 ### 0.1.0 (2012-09-06)
 
 * add view helper: qiniu_image_tag, qiniu_image_path

data/lib/paperclip-qiniu/version.rb

@@ -1,5 +1,5 @@
 module Paperclip
   module Qiniu
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/lib/paperclip/storage/qiniu.rb

@@ -5,9 +5,9 @@ module Paperclip
     module Qiniu
       def self.extended base
         begin
-          require 'qiniu-rs'
+          require 'qiniu'
         rescue LoadError => e
-          e.message << " (You may need to install the qiniu-rs gem)"
+          e.message << " (You may need to install the qiniu gem)"
           raise e
         end unless defined?(::Qiniu)
 
@@ -25,7 +25,7 @@ module Paperclip
 
       def exists?(style = default_style)
         init
-        !!::Qiniu::RS.stat(bucket, path(style))
+        !!::Qiniu.stat(bucket, path(style))
       end
 
       def flush_writes
@@ -48,7 +48,7 @@ module Paperclip
       def flush_deletes
         init
         for path in @queued_for_delete do
-          ::Qiniu::RS.delete(bucket, path)
+          ::Qiniu.delete(bucket, path)
         end
         @queued_for_delete = []
       end
@@ -58,7 +58,7 @@ module Paperclip
         if @options[:qiniu_host]
           "#{dynamic_fog_host_for_style(style)}/#{path(style)}"
         else
-          res = ::Qiniu::RS.get(bucket, path(style))
+          res = ::Qiniu.get(bucket, path(style))
           if res
             res["url"]
           else
@@ -71,19 +71,19 @@ module Paperclip
 
       def init
         return if @inited
-        ::Qiniu::RS.establish_connection! @options[:qiniu_credentials]
+        ::Qiniu.establish_connection! @options[:qiniu_credentials]
         inited = true
       end
 
       def upload(file, path)
-        upload_token = ::Qiniu::RS.generate_upload_token :scope => bucket
+        upload_token = ::Qiniu.generate_upload_token :scope => bucket
         opts = {:uptoken            => upload_token,
                  :file               => file.path,
                  :key                => path,
                  :bucket             => bucket,
                  :mime_type          => file.content_type,
                  :enable_crc32_check => true}
-        unless ::Qiniu::RS.upload_file(opts)
+        unless ::Qiniu.upload_file(opts)
           raise Paperclip::Qiniu::UploadFailed
         end
       end

data/paperclip-qiniu.gemspec

@@ -15,6 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Paperclip::Qiniu::VERSION
   gem.add_dependency 'paperclip'
-  gem.add_dependency 'qiniu-rs', '~> 3.0'
+  gem.add_dependency 'qiniu', '~> 6.4.1'
   gem.add_development_dependency 'rspec'
 end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-qiniu
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - LI Daobing
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: qiniu-rs
+  name: qiniu
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 6.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 6.4.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: paperclip plugin for qiniu
@@ -66,8 +59,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -85,29 +78,27 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/lidaobing/paperclip-qiniu
 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.23
+rubygems_version: 2.4.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: paperclip plugin for qiniu
 test_files:
 - spec/lib/paperclip/storage/qiniu_spec.rb
 - spec/spec_helper.rb
-has_rdoc: