simple_worker 1.0.1 → 1.0.2
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/simple_worker/base.rb +3 -3
- metadata +2 -2
data/lib/simple_worker/base.rb
CHANGED
|
@@ -61,7 +61,7 @@ module SimpleWorker
|
|
|
61
61
|
|
|
62
62
|
#merge action_mailer mailers
|
|
63
63
|
def merge_mailer(mailer, params={})
|
|
64
|
-
f2 = SimpleWorker::MergeHelper.check_for_file mailer,
|
|
64
|
+
f2 = SimpleWorker::MergeHelper.check_for_file mailer, @caller_file
|
|
65
65
|
basename = File.basename(mailer, File.extname(mailer))
|
|
66
66
|
path_to_templates = params[:path_to_templates] || File.join(Rails.root, "app/views/#{basename}")
|
|
67
67
|
@merged_mailers[basename] = {:name=>basename, :path_to_templates=>path_to_templates, :filename => mailer}.merge!(params)
|
|
@@ -94,7 +94,7 @@ module SimpleWorker
|
|
|
94
94
|
# Example: merge 'models/my_model'
|
|
95
95
|
def merge(f)
|
|
96
96
|
ret = nil
|
|
97
|
-
f2 = SimpleWorker::MergeHelper.check_for_file(f,
|
|
97
|
+
f2 = SimpleWorker::MergeHelper.check_for_file(f, @caller_file)
|
|
98
98
|
fbase = File.basename(f2)
|
|
99
99
|
ret = {:name=>fbase, :path=>f2}
|
|
100
100
|
@merged[fbase] = ret
|
|
@@ -104,7 +104,7 @@ module SimpleWorker
|
|
|
104
104
|
# Opposite of merge, this will omit the files you specify from being merged in. Useful in Rails apps
|
|
105
105
|
# where a lot of things are auto-merged by default like your models.
|
|
106
106
|
def unmerge(f)
|
|
107
|
-
f2 = SimpleWorker::MergeHelper.check_for_file(f,
|
|
107
|
+
f2 = SimpleWorker::MergeHelper.check_for_file(f, @caller_file)
|
|
108
108
|
fbase = File.basename(f2)
|
|
109
109
|
@unmerged[fbase] = {:name=>fbase, :path=>f2}
|
|
110
110
|
@merged.delete(fbase)
|
metadata
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
name: simple_worker
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
4
|
prerelease:
|
|
5
|
-
version: 1.0.
|
|
5
|
+
version: 1.0.2
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
8
8
|
- Travis Reeder
|
|
@@ -10,7 +10,7 @@ autorequire:
|
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
12
|
|
|
13
|
-
date: 2011-08-
|
|
13
|
+
date: 2011-08-12 00:00:00 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: zip
|