carrierwave 0.4.4 → 0.4.5

data/Manifest.txt

@@ -3,6 +3,7 @@ History.txt
 Manifest.txt
 README.rdoc
 Rakefile
+carrierwave.gemspec
 cucumber.yml
 features/caching.feature
 features/download.feature
@@ -33,6 +34,7 @@ features/versions_overriden_store_dir.feature
 lib/carrierwave.rb
 lib/carrierwave/compatibility/paperclip.rb
 lib/carrierwave/core_ext/blank.rb
+lib/carrierwave/core_ext/file.rb
 lib/carrierwave/core_ext/inheritable_attributes.rb
 lib/carrierwave/core_ext/module_setup.rb
 lib/carrierwave/mount.rb
@@ -46,6 +48,7 @@ lib/carrierwave/processing/mini_magick.rb
 lib/carrierwave/processing/rmagick.rb
 lib/carrierwave/sanitized_file.rb
 lib/carrierwave/storage/abstract.rb
+lib/carrierwave/storage/cloud_files.rb
 lib/carrierwave/storage/file.rb
 lib/carrierwave/storage/grid_fs.rb
 lib/carrierwave/storage/right_s3.rb
@@ -89,6 +92,7 @@ spec/processing/mini_magick_spec.rb
 spec/processing/rmagick_spec.rb
 spec/sanitized_file_spec.rb
 spec/spec_helper.rb
+spec/storage/cloudfiles_spec.rb
 spec/storage/grid_fs_spec.rb
 spec/storage/right_s3_spec.rb
 spec/storage/s3_spec.rb

data/README.rdoc

@@ -60,7 +60,7 @@ You can use your uploader class to store and retrieve files like this:
 
 CarrierWave gives you a +store+ for permanent storage, and a +cache+ for
 temporary storage. You can use different stores, at the moment a filesystem
-store, an Amazon S3 store and a store for MongoDB's GridFS are bundled.
+store, an Amazon S3 store, a Rackspace Cloud Files store, and a store for MongoDB's GridFS are bundled.
 
 Most of the time you are going to want to use CarrierWave together with an ORM.
 It is quite simple to mount uploaders on columns in your model, so you can
@@ -106,7 +106,8 @@ method:
       end
     end
 
-This works for the file storage as well as Amazon S3.
+This works for the file storage as well as Amazon S3 and Rackspace Cloud Files.
+Define +store_dir+ as +nil+ if you'd like to store files at the root level.
 
 == Securing uploads
 
@@ -331,6 +332,27 @@ RightAWS library by setting the storage to :right_s3
 CarrierWave uses the RightAWS S3 Interface directly, meaning that the performance issues
 mentioned by Jonathan Yurek for paperclip do not apply: http://groups.google.com/group/paperclip-plugin/browse_thread/thread/d4dc166a9a5f0df4#
 
