carrierwave 0.3.4 → 0.3.5

data/History.txt

@@ -1,3 +1,12 @@
+=== Version 0.3.4 2009-09-01
+
+* [added] `default_url` as a replacement for `default_path`
+* [deprecated] `default_path` is deprecated
+
+=== Version 0.3.4 2009-08-31
+
+* [fixed] Deleting no longer causes TypeError in MongoMapper
+
 === Version 0.3.3 2009-08-29
 
 * [added] Support for MongoMapper

data/Manifest.txt

@@ -49,6 +49,7 @@ lib/carrierwave/uploader.rb
 lib/carrierwave/uploader/cache.rb
 lib/carrierwave/uploader/callbacks.rb
 lib/carrierwave/uploader/default_path.rb
+lib/carrierwave/uploader/default_url.rb
 lib/carrierwave/uploader/extension_whitelist.rb
 lib/carrierwave/uploader/mountable.rb
 lib/carrierwave/uploader/paths.rb
@@ -78,6 +79,7 @@ spec/sanitized_file_spec.rb
 spec/spec_helper.rb
 spec/uploader/cache_spec.rb
 spec/uploader/default_path_spec.rb
+spec/uploader/default_url_spec.rb
 spec/uploader/extension_whitelist_spec.rb
 spec/uploader/mountable_spec.rb
 spec/uploader/paths_spec.rb

data/README.rdoc

@@ -9,7 +9,7 @@ upload files.
 
 == Description
 
-* RDoc Documentation {available at Rubyforge}[http://carrierwave.rubyforge.org/].
+* 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]
@@ -20,10 +20,6 @@ Install the latest stable release:
 
     [sudo] gem install carrierwave
 
-Or the cutting edge development version:
-
-    [sudo] gem install jnicklas-carrierwave --source http://gems.github.com
-
 In Merb, add it as a dependency to your config/dependencies.rb:
     
     dependency 'carrierwave'
@@ -71,15 +67,12 @@ simply assign files and get going:
 
 === ActiveRecord, DataMapper, Sequel, MongoMapper
 
-If you are *not* using Merb or Rails you'll need to require the relevant ORM
-extension.
+Make sure you are loading CarrierWave after loading your ORM, otherwise you'll
+need to require the relevant extension manually, e.g.:
 
     require 'carrierwave/orm/activerecord'
-    require 'carrierwave/orm/datamapper'
-    require 'carrierwave/orm/sequel'
-    require 'carrierwave/orm/mongomapper'
 
-Open your model file, for ActiveRecord do something like:
+Open your model file. For ActiveRecord do something like:
 
     class User < ActiveRecord::Base
       mount_uploader :avatar, AvatarUploader
@@ -196,15 +189,15 @@ CarrierWave from writing to the file system by setting
 `CarrierWave.config[:cache_to_cache_dir] = false`. This will however break
 redisplays of forms.
 
-== Providing a default path
+== Providing a default URL
 
 In many cases, especially when working with images, it might be a good idea to
-provide a default path, a fallback in case no file has been uploaded. You can do
-this easily by overriding the +default_path+ method in your uploader:
+provide a default url, a fallback in case no file has been uploaded. You can do
+this easily by overriding the +default_url+ method in your uploader:
 
     class MyUploader < CarrierWave::Uploader::Base
-      def default_path
-        "images/fallback/" + [version_name, "default.png"].compact.join('_')
+      def default_url
+        "/images/fallback/" + [version_name, "default.png"].compact.join('_')
       end
     end
 

data/carrierwave.gemspec

@@ -2,24 +2,24 @@
 
 Gem::Specification.new do |s|
   s.name = %q{carrierwave}
-  s.version = "0.3.3"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jonas Nicklas"]
-  s.date = %q{2009-08-29}
-  s.description = %q{* RDoc Documentation {available at Rubyforge}[http://carrierwave.rubyforge.org/].
+  s.date = %q{2009-09-01}
+  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]}
   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", "carrierwave.gemspec", "cucumber.yml", "features/caching.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/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/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/mongomapper.rb", "lib/carrierwave/orm/sequel.rb", "lib/carrierwave/processing/image_science.rb", "lib/carrierwave/processing/rmagick.rb", "lib/carrierwave/sanitized_file.rb", "lib/carrierwave/storage/abstract.rb", "lib/carrierwave/storage/file.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/default_path.rb", "lib/carrierwave/uploader/extension_whitelist.rb", "lib/carrierwave/uploader/mountable.rb", "lib/carrierwave/uploader/paths.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", "lib/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/test.jpeg", "spec/fixtures/test.jpg", "spec/mount_spec.rb", "spec/orm/activerecord_spec.rb", "spec/orm/datamapper_spec.rb", "spec/orm/mongomapper_spec.rb", "spec/orm/sequel_spec.rb", "spec/sanitized_file_spec.rb", "spec/spec_helper.rb", "spec/uploader/cache_spec.rb", "spec/uploader/default_path_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.files = ["Generators", "History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "carrierwave.gemspec", "cucumber.yml", "features/caching.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/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/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/mongomapper.rb", "lib/carrierwave/orm/sequel.rb", "lib/carrierwave/processing/image_science.rb", "lib/carrierwave/processing/rmagick.rb", "lib/carrierwave/sanitized_file.rb", "lib/carrierwave/storage/abstract.rb", "lib/carrierwave/storage/file.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/default_path.rb", "lib/carrierwave/uploader/default_url.rb", "lib/carrierwave/uploader/extension_whitelist.rb", "lib/carrierwave/uploader/mountable.rb", "lib/carrierwave/uploader/paths.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", "lib/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/test.jpeg", "spec/fixtures/test.jpg", "spec/mount_spec.rb", "spec/orm/activerecord_spec.rb", "spec/orm/datamapper_spec.rb", "spec/orm/mongomapper_spec.rb", "spec/orm/sequel_spec.rb", "spec/sanitized_file_spec.rb", "spec/spec_helper.rb", "spec/uploader/cache_spec.rb", "spec/uploader/default_path_spec.rb", "spec/uploader/default_url_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/]}
+  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

data/lib/carrierwave.rb

@@ -7,7 +7,7 @@ require 'carrierwave/core_ext/inheritable_attributes'
 
 module CarrierWave
 
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 
   class << self
     attr_accessor :config, :logger
@@ -64,6 +64,7 @@ module CarrierWave
     autoload :Paths, 'carrierwave/uploader/paths'
     autoload :ExtensionWhitelist, 'carrierwave/uploader/extension_whitelist'
     autoload :DefaultPath, 'carrierwave/uploader/default_path'
+    autoload :DefaultUrl, 'carrierwave/uploader/default_url'
     autoload :Proxy, 'carrierwave/uploader/proxy'
     autoload :Url, 'carrierwave/uploader/url'
     autoload :Mountable, 'carrierwave/uploader/mountable'
@@ -101,35 +102,23 @@ CarrierWave.config = {
   }
 }
 
-if defined?(Merb::Plugins)
+if defined?(Merb)
+  CarrierWave.logger = Merb.logger
   CarrierWave.config[:root] = Merb.root
   CarrierWave.config[:public] = Merb.dir_for(:public)
+  Merb.add_generators File.dirname(__FILE__) / 'generators' / 'uploader_generator'
 
   Merb::BootLoader.before_app_loads do
-    # Set logger
-    CarrierWave.logger ||= Merb.logger
     # Setup path for uploaders and load all of them before classes are loaded
     Merb.push_path(:uploaders, Merb.root / 'app' / 'uploaders', '*.rb')
     Dir.glob(File.join(Merb.load_paths[:uploaders])).each {|f| require f }
   end
 
-  orm_path = File.dirname(__FILE__) / 'carrierwave' / 'orm' / Merb.orm
-  require orm_path if File.exist?(orm_path + '.rb')
-
-  Merb.add_generators File.dirname(__FILE__) / 'generators' / 'uploader_generator'
-
 elsif defined?(Rails)
-  begin
-    CarrierWave.logger = Rails.logger
-  rescue
-    # Rails < 2.1
-    CarrierWave.logger = RAILS_DEFAULT_LOGGER
-  end
+  CarrierWave.logger = Rails.logger
   CarrierWave.config[:root] = Rails.root
   CarrierWave.config[:public] = File.join(Rails.root, 'public')
 
-  require File.join(File.dirname(__FILE__), "carrierwave", "orm", 'activerecord')
-
   ActiveSupport::Dependencies.load_paths << File.join(Rails.root, "app", "uploaders")
 
 elsif defined?(Sinatra)
@@ -139,7 +128,8 @@ elsif defined?(Sinatra)
 
 end
 
-# MongoMapper is framework agnostic so we could need this in any environment.
-if defined?(MongoMapper)
-  require File.join(File.dirname(__FILE__), "carrierwave", "orm", "mongomapper")
-end
+
+require File.join(File.dirname(__FILE__), "carrierwave", "orm", 'activerecord') if defined?(ActiveRecord)
+require File.join(File.dirname(__FILE__), "carrierwave", "orm", 'datamapper') if defined?(DataMapper)
+require File.join(File.dirname(__FILE__), "carrierwave", "orm", 'sequel') if defined?(Sequel)
+require File.join(File.dirname(__FILE__), "carrierwave", "orm", "mongomapper") if defined?(MongoMapper)

data/lib/carrierwave/uploader.rb

