qbwc 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29001e1940a32d3b067eccfb012a676fef8791e5
-  data.tar.gz: 5700d148297caecaf087fb73c8ac4aebe27f2cba
+  metadata.gz: 5bbaec3ca34a9a960128b6933f41fc78682d8ba4
+  data.tar.gz: 7738ce71948875a6ea4a44753eddcfa37528ac64
 SHA512:
-  metadata.gz: c12ab12caac68c60bbfc08977acc0c60346ee5d53870e45175ae1f02cd06d2237ed6b80e06a799129b8f41f5491ea00fae502fe74069d2d266b99e729ef15286
-  data.tar.gz: 1bece5acbd95f05a7eaf06f23df0c2726718e1082571e630ac0ba8fe296b708c7727fdcafa8d914bc5eb7f0299f7dda735baaa64895730026b3d186e8cd136ba
+  metadata.gz: e8c027bfc0527d79c5b6bb2a5e1c19f68ef7be4ea90a4d0e39a3b111c62a12ac57ef601dac756f0e951887e4de53955a4b681bf5881b9b5e4e66c374c2cf7a0f
+  data.tar.gz: e52f3419dcc33fe1212600038f90586604603953a3c5a07795f8598e9fe55e8ffbc0018dc6fb18f8ea7ebfe72266a09087a174b081cc88a1025cc3a00fe69120

data/.travis.yml

@@ -4,3 +4,5 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+before_install:
+  - gem update bundler

data/CHANGELOG.md

