metaforce 1.0.4 → 1.0.5

data/lib/metaforce.rb

@@ -23,6 +23,7 @@ module Metaforce
 
     # Performs a login and retrurns the session
     def login(options={})
+      options = HashWithIndifferentAccess.new(options)
       username       = options.fetch(:username, ENV['SALESFORCE_USERNAME'])
       password       = options.fetch(:password, ENV['SALESFORCE_PASSWORD'])
       security_token = options.fetch(:security_token, ENV['SALESFORCE_SECURITY_TOKEN'])

data/lib/metaforce/cli.rb

@@ -2,8 +2,10 @@ require 'listen'
 require 'thor'
 require 'metaforce/reporters'
 
-Metaforce.configuration.log = false
-Metaforce::Job.disable_threading!
+Metaforce.configure do |config|
+  config.log = false
+  config.threading = false
+end
 
 module Metaforce
   class CLI < Thor

data/lib/metaforce/config.rb

@@ -47,6 +47,14 @@ module Metaforce
     # options. The block should set the options to a hash containing a valid
     # session_id and service urls.
     attr_accessor :authentication_handler
+    # Enables or disables threading when polling for job status. If disabled,
+    # calling .perform on a job will block until completion and all callbacks
+    # have run. (default: true).
+    attr_accessor :threading
+
+    def initialize
+      @threading = false
+    end
 
     def api_version
       @api_version ||= '26.0'

data/lib/metaforce/job.rb

@@ -142,23 +142,11 @@ module Metaforce
       "#<#{self.class} @id=#{@id.inspect}>"
     end
 
-    class << self
-
-      # Internal: Disable threading in tests.
-      def disable_threading!
-        self.class_eval do
-          def start_heart_beat
-            delay = DELAY_START
-            loop do
-              @status = nil
-              wait (delay = delay * DELAY_MULTIPLIER)
-              trigger_poll_callbacks
-              trigger_callbacks && break if completed? || error?
-            end
-          end
-        end
-      end
-
+    def self.disable_threading!
+      ActiveSupport::Deprecation.warn <<-WARNING.strip_heredoc
+        Metaforce::Job.disable_threading! is deprecated. Use Metaforce.configuration.threading = false instead.
+      WARNING
+      Metaforce.configuration.threading = false
     end
 
   private
@@ -167,30 +155,34 @@ module Metaforce
     # Internal: Starts a heart beat in a thread, which polls the job status
     # until it has completed or timed out.
     def start_heart_beat
-      Thread.abort_on_exception = true
-      @heart_beat ||= Thread.new do
+      if threading?
+        Thread.abort_on_exception = true
+        @heart_beat ||= Thread.new &run_loop
+      else
+        run_loop.call
+      end
+    end
+
+    # Internal: Starts the run loop, and blocks until the job has completed or
+    # failed.
+    def run_loop
+      proc {
         delay = DELAY_START
         loop do
           @status = nil
-          wait (delay = delay * DELAY_MULTIPLIER)
-          trigger_poll_callbacks
-          trigger_callbacks && Thread.stop if completed? || error?
+          sleep (delay = delay * DELAY_MULTIPLIER)
+          trigger :on_poll
+          if completed? || error?
+            trigger callback_type
+            Thread.stop if threading?
+            break
+          end
         end
-      end
+      }
     end
 
-    def trigger_poll_callbacks
-      @_callbacks[:on_poll].each do |block|
-        block.call(self)
-      end
-    end
-
-    def wait(duration)
-      sleep duration
-    end
-
-    def trigger_callbacks
-      @_callbacks[callback_type].each do |block|
+    def trigger(type)
+      @_callbacks[type].each do |block|
         block.call(self)
       end
     end
@@ -203,5 +195,9 @@ module Metaforce
       end
     end
 
+    def threading?
+      Metaforce.configuration.threading
+    end
+
   end
 end

data/lib/metaforce/version.rb

@@ -1,3 +1,3 @@
 module Metaforce
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/spec/spec_helper.rb

@@ -10,8 +10,8 @@ RSpec.configure do |config|
   config.include Savon::Spec::Macros
 
   config.before(:each) do
-    Metaforce::Job.disable_threading!
-    Metaforce::Job.any_instance.stub(:wait)
+    Metaforce.configuration.threading = false
+    Metaforce::Job.any_instance.stub(:sleep)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metaforce
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon