simple_worker 1.0.14 → 2.0.0.beta.2

data/README.markdown

@@ -80,13 +80,6 @@ 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,15 +41,11 @@ 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
-        reqs = gem_info[:require].is_a?(Array) ? gem_info[:require] : [gem_info[:require]]
-        reqs.each do |r|
-          r2 = "#{gem_info[:path]}/lib/#{r}"
-          begin
-            SimpleWorker.logger.debug '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
+        #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.........."
         end
       end
 
@@ -68,7 +64,7 @@ module SimpleWorker
         f2 = SimpleWorker::MergeHelper.check_for_file(mailer, @caller_file)
         basename = File.basename(mailer, f2[:extname])
         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 => f2[:path]}.merge!(params)
+        @merged_mailers[basename] = {:name=>basename, :path_to_templates=>path_to_templates, :filename => mailer}.merge!(params)
       end
 
       def merge_folder(path)
@@ -155,7 +151,7 @@ module SimpleWorker
       # puts 'run_local'
       set_auto_attributes
       init_database
-      init_mailer
+	  init_mailer
       begin
         run
       rescue => ex
@@ -167,11 +163,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/server/runner.rb

@@ -1,9 +1,11 @@
 # This is the file that gets executed on the server.
 
+
 def init_database_connection(sw_config)
   if sw_config
     db_config = sw_config['database']
     if db_config
+      #@logger.info "Connecting to database using ActiveRecord..."
       require 'active_record'
       ActiveRecord::Base.establish_connection(db_config)
     end
@@ -75,3 +77,22 @@ def init_worker_service_for_runner(job_data)
   end
 end
 
+
+run_data = JSON.load(File.open(run_data_file))
+# Load in job data
+job_data = JSON.load(File.open(job_data_file))
+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)
+  SimpleWorker.disable_queueing()
+  runner_class = get_class_to_run(job_data['class_name'])
+  SimpleWorker.running_class = runner_class
+  runner = init_runner(runner_class, job_data, dirname)
+  init_worker_service_for_runner(job_data)
+  SimpleWorker.enable_queueing()
+
+# Let's run it!
+  runner_return_data = runner.run

data/lib/simple_worker/service.rb

@@ -122,11 +122,6 @@ module SimpleWorker
       #tmp_file = File.join(Dir.tmpdir(), File.basename(filename))
       tmp_file = File.join(Dir.tmpdir(), 'runner.rb')
       File.open(tmp_file, "w") do |f|
-        File.open(File.join(File.dirname(__FILE__), "server", 'runner.rb'), 'r') do |fr|
-          while line = fr.gets
-            f.write line
-          end
-        end
         f.write("begin\n")#error handling block start
         f.write("
 # Find environment (-e)
@@ -150,36 +145,15 @@ ARGV.each do |arg|
   i+=1
 end
 
-
 # Change to user directory
 #puts 'dirname=' + dirname.inspect
 Dir.chdir(dirname)
-require 'json'
-run_data = JSON.load(File.open(run_data_file))
-# Load in job data
-job_data = JSON.load(File.open(job_data_file))
-job_data.merge!(run_data)
-#puts 'job_data=' + job_data.inspect
-
-sw_config = job_data['sw_config']
 ")
 
 
         f.write("require 'simple_worker'\n")
 
 
-        File.open(File.join(File.dirname(__FILE__), 'server', 'overrides.rb'), 'r') do |fr|
-          while line = fr.gets
-            f.write line
-          end
-        end
-
-        # Now we must disable queuing while loading up classes. This is from the overrides.rb file
-f.write("
-SimpleWorker.disable_queueing()
-")
-        
-
         # add some rails stuff if using Rails
         if defined?(Rails)
           f.write "module Rails
@@ -193,6 +167,15 @@ 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,19 +197,17 @@ 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)\n"
         if SimpleWorker.config.extra_requires
           SimpleWorker.config.extra_requires.each do |r|
             f.write "require '#{r}'\n"
           end
         end
 
+        File.open(File.join(File.dirname(__FILE__), 'server', 'overrides.rb'), 'r') do |fr|
+          while line = fr.gets
+            f.write line
+          end
+        end
 
         merged.each_pair do |k, v|
           if v[:extname] == ".rb"
@@ -238,23 +219,13 @@ end
         end
         #end
         #f.write File.open(filename, 'r') { |mo| mo.read }
-        f.write("require_relative '#{File.basename(filename)}'\n")
-
-
-
-        f.write("
-  runner_class = get_class_to_run(job_data['class_name'])
-  SimpleWorker.running_class = runner_class
-  runner = init_runner(runner_class, job_data, dirname)
-  init_worker_service_for_runner(job_data)
-
-  # lastly, reenable queueing
-  SimpleWorker.enable_queueing()
-
-# Let's run it!
-  runner_return_data = runner.run
-")
+        f.write("require_relative '#{File.basename(filename)}'")
 
+        File.open(File.join(File.dirname(__FILE__), "server", 'runner.rb'), 'r') do |fr|
+          while line = fr.gets
+            f.write line
+          end
+        end
         #error handling block - end
         f.write("\nrescue Exception => ex
                 $stderr.puts '_error_from_sw_'
@@ -333,7 +304,6 @@ end
           # puts " MERGED MAILERS" + merged_mailers.inspect
           merged_mailers.each_pair do |k, mailer|
             SimpleWorker.logger.debug "Collecting mailer #{mailer[:name]}"
-            puts "MAILER #{mailer.inspect}"
             f.add(File.basename(mailer[:filename]), mailer[:filename])
             path = mailer[:path_to_templates]
             Dir["#{path}/**/**"].each do |file|

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: simple_worker
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.0.14
+  prerelease: 6
+  version: 2.0.0.beta.2
 platform: ruby
 authors: 
 - Travis Reeder
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-03 00:00:00 Z
+date: 2011-09-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zip
@@ -44,7 +44,6 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - lib/generators/simple_worker/simple_worker_generator.rb
-- lib/generators/simple_worker/templates/template_worker.erb
 - lib/simple_worker.rb
 - lib/simple_worker/api.rb
 - lib/simple_worker/base.rb
@@ -75,9 +74,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 

data/lib/generators/simple_worker/templates/template_worker.erb

@@ -1,7 +0,0 @@
-class <%= @camel %> < SimpleWorker::Base
-
-  def run
-    log "Your code goes in this bit"
-  end
-
-end