@@ -37,6 +37,7 @@ module CarrierWave
       use CarrierWave::Uploader::DefaultPath
       use CarrierWave::Uploader::Processing
       use CarrierWave::Uploader::Versions
+      use CarrierWave::Uploader::DefaultUrl
     end # Base
 
   end # Uploader

data/lib/carrierwave/uploader/default_path.rb

@@ -7,6 +7,7 @@ module CarrierWave
       def initialize(*args)
         super
         if default_path
+          puts "WARNING: Default Path is deprecated and will be removed in CarrierWave 0.4. Please use default_url instead!"
           @file = CarrierWave::SanitizedFile.new(File.expand_path(default_path, public))
           def @file.blank?; true; end
         end

data/lib/carrierwave/uploader/default_url.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+
+module CarrierWave
+  module Uploader
+    module DefaultUrl
+
+      def url(*args)
+        super || default_url
+      end
+
+      ##
+      # Override this method in your uploader to provide a default url
+      # in case no file has been cached/stored yet.
+      #
+      def default_url; end
+
+    end # DefaultPath
+  end # Uploader
+end # CarrierWave

data/spec/uploader/default_url_spec.rb

@@ -0,0 +1,85 @@
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe CarrierWave::Uploader do
+
+  before do
+    @uploader_class = Class.new(CarrierWave::Uploader::Base)
+    @uploader = @uploader_class.new
+  end
+
+  after do
+    FileUtils.rm_rf(public_path)
+  end
+
+  describe 'with a default url' do
+    before do
+      @uploader_class.class_eval do
+        version :thumb
+        def default_url
+          ["http://someurl.example.com", version_name].compact.join('/')
+        end
+      end
+      @uploader = @uploader_class.new
+    end
+
+    describe '#blank?' do
+      it "should be true by default" do
+        @uploader.should be_blank
+      end
+    end
+
+    describe '#current_path' do
+      it "should return nil" do
+        @uploader.current_path.should be_nil
+      end
+    end
+    
+    describe '#url' do
+      it "should return the default url" do
+        @uploader.url.should == 'http://someurl.example.com'
+      end
+      
+      it "should return the default url with version when given" do
+        @uploader.url(:thumb).should == 'http://someurl.example.com/thumb'
+      end
+    end
+
+    describe '#cache!' do
+
+      before do
+        CarrierWave.stub!(:generate_cache_id).and_return('20071201-1234-345-2255')
+      end
+
+      it "should cache a file" do
+        @uploader.cache!(File.open(file_path('test.jpg')))
+        @uploader.file.should be_an_instance_of(CarrierWave::SanitizedFile)
+      end
+
+      it "should be cached" do
+        @uploader.cache!(File.open(file_path('test.jpg')))
+        @uploader.should be_cached
+      end
+
+      it "should no longer be blank" do
+        @uploader.cache!(File.open(file_path('test.jpg')))
+        @uploader.should_not be_blank
+      end
+
+      it "should set the current_path" do
+        @uploader.cache!(File.open(file_path('test.jpg')))
+        @uploader.current_path.should == public_path('uploads/tmp/20071201-1234-345-2255/test.jpg')
+      end
+      
+      it "should set the url" do
+        @uploader.cache!(File.open(file_path('test.jpg')))
+        @uploader.url.should_not == 'http://someurl.example.com'
+        @uploader.url.should == '/uploads/tmp/20071201-1234-345-2255/test.jpg'
+      end
+
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: carrierwave
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-30 00:00:00 +02:00
+date: 2009-09-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,7 +113,7 @@ dependencies:
         version: 2.3.3
     version: 
 description: |-
-  * RDoc Documentation {available at Rubyforge}[http://carrierwave.rubyforge.org/].
+  * 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]
@@ -181,6 +181,7 @@ files:
 - lib/carrierwave/uploader/cache.rb
 - lib/carrierwave/uploader/callbacks.rb
 - lib/carrierwave/uploader/default_path.rb
+- lib/carrierwave/uploader/default_url.rb
 - lib/carrierwave/uploader/extension_whitelist.rb
 - lib/carrierwave/uploader/mountable.rb
 - lib/carrierwave/uploader/paths.rb
@@ -210,6 +211,7 @@ files:
 - spec/spec_helper.rb
 - spec/uploader/cache_spec.rb
 - spec/uploader/default_path_spec.rb
+- spec/uploader/default_url_spec.rb
 - spec/uploader/extension_whitelist_spec.rb
 - spec/uploader/mountable_spec.rb
 - spec/uploader/paths_spec.rb
@@ -247,6 +249,6 @@ rubyforge_project: carrierwave
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: "* RDoc Documentation {available at Rubyforge}[http://carrierwave.rubyforge.org/]"
+summary: "* RDoc Documentation {available at Rubyforge}[http://carrierwave.rubyforge.org/rdoc]"
 test_files: []