daengine 0.3.3 → 0.3.4

data/app/models/digital_asset.rb

@@ -123,13 +123,20 @@ class DigitalAsset
     TaxonomyTerm.label_for_term(content_organization_ids[0])
   end
   def content_type
-    type_id = documents.detect{|d| d.content_type != '549'}.try(:content_type)
+    type_id = first_non_finra.try(:content_type)
     TaxonomyTerm.label_for_term(type_id)
   end
+  def pages; first_non_finra.pages end
+  
   def audience
     TaxonomyTerm.label_for_term(audiences[0])
   end
 
+  private
+
+  def first_non_finra; documents.detect{|d| d.content_type != '549'} end
+
+
 end
 
 class DigitalAsset::Document

data/lib/daengine/digital_asset_processor.rb

@@ -3,78 +3,54 @@ module Daengine
 
     @@last_read_time = 2.days.ago
 
-    def self.trap_signals
-      sigtrap = proc {
-        puts "DigitalAssetProcessor: caught trapped signal, shutting down"
-        @@run = false
-      }
-      signals = ["SIGTERM", "SIGINT"]
-      signals.push("SIGHUP") unless is_windows?
-      signals.each do |signal|
-        trap signal, sigtrap
-      end
-    end
-
-    def self.is_windows?
-      processor, platform, *rest = RUBY_PLATFORM.split("-")
-      platform =~ /mswin/ || platform =~ /mingw/
-    end
-
-    def self.execute
-      @@run = true
-      trap_signals
-      @@wthread = Thread.new { worker() }
-      return @@wthread
-    end
-
-    def self.worker
-      puts "DigitalAssetProcessor: start processing digital assets!"
-      while @@run
-        begin
-          self.process_tuple_directory
-          process_tuple_directory
-        rescue => e
-          puts e.message
-          puts e.backtrace
-        end
-        sleep(5)
-      end
-      @@wthread.exit
-    end
-
     def self.process_tuple_directory
       path = Daengine.config[:assets_path]
       raise "ERROR: DigitalAssetProcessor: Invalid assets_path provided. Unable to read from #{path}" unless File::directory?(path)
-      # read the given directory, process each file in date order starting 2 days ago if last_read_time is nil
-      time = self.read_last_process_time
-      last_run_time = 10.years.ago
-      if not time.blank?
-        @@last_read_time = time
-        last_run_time = time 
-      end
-      Daengine.log("DigitalAssetProcessor: Last process time was #{@@last_read_time}", "info")
-      deploy_files= []
+      # ensure only one instance running at a time
+      lockfile_name = Daengine.config[:daengine_yml_file] + '.lck'
+      begin
+        lockfile = File.new(lockfile_name, File::CREAT|File::EXCL)
 
-      deploy_files = Dir.entries(path).select {
-          |f| File.file?("#{path}/#{f}") and File.mtime("#{path}/#{f}") > @@last_read_time
-      }.sort_by { |f| File.mtime("#{path}/#{f}") }
+        # read the given directory, process each file in date order starting 2 days ago if last_read_time is nil
+        time = self.read_last_process_time
+        last_run_time = 10.years.ago
+        if not time.blank?
+          @@last_read_time = time
+          last_run_time = time 
+        end
+        Daengine.log("DigitalAssetProcessor: Last process time was #{@@last_read_time}", "info")
+        deploy_files= []
+
+        deploy_files = Dir.entries(path).select {
+            |f| File.file?("#{path}/#{f}") and File.mtime("#{path}/#{f}") > @@last_read_time
+        }.sort_by { |f| File.mtime("#{path}/#{f}") }
+
+        if deploy_files.empty?
+          Daengine.log("WARN: DigitalAssetProcessor: No digital asset deployment files found to process under #{path}", "warn")
+        else
+          Daengine.log("DigitalAssetProcessor: Reading digital asset deployment files from #{path}", "info")
+          deploy_files.each do |filename|
+            #parse the file and add metadata content to database.
+            file = File.expand_path(filename, path)
+            Daengine.log("DigitalAssetProcessor: Processing file #{filename} --- #{File.mtime(file)}", "info")
+            open_file = File.open(file, 'rb')
+            Daengine::TeamsiteMetadataParser.parse_tuple_file(open_file, last_run_time)
+            Daengine.log("DigitalAssetProcessor: Finished processing #{filename}", "info")
+            @@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
+        end
 
-      if deploy_files.empty?
-        Daengine.log("WARN: DigitalAssetProcessor: No digital asset deployment files found to process under #{path}", "warn")
-      else
-        Daengine.log("DigitalAssetProcessor: Reading digital asset deployment files from #{path}", "info")
-        deploy_files.each do |filename|
-          #parse the file and add metadata content to database.
-          file = File.expand_path(filename, path)
-          Daengine.log("DigitalAssetProcessor: Processing file #{filename} --- #{File.mtime(file)}", "info")
-          open_file = File.open(file, 'rb')
-          Daengine::TeamsiteMetadataParser.parse_tuple_file(open_file, last_run_time)
-          Daengine.log("DigitalAssetProcessor: Finished processing #{filename}", "info")
-          @@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")
+      rescue Errno::EEXIST
+        Daengine.log("DigitalAssetProcessor: Already in progress. Lockfile exists at #{lockfile_name}. Aborting!", "error")
+      ensure
+        unless lockfile.nil?
+          lockfile.close()
+          File.delete(lockfile_name)
         end
       end
+ 
     end
 
     def self.save_last_read_time
@@ -90,7 +66,7 @@ module Daengine
     end
 
     def self.read_last_process_time
-      time = 1.year.ago
+      time = 2.days.ago
       begin
         target = Daengine.config[:daengine_yml_file]
         property = YAML.load_file(target)

data/lib/daengine/teamsite_metadata_parser.rb

@@ -125,28 +125,34 @@ module Daengine::TeamsiteMetadataParser
   def self.trim_package(asset_docs, last_read = nil)
     docs = []
     path = Daengine.config[:digital_assets_file_directory]
-    asset_docs.each do |doc|
-      #exclude manifest_file
-      unless doc['path'].match('\/manifest\/')
-        file = File.join(path, doc['path'])
-        #exclude digital_asset_files that are not in *Teamsite Staging*
-        if File.exist?(file)
-          docs << doc
-          if(File.mtime(file) > last_read)
-            begin
-              exifdata = ::MiniExiftool.new("'#{file}'") # spaces in filename
-              doc['pages'] = exifdata.pagecount # or exifdata['Slides']
-              doc['size'] = exifdata.filesize
-              doc['mime_type'] = exifdata.mimetype
-            rescue Exception => e
-              Daengine.log "Error reading metadata from #{file} #{e.message}", "error"
+    if Dir.exist?(path)  # dont throw away assets if we can't locate the dir
+      asset_docs.each do |doc|
+        #exclude manifest_file
+        unless doc['path'].match('\/manifest\/')
+          file = File.join(path, doc['path'])
+          #exclude digital_asset_files that are not in *Teamsite Staging*
+          if File.exist?(file)
+            docs << doc
+            if(File.mtime(file) > last_read)
+              begin
+                exifdata = ::MiniExiftool.new("#{file}") # spaces in filename
+                doc['pages'] = exifdata.pagecount # or exifdata['Slides']
+                doc['size'] = exifdata.filesize
+                doc['mime_type'] = exifdata.mimetype
+              rescue Exception => e
+                Daengine.log "Error reading metadata from #{file} #{e.message}", "error"
+              end
             end
+          else
+            # the file was missing on disk, show a warning!
+            Daengine.log("TeamsiteMetadataParser: Unable to locate file #{file} on disk!  Removing from metadata", "warn")
           end
