mongoid_paperclip_queue 0.1.3 → 0.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/mongoid_paperclip_queue.rb +11 -11
- data/mongoid_paperclip_queue.gemspec +2 -2
- data/test/test_helper.rb +13 -14
- data/test/tmp/redis-test.pid +1 -1
- metadata +81 -59
@@ -91,8 +91,8 @@ module Mongoid::PaperclipQueue
|
|
91
91
|
if self.changed.include? "#{field}_updated_at"
|
92
92
|
# add a Redis key for the application to check if we're still processing
|
93
93
|
# we don't need it for the processing, it's just a helpful tool
|
94
|
-
Mongoid::PaperclipQueue::Redis.server.sadd(self.class.name, "#{field}:#{self.id}")
|
95
|
-
|
94
|
+
Mongoid::PaperclipQueue::Redis.server.sadd(self.class.name, "#{field}:#{self.id.to_s}")
|
95
|
+
|
96
96
|
# check if the document is embedded. if so, we need that to find it later
|
97
97
|
if self.embedded?
|
98
98
|
parents = []
|
@@ -102,22 +102,22 @@ module Mongoid::PaperclipQueue
|
|
102
102
|
# there should only be one :embedded_in per model, correct me if I'm wrong
|
103
103
|
association = associations.first
|
104
104
|
path = path.send(association.name.to_sym)
|
105
|
-
parents << [association.class_name,association.name, path.id]
|
105
|
+
parents << [association.class_name,association.name, path.id.to_s]
|
106
106
|
associations = path.reflect_on_all_associations(:embedded_in)
|
107
|
-
|
107
|
+
|
108
108
|
end
|
109
109
|
# we need the relation name, not the class name
|
110
|
-
args = [ self.metadata.name, field, self.id] + parents.reverse
|
110
|
+
args = [ self.metadata.name, field, self.id.to_s] + parents.reverse
|
111
111
|
else
|
112
112
|
# or just use our default params like any other Paperclip model
|
113
|
-
args = [self.class.name, field, self.id]
|
113
|
+
args = [self.class.name, field, self.id.to_s]
|
114
114
|
end
|
115
|
-
|
115
|
+
|
116
116
|
# then queue up our processing
|
117
117
|
Mongoid::PaperclipQueue::Queue.enqueue(*args)
|
118
118
|
end
|
119
119
|
end
|
120
|
-
|
120
|
+
|
121
121
|
##
|
122
122
|
# Define the necessary collection fields in Mongoid for Paperclip
|
123
123
|
field(:"#{field}_file_name", :type => String)
|
@@ -135,15 +135,15 @@ module Mongoid::PaperclipQueue
|
|
135
135
|
def do_reprocessing_on(field)
|
136
136
|
@is_processing=true
|
137
137
|
self.send(field.to_sym).reprocess!
|
138
|
-
Mongoid::PaperclipQueue::Redis.server.srem(self.class.name, "#{field}:#{self.id}")
|
138
|
+
Mongoid::PaperclipQueue::Redis.server.srem(self.class.name, "#{field}:#{self.id.to_s}")
|
139
139
|
end
|
140
|
-
|
140
|
+
|
141
141
|
end
|
142
142
|
end
|
143
143
|
module Paperclip
|
144
144
|
class Attachment
|
145
145
|
def processing?
|
146
|
-
@instance.respond_to?(:"#{name}_processing!") && (@instance.new_record? || Mongoid::PaperclipQueue::Redis.server.sismember(@instance.class.name, "#{@name}:#{@instance.id}"))
|
146
|
+
@instance.respond_to?(:"#{name}_processing!") && (@instance.new_record? || Mongoid::PaperclipQueue::Redis.server.sismember(@instance.class.name, "#{@name}:#{@instance.id.to_s}"))
|
147
147
|
end
|
148
148
|
|
149
149
|
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
Gem::Specification.new do |s|
|
2
2
|
s.name = %q{mongoid_paperclip_queue}
|
3
|
-
s.version = "0.1.
|
3
|
+
s.version = "0.1.4"
|
4
4
|
|
5
5
|
s.authors = ["Kelly Martin"]
|
6
6
|
s.summary = %q{Process your Paperclip attachments in the background using Mongoid and Resque.}
|
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
|
|
11
11
|
s.files = `git ls-files`.split("\n")
|
12
12
|
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
|
13
13
|
|
14
|
-
s.add_dependency 'paperclip', ["~> 2.
|
14
|
+
s.add_dependency 'paperclip', ["~> 2.7.0"]
|
15
15
|
s.add_dependency 'redis-namespace'
|
16
16
|
s.add_dependency 'mongoid', [">= 2.3.0"]
|
17
17
|
s.add_dependency 'resque'
|
data/test/test_helper.rb
CHANGED
@@ -5,16 +5,16 @@ require 'mongoid'
|
|
5
5
|
require 'logger'
|
6
6
|
require 'paperclip/railtie'
|
7
7
|
require 'resque_unit'
|
8
|
-
#require 'redis-namespace'
|
9
|
-
|
10
|
-
#Paperclip::Railtie.insert
|
11
8
|
|
12
9
|
ROOT = File.join(File.dirname(__FILE__), '..')
|
13
10
|
RAILS_ROOT = ROOT
|
14
11
|
$LOAD_PATH << File.join(ROOT, 'lib')
|
15
12
|
|
16
|
-
|
17
|
-
|
13
|
+
TMP_DIR = File.join(File.dirname(__FILE__), "tmp")
|
14
|
+
REDIS_PID = "#{TMP_DIR}/redis-test.pid"
|
15
|
+
REDIS_CACHE_PATH = "#{TMP_DIR}/cache/"
|
16
|
+
|
17
|
+
FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures")
|
18
18
|
|
19
19
|
require 'mongoid_paperclip_queue'
|
20
20
|
|
@@ -39,7 +39,13 @@ class Test::Unit::TestCase
|
|
39
39
|
"databases" => 16
|
40
40
|
}.map { |k, v| "#{k} #{v}" }.join('\n')
|
41
41
|
`echo '#{redis_options}' | redis-server -`
|
42
|
-
|
42
|
+
|
43
|
+
Mongoid.configure do |config|
|
44
|
+
config.master = Mongo::Connection.new.db("mongoid_paperclip_queue_test")
|
45
|
+
end
|
46
|
+
Mongoid.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
|
47
|
+
|
48
|
+
Mongoid.database.collections.reject { |c| c.name == 'system.indexes' }.each(&:drop)
|
43
49
|
end
|
44
50
|
|
45
51
|
def teardown
|
@@ -47,18 +53,11 @@ class Test::Unit::TestCase
|
|
47
53
|
cat #{REDIS_PID} | xargs kill -QUIT
|
48
54
|
rm -f #{REDIS_CACHE_PATH}dump.rdb
|
49
55
|
}
|
56
|
+
Mongoid.database.collections.reject { |c| c.name == 'system.indexes' }.each(&:drop)
|
50
57
|
end
|
51
58
|
|
52
59
|
end
|
53
60
|
|
54
|
-
|
55
|
-
|
56
|
-
FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures")
|
57
|
-
Mongoid.configure do |config|
|
58
|
-
config.master = Mongo::Connection.new.db("mongoid_paperclip_queue_test")
|
59
|
-
end
|
60
|
-
Mongoid.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
|
61
|
-
|
62
61
|
class EmbedsDummy
|
63
62
|
|
64
63
|
include Mongoid::Document
|
data/test/tmp/redis-test.pid
CHANGED
@@ -1 +1 @@
|
|
1
|
-
|
1
|
+
3258
|
metadata
CHANGED
@@ -1,67 +1,83 @@
|
|
1
|
-
--- !ruby/object:Gem::Specification
|
1
|
+
--- !ruby/object:Gem::Specification
|
2
2
|
name: mongoid_paperclip_queue
|
3
|
-
version: !ruby/object:Gem::Version
|
4
|
-
|
5
|
-
|
3
|
+
version: !ruby/object:Gem::Version
|
4
|
+
prerelease: false
|
5
|
+
segments:
|
6
|
+
- 0
|
7
|
+
- 1
|
8
|
+
- 4
|
9
|
+
version: 0.1.4
|
6
10
|
platform: ruby
|
7
|
-
authors:
|
11
|
+
authors:
|
8
12
|
- Kelly Martin
|
9
13
|
autorequire:
|
10
14
|
bindir: bin
|
11
15
|
cert_chain: []
|
12
|
-
|
13
|
-
|
14
|
-
|
16
|
+
|
17
|
+
date: 2012-05-17 00:00:00 -05:00
|
18
|
+
default_executable:
|
19
|
+
dependencies:
|
20
|
+
- !ruby/object:Gem::Dependency
|
15
21
|
name: paperclip
|
16
|
-
|
17
|
-
|
18
|
-
requirements:
|
22
|
+
prerelease: false
|
23
|
+
requirement: &id001 !ruby/object:Gem::Requirement
|
24
|
+
requirements:
|
19
25
|
- - ~>
|
20
|
-
- !ruby/object:Gem::Version
|
21
|
-
|
26
|
+
- !ruby/object:Gem::Version
|
27
|
+
segments:
|
28
|
+
- 2
|
29
|
+
- 7
|
30
|
+
- 0
|
31
|
+
version: 2.7.0
|
22
32
|
type: :runtime
|
23
|
-
|
24
|
-
|
25
|
-
- !ruby/object:Gem::Dependency
|
33
|
+
version_requirements: *id001
|
34
|
+
- !ruby/object:Gem::Dependency
|
26
35
|
name: redis-namespace
|
27
|
-
requirement: &70132006490620 !ruby/object:Gem::Requirement
|
28
|
-
none: false
|
29
|
-
requirements:
|
30
|
-
- - ! '>='
|
31
|
-
- !ruby/object:Gem::Version
|
32
|
-
version: '0'
|
33
|
-
type: :runtime
|
34
36
|
prerelease: false
|
35
|
-
|
36
|
-
|
37
|
+
requirement: &id002 !ruby/object:Gem::Requirement
|
38
|
+
requirements:
|
39
|
+
- - ">="
|
40
|
+
- !ruby/object:Gem::Version
|
41
|
+
segments:
|
42
|
+
- 0
|
43
|
+
version: "0"
|
44
|
+
type: :runtime
|
45
|
+
version_requirements: *id002
|
46
|
+
- !ruby/object:Gem::Dependency
|
37
47
|
name: mongoid
|
38
|
-
|
39
|
-
|
40
|
-
requirements:
|
41
|
-
- -
|
42
|
-
- !ruby/object:Gem::Version
|
48
|
+
prerelease: false
|
49
|
+
requirement: &id003 !ruby/object:Gem::Requirement
|
50
|
+
requirements:
|
51
|
+
- - ">="
|
52
|
+
- !ruby/object:Gem::Version
|
53
|
+
segments:
|
54
|
+
- 2
|
55
|
+
- 3
|
56
|
+
- 0
|
43
57
|
version: 2.3.0
|
44
58
|
type: :runtime
|
45
|
-
|
46
|
-
|
47
|
-
- !ruby/object:Gem::Dependency
|
59
|
+
version_requirements: *id003
|
60
|
+
- !ruby/object:Gem::Dependency
|
48
61
|
name: resque
|
49
|
-
requirement: &70132006489620 !ruby/object:Gem::Requirement
|
50
|
-
none: false
|
51
|
-
requirements:
|
52
|
-
- - ! '>='
|
53
|
-
- !ruby/object:Gem::Version
|
54
|
-
version: '0'
|
55
|
-
type: :runtime
|
56
62
|
prerelease: false
|
57
|
-
|
58
|
-
|
59
|
-
|
63
|
+
requirement: &id004 !ruby/object:Gem::Requirement
|
64
|
+
requirements:
|
65
|
+
- - ">="
|
66
|
+
- !ruby/object:Gem::Version
|
67
|
+
segments:
|
68
|
+
- 0
|
69
|
+
version: "0"
|
70
|
+
type: :runtime
|
71
|
+
version_requirements: *id004
|
72
|
+
description: Process your Paperclip attachments in the background using Mongoid and Resque. Loosely based on delayed_paperclip and mongoid-paperclip.
|
60
73
|
email: kelly@fullybrand.com
|
61
74
|
executables: []
|
75
|
+
|
62
76
|
extensions: []
|
77
|
+
|
63
78
|
extra_rdoc_files: []
|
64
|
-
|
79
|
+
|
80
|
+
files:
|
65
81
|
- .gitignore
|
66
82
|
- .project
|
67
83
|
- .rvmrc
|
@@ -77,31 +93,37 @@ files:
|
|
77
93
|
- test/resque_paperclip_test.rb
|
78
94
|
- test/test_helper.rb
|
79
95
|
- test/tmp/redis-test.pid
|
96
|
+
has_rdoc: true
|
80
97
|
homepage: http://github.com/kellym/mongoid_paperclip_queue
|
81
98
|
licenses: []
|
99
|
+
|
82
100
|
post_install_message:
|
83
101
|
rdoc_options: []
|
84
|
-
|
102
|
+
|
103
|
+
require_paths:
|
85
104
|
- lib
|
86
|
-
required_ruby_version: !ruby/object:Gem::Requirement
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
requirements:
|
95
|
-
- -
|
96
|
-
- !ruby/object:Gem::Version
|
97
|
-
|
105
|
+
required_ruby_version: !ruby/object:Gem::Requirement
|
106
|
+
requirements:
|
107
|
+
- - ">="
|
108
|
+
- !ruby/object:Gem::Version
|
109
|
+
segments:
|
110
|
+
- 0
|
111
|
+
version: "0"
|
112
|
+
required_rubygems_version: !ruby/object:Gem::Requirement
|
113
|
+
requirements:
|
114
|
+
- - ">="
|
115
|
+
- !ruby/object:Gem::Version
|
116
|
+
segments:
|
117
|
+
- 0
|
118
|
+
version: "0"
|
98
119
|
requirements: []
|
120
|
+
|
99
121
|
rubyforge_project:
|
100
|
-
rubygems_version: 1.
|
122
|
+
rubygems_version: 1.3.6
|
101
123
|
signing_key:
|
102
124
|
specification_version: 3
|
103
125
|
summary: Process your Paperclip attachments in the background using Mongoid and Resque.
|
104
|
-
test_files:
|
126
|
+
test_files:
|
105
127
|
- test/base_mongoid_paperclip_queue_test.rb
|
106
128
|
- test/fixtures/12k.png
|
107
129
|
- test/resque_paperclip_test.rb
|