jnicklas-carrierwave 0.3.1 → 0.3.2

data/Rakefile

@@ -13,7 +13,7 @@ require 'spec/rake/verify_rcov'
 require 'cucumber/rake/task'
 
 NAME = "carrierwave"
-GEM_VERSION = "0.3.1"
+GEM_VERSION = "0.3.2"
 AUTHOR = "Jonas Nicklas"
 EMAIL = "jonas.nicklas@gmail.com"
 HOMEPAGE = "http://www.example.com"

data/lib/carrierwave.rb

@@ -1,4 +1,7 @@
+# encoding: utf-8
+
 require 'fileutils'
+require 'carrierwave/core_ext/blank'
 require 'carrierwave/core_ext/module_setup'
 require 'carrierwave/core_ext/inheritable_attributes'
 

data/lib/carrierwave/compatibility/paperclip.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module CarrierWave
   module Compatibility
 

data/lib/carrierwave/core_ext/blank.rb

@@ -0,0 +1,46 @@
+# encoding: utf-8
+
+unless "".respond_to?(:blank?)
+  # blank? methods for several different class types
+  class Object
+    # Returns true if the object is nil or empty (if applicable)
+    def blank?
+      nil? || (respond_to?(:empty?) && empty?)
+    end
+  end # class Object
+
+  class Numeric
+    # Numerics can't be blank
+    def blank?
+      false
+    end
+  end # class Numeric
+
+  class NilClass
+    # Nils are always blank
+    def blank?
+      true
+    end
+  end # class NilClass
+
+  class TrueClass
+    # True is not blank.
+    def blank?
+      false
+    end
+  end # class TrueClass
+
+  class FalseClass
+    # False is always blank.
+    def blank?
+      true
+    end
+  end # class FalseClass
+
+  class String
+    # Strips out whitespace then tests if the string is empty.
+    def blank?
+      strip.empty?
+    end
+  end # class String
+end

data/lib/carrierwave/core_ext/inheritable_attributes.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # Stolen from Rails 3
 
 # Copyright (c) 2005-2009 David Heinemeier Hansson

data/lib/carrierwave/core_ext/module_setup.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # Stolen from Rails 3
 
 # Copyright (c) 2005-2009 David Heinemeier Hansson

data/lib/carrierwave/mount.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module CarrierWave
 
   ##

data/lib/carrierwave/orm/activerecord.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'activerecord'
 
 module CarrierWave

data/lib/carrierwave/orm/datamapper.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'dm-core'
 
 module CarrierWave

data/lib/carrierwave/orm/sequel.rb

@@ -1,21 +1,27 @@
-require 'sequel'
+# encoding: utf-8
 
+require 'sequel'
+ 
 module CarrierWave
   module Sequel
-
     include CarrierWave::Mount
-
+ 
     def mount_uploader(column, uploader)
       super
-
+ 
       alias_method :read_uploader, :[]
       alias_method :write_uploader, :[]=
-
-      after_save "store_#{column}!"
-      before_save "write_#{column}_identifier"
-      before_destroy "remove_#{column}!"
+ 
+      if CarrierWave::Sequel.new_sequel?
+        include CarrierWave::Sequel::Hooks
+        include CarrierWave::Sequel::Validations
+      else
+        after_save "store_#{column}!"
+        before_save "write_#{column}_identifier"
+        before_destroy "remove_#{column}!"
+      end
     end
-
+ 
     # Determine if we're using Sequel > 2.12
     #
     # ==== Returns
@@ -23,10 +29,29 @@ module CarrierWave
     def self.new_sequel?
       ::Sequel::Model.respond_to?(:plugin)
     end
-
   end # Sequel
 end # CarrierWave
+ 
+# Instance hook methods for the Sequel 3.x
+module CarrierWave::Sequel::Hooks
+  def after_save
+    return false if super == false
+    self.class.uploaders.each_key {|column| self.send("store_#{column}!") }
+  end
+
+  def before_save
+    return false if super == false
+    self.class.uploaders.each_key {|column| self.send("write_#{column}_identifier") }
+  end
+
+  def before_destroy
+    return false if super == false
+    self.class.uploaders.each_key {|column| self.send("remove_#{column}!") }
+  end
+end
+
+# Instance validation methods for the Sequel 3.x
+module CarrierWave::Sequel::Validations
+end
 
