carrierwave-upyun 0.1.1 → 0.1.2

data/.rspec

@@ -0,0 +1,2 @@
+--colour
+--format nested

data/Gemfile

@@ -0,0 +1,12 @@
+source :rubygems
+gem "rake"
+
+group :test do
+  gem 'rails', '3.0.0'
+  gem 'sqlite3-ruby', :require => 'sqlite3'
+  gem 'carrierwave'
+  gem 'mini_magick'
+  gem 'rest-client'
+  gem 'rspec','~> 2.6.0'
+  gem 'mocha','0.10.0'
+end

data/Gemfile.lock

@@ -0,0 +1,102 @@
+GEM
+  remote: http://rubygems.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)
+    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)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    metaclass (0.0.1)
+    mime-types (1.17.2)
+    mini_magick (3.3)
+      subexec (~> 0.1.0)
+    mocha (0.10.0)
+      metaclass (~> 0.0.1)
+    polyglot (0.3.3)
+    rack (1.2.4)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      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)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    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)
+    subexec (0.1.0)
+    thor (0.14.6)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.30)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  carrierwave
+  mini_magick
+  mocha (= 0.10.0)
+  rails (= 3.0.0)
+  rake
+  rest-client
+  rspec (~> 2.6.0)
+  sqlite3-ruby

data/README.md

@@ -17,9 +17,10 @@ You'll need to configure the to use this in config/initializes/carrierwave.rb
 
 ```ruby
 CarrierWave.configure do |config|
-  config.upyun_storage_username = "xxxxxx"
-  config.upyun_storage_userpass = 'xxxxxx'
-  config.upyun_storage_bucket = "my_bucket"
+  config.storage = :upyun
+  config.upyun_username = "xxxxxx"
+  config.upyun_password = 'xxxxxx'
+  config.upyun_bucket = "my_bucket"
   config.upyun_bucket_domain = "my_bucket.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.1"
+  s.version     = "0.1.2"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Nowa Zhu"]
   s.email       = ["nowazhu@gmail.com"]

data/lib/carrierwave/storage/upyun.rb

@@ -13,11 +13,11 @@ module CarrierWave
     ##
     #
     #     CarrierWave.configure do |config|
-    #       config.upyun_storage_username = "xxxxxx"
-    #       config.upyun_storage_userpass = "xxxxxx"
-    #       config.upyun_storage_bucket = "my_bucket"
+    #       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_storage_api_host = "http://v0.api.upyun.com"
+    #       config.upyun_api_host = "http://v0.api.upyun.com"
     #     end
     #
     #
@@ -25,12 +25,12 @@ module CarrierWave
       
       class Connection
         def initialize(options={})
-          @upyun_storage_username = options[:upyun_storage_username]
-          @upyun_storage_userpass = options[:upyun_storage_userpass]
-          @upyun_storage_bucket = options[:upyun_storage_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_storage_bucket}", @upyun_storage_username, @upyun_storage_userpass)
+          @http = RestClient::Resource.new("#{@host}/#{@upyun_bucket}", @upyun_username, @upyun_password)
         end
         
         def put(path, payload, headers = {})
@@ -82,7 +82,7 @@ module CarrierWave
         #
         def read
           object = uy_connection.get(@path)
-          object.data
+          object.net_http_res.read_body
         end
 
         ##
@@ -140,11 +140,11 @@ module CarrierWave
             if @uy_connection
               @uy_connection
             else
-              config = {:upyun_storage_username => @uploader.upyun_storage_username, 
-                :upyun_storage_userpass => @uploader.upyun_storage_userpass, 
-                :upyun_storage_bucket => @uploader.upyun_storage_bucket
+              config = {:upyun_username => @uploader.upyun_username, 
+                :upyun_password => @uploader.upyun_password, 
+                :upyun_bucket => @uploader.upyun_bucket
               }
-              config[:api_host] = @uploader.upyun_storage_api_host if @uploader.respond_to?(:upyun_storage_api_host)
+              config[:api_host] = @uploader.upyun_api_host if @uploader.respond_to?(:upyun_api_host)
               @uy_connection ||= CarrierWave::Storage::UpYun::Connection.new(config)
             end
           end

data/lib/carrierwave/upyun/configuration.rb

@@ -3,10 +3,10 @@ module CarrierWave
     module Configuration
       extend ActiveSupport::Concern
       included do
-        add_config :upyun_storage_username
-        add_config :upyun_storage_userpass
-        add_config :upyun_storage_bucket
-        add_config :upyun_storage_api_host
+        add_config :upyun_username
+        add_config :upyun_password
+        add_config :upyun_bucket
+        add_config :upyun_api_host
         add_config :upyun_bucket_domain
       end
     end

data/spec/spec_helper.rb

@@ -0,0 +1,37 @@
+require 'rubygems'
+require 'rspec'
+require 'rspec/autorun'
+require 'rails'
+require 'active_record'
+require "carrierwave"
+require 'carrierwave/orm/activerecord'
+require 'carrierwave/processing/mini_magick'
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require "carrierwave/upyun"
+
+
+module Rails
+  class <<self
+    def root
+      [File.expand_path(__FILE__).split('/')[0..-3].join('/'),"spec"].join("/")
+    end
+  end
+end
+
+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"
+end
+
+def load_file(fname)
+  File.open([Rails.root,fname].join("/"))
+end

data/spec/upload_spec.rb

@@ -0,0 +1,56 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+require "open-uri"
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+
+describe "Upload" 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
+  
+  class PhotoUploader < CarrierWave::Uploader::Base
+    include CarrierWave::MiniMagick
+
+    version :small do
+      process :resize_to_fill => [120, 120]
+    end
+    
+    def store_dir
+      "photos"
+    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 "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
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Nowa Zhu
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-03 00:00:00 +08:00
+date: 2011-12-05 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,11 +81,19 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .rspec
+- Gemfile
+- Gemfile.lock
 - README.md
 - carrierwave-upyun.gemspec
 - lib/carrierwave/storage/upyun.rb
 - lib/carrierwave/upyun.rb
 - lib/carrierwave/upyun/configuration.rb
+- spec/.DS_Store
+- spec/foo.gif
+- spec/foo.jpg
+- spec/spec_helper.rb
+- spec/upload_spec.rb
 has_rdoc: true
 homepage: https://github.com/nowa/carrierwave-upyun
 licenses: []
@@ -116,5 +124,8 @@ rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: UpYun Storage support for CarrierWave
-test_files: []
-
+test_files: 
+- spec/foo.gif
+- spec/foo.jpg
+- spec/spec_helper.rb
+- spec/upload_spec.rb