Fixed merging issue.

iron-io · Jan 7, 2011 · 78872a6 · 78872a6
1 parent af6c21e
commit 78872a6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/README.markdown b/README.markdown
@@ -187,6 +187,9 @@ Or simpler yet, try using relative paths:
     merge "../app/models/user"
     merge "../app/models/account.rb"
 
+The opposite can be done as well with "unmerge" and can be useful when using Rails to exclude classes that are automatically
+merged.
+
 
 Bringing in other Workers
 ---------------------

diff --git a/lib/railtie.rb b/lib/railtie.rb
@@ -5,7 +5,7 @@
 
 module SimpleWorker
   class Railtie < Rails::Railtie
-    railtie_name :simple_worker
+#    railtie_name :simple_worker deprecated
 
     initializer "simple_worker.configure_rails_initialization" do |app|
       puts 'railtie'

diff --git a/lib/simple_worker/base.rb b/lib/simple_worker/base.rb
@@ -47,7 +47,9 @@ def check_for_file(f)
           exists = true
         else
           # try relative
-          f2 = File.join(File.dirname(caller[0]), f)
+#          p caller
+          f2 = File.join(File.dirname(caller[3]), f)
+          puts 'f2=' + f2
           if File.exist? f2
             exists = true
             f      = f2
@@ -97,7 +99,7 @@ def log(str)
     end
 
     def user_dir
-      "."
+      "./"
     end
 
     def set_progress(hash)

diff --git a/lib/simple_worker/service.rb b/lib/simple_worker/service.rb
@@ -59,7 +59,10 @@ def upload(filename, class_name, options={})
     def build_merged_file(filename, merge, unmerge)
       merge = merge.dup
       merge << filename
+      #puts "merge before uniq! " + merge.inspect
       merge.uniq!
+     # puts "merge after uniq! " + merge.inspect
+
       if unmerge
         unmerge.each do |x|
           deleted = merge.delete x