@@ -0,0 +1,34 @@
+
+# Change Log
+
+## [1.0.0](https://github.com/qbwc/qbwc/releases/tag/v1.0.0) (2016-03-02)
+[Full Changelog](https://github.com/qbwc/qbwc/compare/0.1.0...1.0.0)
+
+**Upgrading:**
+
+Upgrading from previous versions requires running new migrations.
+
+Run the generator:
+
+`rails generate qbwc:install`
+
+Then the migrations:
+
+`rake db:migrate`
+`rake RAILS_ENV=test db:migrate`
+
+In production, ensure that no jobs are queued, then:
+`rake RAILS_ENV=production db:migrate`
+
+The `requests` and `should_run?` methods of `QBWC::Worker` now take three parameters: `job`, `session`, and `data`. Any workers that implement these methods should be updated to accept the additional parameters.
+
+**Fixed bugs:**
+
+- Removed 1000-character restriction on list of pending jobs [\#76](https://github.com/qbwc/qbwc/pull/76) ([rchekaluk](https://github.com/rchekaluk))
+
+**New features:**
+
+- App name and FileID provided to QuickBooks can now be overridden by implementing `app_name` and `file_id` in the generated QbwcController. [\#72](https://github.com/qbwc/qbwc/pull/72) ([r38y](https://github.com/r38y))
+- `requests` and `should_run?` now receive the session and data Hash as arguments. This allows for greater control over which requests happen in a run. [\#80](https://github.com/qbwc/qbwc/pull/80) ([bkroeker](https://github.com/bkroeker))
+- Added the `session_complete_success` configuration to specify a block to execute when the session completes.  [\#80](https://github.com/qbwc/qbwc/pull/80) ([bkroeker](https://github.com/bkroeker))
+- Added some indexes to qbwc_jobs for better performance with many jobs are defined. [\#80](https://github.com/qbwc/qbwc/pull/80) ([bkroeker](https://github.com/bkroeker))

data/README.md

@@ -14,6 +14,10 @@ and run
 
 `bundle install`
 
+## Upgrade
+
+Read [the changelog](CHANGELOG.md) if upgrading from previous versions.
+
 ## Configuration
 
 Run the generator:
@@ -54,12 +58,11 @@ At this point, QuickBooks Web Connector should be able to send requests to your
 
 ### Multiple users and multiple company files ###
 
-If you want to have more than one person to connect to the same QuickBooks company file, you will need to manually edit the QWC file to change the `OwnerID` (any GUID will do) before giving it to QuickBooks Web Connector.
+If you want to have more than one person to connect to the same QuickBooks company file, you will need to manually edit the QWC file to change the OwnerID (any GUID will do) before giving it to QuickBooks Web Connector.
 
 If you want each person to have their own login, set up authentication per [Authentication and multiple company files](#authentication-and-multiple-company-files). In the QWC file, you will need to change `UserName`.
 
-If you are connecting to multiple company files, you will additionally need to change `AppName` and `FileID` (any GUID) to be unique to each file.
-
+If you are connecting to multiple company files, you will additionally need to change `AppName` and `FileID` (any GUID) to be unique to each file. In the generated `QbwcController` you can override the `file_id` method to customize `FileID` and `app_name` to customize `AppName`.
 
 ## Creating jobs
 
@@ -80,9 +83,9 @@ QBWC.add_job(:list_customers, true, '', CustomerTestWorker)
 Your job will be persisted in your database and will remain active and run every time QuickBooks Web Connector runs an update. If you don't want this to happen, you can have have your job disable or delete itself after completion. For example:
 
 ```ruby
-	def handle_response(r, session, job, request, data)
-		QBWC.delete_job(job)
-	end
+  def handle_response(r, session, job, request, data)
+    QBWC.delete_job(job)
+  end
 
 ```
 
@@ -93,8 +96,8 @@ Alternately, you can custom logic in your worker's `requests` and `should_run?`
 
 A job is associated to a worker, which is an object descending from `QBWC::Worker` that can define three methods:
 
-- `requests(job)` - defines the request(s) that QuickBooks should process - returns a `Hash` or an `Array` of `Hash`es.
-- `should_run?(job)` - whether this job should run (e.g. you can have a job run only under certain circumstances) - returns `Boolean` and defaults to `true`.
+- `requests(job, session, data)` - defines the request(s) that QuickBooks should process - returns a `Hash` or an `Array` of `Hash`es.
+- `should_run?(job, session, data)` - whether this job should run (e.g. you can have a job run only under certain circumstances) - returns `Boolean` and defaults to `true`.
 - `handle_response(response, session, job, request, data)` - defines what to do with the response from Quickbooks.
 
 All three methods are not invoked until a QuickBooks Web Connector session has been established with your web service.
@@ -106,25 +109,25 @@ require 'qbwc'
 
 class CustomerTestWorker < QBWC::Worker
 
-	def requests(job)
-		{
-			:customer_query_rq => {
-				:xml_attributes => { "requestID" =>"1", 'iterator'  => "Start" },
-				:max_returned => 100
-			}
-		}
-	end
-
-	def handle_response(r, session, job, request, data)
-		# handle_response will get customers in groups of 100. When this is 0, we're done.
-		complete = r['xml_attributes']['iteratorRemainingCount'] == '0'
-
-		r['customer_ret'].each do |qb_cus|
-			qb_id = qb_cus['list_id']
-			qb_name = qb_cus['name']
-			Rails.logger.info("#{qb_id} #{qb_name}")
-		end
-	end
+  def requests(job, session, data)
+    {
+      :customer_query_rq => {
+        :xml_attributes => { "requestID" =>"1", 'iterator'  => "Start" },
+        :max_returned => 100
+      }
+    }
+  end
+
+  def handle_response(r, session, job, request, data)
+    # handle_response will get customers in groups of 100. When this is 0, we're done.
+    complete = r['xml_attributes']['iteratorRemainingCount'] == '0'
+
+    r['customer_ret'].each do |qb_cus|
+      qb_id = qb_cus['list_id']
+      qb_name = qb_cus['name']
+      Rails.logger.info("#{qb_id} #{qb_name}")
+    end
+  end
 
 end
 ```
@@ -132,15 +135,41 @@ end
 
 Use the [Onscreen Reference for Intuit Software Development Kits](https://developer-static.intuit.com/qbSDK-current/Common/newOSR/index.html) (use Format: qbXML) to see request and response formats to use in your jobs. Use underscored, lowercased versions of all tags (e.g. `customer_query_rq`, not `CustomerQueryRq`).
 
-### Referencing memory values when constructing requests ###
+### Defining requests outside of a worker ###
+
+You can pass requests (via a `Hash`, `String`, or array of `Hash`es and `String`s) to `QBWC.add_job` rather than having `QBWC::Worker#requests` define them.
+
+```ruby
+require 'qbwc'
+requests = {
+  :customer_query_rq => {
+    :xml_attributes => { "requestID" =>"1", 'iterator'  => "Start" },
+    :max_returned => 100
+  }
+}
+# QBWC will run the contents of the requests variable, and will not use CustomerTestWorker#requests.
+QBWC.add_job(:list_customers, true, '', CustomerTestWorker, requests)
+```
+
+### Passing data to a worker ###
+
+`QBWC::Worker#handle_response` method cannot access variables that are in-memory at the time that `QBWC.add_job` is called; however, you can optionally pass a serializable value (for example, `String`, `Array`, or `Hash`) to `QBWC.add_job`. This data will be passed to `QBWC::Worker#handle_response` during a QuickBooks Web Connector session.
 
-A `QBWC::Worker#requests` method cannot access values that are in-memory (global variables, local variables, model attributes, etc.) at the time that `QBWC.add_job` is called; however, in lieu of using `QBWC::Worker#requests`, you can construct and pass requests directly to `QBWC.add_job` (`Hash`, `String`, or array of `Hash`es and `String`s). These requests will be immediately persisted by `QBWC.add_job` (in contrast to requests constructed by `QBWC::Worker#requests`, which are persisted during a QuickBooks Web Connector session).
+```ruby
+require 'qbwc'
+extra_data = "something important"
+QBWC.add_job(:list_customers, true, '', CustomerTestWorker, nil, extra_data)
+
+class CustomerTestWorker < QBWC::Worker
 
-If requests are passed to `QBWC.add_job`, the `requests` method on your worker will be ignored.
+  # ...
 
-### Referencing memory values when handling responses ###
+  def handle_response(r, session, job, request, data)
+    # data here is "something important"
+  end
 
-Similarly, a `QBWC::Worker#handle_response` method cannot access variables that are in-memory at the time that `QBWC.add_job` is called; however, you can optionally pass a serializable value (for example, String, Array, or Hash) to `QBWC.add_job`. This data will immediately be persisted by `QBWC.add_job`, then later passed to `QBWC::Worker#handle_response` during a QuickBooks Web Connector session.
+end
+```
 
 ## Sessions ##
 
@@ -158,21 +187,32 @@ c.session_initializer = Proc.new{|session|
 
 In application code:
 ```ruby
-        require 'qbwc'
+  require 'qbwc'
 
-	QBWC.set_session_initializer() do |session|
-          puts "New QuickBooks Web Connector session has been established (overridden session initializer)"
-          @information_from_jobs = {}
-        end if the_application_needs_a_different_session_initializer
+  QBWC.set_session_initializer() do |session|
+    puts "New QuickBooks Web Connector session has been established (overridden session initializer)"
+    @information_from_jobs = {}
+  end if the_application_needs_a_different_session_initializer
 
-        QBWC.add_job(:list_customers, false, '', CustomerTestWorker)
+  QBWC.add_job(:list_customers, false, '', CustomerTestWorker)
 
 ```
 
-Note: If you `set_session initializer` in your application code, you're only affecting the process that your application code runs in. A request to another process (e.g. if you're multiprocess or you restarted the server) means that QBWC won't see the session initializer.
+Note: If you `set_session_initializer` in your application code, you're only affecting the process that your application code runs in. A request to another process (e.g. if you're multiprocess or you restarted the server) means that QBWC won't see the session initializer.
 
 Note: a QuickBooks Web Connector session is established when you manually run (update) an application's web service in QuickBooks Web Connector, or when QuickBooks Web Connector automatically executes a scheduled update.
 
+Similarly, it is possible to set a block to be run upon successful completion of a session.
+
+```ruby
+  QBWC.session_complete_success = lambda do |session|
+    total_time = Time.now - session.began_at
+    puts "Total run time of this session was #{total_time}s"
+  end
+```
+
+Note that if `QBWC.on_error == :stop` and an error is encountered, this block will not be run.
+
 ## Handling errors ##
 
 By default, when an error response is received from QuickBooks, `QBWC::Worker#handle_response` will be invoked but no further requests will be processed in the current job or in subsequent jobs. However, the job will remain persisted and so will be attempted again at next QuickBooks Web Connector session. Unless there is some intervention, presumably the job will fail again and block all remaining jobs and their requests from being serviced.

data/lib/generators/qbwc/install/install_generator.rb

@@ -12,6 +12,10 @@ module QBWC
       source_root File.expand_path('../templates', __FILE__)
       argument :controller_name, :type => :string, :default => 'qbwc'
       
+      def routes_rb
+         "config/routes.rb"
+      end
+
       def copy_config
          template('config/qbwc.rb', "config/initializers/qbwc.rb")
       end
@@ -23,16 +27,33 @@ module QBWC
       def active_record
         migration_template 'db/migrate/create_qbwc_jobs.rb',     'db/migrate/create_qbwc_jobs.rb'
         migration_template 'db/migrate/create_qbwc_sessions.rb', 'db/migrate/create_qbwc_sessions.rb'
+        migration_template 'db/migrate/index_qbwc_jobs.rb',      'db/migrate/index_qbwc_jobs.rb'
+        migration_template 'db/migrate/change_request_index.rb', 'db/migrate/change_request_index.rb'
+        migration_template 'db/migrate/session_pending_jobs_text.rb', 'db/migrate/session_pending_jobs_text.rb'
       end
 
       def self.next_migration_number(dirname)
         ::ActiveRecord::Generators::Base.next_migration_number(dirname)
       end
 
+     def route1
+        "wash_out :#{controller_name}"
+     end
+
+     def route2
+        "get '#{controller_name}/qwc' => '#{controller_name}#qwc'"
+     end
+
+     def route3
+        "get '#{controller_name}/action' => '#{controller_name}#_generate_wsdl'"
+     end
+
+     # Idempotent routes inspired by https://github.com/thoughtbot/administrate/issues/232
+     # Idempotent routes fixed permanently by https://github.com/rails/rails/issues/22082
      def setup_routes
-        route("wash_out :#{controller_name}")
-        route("get '#{controller_name}/qwc' => '#{controller_name}#qwc'")
-        route("get '#{controller_name}/action' => '#{controller_name}#_generate_wsdl'")
+        route(route1) unless File.new(routes_rb).read.include?(route1)
+        route(route2) unless File.new(routes_rb).read.include?(route2)
+        route(route3) unless File.new(routes_rb).read.include?(route3)
       end
       
     end

data/lib/generators/qbwc/install/templates/db/migrate/change_request_index.rb

@@ -0,0 +1,5 @@
+class ChangeRequestIndex < ActiveRecord::Migration
+  def change
+    change_column :qbwc_jobs, :request_index, :text, null: true, default: nil
+  end
+end

data/lib/generators/qbwc/install/templates/db/migrate/index_qbwc_jobs.rb

@@ -0,0 +1,6 @@
+class IndexQbwcJobs < ActiveRecord::Migration
+  def change
+    add_index :qbwc_jobs, :name, unique: true
+    add_index :qbwc_jobs, :company, length: 150
+  end
+end

data/lib/generators/qbwc/install/templates/db/migrate/session_pending_jobs_text.rb

@@ -0,0 +1,6 @@
+class SessionPendingJobsText < ActiveRecord::Migration
+  def change
+    change_column_default(:qbwc_sessions, :pending_jobs, nil)
+    change_column :qbwc_sessions, :pending_jobs, :text, :limit => 1000, :null => false
+  end
+end

data/lib/qbwc.rb

@@ -54,6 +54,10 @@ module QBWC
   mattr_accessor :session_initializer
   @@session_initializer = nil
 
+  # Code to execute after each session has completed all jobs without errors
+  mattr_accessor :session_complete_success
+  @@session_complete_success = nil
+
   # In the event of an error running requests, :stop all work or :continue with the next request?
   mattr_reader :on_error
   @@on_error = 'stopOnError'
@@ -89,10 +93,10 @@ module QBWC
       storage_module::Job.delete_job_with_name(name)
     end
 
-    def pending_jobs(company)
+    def pending_jobs(company, session = QBWC::Session.get)
       js = jobs
       QBWC.logger.info "#{js.length} jobs exist, checking for pending jobs for company '#{company}'."
-      storage_module::Job.sort_in_time_order(js.select {|job| job.company == company && job.pending?})
+      storage_module::Job.sort_in_time_order(js.select {|job| job.company == company && job.pending?(session)})
     end
     
     def set_session_initializer(&block)
@@ -100,6 +104,11 @@ module QBWC
       self
     end
 
+    def set_session_complete_success(&block)
+      @@session_complete_success = block
+      self
+    end
+
     def on_error=(reaction)
       raise 'Quickbooks on_error must be :stop or :continue' unless [:stop, :continue].include?(reaction)
       @@on_error = "stopOnError" if reaction == :stop

data/lib/qbwc/active_record/job.rb

@@ -1,7 +1,8 @@
 class QBWC::ActiveRecord::Job < QBWC::Job
   class QbwcJob < ActiveRecord::Base
     validates :name, :uniqueness => true, :presence => true
-    serialize :requests, Array
+    serialize :requests, Hash
+    serialize :request_index, Hash
     serialize :data
 
     def to_qbwc_job
@@ -12,20 +13,22 @@ class QBWC::ActiveRecord::Job < QBWC::Job
 
   # Creates and persists a job.
   def self.add_job(name, enabled, company, worker_class, requests, data)
-
     worker_class = worker_class.to_s
     ar_job = find_ar_job_with_name(name).first_or_initialize
     ar_job.company = company
     ar_job.enabled = enabled
-    ar_job.request_index = 0
     ar_job.worker_class = worker_class
     ar_job.save!
 
     jb = self.new(name, enabled, company, worker_class, requests, data)
-    jb.requests = requests.is_a?(Array) ? requests : [requests] unless requests.nil?
+    unless requests.nil? || requests.empty?
+      request_hash = { [nil, company] => [requests].flatten }
+
+      jb.requests = request_hash
+      ar_job.update_attribute :requests, request_hash
+    end
     jb.requests_provided_when_job_added = (! requests.nil? && ! requests.empty?)
     jb.data = data
-
     jb
   end
 
@@ -56,13 +59,14 @@ class QBWC::ActiveRecord::Job < QBWC::Job
     find_ar_job.where(:enabled => true).exists?
   end
 
-  def requests
-    find_ar_job.pluck(:requests).first
+  def requests(session = QBWC::Session.get)
+    @requests = find_ar_job.pluck(:requests).first
+    super
   end
 
-  def requests=(r)
-    find_ar_job.update_all(:requests => r)
+  def set_requests(session, requests)
     super
+    find_ar_job.update_all(:requests => @requests)
   end
 
   def requests_provided_when_job_added
@@ -83,17 +87,27 @@ class QBWC::ActiveRecord::Job < QBWC::Job
     super
   end
 
-  def request_index
-    find_ar_job.pluck(:request_index).first
+  def request_index(session)
+    (find_ar_job.pluck(:request_index).first || {})[session.key] || 0
   end
 
-  def request_index=(nr)
-    find_ar_job.update_all(:request_index => nr)
+  def set_request_index(session, index)
+    find_ar_job.each do |jb|
+      jb.request_index[session.key] = index
+      jb.save
+    end
+  end
+
+  def advance_next_request(session)
+    nr = request_index(session)
+    set_request_index session, nr + 1
   end
 
-  def advance_next_request
-    nr = request_index
-    self.request_index = nr + 1
+  def reset
+    super
+    job = find_ar_job
+    job.update_all :request_index => {}
+    job.update_all(:requests => {}) unless self.requests_provided_when_job_added
   end
 
   def self.list_jobs

data/lib/qbwc/controller.rb

@@ -72,14 +72,14 @@ SB
 
       qwc = <<QWC
 <QBWCXML>
-   <AppName>#{Rails.application.class.parent_name} #{Rails.env} #{@app_name_suffix}</AppName>
+   <AppName>#{app_name}</AppName>
    <AppID></AppID>
    <AppURL>#{qbwc_action_url(:only_path => false)}</AppURL>
    <AppDescription>Quickbooks integration</AppDescription>
    <AppSupport>#{QBWC.support_site_url || root_url(:protocol => 'https://')}</AppSupport>
    <UserName>#{@username || QBWC.username}</UserName>
    <OwnerID>#{QBWC.owner_id}</OwnerID>
-   <FileID>{90A44FB5-33D9-4815-AC85-BC87A7E7D1EB}</FileID>
+   <FileID>{#{file_id}}</FileID>
    <QBType>QBFS</QBType>
    <Style>Document</Style>
    #{scheduler_block}
@@ -115,13 +115,17 @@ QWC
       if company_file_path.nil?
         QBWC.logger.info "Authentication of user '#{username}' failed."
         company_file_path = AUTHENTICATE_NOT_VALID_USER
-      elsif !QBWC.pending_jobs(company_file_path).present?
-        QBWC.logger.info "Authentication of user '#{username}' succeeded, but no jobs pending for '#{company_file_path}'."
-        company_file_path = AUTHENTICATE_NO_WORK
       else
-        QBWC.logger.info "Authentication of user '#{username}' succeeded, jobs are pending for '#{company_file_path}'."
         ticket = QBWC.storage_module::Session.new(username, company_file_path).ticket
-        QBWC.session_initializer.call(get_session(ticket)) unless QBWC.session_initializer.nil?
+        session = get_session(ticket)
+
+        if !QBWC.pending_jobs(company_file_path, session).present?
+          QBWC.logger.info "Authentication of user '#{username}' succeeded, but no jobs pending for '#{company_file_path}'."
+          company_file_path = AUTHENTICATE_NO_WORK
+        else
+          QBWC.logger.info "Authentication of user '#{username}' succeeded, jobs are pending for '#{company_file_path}'."
+          QBWC.session_initializer.call(session) unless QBWC.session_initializer.nil?
+        end
       end
       render :soap => {"tns:authenticateResult" => {"tns:string" => [ticket || '', company_file_path]}}
     end
@@ -157,6 +161,14 @@ QWC
       render :soap => {'tns:getLastErrorResult' => @session.error || ''}
     end
 
+    def app_name
+      "#{Rails.application.class.parent_name} #{Rails.env} #{@app_name_suffix}"
+    end
+
+    def file_id
+      '90A44FB5-33D9-4815-AC85-BC87A7E7D1EB'
+    end
+
     protected
 
     def get_session(ticket = params[:ticket])

data/lib/qbwc/job.rb

@@ -7,9 +7,14 @@ class QBWC::Job
     @enabled = enabled
     @company = company || QBWC.company_file_path
     @worker_class = worker_class
-    @requests = requests
     @data = data
-    @request_index = 0
+
+    default_key = [nil, company]
+    requests = [requests].compact unless Hash === requests || Array === requests
+    requests = { default_key => requests } unless Hash === requests || requests.empty?
+    @requests = requests
+
+    @request_index = { default_key => 0 }
   end
 
   def worker
@@ -18,16 +23,17 @@ class QBWC::Job
 
   def process_response(qbxml_response, response, session, advance)
     QBWC.logger.info "Processing response."
-    completed_request = requests[request_index]
-    advance_next_request if advance
+    request_list = requests(session)
+    completed_request = request_list[request_index(session)] if request_list
+    advance_next_request(session) if advance
     QBWC.logger.info "Job '#{name}' received response: '#{qbxml_response}'." if QBWC.log_requests_and_responses
     worker.handle_response(response, session, self, completed_request, data)
   end
 
-  def advance_next_request
-    new_index = request_index + 1
+  def advance_next_request(session)
+    new_index = request_index(session) + 1
     QBWC.logger.info "Job '#{name}' advancing to request #'#{new_index}'."
-    self.request_index = new_index
+    @request_index[session.key] = new_index
   end
 
   def enable
@@ -38,12 +44,12 @@ class QBWC::Job
     self.enabled = false
   end
 
-  def pending?
+  def pending?(session)
     if !enabled?
       QBWC.logger.info "Job '#{name}' not enabled."
       return false
     end
-    sr = worker.should_run?(self)
+    sr = worker.should_run?(self, session, @data)
     QBWC.logger.info "Job '#{name}' should_run?: #{sr}."
     return sr
   end
@@ -52,12 +58,23 @@ class QBWC::Job
     @enabled
   end
 
-  def requests
-    @requests
+  def requests(session)
+    secondary_key = session.key.dup
+    secondary_key[0] = nil # username = nil
+    result = nil
+    [session.key, secondary_key].each do |k|
+      result ||= (@requests || {})[k]
+    end
+    result
   end
 
-  def requests=(r)
-    @requests = r
+  def set_requests(session, requests)
+    @requests ||= {}
+    @requests[session.key] = requests
+  end
+
+  def requests=(requests)
+    @requests = requests
   end
 
   def data
@@ -68,12 +85,8 @@ class QBWC::Job
     @data = d
   end
 
-  def request_index
-    @request_index
-  end
-
-  def request_index=(ri)
-    @request_index = ri
+  def request_index(session)
+    @request_index[session.key] || 0
   end
 
   def requests_provided_when_job_added
@@ -84,27 +97,30 @@ class QBWC::Job
     @requests_provided_when_job_added = value
   end
 
-  def next_request
+  def next_request(session = QBWC::Session.get)
+    reqs = requests session
+
     # Generate and save the requests to run when starting the job.
-    if (requests.nil? || requests.empty?) && ! self.requests_provided_when_job_added
-      r = worker.requests(self)
-      r = [r] unless r.nil? || r.is_a?(Array)
-      self.requests = r
+    if (reqs.nil? || reqs.empty?) && ! self.requests_provided_when_job_added
+      greqs = worker.requests(self, session, @data)
+      greqs = [greqs] unless greqs.nil? || greqs.is_a?(Array)
+      set_requests session, greqs
+      reqs = requests session
     end
 
-    QBWC.logger.info("Requests available are '#{requests}'.") if QBWC.log_requests_and_responses
-    ri = request_index
+    QBWC.logger.info("Requests available are '#{reqs}'.") if QBWC.log_requests_and_responses
+    ri = request_index session
     QBWC.logger.info("Request index is '#{ri}'.")
-    return nil if ri.nil? || requests.nil? || ri >= requests.length
-    nr = requests[ri]
+    return nil if ri.nil? || reqs.nil? || ri >= reqs.length
+    nr = reqs[ri]
     QBWC.logger.info("Next request is '#{nr}'.") if QBWC.log_requests_and_responses
-    return QBWC::Request.new(nr)
+    return QBWC::Request.new(nr) if nr
   end
   alias :next :next_request  # Deprecated method name 'next'
 
   def reset
-    self.request_index = 0
-    self.requests = [] unless self.requests_provided_when_job_added
+    @request_index = {}
+    @requests = {} unless self.requests_provided_when_job_added
   end
 
 end

data/lib/qbwc/session.rb

@@ -5,7 +5,7 @@ class QBWC::Session
 
   @@session = nil
 
-	def self.get(ticket)
+	def self.get(ticket = nil)
 		@@session
 	end
 
@@ -24,6 +24,10 @@ class QBWC::Session
     reset(ticket.nil?)
   end
 
+  def key
+    [user, company]
+  end
+
   def response_is_error?
     self.error && self.status_severity == 'Error'
   end
@@ -39,14 +43,16 @@ class QBWC::Session
   def next_request
     if current_job.nil? || error_and_stop_requested?
       self.progress = 100
+      complete_with_success unless response_is_error?
       return nil
     end
-    until (request = current_job.next_request) do
+    until (request = current_job.next_request(self)) do
       pending_jobs.shift
       reset(true) or break
     end
     jobs_completed = @initial_job_count - pending_jobs.length
     self.progress = ((jobs_completed.to_f  / @initial_job_count.to_f ) * 100).to_i
+    complete_with_success if finished?
     request
   end
   alias :next :next_request  # Deprecated method name 'next'
@@ -92,6 +98,10 @@ class QBWC::Session
   def save
   end
 
+  def began_at
+    @session.created_at
+  end
+
   def destroy
     self.freeze
     @@session = nil
@@ -111,7 +121,11 @@ class QBWC::Session
   end
 
   def pending_jobs
-    @pending_jobs ||= QBWC.pending_jobs(@company)
+    @pending_jobs ||= QBWC.pending_jobs(@company, self)
+  end
+
+  def complete_with_success
+    QBWC.session_complete_success.call(self) if QBWC.session_complete_success
   end
 
   def parse_response_header(response)

data/lib/qbwc/version.rb

@@ -1,3 +1,3 @@
 module QBWC
-  VERSION = "0.1.0"
+  VERSION = "1.0.0"
 end

data/lib/qbwc/worker.rb

@@ -1,11 +1,11 @@
 module QBWC
   class Worker
 
-    def requests(job)
+    def requests(job, session, data)
       []
     end
 
-    def should_run?(job)
+    def should_run?(job, session, data)
       true
     end
 

data/test/qbwc/controllers/controller_test.rb

@@ -9,6 +9,7 @@ class QBWCControllerTest < ActionController::TestCase
   def setup
     @routes = Rails.application.routes  # https://github.com/blowmage/minitest-rails/issues/133#issuecomment-36401436
     @controller = QbwcController.new    # http://stackoverflow.com/a/7743176
+    @session = QBWC::Session.new('foo', '')
 
     @controller.prepend_view_path("#{Gem::Specification.find_by_name("wash_out").gem_dir}/app/views")
     #p @controller.view_paths
@@ -21,6 +22,11 @@ class QBWCControllerTest < ActionController::TestCase
     $HANDLE_RESPONSE_EXECUTED = false
   end
 
+  def teardown
+    QBWC.session_initializer = nil
+    QBWC.session_complete_success = nil
+  end
+
   test "qwc" do
     #_inspect_routes
     process(:qwc)
@@ -31,17 +37,18 @@ class QBWCControllerTest < ActionController::TestCase
     assert_match /AppDescription.*Quickbooks integration.*AppDescription/,  @response.body
     assert_match /AppSupport.*https:\/\/test.host\/.*AppSupport/,           @response.body
     assert_match /UserName.*#{QBWC_USERNAME}.*UserName/,                    @response.body
+    assert_match /FileID.*{90A44FB5-33D9-4815-AC85-BC87A7E7D1EB}.*FileID/,  @response.body
   end
 
   test "authenticate with no jobs" do
     _authenticate
-    assert_equal 0, QBWC.pending_jobs(COMPANY).count
+    assert_equal 0, QBWC.pending_jobs(COMPANY, @session).count
     assert @response.body.include?(QBWC::Controller::AUTHENTICATE_NO_WORK), @response.body
   end
 
   test "authenticate with jobs" do
     _authenticate_with_queued_job
-    assert_equal 1, QBWC.pending_jobs(COMPANY).count
+    assert_equal 1, QBWC.pending_jobs(COMPANY, @session).count
     assert @response.body.include?(COMPANY), @response.body
   end
 
@@ -102,7 +109,7 @@ class QBWCControllerTest < ActionController::TestCase
       raise "#{tag} is not correct" if expected_value != value && ! expected_value.blank?
     end
 
-    def requests(job)
+    def requests(job, session, data)
       {:customer_query_rq => {:full_name => 'Quincy Bob William Carlos'}}
     end
 
@@ -153,5 +160,34 @@ class QBWCControllerTest < ActionController::TestCase
     _receive_response_error_helper(50, true)
   end
 
+
+  test "session_complete_success block called upon successful completion" do
+    block_called = false
+    QBWC.on_error = :stop
+    QBWC.set_session_complete_success do |session|
+      block_called = true
+      assert_not_nil session
+      assert_equal QBWC_USERNAME, session.user
+      assert_equal 100, session.progress
+      assert_not_nil session.began_at
+    end
+
+    _authenticate_with_queued_job
+    _simulate_soap_request('receive_response', RECEIVE_RESPONSE_SOAP_ACTION, RECEIVE_RESPONSE_PARAMS)
+    assert block_called
+  end
+
+  test "session_complete_success block not called upon failed completion" do
+    block_called = false
+    QBWC.on_error = :stop
+    QBWC.session_complete_success = lambda do |session|
+      block_called = true
+    end
+
+    _authenticate_with_queued_job
+    _simulate_soap_request('receive_response', RECEIVE_RESPONSE_SOAP_ACTION, RECEIVE_RESPONSE_ERROR_PARAMS)
+    assert !block_called
+  end
+
 end
 

data/test/qbwc/integration/job_management_test.rb

@@ -3,10 +3,14 @@ require 'test_helper.rb'
 
 class JobManagementTest < ActionDispatch::IntegrationTest
 
+  REQUESTS_AS_HASH   = {:customer_query_rq => {:full_name => 'Quincy Bob William Carlos'}}
+  REQUESTS_AS_STRING = QBWC_CUSTOMER_ADD_RQ
+
   def setup
     JobManagementTest.app = Rails.application
     Rails.logger = Logger.new('/dev/null')  # or STDOUT
     QBWC.clear_jobs
+    @session = QBWC::Session.new('foo', '')
   end
 
   test "add_job" do
@@ -18,7 +22,57 @@ class JobManagementTest < ActionDispatch::IntegrationTest
     assert_equal 1, QBWC.jobs.length
   end
 
+  test "add_job requests as hash" do
+    QBWC.add_job(:integration_test, true, '', QBWC::Worker, REQUESTS_AS_HASH)
+    assert_equal 1, QBWC.jobs.length
+  end
+
+  test "add_job requests as array of hashes" do
+    QBWC.add_job(:integration_test, true, '', QBWC::Worker, [REQUESTS_AS_HASH])
+    assert_equal 1, QBWC.jobs.length
+  end
+
+  test "add_job requests as string" do
+    QBWC.add_job(:integration_test, true, '', QBWC::Worker, REQUESTS_AS_STRING)
+    assert_equal 1, QBWC.jobs.length
+  end
+
+  test "add_job requests as array of strings" do
+    QBWC.add_job(:integration_test, true, '', QBWC::Worker, [REQUESTS_AS_STRING])
+    assert_equal 1, QBWC.jobs.length
+  end
+
+  test "requests" do
+    job = QBWC.add_job(:integration_test, true, '', QBWC::Worker)
+    session = QBWC::Session.new('foo', '')
+    assert_nil job.requests(session)
+  end
+
+  test "requests with default session" do
+    job = QBWC.add_job(:integration_test, true, '', QBWC::Worker)
+    session = QBWC::Session.new('foo', '')
+    assert_nil job.requests
+  end
+
+  test "next_request" do
+    job = QBWC.add_job(:integration_test, true, '', QBWC::Worker)
+    session = QBWC::Session.new('foo', '')
+    assert_nil job.next_request(session)
+  end
+
+  test "next_request with default session" do
+    job = QBWC.add_job(:integration_test, true, '', QBWC::Worker)
+    session = QBWC::Session.new('foo', '')
+    assert_nil job.next_request
+  end
+
   test "pending_jobs" do
+    QBWC.add_job(:integration_test, true, 'my-company', QBWC::Worker)
+    assert_equal 1, QBWC.pending_jobs('my-company', @session).length
+    assert_empty QBWC.pending_jobs('another-company', @session)
+  end
+
+  test "pending_jobs with default session" do
     QBWC.add_job(:integration_test, true, 'my-company', QBWC::Worker)
     assert_equal 1, QBWC.pending_jobs('my-company').length
     assert_empty QBWC.pending_jobs('another-company')
@@ -26,7 +80,7 @@ class JobManagementTest < ActionDispatch::IntegrationTest
 
   test "pending_jobs_disabled" do
     QBWC.add_job(:integration_test, false, 'my-company', QBWC::Worker)
-    assert_empty QBWC.pending_jobs('my-company')
+    assert_empty QBWC.pending_jobs('my-company', @session)
   end
 
   test "get_job" do
@@ -65,8 +119,8 @@ class JobManagementTest < ActionDispatch::IntegrationTest
   end
 
   class DeleteJobWorker < QBWC::Worker
-    def requests(job)
-      {:customer_query_rq => {:full_name => 'Quincy Bob William Carlos'}}
+    def requests(job, session, data)
+      REQUESTS_AS_HASH
     end
 
     def handle_response(resp, session, job, request, data)
@@ -76,11 +130,11 @@ class JobManagementTest < ActionDispatch::IntegrationTest
 
   test "job deletes itself after running" do
     QBWC.add_job(:job_deletes_itself_after_running, true, COMPANY, DeleteJobWorker)
-    assert_equal 1, QBWC.pending_jobs(COMPANY).length
     session = QBWC::Session.new('foo', COMPANY)
+    assert_equal 1, QBWC.pending_jobs(COMPANY, session).length
     assert_not_nil session.next_request
     simulate_response(session)
-    assert_equal 0, QBWC.pending_jobs(COMPANY).length
+    assert_equal 0, QBWC.pending_jobs(COMPANY, session).length
   end
 
 end

data/test/qbwc/integration/request_generation_test.rb

@@ -15,7 +15,7 @@ class RequestGenerationTest < ActionDispatch::IntegrationTest
   end
 
   class NilRequestWorker < QBWC::Worker
-    def requests(job)
+    def requests(job, session, data)
       nil
     end
   end
@@ -29,7 +29,7 @@ class RequestGenerationTest < ActionDispatch::IntegrationTest
   end
 
   class SingleRequestWorker < QBWC::Worker
-    def requests(job)
+    def requests(job, session, data)
       $SINGLE_REQUESTS_INVOKED_COUNT += 1 if $SINGLE_REQUESTS_INVOKED_COUNT.is_a?(Integer)
       {:customer_query_rq => {:full_name => 'Quincy Bob William Carlos'}}
     end
@@ -47,7 +47,7 @@ class RequestGenerationTest < ActionDispatch::IntegrationTest
   end
 
   class SingleStringRequestWorker < QBWC::Worker
-    def requests(job)
+    def requests(job, session, data)
       $SINGLE_REQUESTS_INVOKED_COUNT += 1 if $SINGLE_REQUESTS_INVOKED_COUNT.is_a?(Integer)
       QBWC_CUSTOMER_QUERY_RQ
     end
@@ -65,7 +65,7 @@ class RequestGenerationTest < ActionDispatch::IntegrationTest
   end
 
   class MultipleRequestWorker < QBWC::Worker
-    def requests(job)
+    def requests(job, session, data)
       $MULTIPLE_REQUESTS_INVOKED_COUNT += 1 if $MULTIPLE_REQUESTS_INVOKED_COUNT.is_a?(Integer)
       [
         {:customer_query_rq => {:full_name => 'Quincy Bob William Carlos'}},
@@ -97,9 +97,9 @@ class RequestGenerationTest < ActionDispatch::IntegrationTest
 
     # requests should be generated once per session
     session2 = QBWC::Session.new('foo', '')
-    assert_not_nil session2.next
+    assert_not_nil session2.next_request
     simulate_response(session2)
-    assert_not_nil session2.next
+    assert_not_nil session2.next_request
     simulate_response(session2)
     assert_nil session2.next
 
@@ -113,7 +113,7 @@ class RequestGenerationTest < ActionDispatch::IntegrationTest
         {:customer_query_rq => {:full_name => 'Quigley Brian Wally Colin'}},
     ]
 
-    def requests(job)
+    def requests(job, session, data)
       $REQUESTS_FROM_DB
     end
 
@@ -178,12 +178,14 @@ class RequestGenerationTest < ActionDispatch::IntegrationTest
     QBWC.jobs.each {|job| assert job.requests_provided_when_job_added == (job.name == 'integration_test_2')}
     session = QBWC::Session.new('foo', '')
 
+    assert_equal 2, QBWC.pending_jobs('', session).count
+
     # one request from SingleRequestWorker
-    assert_not_nil session.next
+    assert_not_nil session.next_request
     simulate_response(session)
 
     # Requests from MultipleRequestWorker are suppressed; instead use one request passed when job added
-    assert_not_nil session.next
+    assert_not_nil session.next_request
     simulate_response(session)
     assert_nil session.next
 
@@ -206,14 +208,14 @@ class RequestGenerationTest < ActionDispatch::IntegrationTest
   end
 
   class ShouldntRunWorker < QBWC::Worker
-    def requests(job)
+    def requests(job, session, data)
       [
         {:customer_query_rq => {:full_name => 'Quincy Bob William Carlos'}},
         {:customer_query_rq => {:full_name => 'Quentin Billy Wyatt Charles'}}
       ]
     end
 
-    def should_run?(job)
+    def should_run?(job, session, data)
       false
     end
   end
@@ -226,7 +228,7 @@ class RequestGenerationTest < ActionDispatch::IntegrationTest
 
   $VARIABLE_REQUEST_COUNT = 2
   class VariableRequestWorker < QBWC::Worker
-    def requests(job)
+    def requests(job, session, data)
       r = []
       $VARIABLE_REQUEST_COUNT.times do
         r << {:customer_query_rq => {:full_name => 'Quincy Bob William Carlos'}}
@@ -263,7 +265,7 @@ class RequestGenerationTest < ActionDispatch::IntegrationTest
     simulate_response(session)
     assert_nil session.next_request
 
-    assert_match /CustomerAddRq.*\/CustomerAddRq/m, QBWC::ActiveRecord::Job::QbwcJob.first[:requests][0]
+    assert_match /CustomerAddRq.*\/CustomerAddRq/m, extract_request(QBWC::ActiveRecord::Job::QbwcJob.first, session)[0]
     QBWC.jobs.each {|job| assert job.requests_provided_when_job_added == true}
   end
 
@@ -293,9 +295,11 @@ class RequestGenerationTest < ActionDispatch::IntegrationTest
 
     session = QBWC::Session.new('foo', '')
     request = session.next_request
+    assert_not_nil request
     assert_match /FullName.#{QBWC_USERNAME}.\/FullName/, request.request
 
-    assert_equal [{:customer_query_rq => {:full_name => QBWC_USERNAME}}], QBWC::ActiveRecord::Job::QbwcJob.first[:requests]
+    expected = {[nil, ""] => [{:customer_query_rq => {:full_name => QBWC_USERNAME}}]}
+    assert_equal expected, QBWC::ActiveRecord::Job::QbwcJob.first[:requests]
     QBWC.jobs.each {|job| assert job.requests_provided_when_job_added == true}
   end
 
@@ -332,9 +336,21 @@ class RequestGenerationTest < ActionDispatch::IntegrationTest
 
     assert_nil session.next_request
 
-    assert_equal multiple_requests[0], QBWC::ActiveRecord::Job::QbwcJob.first[:requests][0]
-    assert_equal multiple_requests[1], QBWC::ActiveRecord::Job::QbwcJob.first[:requests][1]
+    assert_equal multiple_requests[0], extract_request(QBWC::ActiveRecord::Job::QbwcJob.first, session)[0]
+    assert_equal multiple_requests[1], extract_request(QBWC::ActiveRecord::Job::QbwcJob.first, session)[1]
     QBWC.jobs.each {|job| assert job.requests_provided_when_job_added == true}
   end
 
+
+  def extract_request(ar_job, session)
+    requests = ar_job[:requests]
+    secondary_key = session.key.dup
+    secondary_key[0] = nil # username = nil
+    result = nil
+    [session.key, secondary_key].each do |k|
+      result ||= (requests || {})[k]
+    end
+    result
+  end
+
 end

data/test/qbwc/integration/response_test.rb

@@ -74,7 +74,7 @@ class ResponseTest < ActionDispatch::IntegrationTest
   end
 
   class HandleResponseWithDataWorker < QBWC::Worker
-    def requests(job)
+    def requests(job, session, data)
       {:customer_query_rq => {:full_name => 'Quincy Bob William Carlos'}}
     end
     def handle_response(response, session, job, request, data)
@@ -95,7 +95,7 @@ class ResponseTest < ActionDispatch::IntegrationTest
   end
 
   class HandleResponseRaisesExceptionWorker < QBWC::Worker
-    def requests(job)
+    def requests(job, session, data)
       {:customer_query_rq => {:full_name => 'Quincy Bob William Carlos'}}
     end
     def handle_response(response, session, job, request, data)
@@ -113,7 +113,7 @@ class ResponseTest < ActionDispatch::IntegrationTest
   end
 
   class HandleResponseOmitsJobWorker < QBWC::Worker
-    def requests(job)
+    def requests(job, session, data)
       {:customer_query_rq => {:full_name => 'Quincy Bob William Carlos'}}
     end
     def handle_response(*response)
@@ -131,7 +131,7 @@ class ResponseTest < ActionDispatch::IntegrationTest
   end
 
   class QueryAndDeleteWorker < QBWC::Worker
-    def requests(job)
+    def requests(job, session, data)
       {:name => 'mrjoecustomer'}
     end
 
@@ -211,7 +211,7 @@ class ResponseTest < ActionDispatch::IntegrationTest
   end
 
   class MultiRequestWorker < QBWC::Worker
-    def requests(job)
+    def requests(job, session, data)
       [
         {:customer_query_rq => {:full_name => 'First Request'}},
         {:customer_query_rq => {:full_name => 'Second Request'}},

data/test/qbwc/integration/session_test.rb

@@ -9,7 +9,7 @@ class SessionTest < ActionDispatch::IntegrationTest
   end
 
   class ProgressTestWorker < QBWC::Worker
-    def requests(job)
+    def requests(job, session, data)
       {:customer_query_rq => {:full_name => 'Quincy Bob William Carlos'}}
     end
   end
@@ -20,11 +20,11 @@ class SessionTest < ActionDispatch::IntegrationTest
     QBWC.add_job(:session_test_1, true, COMPANY, ProgressTestWorker)
     QBWC.add_job(:session_test_2, true, COMPANY, ProgressTestWorker)
 
-    assert_equal 2, QBWC.jobs.count
-    assert_equal 2, QBWC.pending_jobs(COMPANY).count
-
     session = QBWC::Session.new(nil, COMPANY)
 
+    assert_equal 2, QBWC.jobs.count
+    assert_equal 2, QBWC.pending_jobs(COMPANY, session).count
+
     # Simulate controller 1st send_request and receive_response
     request = session.current_request
     session.response = QBWC_CUSTOMER_QUERY_RESPONSE_INFO
@@ -42,11 +42,11 @@ class SessionTest < ActionDispatch::IntegrationTest
     QBWC.add_job(:session_test_1, true, COMPANY, QBWC::Worker, QBWC_CUSTOMER_ADD_RQ)
     QBWC.add_job(:session_test_2, true, COMPANY, QBWC::Worker, QBWC_CUSTOMER_QUERY_RQ)
 
-    assert_equal 2, QBWC.jobs.count
-    assert_equal 2, QBWC.pending_jobs(COMPANY).count
-
     session = QBWC::Session.new(nil, COMPANY)
 
+    assert_equal 2, QBWC.jobs.count
+    assert_equal 2, QBWC.pending_jobs(COMPANY, session).count
+
     # Simulate controller 1st send_request and receive_response
     request = session.current_request
     session.response = QBWC_CUSTOMER_ADD_RESPONSE_LONG
@@ -63,8 +63,12 @@ class SessionTest < ActionDispatch::IntegrationTest
     # Add a job and pass a request
     QBWC.add_job(:add_joe_customer, true, COMPANY, QBWC::Worker, QBWC_CUSTOMER_ADD_RQ_LONG)
 
+    # Simulate controller receive_response
+    session = QBWC::Session.new(nil, COMPANY)
+    session.response = QBWC_CUSTOMER_ADD_RESPONSE_LONG
+
     assert_equal 1, QBWC.jobs.count
-    assert_equal 1, QBWC.pending_jobs(COMPANY).count
+    assert_equal 1, QBWC.pending_jobs(COMPANY, session).count
 
     # Omit these controller calls that normally occur during a QuickBooks Web Connector session:
     # - server_version
@@ -72,10 +76,6 @@ class SessionTest < ActionDispatch::IntegrationTest
     # - authenticate
     # - send_request
 
-    # Simulate controller receive_response
-    session = QBWC::Session.new(nil, COMPANY)
-    session.response = QBWC_CUSTOMER_ADD_RESPONSE_LONG
-
     assert_equal 100, session.progress
   end
 
@@ -83,12 +83,48 @@ class SessionTest < ActionDispatch::IntegrationTest
 
     QBWC.add_job(:add_joe_customer, true, COMPANY, QBWC::Worker, [])
 
+    session = QBWC::Session.new(nil, COMPANY)
+
     assert_equal 1, QBWC.jobs.count
-    assert_equal 1, QBWC.pending_jobs(COMPANY).count
+    assert_equal 1, QBWC.pending_jobs(COMPANY, session).count
 
     # Simulate controller send_request
-    session = QBWC::Session.new(nil, COMPANY)
     request = session.request_to_send
   end
 
+  class ConditionalTestWorker < QBWC::Worker
+    def should_run?(job, session, data)
+      session.user != "margaret"
+    end
+
+    def requests(job, session, data)
+      {:customer_query_rq => {:full_name => session.user}}
+    end
+  end
+
+  test "worker can filter on user" do
+    QBWC.add_job(:session_test_1, true, COMPANY, ConditionalTestWorker)
+
+    timothy_session  = QBWC::Session.new("timothy", COMPANY)
+    margaret_session = QBWC::Session.new("margaret", COMPANY)
+    susan_session    = QBWC::Session.new("susan", COMPANY)
+
+    # Should run for everyone except margaret
+    assert_equal 1, QBWC.pending_jobs(COMPANY, timothy_session).count
+    assert_equal 0, QBWC.pending_jobs(COMPANY, margaret_session).count
+    assert_equal 1, QBWC.pending_jobs(COMPANY, susan_session).count
+
+    # Simulate requests
+    timothy_request = timothy_session.current_request
+    assert timothy_request.request.include?("timothy")
+    timothy_session.response = QBWC_CUSTOMER_QUERY_RESPONSE_INFO
+    assert_equal 100, timothy_session.progress
+
+    susan_request = susan_session.current_request
+    assert susan_request.request.include?("susan")
+    susan_session.response = QBWC_CUSTOMER_QUERY_RESPONSE_INFO
+    assert_equal 100, susan_session.progress
+  end
+
+
 end

data/test/test_helper.rb

@@ -41,8 +41,12 @@ module QbwcTestApplication
     end
     ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
     require '../qbwc/lib/generators/qbwc/install/templates/db/migrate/create_qbwc_jobs'
+    require '../qbwc/lib/generators/qbwc/install/templates/db/migrate/index_qbwc_jobs'
+    require '../qbwc/lib/generators/qbwc/install/templates/db/migrate/change_request_index'
     require '../qbwc/lib/generators/qbwc/install/templates/db/migrate/create_qbwc_sessions'
     ActiveRecord::Migration.run(CreateQbwcJobs)
+    ActiveRecord::Migration.run(IndexQbwcJobs)
+    ActiveRecord::Migration.run(ChangeRequestIndex)
     ActiveRecord::Migration.run(CreateQbwcSessions)
     QBWC.configure do |c|
       c.username = QBWC_USERNAME

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qbwc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Alex Skryl
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-04 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: qbxml
@@ -209,6 +209,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -217,8 +218,11 @@ files:
 - lib/generators/qbwc/install/install_generator.rb
 - lib/generators/qbwc/install/templates/config/qbwc.rb
 - lib/generators/qbwc/install/templates/controllers/qbwc_controller.rb
+- lib/generators/qbwc/install/templates/db/migrate/change_request_index.rb
 - lib/generators/qbwc/install/templates/db/migrate/create_qbwc_jobs.rb
 - lib/generators/qbwc/install/templates/db/migrate/create_qbwc_sessions.rb
+- lib/generators/qbwc/install/templates/db/migrate/index_qbwc_jobs.rb
+- lib/generators/qbwc/install/templates/db/migrate/session_pending_jobs_text.rb
 - lib/generators/qbwc/install/usage.md
 - lib/qbwc.rb
 - lib/qbwc/active_record.rb