paperclip-qiniu 0.0.1 → 0.0.2

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    paperclip-qiniu (0.0.1)
+    paperclip-qiniu (0.0.2)
       paperclip
       qiniu-rs
 
@@ -22,11 +22,12 @@ GEM
     arel (3.0.2)
     builder (3.0.0)
     cocaine (0.2.1)
+    diff-lcs (1.1.3)
     i18n (0.6.0)
     json (1.7.3)
     mime-types (1.19)
     multi_json (1.3.6)
-    paperclip (3.1.2)
+    paperclip (3.1.3)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -39,6 +40,14 @@ GEM
       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.0)
+    rspec-expectations (2.11.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.1)
     ruby-hmac (0.4.0)
     tzinfo (0.3.33)
 
@@ -47,3 +56,4 @@ PLATFORMS
 
 DEPENDENCIES
   paperclip-qiniu!
+  rspec

data/README.md

@@ -1,21 +1,25 @@
 # Paperclip::Qiniu
 
-storage paperclip attachments to http://qiniutek.com
+storage [paperclip](https://github.com/thoughtbot/paperclip/) attachments to http://qiniutek.com
+
+example project: https://github.com/lidaobing/paperclip-qiniu-example
+
+example site: http://stark-cloud-4321.herokuapp.com/
 
 ## Usage
 
-0. confirm you are working on a rails app
+* confirm you are working on a rails app
 
-1. add following line to `Gemfile`
+* add following line to `Gemfile`
 
-```
+```ruby
 gem 'paperclip'
 gem 'paperclip-qiniu'
 ```
 
-2. edit your `config/application.rb`
+* edit your `config/application.rb`
 
-```
+```ruby
 module PaperclipQiniuExample
   class Application < Rails::Application
     # ....
@@ -25,18 +29,21 @@ module PaperclipQiniuExample
         :secret_key => ENV['QINIU_SECRET_KEY'] || raise("set env QINIU_SECRET_KEY")
       },
       :bucket => "paperclip-qiniu-example",
-      :use_timestamp => false
+      :use_timestamp => false,         # required, and must be set to false
+      :qiniu_host => "cdn.example.com" # optional
     }
   end
 end
 ```
 
-3. add a model like this
+for more information on `qiniu_host`, read http://docs.qiniutek.com/v2/sdk/ruby/#publish
 
-```
+* add a model like this
+
+```ruby
 class Image < ActiveRecord::Base
   attr_accessible :file
-  has_attached_file :file, :styles => { :medium => "300x300>", :thumb => "100x100>" }
+  has_attached_file :file, :styles => { :medium => "300x300>", :thumb => "100x100>" }, :path => ":class/:attachment/:id/:style/:basename.:extension"
   validates :file, :attachment_presence => true
 end
 ```
@@ -48,3 +55,14 @@ end
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## CHANGELOG
+
+### 0.0.2 (2012-07-17)
+
+* support public host.
+
+### 0.0.1
+
+* it works.
+

data/Rakefile

@@ -1,2 +1,5 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new

data/lib/paperclip-qiniu/version.rb

@@ -1,5 +1,5 @@
 module Paperclip
   module Qiniu
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/paperclip/storage/qiniu.rb

@@ -53,9 +53,16 @@ module Paperclip
 
       def public_url(style = default_style)
         init
-        res = ::Qiniu::RS.get(bucket, path(style))
-        return res["url"] if res
-        nil
+        if @options[:qiniu_host]
+          "#{dynamic_fog_host_for_style(style)}/#{path(style)}"
+        else
+          res = ::Qiniu::RS.get(bucket, path(style))
+          if res
+            res["url"]
+          else
+            nil
+          end
+        end
       end
 
       private
@@ -75,12 +82,19 @@ module Paperclip
                  :mime_type          => file.content_type,
                  :enable_crc32_check => true}
         ::Qiniu::RS.upload opts
-        log ::Qiniu::RS.get(bucket, path)
       end
 
       def bucket
         @options[:bucket] || raise("bucket is nil")
       end
+
+      def dynamic_fog_host_for_style(style)
+        if @options[:qiniu_host].respond_to?(:call)
+          @options[:qiniu_host].call(self)
+        else
+          @options[:qiniu_host]
+        end
+      end
     end
   end
 end

data/paperclip-qiniu.gemspec

@@ -16,4 +16,5 @@ Gem::Specification.new do |gem|
   gem.version       = Paperclip::Qiniu::VERSION
   gem.add_dependency 'paperclip'
   gem.add_dependency 'qiniu-rs'
+  gem.add_development_dependency 'rspec'
 end

data/spec/lib/paperclip/storage/qiniu_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+require 'paperclip/storage/qiniu'
+
+module Paperclip::Storage
+  describe Qiniu do
+    context 'exists?' do
+      pending "it's hard to test paperclip plugin"
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,17 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-qiniu
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2012-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !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
 email:
 - lidaobing@gmail.com
@@ -51,6 +67,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -60,6 +77,8 @@ files:
 - lib/paperclip-qiniu/version.rb
 - lib/paperclip/storage/qiniu.rb
 - paperclip-qiniu.gemspec
+- spec/lib/paperclip/storage/qiniu_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/lidaobing/paperclip-qiniu
 licenses: []
 post_install_message: 
@@ -84,5 +103,7 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: paperclip plugin for qiniu
-test_files: []
+test_files:
+- spec/lib/paperclip/storage/qiniu_spec.rb
+- spec/spec_helper.rb
 has_rdoc: