simple_worker 1.0.12 → 1.0.13

data/README.markdown

@@ -80,6 +80,13 @@ Let's say someone does something in your app and you want to send an email about
 
 This will send it off to the SimpleWorker cloud.
 
+To queue worker without uploading you could try to do following:
+
+    data[:attr_encoded] = Base64.encode64({'@to'=>'example@email.com'}.to_json)
+    data[:sw_config] = SimpleWorker.config.get_atts_to_send
+    SimpleWorker.service.queue('EmailWorker', data)
+
+
 Setting Priority
 ----------------------------------------------
 

data/lib/simple_worker/base.rb

@@ -41,11 +41,15 @@ module SimpleWorker
       def merge_gem(gem_name, options={})
         gem_info = SimpleWorker::MergeHelper.create_gem_info(gem_name, options)
         @merged_gems[gem_name.to_s] = gem_info
-        #puts 'before require ' + (options[:require] || gem_name)
-        begin
-          require gem_info[:require]
-        rescue LoadError=>ex
-          raise "Gem #{gem_name} was found, but we could not load the file '#{options[:require] || gem_name}.rb'. You may need to use :require=>x.........."
+        reqs = gem_info[:require].is_a?(Array) ? gem_info[:require] : [gem_info[:require]]
+        reqs.each do |r|
+          r2 = "#{gem_info[:path]}/lib/#{r}"
+          begin
+            puts 'requiring ' + r2
+            require r2
+          rescue LoadError=>ex
+            raise "Gem #{gem_name} was found, but we could not load the file '#{r2}'. You may need to use :require=>x.........."
+          end
         end
       end
 
@@ -151,7 +155,7 @@ module SimpleWorker
       # puts 'run_local'
       set_auto_attributes
       init_database
-	  init_mailer
+      init_mailer
       begin
         run
       rescue => ex
@@ -163,11 +167,11 @@ module SimpleWorker
       end
     end
 
-	def init_mailer
+    def init_mailer
       if SimpleWorker.config.mailer
         require 'action_mailer'
-         ActionMailer::Base.raise_delivery_errors = true
-         ActionMailer::Base.smtp_settings = (SimpleWorker.config.mailer)
+        ActionMailer::Base.raise_delivery_errors = true
+        ActionMailer::Base.smtp_settings = (SimpleWorker.config.mailer)
       end
     end
 

data/lib/simple_worker/service.rb

@@ -162,9 +162,6 @@ job_data.merge!(run_data)
 #puts 'job_data=' + job_data.inspect
 
 sw_config = job_data['sw_config']
-init_database_connection(sw_config)
-init_mailer(sw_config)
-
 ")
 
 
@@ -184,15 +181,6 @@ end
 "
         end
 
-        if SimpleWorker.config.database && !SimpleWorker.config.database.empty?
-          f.write "require 'active_record'\n"
-        end
-
-        if merged_mailers && !merged_mailers.empty?
-          # todo: isn't 'action_mailer already required in railtie?
-          f.write "require 'action_mailer'\n"
-          f.write "ActionMailer::Base.prepend_view_path('templates')\n"
-        end
         #if SimpleWorker.config.auto_merge
         merged_gems.each_pair do |k, gem|
           SimpleWorker.logger.debug "Bundling gem #{gem[:name]}..."
@@ -214,6 +202,13 @@ end
 #              end
         end
 
+        if merged_mailers && !merged_mailers.empty?
+          # todo: isn't 'action_mailer already required in railtie?
+          f.write "require 'action_mailer'\n"
+          f.write "init_mailer(sw_config)\n"
+          f.write "ActionMailer::Base.prepend_view_path('templates')\n"
+        end
+        f.write "init_database_connection(sw_config)"
         if SimpleWorker.config.extra_requires
           SimpleWorker.config.extra_requires.each do |r|
             f.write "require '#{r}'\n"

metadata

@@ -2,7 +2,7 @@
 name: simple_worker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors: 
 - Travis Reeder
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-13 00:00:00 Z
+date: 2011-10-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zip