simple_worker 1.0.1 → 1.0.2

data/lib/simple_worker/base.rb

@@ -61,7 +61,7 @@ module SimpleWorker
 
       #merge action_mailer mailers
       def merge_mailer(mailer, params={})
-        f2 = SimpleWorker::MergeHelper.check_for_file mailer, caller[2]
+        f2 = SimpleWorker::MergeHelper.check_for_file mailer, @caller_file
         basename = File.basename(mailer, File.extname(mailer))
         path_to_templates = params[:path_to_templates] || File.join(Rails.root, "app/views/#{basename}")
         @merged_mailers[basename] = {:name=>basename, :path_to_templates=>path_to_templates, :filename => mailer}.merge!(params)
@@ -94,7 +94,7 @@ module SimpleWorker
       # Example: merge 'models/my_model'
       def merge(f)
         ret = nil
-        f2 = SimpleWorker::MergeHelper.check_for_file(f, caller[2])
+        f2 = SimpleWorker::MergeHelper.check_for_file(f, @caller_file)
         fbase = File.basename(f2)
         ret = {:name=>fbase, :path=>f2}
         @merged[fbase] = ret
@@ -104,7 +104,7 @@ module SimpleWorker
       # Opposite of merge, this will omit the files you specify from being merged in. Useful in Rails apps
       # where a lot of things are auto-merged by default like your models.
       def unmerge(f)
-        f2 = SimpleWorker::MergeHelper.check_for_file(f, caller[2])
+        f2 = SimpleWorker::MergeHelper.check_for_file(f, @caller_file)
         fbase = File.basename(f2)
         @unmerged[fbase] = {:name=>fbase, :path=>f2}
         @merged.delete(fbase)

metadata

@@ -2,7 +2,7 @@
 name: simple_worker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Travis Reeder
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-11 00:00:00 Z
+date: 2011-08-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zip