-        else
-          # the file was missing on disk, show a warning!
-          Daengine.log("TeamsiteMetadataParser: Unable to locate file #{file} on disk!  Removing from metadata", "warn")
         end
       end
+    else
+      Daengine.log("******************", "error")
+      Daengine.log("ERROR!!!  Unable to locate physical teamsite files at #{path}", "error")
+      Daengine.log("******************", "error")
     end
     docs
   end

data/lib/daengine/version.rb

@@ -1,3 +1,3 @@
 module Daengine
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/dummy/log/test.log

@@ -24295,3 +24295,103 @@ Completed 200 OK in 5ms (Views: 3.0ms)
 Processing by DigitalAssetsController#search as HTML
   Parameters: {"guid"=>"blargh-blargh-blargh", "title"=>"Doc Title"}
 Completed 200 OK in 20ms (Views: 14.0ms)
+Processing by DigitalAssetsController#index as HTML
+  Rendered c:/dev/rails/daengine/app/views/digital_assets/index.html.erb within layouts/application (17.0ms)
+Completed 200 OK in 97ms (Views: 94.0ms)
+Processing by DigitalAssetsController#show as HTML
+  Parameters: {"id"=>"guid-foobar-permanent-2"}
+Completed 200 OK in 37ms (Views: 6.0ms)
+Processing by DigitalAssetsController#show as HTML
+  Parameters: {"id"=>"IL1111.077"}
+Completed 200 OK in 19ms (Views: 4.0ms)
+Processing by DigitalAssetsController#show as HTML
+  Parameters: {"id"=>"IL1111.077"}
+Completed 200 OK in 19ms (Views: 3.0ms)
+Processing by DigitalAssetsController#show as HTML
+  Parameters: {"id"=>"guid-foobar-permanent-6"}
+Completed 200 OK in 19ms (Views: 5.0ms)
+Processing by DigitalAssetsController#search as HTML
+Completed 200 OK in 8ms (Views: 7.0ms)
+Processing by DigitalAssetsController#search as HTML
+  Parameters: {"path"=>"/one/off.path"}
+Completed 200 OK in 6ms (Views: 4.0ms)
+Processing by DigitalAssetsController#search as HTML
+  Parameters: {"doctype"=>"666"}
+Completed 200 OK in 8ms (Views: 4.0ms)
+Processing by DigitalAssetsController#search as HTML
+  Parameters: {"doctype"=>["666", "777"]}
+Completed 200 OK in 9ms (Views: 8.0ms)
+Processing by DigitalAssetsController#search as HTML
+  Parameters: {"sami"=>"SOMETHING.001"}
+Completed 200 OK in 18ms (Views: 17.0ms)
+Processing by DigitalAssetsController#search as HTML
+  Parameters: {"audience"=>"492"}
+Completed 200 OK in 4ms (Views: 3.0ms)
+Processing by DigitalAssetsController#search as HTML
+  Parameters: {"title"=>"Doc Title"}
+Completed 200 OK in 6ms (Views: 3.0ms)
+Processing by DigitalAssetsController#search as HTML
+  Parameters: {"guid"=>"guid-foobar-permanent-28"}
+Completed 200 OK in 6ms (Views: 5.0ms)
+Processing by DigitalAssetsController#search as HTML
+  Parameters: {"business_owner"=>"biz owner"}
+Completed 200 OK in 7ms (Views: 3.0ms)
+Processing by DigitalAssetsController#search as HTML
+  Parameters: {"guid"=>"guid-foobar-permanent-35", "title"=>"Doc Title"}
+Completed 200 OK in 7ms (Views: 6.0ms)
+Processing by DigitalAssetsController#search as HTML
+  Parameters: {"title"=>"Doc Title", "audiences"=>["490"], "sami"=>"IL1111.077"}
+Completed 200 OK in 5ms (Views: 3.0ms)
+Processing by DigitalAssetsController#search as HTML
+  Parameters: {"guid"=>"blargh-blargh-blargh", "title"=>"Doc Title"}
+Completed 200 OK in 20ms (Views: 14.0ms)
+Processing by DigitalAssetsController#index as HTML
+  Rendered c:/dev/rails/daengine/app/views/digital_assets/index.html.erb within layouts/application (17.0ms)
+Completed 200 OK in 94ms (Views: 90.0ms)
+Processing by DigitalAssetsController#show as HTML
+  Parameters: {"id"=>"guid-foobar-permanent-2"}
+Completed 200 OK in 20ms (Views: 6.0ms)
+Processing by DigitalAssetsController#show as HTML
+  Parameters: {"id"=>"IL1111.077"}
+Completed 200 OK in 19ms (Views: 4.0ms)
+Processing by DigitalAssetsController#show as HTML
+  Parameters: {"id"=>"IL1111.077"}
+Completed 200 OK in 21ms (Views: 3.0ms)
+Processing by DigitalAssetsController#show as HTML
+  Parameters: {"id"=>"guid-foobar-permanent-6"}
+Completed 200 OK in 18ms (Views: 5.0ms)
+Processing by DigitalAssetsController#search as HTML
+Completed 200 OK in 10ms (Views: 9.0ms)
+Processing by DigitalAssetsController#search as HTML
+  Parameters: {"path"=>"/one/off.path"}
+Completed 200 OK in 5ms (Views: 3.0ms)
+Processing by DigitalAssetsController#search as HTML
+  Parameters: {"doctype"=>"666"}
+Completed 200 OK in 8ms (Views: 3.0ms)
+Processing by DigitalAssetsController#search as HTML
+  Parameters: {"doctype"=>["666", "777"]}
+Completed 200 OK in 10ms (Views: 9.0ms)
+Processing by DigitalAssetsController#search as HTML
+  Parameters: {"sami"=>"SOMETHING.001"}
+Completed 200 OK in 18ms (Views: 17.0ms)
+Processing by DigitalAssetsController#search as HTML
+  Parameters: {"audience"=>"492"}
+Completed 200 OK in 4ms (Views: 3.0ms)
+Processing by DigitalAssetsController#search as HTML
+  Parameters: {"title"=>"Doc Title"}
+Completed 200 OK in 6ms (Views: 3.0ms)
+Processing by DigitalAssetsController#search as HTML
+  Parameters: {"guid"=>"guid-foobar-permanent-28"}
+Completed 200 OK in 6ms (Views: 5.0ms)
+Processing by DigitalAssetsController#search as HTML
+  Parameters: {"business_owner"=>"biz owner"}
+Completed 200 OK in 7ms (Views: 3.0ms)
+Processing by DigitalAssetsController#search as HTML
+  Parameters: {"guid"=>"guid-foobar-permanent-35", "title"=>"Doc Title"}
+Completed 200 OK in 8ms (Views: 6.0ms)
+Processing by DigitalAssetsController#search as HTML
+  Parameters: {"title"=>"Doc Title", "audiences"=>["490"], "sami"=>"IL1111.077"}
+Completed 200 OK in 4ms (Views: 3.0ms)
+Processing by DigitalAssetsController#search as HTML
+  Parameters: {"guid"=>"blargh-blargh-blargh", "title"=>"Doc Title"}
+Completed 200 OK in 21ms (Views: 14.0ms)

data/spec/mock_data/daengine.yml

@@ -1 +1 @@
-last_read_time: 2010-08-27 13:27:49 -0600
+last_read_time: 2012-08-28 11:03:30 -0600

data/spec/mock_data/taxonomy/taxonomyengine.yml

@@ -1 +1 @@
-last_read_time: 2010-08-27 11:44:32 -0600
+last_read_time: 2012-08-28 11:03:30 -0600

metadata

@@ -2,7 +2,7 @@
 name: daengine
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - sbhatia
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-08-27 00:00:00.000000000Z
+date: 2012-08-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails