onebody-updateagent 0.4.0 → 0.4.1

data/README.markdown

@@ -10,7 +10,7 @@ Install [Ruby](http://ruby-lang.org) if you don't already have it.
 
 Run the following command ("sudo" may be required in some environments):
 
-    gem install seven1m-onebody-updateagent -s http://gems.github.com
+    gem install onebody-updateagent -s http://gemcutter.org
     
 Configuration
 -------------

data/lib/updateagent/updateagent.rb

@@ -30,7 +30,7 @@ class UpdateAgent
       puts "You must utilize 'legacy_id' rather than 'id' so that"
       puts "identity and foreign keys are maintained from your"
       puts "existing membership management database."
-      exit
+      exit(1)
     end
   end
   
@@ -71,9 +71,14 @@ class UpdateAgent
       end
       record_count += 1
       print "reading record #{record_count}\r"
-      hash['deleted'] = false
-      hash
+      if hash.any?
+        hash['deleted'] = false
+        hash
+      else
+        nil
+      end
     end
+    @data.compact!
     puts
     @attributes << 'deleted'
     @attributes.reject! { |a| IGNORE_ATTRIBUTES.include?(a) }
@@ -128,7 +133,9 @@ class UpdateAgent
       statuses.each do |status|
         record = data_by_id[status['legacy_id']]
         record['id'] = status['id']
-        if status['status'] == 'error'
+        record['name'] = status['name']
+        record['status'] = status['status']
+        if status['error']
           puts "#{status['legacy_id']}: #{status['error']}"
           @errors << {:record => record, :error => status['error']}
           record['error_messages'] = status['error']
@@ -166,7 +173,7 @@ class UpdateAgent
   end
   
   def start_sync
-    @sync = Sync.create(:complete => false)
+    @sync = Sync.create(:complete => false, :started_at => Time.now)
   end
   
   def finish_sync(create_items=true, mark_complete=true)
@@ -182,6 +189,7 @@ class UpdateAgent
     end
     if mark_complete
       @sync.complete = true
+      @sync.finished_at = Time.now
       @sync.error_count = errors.length
       @sync.success_count = (@create + @update).length - errors.length
       @sync.save
@@ -192,15 +200,15 @@ class UpdateAgent
     h = {
       :syncable_type  => self.resource.name,
       :syncable_id    => record['id'],
-      :name           => name_for(record),
+      :name           => record['name'],
       :legacy_id      => record['legacy_id'],
       :operation      => operation,
-      :status         => record['error_messages'] ? 'error' : 'success'
+      :status         => record['status']
     }
     if record['error_messages']
-      h[:error_messages] = record['error_messages'].split('; ')
+      h[:error_messages] = record['error_messages']
     end
-    return h    
+    return h
   end
 
   def data_by_id

data/lib/updateagent/updaters/people_updater.rb

@@ -10,16 +10,26 @@ class PeopleUpdater < UpdateAgent
       @data = converter.convert(@data.clone)
       @attributes = @data.first.keys
     end
+    check_for_missing_columns
     person_data = []
     family_data = {}
     @data.each_with_index do |row, index|
       person, family = split_change_hash(row)
       if existing_family = family_data[family['legacy_id']]
         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')
         family_data[family['legacy_id']] = family
       end
       print "splitting family record #{index+1}\r"
@@ -30,6 +40,16 @@ class PeopleUpdater < UpdateAgent
     @family_agent = FamilyUpdater.new(family_data.values)
   end
   
+  @@required_columns = %w(legacy_id legacy_family_id)
+  
+  def check_for_missing_columns
+    if row = @data.detect { |row| (@@required_columns - row.keys).any? }
+      puts "Error: one or more required columns are missing."
+      puts "Required but missing: #{(@@required_columns - row.keys).join(', ')}"
+      exit(1)
+    end
+  end
+  
   def name_for(row)
     "#{row['first_name']} #{row['last_name']}" rescue ''
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: onebody-updateagent
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Tim Morgan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-15 00:00:00 -06:00
+date: 2009-11-16 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,8 +63,10 @@ files:
 - lib/updateagent/updaters/family_updater.rb
 - lib/updateagent/updaters/people_updater.rb
 - lib/updateagent/updaters/external_group_updater.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/seven1m/onebody-updateagent
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -85,9 +87,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Companion to OneBody that handles sync with external data source.
 test_files: []