delayed_paperclip 2.4.2.0 → 2.4.3.0

data/lib/delayed_paperclip.rb

@@ -33,8 +33,10 @@ module DelayedPaperclip
 
   end
 
-  def self.included(base)
-    base.extend(ClassMethods)
+  module Glue
+    def self.included base #:nodoc:
+      base.extend(ClassMethods)
+    end
   end
 
   module ClassMethods

data/lib/delayed_paperclip/attachment.rb

@@ -53,7 +53,7 @@ module DelayedPaperclip
         end
       end
 
-      def url_with_processed style = default_style, include_updated_timestamp = @use_timestamp
+      def url_with_processed style = default_style, include_updated_timestamp = @options.use_timestamp
         return url_without_processed style, include_updated_timestamp if !@instance.class.attachment_definitions[@name][:delayed].try(:[], :url_with_processing) || job_is_processing
 
         if !@instance.respond_to?(:"#{name}_processing?")
@@ -65,7 +65,8 @@ module DelayedPaperclip
             if dirty?
               url_without_processed style, include_updated_timestamp
             else
-              interpolate(@default_url, style)
+              default_url = @options.default_url.is_a?(Proc) ? @options.default_url.call(self) : @options.default_url
+              interpolate(default_url, style)
             end
           end
         end

data/lib/delayed_paperclip/railtie.rb

@@ -14,7 +14,7 @@ module DelayedPaperclip
 
   class Railtie
     def self.insert
-      ActiveRecord::Base.send(:include, DelayedPaperclip)
+      ActiveRecord::Base.send(:include, DelayedPaperclip::Glue)
       Paperclip::Attachment.send :include, DelayedPaperclip::Attachment
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_paperclip
 version: !ruby/object:Gem::Version
-  version: 2.4.2.0
+  version: 2.4.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,18 +14,18 @@ date: 2011-11-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &2152842880 !ruby/object:Gem::Requirement
+  requirement: &2165116360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152842880
+  version_requirements: *2165116360
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152842460 !ruby/object:Gem::Requirement
+  requirement: &2165115920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152842460
+  version_requirements: *2165115920
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2152841940 !ruby/object:Gem::Requirement
+  requirement: &2165115400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152841940
+  version_requirements: *2165115400
 - !ruby/object:Gem::Dependency
   name: delayed_job
-  requirement: &2152841460 !ruby/object:Gem::Requirement
+  requirement: &2165114820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152841460
+  version_requirements: *2165114820
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &2152840980 !ruby/object:Gem::Requirement
+  requirement: &2165114300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152840980
+  version_requirements: *2165114300
 description: Process your Paperclip attachments in the background with delayed_job,
   Resque or your own processor.
 email: jesse@jstorimer.com