+== Using Rackspace Cloud Files
+
+Cloud Files support requires a {Rackspace Cloud}[http://rackspacecloud.com] username and API key.
+You must also create a container for Carrierwave to use, and mark it public (publish it to the CDN)
+
+    CarrierWave.configure do |config|
+      config.cloud_files_user_name = 'xxxxxx'
+      config.cloud_files_api_key = 'xxxxxxxxxxxxxxxxxxxxx'
+      config.cloud_files_container = 'name_of_bucket'
+    end
+
+Do this in an initializer in Rails, and in a +before_app_loads+ block in Merb.
+
+And then in your uploader, set the storage to :cloud_files
+
+    class AvatarUploader < CarrierWave::Uploader::Base
+      storage :cloud_files
+    end
+
+That's it! You can still use the <code>CarrierWave::Uploader#url</code> method to return
+the url to the file on the Cloud Files CDN.
 
 == Using MongoDB's GridFS store
 
@@ -463,6 +485,10 @@ These people have contributed their time and effort to CarrierWave:
 * Sam Lown
 * Dave Ott
 * Quin Hoxie
+* H. Wade Minter
+* Trevor Turk
+* Nicklas Ramhöj
+* Matt Hooks
 
 == License
 

data/Rakefile

@@ -29,6 +29,7 @@ $hoe = Hoe.spec 'carrierwave' do
   self.extra_dev_deps << ['mongoid', '>=0.10.4']
   self.extra_dev_deps << ['aws-s3', '>=0.6.2']
   self.extra_dev_deps << ['timecop', '>=0.3.4']
+  self.extra_dev_deps << ['json', '>=1.1.9']
   self.extra_rdoc_files << 'README.rdoc'
 end
 

data/carrierwave.gemspec

@@ -0,0 +1,85 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{carrierwave}
+  s.version = "0.4.4"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jonas Nicklas"]
+  s.date = %q{2010-02-18}
+  s.description = %q{* RDoc Documentation {available at Rubyforge}[http://carrierwave.rubyforge.org/rdoc].
+* Source code {hosted at GitHub}[http://github.com/jnicklas/carrierwave]
+* Please {report any issues}[http://github.com/jnicklas/carrierwave/issues] on GitHub
+* Please direct any questions at the {mailing list}[http://groups.google.com/group/carrierwave]
+* Check out the {example app}[http://github.com/jnicklas/carrierwave-example-app]}
+  s.email = ["jonas.nicklas@gmail.com"]
+  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "features/fixtures/bork.txt", "features/fixtures/monkey.txt", "README.rdoc"]
+  s.files = ["Generators", "History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "cucumber.yml", "features/caching.feature", "features/download.feature", "features/file_storage.feature", "features/file_storage_overridden_filename.feature", "features/file_storage_overridden_store_dir.feature", "features/file_storage_reversing_processor.feature", "features/fixtures/bork.txt", "features/fixtures/monkey.txt", "features/grid_fs_storage.feature", "features/mount_activerecord.feature", "features/mount_datamapper.feature", "features/step_definitions/activerecord_steps.rb", "features/step_definitions/caching_steps.rb", "features/step_definitions/datamapper_steps.rb", "features/step_definitions/download_steps.rb", "features/step_definitions/file_steps.rb", "features/step_definitions/general_steps.rb", "features/step_definitions/mount_steps.rb", "features/step_definitions/store_steps.rb", "features/support/activerecord.rb", "features/support/datamapper.rb", "features/support/env.rb", "features/versions_basics.feature", "features/versions_nested_versions.feature", "features/versions_overridden_filename.feature", "features/versions_overriden_store_dir.feature", "lib/carrierwave.rb", "lib/carrierwave/compatibility/paperclip.rb", "lib/carrierwave/core_ext/blank.rb", "lib/carrierwave/core_ext/inheritable_attributes.rb", "lib/carrierwave/core_ext/module_setup.rb", "lib/carrierwave/mount.rb", "lib/carrierwave/orm/activerecord.rb", "lib/carrierwave/orm/datamapper.rb", "lib/carrierwave/orm/mongoid.rb", "lib/carrierwave/orm/mongomapper.rb", "lib/carrierwave/orm/sequel.rb", "lib/carrierwave/processing/image_science.rb", "lib/carrierwave/processing/mini_magick.rb", "lib/carrierwave/processing/rmagick.rb", "lib/carrierwave/sanitized_file.rb", "lib/carrierwave/storage/abstract.rb", "lib/carrierwave/storage/cloud_files.rb", "lib/carrierwave/storage/file.rb", "lib/carrierwave/storage/grid_fs.rb", "lib/carrierwave/storage/right_s3.rb", "lib/carrierwave/storage/s3.rb", "lib/carrierwave/test/matchers.rb", "lib/carrierwave/uploader.rb", "lib/carrierwave/uploader/cache.rb", "lib/carrierwave/uploader/callbacks.rb", "lib/carrierwave/uploader/configuration.rb", "lib/carrierwave/uploader/default_url.rb", "lib/carrierwave/uploader/download.rb", "lib/carrierwave/uploader/extension_whitelist.rb", "lib/carrierwave/uploader/mountable.rb", "lib/carrierwave/uploader/processing.rb", "lib/carrierwave/uploader/proxy.rb", "lib/carrierwave/uploader/remove.rb", "lib/carrierwave/uploader/store.rb", "lib/carrierwave/uploader/url.rb", "lib/carrierwave/uploader/versions.rb", "merb_generators/uploader_generator.rb", "rails_generators/uploader/USAGE", "rails_generators/uploader/templates/uploader.rb", "rails_generators/uploader/uploader_generator.rb", "script/console", "script/destroy", "script/generate", "spec/compatibility/paperclip_spec.rb", "spec/fixtures/bork.txt", "spec/fixtures/landscape.jpg", "spec/fixtures/portrait.jpg", "spec/fixtures/test.jpeg", "spec/fixtures/test.jpg", "spec/mount_spec.rb", "spec/orm/activerecord_spec.rb", "spec/orm/datamapper_spec.rb", "spec/orm/mongoid_spec.rb", "spec/orm/mongomapper_spec.rb", "spec/orm/sequel_spec.rb", "spec/processing/image_science_spec.rb", "spec/processing/mini_magick_spec.rb", "spec/processing/rmagick_spec.rb", "spec/sanitized_file_spec.rb", "spec/spec_helper.rb", "spec/storage/grid_fs_spec.rb", "spec/storage/right_s3_spec.rb", "spec/storage/s3_spec.rb", "spec/uploader/cache_spec.rb", "spec/uploader/configuration_spec.rb", "spec/uploader/default_url_spec.rb", "spec/uploader/download_spec.rb", "spec/uploader/extension_whitelist_spec.rb", "spec/uploader/mountable_spec.rb", "spec/uploader/paths_spec.rb", "spec/uploader/processing_spec.rb", "spec/uploader/proxy_spec.rb", "spec/uploader/remove_spec.rb", "spec/uploader/store_spec.rb", "spec/uploader/url_spec.rb", "spec/uploader/versions_spec.rb"]
+  s.homepage = %q{http://carrierwave.rubyforge.org}
+  s.rdoc_options = ["--main", "README.rdoc"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{carrierwave}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{* RDoc Documentation {available at Rubyforge}[http://carrierwave.rubyforge.org/rdoc]}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<newgem>, [">= 1.5.2"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.8"])
+      s.add_development_dependency(%q<cucumber>, [">= 0.3.96"])
+      s.add_development_dependency(%q<activerecord>, [">= 2.3.3"])
+      s.add_development_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
+      s.add_development_dependency(%q<dm-core>, [">= 0.9.11"])
+      s.add_development_dependency(%q<data_objects>, [">= 0.9.12"])
+      s.add_development_dependency(%q<do_sqlite3>, [">= 0.9.11"])
+      s.add_development_dependency(%q<sequel>, [">= 3.2.0"])
+      s.add_development_dependency(%q<rmagick>, [">= 2.10.0"])
+      s.add_development_dependency(%q<mini_magick>, [">= 1.2.5"])
+      s.add_development_dependency(%q<mongo_mapper>, [">= 0.6.8"])
+      s.add_development_dependency(%q<mongoid>, [">= 0.10.4"])
+      s.add_development_dependency(%q<aws-s3>, [">= 0.6.2"])
+      s.add_development_dependency(%q<timecop>, [">= 0.3.4"])
+      s.add_development_dependency(%q<json>, [">= 1.1.9"])
+      s.add_development_dependency(%q<hoe>, [">= 2.4.0"])
+    else
+      s.add_dependency(%q<newgem>, [">= 1.5.2"])
+      s.add_dependency(%q<rspec>, [">= 1.2.8"])
+      s.add_dependency(%q<cucumber>, [">= 0.3.96"])
+      s.add_dependency(%q<activerecord>, [">= 2.3.3"])
+      s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
+      s.add_dependency(%q<dm-core>, [">= 0.9.11"])
+      s.add_dependency(%q<data_objects>, [">= 0.9.12"])
+      s.add_dependency(%q<do_sqlite3>, [">= 0.9.11"])
+      s.add_dependency(%q<sequel>, [">= 3.2.0"])
+      s.add_dependency(%q<rmagick>, [">= 2.10.0"])
+      s.add_dependency(%q<mini_magick>, [">= 1.2.5"])
+      s.add_dependency(%q<mongo_mapper>, [">= 0.6.8"])
+      s.add_dependency(%q<mongoid>, [">= 0.10.4"])
+      s.add_dependency(%q<aws-s3>, [">= 0.6.2"])
+      s.add_dependency(%q<timecop>, [">= 0.3.4"])
+      s.add_dependency(%q<json>, [">= 1.1.9"])
+      s.add_dependency(%q<hoe>, [">= 2.4.0"])
+    end
+  else
+    s.add_dependency(%q<newgem>, [">= 1.5.2"])
+    s.add_dependency(%q<rspec>, [">= 1.2.8"])
+    s.add_dependency(%q<cucumber>, [">= 0.3.96"])
+    s.add_dependency(%q<activerecord>, [">= 2.3.3"])
+    s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
+    s.add_dependency(%q<dm-core>, [">= 0.9.11"])
+    s.add_dependency(%q<data_objects>, [">= 0.9.12"])
+    s.add_dependency(%q<do_sqlite3>, [">= 0.9.11"])
+    s.add_dependency(%q<sequel>, [">= 3.2.0"])
+    s.add_dependency(%q<rmagick>, [">= 2.10.0"])
+    s.add_dependency(%q<mini_magick>, [">= 1.2.5"])
+    s.add_dependency(%q<mongo_mapper>, [">= 0.6.8"])
+    s.add_dependency(%q<mongoid>, [">= 0.10.4"])
+    s.add_dependency(%q<aws-s3>, [">= 0.6.2"])
+    s.add_dependency(%q<timecop>, [">= 0.3.4"])
+    s.add_dependency(%q<json>, [">= 1.1.9"])
+    s.add_dependency(%q<hoe>, [">= 2.4.0"])
+  end
+end

data/lib/carrierwave.rb

@@ -4,10 +4,11 @@ require 'fileutils'
 require 'carrierwave/core_ext/blank'
 require 'carrierwave/core_ext/module_setup'
 require 'carrierwave/core_ext/inheritable_attributes'
+require 'carrierwave/core_ext/file'
 
 module CarrierWave
 
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 
   class << self
     attr_accessor :root
@@ -39,6 +40,7 @@ module CarrierWave
     autoload :S3, 'carrierwave/storage/s3'
     autoload :GridFS, 'carrierwave/storage/grid_fs'
     autoload :RightS3, 'carrierwave/storage/right_s3'
+    autoload :CloudFiles, 'carrierwave/storage/cloud_files'
   end
 
   module Uploader

data/lib/carrierwave/core_ext/file.rb

@@ -0,0 +1,11 @@
+class File
+  def size
+    File.size(path)
+  end
+
+  def empty?
+    size == 0
+  rescue Errno::ENOENT
+    false
+  end
+end

data/lib/carrierwave/processing/mini_magick.rb

@@ -64,7 +64,7 @@ module CarrierWave
 
     module ClassMethods
       def convert(format)
-        process :resize_to_limit => format
+        process :convert => format
       end
 
       def resize_to_limit(width, height)
@@ -79,10 +79,6 @@ module CarrierWave
         process :resize_to_fill => [width, height]
       end
 
-      def resize_and_pad(width, height)
-        process :resize_to_fit => [width, height]
-      end
-
       def resize_and_pad(width, height, background=:transparent, gravity=::Magick::CenterGravity)
         process :resize_and_pad => [width, height, background, gravity]
       end

data/lib/carrierwave/storage/cloud_files.rb

@@ -0,0 +1,169 @@
+# encoding: utf-8
+require 'cloudfiles'
+
+module CarrierWave
+  module Storage
+
+    ##
+    # Uploads things to Rackspace Cloud Files webservices using the Rackspace libraries (cloudfiles gem). 
+    # In order for CarrierWave to connect to Cloud Files, you'll need to specify an username, api key
+    # and container
+    #
+    #     CarrierWave.configure do |config|
+    #       config.cloud_files_username = "xxxxxx"
+    #       config.cloud_files_api_key = "xxxxxx"
+    #       config.cloud_files_container = "my_container"
+    #     end
+    #
+    #
+    # You can set the access policy for the uploaded files:
+    #
+    #     CarrierWave.configure do |config|
+    #       config.s3_access_policy = 'public-read'
+    #     end
+    #
+    #
+    class CloudFiles < Abstract
+
+      class File
+
+        def initialize(uploader, base, path)
+          @uploader = uploader
+          @path = path
+          @base = base
+        end
+
+        ##
+        # Returns the current path/filename of the file on Cloud Files. 
+        #
+        # === Returns
+        #
+        # [String] A path
+        #
+        def path
+          @path
+        end
+
+        ##
+        # Reads the contents of the file from Cloud Files
+        #
+        # === Returns
+        #
+        # [String] contents of the file
+        #
+        def read
+          object = cf_container.object(@path)
+          @content_type = object.content_type
+          object.data
+        end
+
+        ##
+        # Remove the file from Cloud Files
+        #
+        def delete
+          cf_container.delete_object(@path)
+        end
+
+        ##
+        # Returns the url on the Cloud Files CDN.  Note that the parent container must be marked as
+        # public for this to work.
+        #
+        # === Returns
+        #
+        # [String] file's url
+        #
+        def url
+          cf_container.object(@path).public_url
+        end
+
+        #def metadata
+        #  s3_object.metadata
+        #end
+
+        def content_type
+          cf_container.object(@path).content_type
+        end
+
+        def content_type=(new_content_type)
+          headers["content-type"] = new_content_type
+        end
+
+        ##
+        # Writes the supplied data into the object on Cloud Files.
+        #
+        # === Returns
+        #
+        # boolean
+        #
+        def store(data,headers={})
+          object = cf_container.create_object(@path)
+          object.write(data,headers)
+        end
+
+        private
+
+          def headers
+            @headers ||= {  }
+          end
+
+          def container
+            @uploader.cloud_files_container
+          end
+
+          def connection
+            @base.connection
+          end
+          
+          def cf_connection
+            @cf_connection ||= ::CloudFiles::Connection.new(@uploader.cloud_files_username, @uploader.cloud_files_api_key)
+          end
+
+          def cf_container
+            if @cf_container
+              @cf_container
+            else
+              @cf_container = cf_connection.create_container(container)
+              @cf_container.make_public
+              @cf_container
+            end
+          end
+          
+
+      end
+
+      ##
+      # Store the file on Cloud Files
+      #
+      # === Parameters
+      #
+      # [file (CarrierWave::SanitizedFile)] the file to store
+      #
+      # === Returns
+      #
+      # [CarrierWave::Storage::RightS3::File] the stored file
+      #
+      def store!(file)
+        cloud_files_options = {'Content-Type' => file.content_type}
+        f = CarrierWave::Storage::CloudFiles::File.new(uploader, self, uploader.store_path)
+        f.store(file.read,cloud_files_options)
+        f
+      end
+
+      # Do something to retrieve the file
+      #
+      # @param [String] identifier uniquely identifies the file
+      #
+      # [identifier (String)] uniquely identifies the file
+      #
+      # === Returns
+      #
+      # [CarrierWave::Storage::RightS3::File] the stored file
+      #
+      def retrieve!(identifier)
+        CarrierWave::Storage::CloudFiles::File.new(uploader, self, uploader.store_path(identifier))
+      end
+
+
+    end # CloudFiles
+  end # Storage
+end # CarrierWave

data/lib/carrierwave/storage/grid_fs.rb

@@ -82,10 +82,11 @@ module CarrierWave
       def database
         @connection ||= begin
           host = uploader.grid_fs_host
+          port = uploader.grid_fs_port
           database = uploader.grid_fs_database
           username = uploader.grid_fs_username
           password = uploader.grid_fs_password
-          db = Mongo::Connection.new(host).db(database)
+          db = Mongo::Connection.new(host, port).db(database)
           db.authenticate(username, password) if username && password
           db
         end

data/lib/carrierwave/storage/right_s3.rb

@@ -93,9 +93,9 @@ module CarrierWave
         #
         def url
           if @uploader.s3_cnamed
-            ["http://", @uploader.s3_bucket, @path].compact.join('/')
+            ["http://", @uploader.s3_bucket, "/", @path].compact.join
           else
-            ["http://#{@uploader.s3_bucket}.s3.amazonaws.com", @path].compact.join('/')
+            ["http://s3.amazonaws.com/", @uploader.s3_bucket, "/", @path].compact.join
           end
         end
 

data/lib/carrierwave/storage/s3.rb

@@ -112,7 +112,7 @@ module CarrierWave
           if @uploader.s3_cnamed 
             ["http://", @uploader.s3_bucket, "/", @path].compact.join
           else
-            ["http://s3.amazonaws.com", @uploader.s3_bucket, @path].compact.join('/')
+            ["http://s3.amazonaws.com/", @uploader.s3_bucket, "/", @path].compact.join
           end
         end
 

data/lib/carrierwave/uploader/configuration.rb

@@ -12,8 +12,13 @@ module CarrierWave
         add_config :s3_access_key_id
         add_config :s3_secret_access_key
         add_config :s3_cnamed
+        add_config :s3_headers
+        add_config :cloud_files_username
+        add_config :cloud_files_api_key
+        add_config :cloud_files_container
         add_config :grid_fs_database
         add_config :grid_fs_host
+        add_config :grid_fs_port
         add_config :grid_fs_username
         add_config :grid_fs_password
         add_config :grid_fs_access_url
@@ -34,13 +39,16 @@ module CarrierWave
             :file => "CarrierWave::Storage::File",
             :s3 => "CarrierWave::Storage::S3",
             :grid_fs => "CarrierWave::Storage::GridFS",
-            :right_s3 => "CarrierWave::Storage::RightS3"
+            :right_s3 => "CarrierWave::Storage::RightS3",
+            :cloud_files => "CarrierWave::Storage::CloudFiles"
           }
           config.storage = :file
           config.s3_access = :public_read
           config.s3_access_policy = 'public-read'
+          config.s3_headers = {}
           config.grid_fs_database = 'carrierwave'
           config.grid_fs_host = 'localhost'
+          config.grid_fs_host = 27017
           config.store_dir = 'uploads'
           config.cache_dir = 'uploads/tmp'
           config.ignore_integrity_errors = true

data/lib/carrierwave/uploader/store.rb

@@ -39,7 +39,7 @@ module CarrierWave
       # [String] the store path
       #
       def store_path(for_file=filename)
-        File.join(store_dir, full_filename(for_file))
+        File.join([store_dir, full_filename(for_file)].compact)
       end
 
       ##

data/lib/carrierwave/uploader/url.rb

@@ -19,6 +19,15 @@ module CarrierWave
 
       alias_method :to_s, :url
 
+      ##
+      # === Returns
+      #
+      # [String] A JSON serializtion containing this uploader's URL
+      #
+      def to_json
+        { 'url' => url }.to_json
+      end
+
     end # Url
   end # Uploader
-end # CarrierWave
+end # CarrierWave

data/spec/orm/datamapper_spec.rb

@@ -44,14 +44,14 @@ describe CarrierWave::DataMapper do
     end
 
     it "should return blank uploader when an empty string has been assigned" do
-      repository(:default).adapter.query("INSERT INTO events (image) VALUES ('')")
+      repository(:default).adapter.execute("INSERT INTO events (image) VALUES ('')")
       @event = @class.first
 
       @event.image.should be_blank
     end
 
     it "should retrieve a file from the storage if a value is stored in the database" do
-      repository(:default).adapter.query("INSERT INTO events (image) VALUES ('test.jpg')")
+      repository(:default).adapter.execute("INSERT INTO events (image) VALUES ('test.jpg')")
       @event = @class.first
 
       @event.save

data/spec/orm/mongoid_spec.rb

@@ -5,23 +5,19 @@ require 'carrierwave/orm/mongoid'
 
 connection = Mongo::Connection.new
 Mongoid.database = connection.db("carrierwave_test")
+    
+MongoidUploader = Class.new(CarrierWave::Uploader::Base)
+MongoidUser = Class.new
+MongoidUser.class_eval do
+  include Mongoid::Document
+  store_in :users
+  mount_uploader :image, MongoidUploader
+end
 
 describe CarrierWave::Mongoid do
 
-  before do
-    uploader = Class.new(CarrierWave::Uploader::Base)
-    
-    @class = Class.new
-    @class.class_eval do
-      include Mongoid::Document
-      mount_uploader :image, uploader
-    end
-    
-    @uploader = uploader
-  end
-
   after do
-    @class.collection.drop
+    MongoidUser.collection.drop
   end
 
   describe '#image' do
@@ -29,7 +25,7 @@ describe CarrierWave::Mongoid do
     context "when nothing is assigned" do
 
       before do
-        @document = @class.new
+        @document = MongoidUser.new
       end
 
       it "returns a blank uploader" do
@@ -41,12 +37,12 @@ describe CarrierWave::Mongoid do
     context "when an empty string is assigned" do
 
       before do
-        @document = @class.new(:image_filename => "")
+        @document = MongoidUser.new(:image_filename => "")
         @document.save
       end
 
       it "returns a blank uploader" do
-        @saved_doc = @class.find(:first)
+        @saved_doc = MongoidUser.first
         @saved_doc.image.should be_blank
       end
 
@@ -55,13 +51,13 @@ describe CarrierWave::Mongoid do
     context "when a filename is saved in the database" do
 
       before do
-        @document = @class.new(:image_filename => "test.jpg")
+        @document = MongoidUser.new(:image_filename => "test.jpg")
         @document.save
-        @doc = @class.find(:first)
+        @doc = MongoidUser.first
       end
 
       it "returns an uploader" do
-        @doc.image.should be_an_instance_of(@uploader)
+        @doc.image.should be_an_instance_of(MongoidUploader)
       end
 
       it "sets the path to the store directory" do
@@ -75,7 +71,7 @@ describe CarrierWave::Mongoid do
   describe '#image=' do
 
     before do
-      @doc = @class.new
+      @doc = MongoidUser.new
     end
 
     context "when nil is assigned" do
@@ -100,7 +96,7 @@ describe CarrierWave::Mongoid do
 
       it "should cache a file" do
         @doc.image = stub_file('test.jpeg')
-        @doc.image.should be_an_instance_of(@uploader)
+        @doc.image.should be_an_instance_of(MongoidUploader)
       end
 
       it "should write nothing to the database, to prevent overriden filenames to fail because of unassigned attributes" do
@@ -119,7 +115,7 @@ describe CarrierWave::Mongoid do
   describe "#save" do
 
     before do
-      @doc = @class.new
+      @doc = MongoidUser.new
     end
 
     context "when no file is assigned" do
@@ -136,7 +132,7 @@ describe CarrierWave::Mongoid do
       it "copies the file to the upload directory" do
         @doc.image = stub_file('test.jpg')
         @doc.save
-        @doc.image.should be_an_instance_of(@uploader)
+        @doc.image.should be_an_instance_of(MongoidUploader)
         @doc.image.current_path.should == public_path('uploads/test.jpg')
       end
 
@@ -166,7 +162,7 @@ describe CarrierWave::Mongoid do
   describe '#destroy' do
 
     before do
-      @doc = @class.new
+      @doc = MongoidUser.new
     end
 
     describe "when file assigned" do
@@ -175,7 +171,7 @@ describe CarrierWave::Mongoid do
         @doc.image = stub_file('test.jpeg')
         @doc.save.should be_true
         File.exist?(public_path('uploads/test.jpeg')).should be_true
-        @doc.image.should be_an_instance_of(@uploader)
+        @doc.image.should be_an_instance_of(MongoidUploader)
         @doc.image.current_path.should == public_path('uploads/test.jpeg')
         @doc.destroy
         File.exist?(public_path('uploads/test.jpeg')).should be_false
@@ -185,16 +181,16 @@ describe CarrierWave::Mongoid do
 
     describe "when file is not assigned" do
 
-      it "deletes the instance of @class after save" do
+      it "deletes the instance of MongoidUser after save" do
         @doc.save
-        @class.count.should eql(1)
+        MongoidUser.count.should eql(1)
         @doc.destroy
       end
 
-      it "deletes the instance of @class after save and then re-looking up the instance" do
+      it "deletes the instance of MongoidUser after save and then re-looking up the instance" do
         @doc.save
-        @class.count.should eql(1)
-        @doc = @class.first
+        MongoidUser.count.should eql(1)
+        @doc = MongoidUser.first
         @doc.destroy
       end
 

data/spec/orm/mongomapper_spec.rb

@@ -41,7 +41,7 @@ describe CarrierWave::MongoMapper do
       end
       
       it "returns a blank uploader" do
-        @saved_doc = @class.find(:first)
+        @saved_doc = @class.first
         @saved_doc.image.should be_blank
       end
       
@@ -52,7 +52,7 @@ describe CarrierWave::MongoMapper do
       before do
         @document = @class.new(:image_filename => "test.jpg")
         @document.save
-        @doc = @class.find(:first)
+        @doc = @class.first
       end
       
       it "returns an uploader" do
@@ -199,4 +199,4 @@ describe CarrierWave::MongoMapper do
   end
   
   
-end
+end

data/spec/sanitized_file_spec.rb

@@ -35,9 +35,10 @@ describe CarrierWave::SanitizedFile do
     end
 
     it "should be empty for a file with a zero size" do
-      empty_file = mock('emptyfile')
-      empty_file.should_receive(:size).at_least(:once).and_return(0)
-      @sanitized_file = CarrierWave::SanitizedFile.new(empty_file)
+      FileUtils.rm file_path('llama.jpg')
+      FileUtils.touch file_path('llama.jpg')
+
+      @sanitized_file = CarrierWave::SanitizedFile.new(File.open(file_path('llama.jpg')))
       @sanitized_file.should be_empty
     end
 

data/spec/spec_helper.rb

@@ -5,14 +5,6 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'rubygems'
 
-if ENV["AS"]
-  puts "--> using ActiveSupport"
-  require 'activesupport'
-elsif ENV["EXTLIB"]
-  puts "--> using Extlib"
-  require 'extlib'
-end
-
 require 'tempfile'
 #require 'ruby-debug'
 require 'spec'
@@ -21,6 +13,7 @@ require 'spec/autorun'
 require 'carrierwave'
 require 'timecop'
 require 'time'
+require 'json'
 
 require 'logger'
 

data/spec/storage/cloudfiles_spec.rb

@@ -0,0 +1,78 @@
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+if ENV['CLOUDFILES_SPEC']
+  require 'cloudfiles'
+  require 'net/http'
+
+  describe CarrierWave::Storage::CloudFiles do
+    before do
+      @uploader = mock('an uploader')
+      @uploader.stub!(:cloud_files_username).and_return(ENV["CLOUD_FILES_USER_NAME"])
+      @uploader.stub!(:cloud_files_api_key).and_return(ENV["CLOUD_FILES_API_KEY"])
+      @uploader.stub!(:cloud_files_container).and_return(ENV['CARRIERWAVE_TEST_CONTAINER'])
+      @storage = CarrierWave::Storage::CloudFiles.new(@uploader)
+      @file = stub_tempfile('test.jpg', 'application/xml')
+      
+      @cf = CloudFiles::Connection.new(ENV["CLOUD_FILES_USER_NAME"], ENV["CLOUD_FILES_API_KEY"])
+      @container = @cf.container(@uploader.cloud_files_container)
+    end
+  
+    describe '#store!' do
+      before do
+        @uploader.stub!(:store_path).and_return('uploads/bar.txt')
+        @cloud_file = @storage.store!(@file)
+      end
+    
+      it "should upload the file to Cloud Files" do
+        @container.object('uploads/bar.txt').data.should == 'this is stuff'
+      end
+    
+      it "should have a path" do
+        @cloud_file.path.should == 'uploads/bar.txt'
+      end
+          
+      it "should have an Rackspace URL" do
+        @cloud_file.url.should =~ %r!http://(.*?).cdn.cloudfiles.rackspacecloud.com/uploads/bar.txt!
+      end
+      
+      it "should store the content type on Cloud Files" do
+        @cloud_file.content_type.should == 'application/xml'
+      end
+      
+      it "should be deletable" do
+        @cloud_file.delete
+        @container.object_exists?('uploads/bar.txt').should be_false
+      end
+      
+    end
+      
+    describe '#retrieve!' do
+      before do
+        @container.create_object('uploads/bar.txt').write("A test, 1234")
+        @uploader.stub!(:store_path).with('bar.txt').and_return('uploads/bar.txt')
+      
+        @cloud_file = @storage.retrieve!('bar.txt')
+      end
+    
+      it "should retrieve the file contents from Cloud Files" do
+        @cloud_file.read.chomp.should == "A test, 1234"
+      end
+    
+      it "should have a path" do
+        @cloud_file.path.should == 'uploads/bar.txt'
+      end
+    
+      it "should have an Rackspace URL" do
+        @cloud_file.url.should =~ %r!http://(.*?).cdn.cloudfiles.rackspacecloud.com/uploads/bar.txt!
+      end
+    
+      it "should be deletable" do
+        @cloud_file.delete
+        @container.object_exists?('uploads/bar.txt').should be_false
+      end
+    end
+
+  end
+end

data/spec/storage/grid_fs_spec.rb

@@ -5,10 +5,11 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe CarrierWave::Storage::GridFS do
 
   before do
-    @database = Mongo::Connection.new('localhost').db('carrierwave_test')
+    @database = Mongo::Connection.new('localhost', 27017).db('carrierwave_test')
     @uploader = mock('an uploader')
     @uploader.stub!(:grid_fs_database).and_return("carrierwave_test")
     @uploader.stub!(:grid_fs_host).and_return("localhost")
+    @uploader.stub!(:grid_fs_port).and_return(27017)
     @uploader.stub!(:grid_fs_access_url).and_return(nil)
     @uploader.stub!(:grid_fs_username).and_return(nil)
     @uploader.stub!(:grid_fs_password).and_return(nil)
@@ -79,4 +80,4 @@ describe CarrierWave::Storage::GridFS do
     end
   end
 
-end
+end

data/spec/storage/right_s3_spec.rb

@@ -39,7 +39,15 @@ if ENV['S3_SPEC']
       it "should have an Amazon URL" do
         @s3_file.url.should == "http://#{@bucket}.s3.amazonaws.com/uploads/bar.txt"
       end
-    
+      
+      context "with cnamed bucket" do
+        it "should have a CNAMED URL" do
+          @uploader.stub!(:s3_cnamed).and_return(true)
+          @uploader.stub!(:s3_bucket).and_return('foo.bar')
+          @s3_file.url.should == 'http://foo.bar/uploads/bar.txt'
+        end
+      end
+      
       it "should be deletable" do
         @s3_file.delete
         lambda {@storage.connection.head(@bucket, 'uploads/bar.txt')}.should raise_error(RightAws::AwsError)

data/spec/uploader/store_spec.rb

@@ -169,6 +169,22 @@ describe CarrierWave::Uploader do
     end
   end
 
+  describe 'without a store dir' do
+    before do
+      @uploader_class.class_eval do
+        def store_dir; nil; end
+      end
+    end
+
+    it "should create a new file with a valid path and url" do
+      @file = File.open(file_path('test.jpg'))
+      @uploader.store!(@file)
+      @path = ::File.expand_path(@uploader.store_path, @uploader.root)
+      File.exist?(@path).should be_true
+      @uploader.url.should == '/test.jpg'
+    end
+  end
+
   describe 'with an overridden, reversing, filename' do
     before do
       @uploader_class.class_eval do

data/spec/uploader/url_spec.rb

@@ -63,6 +63,21 @@ describe CarrierWave::Uploader do
     end
   end
 
+  describe '#to_json' do
+    before do
+      CarrierWave.stub!(:generate_cache_id).and_return('20071201-1234-345-2255')
+    end
+
+    it "should return a hash with a blank URL" do
+      JSON.parse(@uploader.to_json)['url'].should be_nil
+    end
+
+    it "should return a hash including a cached URL" do
+      @uploader.cache!(File.open(file_path('test.jpg')))
+      JSON.parse(@uploader.to_json)['url'].should == '/uploads/tmp/20071201-1234-345-2255/test.jpg'
+    end
+  end
+
   describe '#to_s' do
     before do
       CarrierWave.stub!(:generate_cache_id).and_return('20071201-1234-345-2255')
@@ -84,4 +99,4 @@ describe CarrierWave::Uploader do
     end
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: carrierwave
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -182,6 +182,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.3.4
     version: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.9
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -216,6 +226,7 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
+- carrierwave.gemspec
 - cucumber.yml
 - features/caching.feature
 - features/download.feature
@@ -246,6 +257,7 @@ files:
 - lib/carrierwave.rb
 - lib/carrierwave/compatibility/paperclip.rb
 - lib/carrierwave/core_ext/blank.rb
+- lib/carrierwave/core_ext/file.rb
 - lib/carrierwave/core_ext/inheritable_attributes.rb
 - lib/carrierwave/core_ext/module_setup.rb
 - lib/carrierwave/mount.rb
@@ -259,6 +271,7 @@ files:
 - lib/carrierwave/processing/rmagick.rb
 - lib/carrierwave/sanitized_file.rb
 - lib/carrierwave/storage/abstract.rb
+- lib/carrierwave/storage/cloud_files.rb
 - lib/carrierwave/storage/file.rb
 - lib/carrierwave/storage/grid_fs.rb
 - lib/carrierwave/storage/right_s3.rb
@@ -302,6 +315,7 @@ files:
 - spec/processing/rmagick_spec.rb
 - spec/sanitized_file_spec.rb
 - spec/spec_helper.rb
+- spec/storage/cloudfiles_spec.rb
 - spec/storage/grid_fs_spec.rb
 - spec/storage/right_s3_spec.rb
 - spec/storage/s3_spec.rb