-# Sequel 3.x.x removed class hook methods and moved them to the plugin
-Sequel::Model.plugin(:hook_class_methods) if CarrierWave::Sequel.new_sequel?
 Sequel::Model.send(:extend, CarrierWave::Sequel)

data/lib/carrierwave/processing/image_science.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require "image_science"
 
 module CarrierWave

data/lib/carrierwave/processing/rmagick.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 begin
   require 'rmagick'
 rescue LoadError

data/lib/carrierwave/sanitized_file.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+
+require 'pathname'
+
 module CarrierWave
 
   ##

data/lib/carrierwave/storage/abstract.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module CarrierWave
   module Storage
 

data/lib/carrierwave/storage/file.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module CarrierWave
   module Storage
 

data/lib/carrierwave/storage/s3.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module CarrierWave
   module Storage
 
@@ -87,20 +89,41 @@ module CarrierWave
           ["http://s3.amazonaws.com", bucket, @path].compact.join('/')
         end
 
-        def respond_to?(*args)
-          super || s3_object.respond_to?(*args)
+        def about
+          s3_object.about
         end
 
-      private
+        def metadata
+          s3_object.metadata
+        end
+
+        def content_type
+          s3_object.content_type
+        end
+
+        def content_type=(new_content_type)
+          s3_object.content_type = new_content_type
+        end
 
-        def method_missing(*args, &block)
-          s3_object.send(*args, &block)
+        def content_disposition
+          s3_object.content_disposition
+        end
+
+        def content_disposition=(new_disposition)
+          s3_object.content_disposition = new_disposition
+        end
+
+        def store
+          s3_object.store
         end
 
         def s3_object
           @s3_object ||= AWS::S3::S3Object.find(@path, bucket)
         end
 
+
+      private
+
         def bucket
           CarrierWave::Storage::S3.bucket
         end

data/lib/carrierwave/test/matchers.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module CarrierWave
   module Test
 

data/lib/carrierwave/uploader.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module CarrierWave
 
   ##

data/lib/carrierwave/uploader/cache.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module CarrierWave
   module Uploader
     module Cache

data/lib/carrierwave/uploader/callbacks.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module CarrierWave
   module Uploader
     module Callbacks

data/lib/carrierwave/uploader/default_path.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module CarrierWave
   module Uploader
     module DefaultPath

data/lib/carrierwave/uploader/extension_whitelist.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module CarrierWave
   module Uploader
     module ExtensionWhitelist

data/lib/carrierwave/uploader/mountable.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module CarrierWave
   module Uploader
     module Mountable

data/lib/carrierwave/uploader/paths.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module CarrierWave
   module Uploader
     module Paths

data/lib/carrierwave/uploader/processing.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module CarrierWave
   module Uploader
     module Processing

data/lib/carrierwave/uploader/proxy.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module CarrierWave
   module Uploader
     module Proxy

data/lib/carrierwave/uploader/remove.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module CarrierWave
   module Uploader
     module Remove

data/lib/carrierwave/uploader/store.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module CarrierWave
   module Uploader
     module Store

data/lib/carrierwave/uploader/url.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module CarrierWave
   module Uploader
     module Url

data/lib/carrierwave/uploader/versions.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module CarrierWave
   module Uploader
     module Versions

data/lib/generators/uploader_generator.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Merb
   module Generators
     class UploaderGenerator < NamedGenerator

data/rails_generators/uploader/templates/uploader.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 class <%= class_name %>Uploader < CarrierWave::Uploader::Base
 
   # Include RMagick or ImageScience support

data/rails_generators/uploader/uploader_generator.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 class UploaderGenerator < Rails::Generator::NamedBase
 
   def manifest

data/spec/compatibility/paperclip_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 require 'carrierwave/orm/activerecord'

data/spec/mount_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe CarrierWave::Mount do

data/spec/orm/activerecord_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 require 'carrierwave/orm/activerecord'
@@ -52,11 +54,11 @@ describe CarrierWave::ActiveRecord do
     
     describe '#image' do
       
-      it "should return nil when nothing has been assigned" do
+      it "should return blank uploader when nothing has been assigned" do
         @event.image.should be_blank
       end
       
-      it "should return nil when an empty string has been assigned" do
+      it "should return blank uploader when an empty string has been assigned" do
         @event[:image] = ''
         @event.save
         @event.reload
@@ -266,4 +268,4 @@ describe CarrierWave::ActiveRecord do
     
   end
   
-end
+end

data/spec/orm/datamapper_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 require 'carrierwave/orm/datamapper'
@@ -30,11 +32,11 @@ describe CarrierWave::DataMapper do
   
   describe '#image' do
     
-    it "should return nil when nothing has been assigned" do
+    it "should return blank uploader when nothing has been assigned" do
       @event.image.should be_blank
     end
     
-    it "should return nil when an empty string has been assigned" do
+    it "should return blank uploader when an empty string has been assigned" do
       repository(:default).adapter.query("INSERT INTO events (image) VALUES ('')")
       @event = @class.first
       
@@ -156,4 +158,4 @@ describe CarrierWave::DataMapper do
 
   end
   
-end
+end

data/spec/orm/sequel_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 require 'carrierwave/orm/sequel'
@@ -27,19 +29,21 @@ describe CarrierWave::Sequel do
       DB.drop_table :events
     end
     
-    before do
+    before(:each) do
       @class = Class.new(Sequel::Model)
       @class.set_dataset :events
       @class, @uploader, @event = setup_variables_for_class(@class)
     end
+
+    after(:each) { @class.delete }
     
     describe '#image' do
       
-      it "should return nil when nothing has been assigned" do
+      it "should return blank uploader when nothing has been assigned" do
         @event.image.should be_blank
       end
       
-      it "should return nil when an empty string has been assigned" do
+      it "should return blank uploader when an empty string has been assigned" do
         @event[:image] = ''
         @event.save
         @event.reload
@@ -87,7 +91,7 @@ describe CarrierWave::Sequel do
         @event.image = ''
         @event.image.should be_blank
       end
-      
+
     end
     
     describe '#save' do

data/spec/sanitized_file_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe CarrierWave::SanitizedFile do

data/spec/spec_helper.rb

@@ -1,12 +1,14 @@
+# encoding: utf-8
+
 $TESTING=true
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'rubygems'
 
 if ENV["AS"]
   puts "--> using ActiveSupport"
   require 'activesupport'
-else
+elsif ENV["EXTLIB"]
   puts "--> using Extlib"
   require 'extlib'
 end

data/spec/uploader/cache_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe CarrierWave::Uploader do

data/spec/uploader/default_path_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe CarrierWave::Uploader do

data/spec/uploader/extension_whitelist_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe CarrierWave::Uploader do

data/spec/uploader/mountable_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe CarrierWave::Uploader do

data/spec/uploader/paths_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe CarrierWave::Uploader do

data/spec/uploader/processing_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe CarrierWave::Uploader do

data/spec/uploader/proxy_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe CarrierWave::Uploader do

data/spec/uploader/remove_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe CarrierWave::Uploader do

data/spec/uploader/store_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe CarrierWave::Uploader do

data/spec/uploader/url_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe CarrierWave::Uploader do

data/spec/uploader/versions_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe CarrierWave::Uploader do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnicklas-carrierwave
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-01 00:00:00 -07:00
+date: 2009-07-18 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - lib/carrierwave/compatibility
 - lib/carrierwave/compatibility/paperclip.rb
 - lib/carrierwave/core_ext
+- lib/carrierwave/core_ext/blank.rb
 - lib/carrierwave/core_ext/inheritable_attributes.rb
 - lib/carrierwave/core_ext/module_setup.rb
 - lib/carrierwave/mount.rb