delayed_paperclip 0.6.4 → 0.6.5

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.6.5

data/delayed_paperclip.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{delayed_paperclip}
-  s.version = "0.6.4"
+  s.version = "0.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jesse Storimer"]
-  s.date = %q{2010-03-10}
+  s.date = %q{2010-03-13}
   s.description = %q{Process your Paperclip attachments in the background with delayed_job.}
   s.email = %q{jesse@jstorimer.com}
   s.extra_rdoc_files = [

data/lib/delayed/paperclip.rb

@@ -1,6 +1,6 @@
 module Delayed
   module Paperclip
-    def self.included(base) #:nodoc:
+    def self.included(base)
       base.extend(ClassMethods)
     end
 
@@ -76,17 +76,18 @@ module Delayed
       def column_exists?(column)
         self.class.columns_hash.has_key?(column.to_s)
       end
-    end
+    end      
   end
 end
 
 module Paperclip
   class Attachment
     attr_accessor :job_is_processing
-    
+
     def url_with_processed style = default_style, include_updated_timestamp = true
+      return url_without_processed style, include_updated_timestamp unless @instance.respond_to?(:column_exists?)
       return url_without_processed style, include_updated_timestamp if job_is_processing
-    
+
       if !@instance.column_exists?(:"#{@name}_processing")
         url_without_processed style, include_updated_timestamp
       else
@@ -101,6 +102,7 @@ module Paperclip
         end
       end
     end
+    
     alias_method_chain :url, :processed
   end
 end

data/test/delayed_paperclip_test.rb

@@ -138,4 +138,11 @@ class DelayedPaperclipTest < Test::Unit::TestCase
 
     assert_match(/images\/.*missing.*/, @dummy.image.url)
   end
+  
+  def test_should_not_blow_up_if_dsl_unused
+    reset_class "Dummy", false
+    @dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+
+    assert @dummy.image.url
+  end
 end

data/test/test_helper.rb

@@ -1,19 +1,7 @@
 require 'test/unit'
 require 'rubygems'
 require 'mocha'
-
 require 'active_record'
-require 'active_support'
-
-gem 'sqlite3-ruby'
-
-gem 'paperclip'
-require 'paperclip'
-
-FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures")
-config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
-ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
-ActiveRecord::Base.establish_connection(config['test'])
 
 ROOT       = File.join(File.dirname(__FILE__), '..')
 RAILS_ROOT = ROOT
@@ -25,6 +13,16 @@ $LOAD_PATH << File.join(ROOT, 'test')
 
 require File.join(ROOT, 'lib', 'delayed_paperclip.rb')
 
+require 'active_support'
+gem 'sqlite3-ruby'
+
+gem 'paperclip'
+require 'paperclip'
+
+FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures")
+config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
+ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
+ActiveRecord::Base.establish_connection(config['test'])
 
 def reset_dummy(with_processed = false)
   build_dummy_table(with_processed)
@@ -34,13 +32,12 @@ def reset_dummy(with_processed = false)
   @dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
 end
 
-def reset_class class_name
-  ActiveRecord::Base.send(:include, Paperclip)
+def reset_class class_name, include_process = true
   Object.send(:remove_const, class_name) rescue nil
   klass = Object.const_set(class_name, Class.new(ActiveRecord::Base))
   klass.class_eval do
     has_attached_file     :image
-    process_in_background :image
+    process_in_background :image if include_process
   end
   @dummy_class = klass
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Jesse Storimer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-10 00:00:00 -05:00
+date: 2010-03-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency