onebody-updateagent 0.4.2 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/bin/update_onebody

@@ -38,6 +38,9 @@ opt_parser = OptionParser.new do |opts|
   #opts.on("-d", "--delete", "Delete people and families not found in source file") do |d|
   #  options[:delete] = true
   #end
+  opts.on("--debug", "Enable extra debugging messages.") do |d|
+    config['debug'] = true if config
+  end
   opts.on("--version", "Show version and exit.") do
     puts "OneBody UpdateAgent version #{UPDATEAGENT_VERSION}"
     puts

data/lib/updateagent/schema.rb

@@ -11,5 +11,6 @@ family_schema = Schema.new(Family)
 
 DATETIME_ATTRIBUTES = person_schema.type(:datetime) + family_schema.type(:datetime).map { |c| 'family_' + c }
 BOOLEAN_ATTRIBUTES  = person_schema.type(:boolean)  + family_schema.type(:boolean).map  { |c| 'family_' + c }
-INTEGER_ATTRIBUTES  = person_schema.type(:integer)  + family_schema.type(:integer).map  { |c| 'family_' + c }
+INTEGER_ATTRIBUTES  = person_schema.type(:integer)  + family_schema.type(:integer).map  { |c| 'family_' + c } \
+  + %w(mobile_phone work_phone fax business_phone family_home_phone)
 IGNORE_ATTRIBUTES   = %w(updated_at created_at family_updated_at family_latitude family_longitude)

data/lib/updateagent/updateagent.rb

@@ -1,12 +1,10 @@
 # general class to handle comparing and pushing data to the remote end
 class UpdateAgent
 
-  MAX_HASHES_AT_A_TIME = 100
+  MAX_HASHES_AT_A_TIME = 500
   MAX_TO_BATCH_AT_A_TIME = 10
   SLEEP_PERIOD = 3
 
-  DEBUG = false
-
   def initialize(data=nil, options={})
     @options = options
     @attributes = []
@@ -66,6 +64,8 @@ class UpdateAgent
           end
         elsif INTEGER_ATTRIBUTES.include?(key)
           value = value.to_s != '' ? value.scan(/\d/).join.to_i : nil
+        else
+          value = value.to_s.gsub(/\r\n|\n|\r/, ' ')
         end
         hash[key] = value
       end
@@ -111,7 +111,7 @@ class UpdateAgent
   
   def present_record(row, new=false)
     puts "#{row['legacy_id'].to_s.ljust(10)} #{name_for(row).to_s.ljust(40)} #{new ? '(new)' : '     '}"
-    if DEBUG
+    if @options['debug']
       puts "Local values:  #{row.values_for_hash(@attributes).join}"
       puts "Remote values: #{row['remote_hash']}"
     end
@@ -178,14 +178,12 @@ class UpdateAgent
   
   def finish_sync(create_items=true, mark_complete=true)
     if create_items
-      @sync.post(
-        :create_items,
-        {},
-        (
-          @create.map { |r| to_sync_item(r, 'create') } +
-          @update.map { |r| to_sync_item(r, 'update') }
-        ).to_xml
-      )
+      items = @create.map { |r| to_sync_item(r, 'create') } +
+              @update.map { |r| to_sync_item(r, 'update') }
+      items.each_slice(100) do |items|
+        @sync.post(:create_items, {}, items.to_xml)
+        sleep SLEEP_PERIOD
+      end
     end
     if mark_complete
       @sync.complete = true
@@ -230,15 +228,16 @@ class UpdateAgent
   # ask remote end for value hashe for each record (50 at a time) 
   # mark records to create or update based on response
   def compare_hashes(ids, force=false)
+    index = 0
+    print "#{resource.name} 0/#{ids.length}\r"; STDOUT.flush
     ids.each_slice(MAX_HASHES_AT_A_TIME) do |some_ids|
-      print '.'; STDOUT.flush
       options = {:attrs => @attributes.join(','), :legacy_id => some_ids.join(',')}
-      options.merge!(:debug => true) if DEBUG
+      options.merge!(:debug => true) if @options['debug']
       response = resource.post(:hashify, {}, options.to_xml)
       hashes = Hash.from_xml(response.body)['records'].to_a
       hashes.each do |record|
         row = data_by_id[record['legacy_id'].to_i]
-        if DEBUG
+        if @options['debug']
           row['remote_hash'] = record['hash']
           @update << row if force or row.values_for_hash(@attributes).join != record['hash'] or (resource.name == 'Person' and record['family_id'].nil?)
         else
@@ -246,6 +245,8 @@ class UpdateAgent
         end
       end
       @create += some_ids.reject { |id| hashes.map { |h| h['legacy_id'].to_i }.include?(id.to_i) }.map { |id| data_by_id[id.to_i] }
+      index += some_ids.length
+      print "#{resource.name} #{index}/#{ids.length}\r"; STDOUT.flush
       sleep SLEEP_PERIOD
     end
     puts

data/lib/updateagent/updaters/people_updater.rb

@@ -19,14 +19,12 @@ class PeopleUpdater < UpdateAgent
         person['family'] = existing_family
         if person.has_key?('email')
           person['email_changed'] = false
-          @attributes << 'email_changed'
         end
         person_data << person
       else
         person['family'] = family
         if person.has_key?('email')
           person['email_changed'] = false
-          @attributes << 'email_changed'
         end
         person_data << person
         family['barcode_id_changed'] = false if family.has_key?('barcode_id')
@@ -35,6 +33,7 @@ class PeopleUpdater < UpdateAgent
       print "splitting family record #{index+1}\r"
     end
     puts
+    @attributes << 'email_changed' if @attributes.include?('email')
     @data = person_data
     @attributes.reject! { |a| a =~ /^family_/ and a != 'family_id' }
     @family_agent = FamilyUpdater.new(family_data.values, @options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: onebody-updateagent
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - Tim Morgan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-19 00:00:00 -06:00
+date: 2009-11-21 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency