daengine 0.1.7 → 0.1.8

data/lib/daengine/digital_asset_processor.rb

@@ -68,7 +68,7 @@ module Daengine
           open_file = File.open(file, 'rb')
           Daengine::TeamsiteMetadataParser.parse_tuple_file(open_file)
           Daengine.log("DigitalAssetProcessor: Finished processing #{filename}", "info")
-          @@last_read_time = File.mtime(file)
+          @@last_read_time = File.mtime(file) + 1.second
           self.save_last_read_time
           Daengine.log("DigitalAssetProcessor: Last process time set to #{@@last_read_time}", "info")
         end

data/lib/daengine/teamsite_metadata_parser.rb

@@ -23,7 +23,7 @@ module Daengine::TeamsiteMetadataParser
   }
   @@validations = {
       "TeamSite/Metadata/display_on_website" => lambda { |val| /Y|1/ =~ val },
-      "TeamSite/Metadata/enterprise_expiration_date" => lambda { |val| Time.parse(val) > 1.minute.from_now },
+      "TeamSite/Metadata/enterprise_expiration_date" => lambda {|val| !val.blank? },
       # "TeamSite/Metadata/enterprise_unpublish_date" => lambda {|val| val.blank? },
       "path" => lambda {|val| !(/\/manifest\// =~ val) }
   }
@@ -79,9 +79,12 @@ module Daengine::TeamsiteMetadataParser
      assets.keys.each do |key|
         da = nil
         begin
-          if(!assets[key]['unpublished_at'].blank?)
-             DigitalAsset.where(guid: key).delete_all
-             delete_count += 1
+          if (!assets[key]['unpublished_at'].nil?)
+            DigitalAsset.where(guid: key).try :delete_all
+            delete_count += 1
+          elsif (assets[key]['expires_at'].nil? || (assets[key]['expires_at'] < 1.minute.from_now))
+            DigitalAsset.where(guid: key).try :delete_all
+            delete_count += 1
           else
             da = DigitalAsset.find_or_initialize_by(guid: key)
             creating = da.new?
@@ -89,12 +92,12 @@ module Daengine::TeamsiteMetadataParser
             da.update_attributes!(assets[key])
             if(creating)
               added_count += 1
-            else 
+            else
               update_count += 1
             end
           end
         rescue Exception => e
-          error_files << e.to_s
+          #puts "--**Exception**--- #{e}"
           error_files << "#{da.try(:guid)}, #{da.try(:errors).try(:full_messages)}"
         end      
       end
@@ -102,7 +105,7 @@ module Daengine::TeamsiteMetadataParser
       error_files.each do |asset_file|
         log_txt = log_txt + "> #{asset_file}\n"
       end
-      Daengine.log(log_txt, "warn") if error_files
+      Daengine.log(log_txt, "warn") if !error_files.empty?
       DigitalAsset.purge!  # if the purge criteria is met, purge anything not updated
       Daengine.log("TeamsiteMetadataParser: #{added_count} records added, #{update_count} updated, #{delete_count} removed", "info")
     end

data/lib/daengine/version.rb

@@ -1,3 +1,3 @@
 module Daengine
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -2,7 +2,7 @@
 name: daengine
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - sbhatia