delayed_paperclip 0.6.0 → 0.6.1

Sign up to get free protection for your applications and to get access to all the features.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.6.0
1
+ 0.6.1
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{delayed_paperclip}
8
- s.version = "0.6.0"
8
+ s.version = "0.6.1"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Jesse Storimer"]
@@ -83,10 +83,14 @@ end
83
83
  module Paperclip
84
84
  class Attachment
85
85
  def url_with_processed style = default_style, include_updated_timestamp = true
86
- if @instance.column_exists?(:"#{@name}_processing") && !@instance.send(:"#{@name}_processing?")
86
+ if !@instance.column_exists?(:"#{@name}_processing")
87
87
  url_without_processed style, include_updated_timestamp
88
88
  else
89
- interpolate(@default_url, style)
89
+ if !@instance.send(:"#{@name}_processing?")
90
+ url_without_processed style, include_updated_timestamp
91
+ else
92
+ interpolate(@default_url, style)
93
+ end
90
94
  end
91
95
  end
92
96
  alias_method_chain :url, :processed
@@ -103,4 +103,16 @@ class DelayedPaperclipTest < Test::Unit::TestCase
103
103
  @dummy.reload
104
104
  assert_match(/\/system\/images\/1\/original\/12k.png/, @dummy.image.url)
105
105
  end
106
+
107
+ def test_original_url_when_no_processing_column
108
+ @dummy = reset_dummy(false)
109
+ @dummy.save!
110
+
111
+ assert_match(/\/system\/images\/1\/original\/12k.png/, @dummy.image.url)
112
+
113
+ # Delayed::Job.first.invoke_job
114
+ #
115
+ # @dummy.reload
116
+ # assert_match(/\/system\/images\/1\/original\/12k.png/, @dummy.image.url)
117
+ end
106
118
  end
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 6
8
- - 0
9
- version: 0.6.0
8
+ - 1
9
+ version: 0.6.1
10
10
  platform: ruby
11
11
  authors:
12
12
  - Jesse Storimer