jgrouper 0.4.0 → 0.4.1

data/HISTORY.md

@@ -1,6 +1,12 @@
 JGrouper History
 ================
 
+2013-07-18 JGrouper v0.4.1
+--------------------------
+* Update "JGrouper::AuditArchiver" to detect re-archive attempts and increment date
+* Update "JGrouper::AuditArchiver" earliest entry detection (again)
+
+
 2013-07-05 JGrouper v0.4.0
 --------------------------
 * Add "--batch-size NUMBER" to "jgrouper-audit-archiver"

data/lib/jgrouper/audit_archiver.rb

@@ -60,12 +60,18 @@ module JGrouper # :nodoc:
 
       connect do
         mappings do
+          last_date = nil
           1.upto @number_of_days do
-            @date = oldest_entry                                      # Date of oldest entry
+            @date = oldest_entry # Date of oldest entry
+            if @date == last_date
+              warn "WARNING: attempt to re-archive #{ @date }, moving one day forward..."
+              @date = @date + 1
+            end
             break if stop?
 
             start_at = time_to_microseconds @date.to_time             # @date start-of-day
             stop_at  = time_to_microseconds ( @date + 1 ).to_time - 1 # @date end-of-day
+            # TODO Verify number of entries is greater than 0?
 
             num_entries   = 0
             entries       = []
@@ -112,7 +118,8 @@ module JGrouper # :nodoc:
 
             prune(entries, num_entries, total_entries) unless entries.empty? 
             log "archiving #{ @date } (#{num_entries}/#{total_entries} entries) - done"
-         
+        
+            last_date = @date 
           end
         end
       end
@@ -266,8 +273,8 @@ module JGrouper # :nodoc:
         stmt = @conn.create_statement
         rs   = stmt.execute_query "SELECT MIN(created_on) FROM #{GROUPER_AUDIT_ENTRY} ORDER BY created_on"
         while rs.next
-          # Microseconds -> Seconds -> Time -> Date
-          d = Time.at( microseconds_to_seconds( rs.get_object(1).to_s.to_f ) ).to_date
+          # String Microseconds -> Float Microseconds -> Round Up -> Seconds -> Time -> Date 
+          d = Time.at( microseconds_to_seconds( rs.get_object(1).to_s.to_f.ceil ) ).to_date
           break
         end
         rs.close

data/lib/jgrouper/version.rb

@@ -1,4 +1,4 @@
 module JGrouper
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jgrouper
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jruby-jars