daengine 0.3.7.3 → 0.3.7.4

data/app/models/digital_asset.rb

@@ -4,14 +4,6 @@ class DigitalAsset
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  PROSPECTUS = '542'
-  FACTSHEET = '533'
-  COMMENTARY = '532'
-  ANNUAL_REPORT = '529'
-  SEMIANNUAL_REPORT = '541'
-  SAI = '540'
-  SUMMARY_PROSPECTUS = '5380'
-  OTHER = ''
 
   field :title, type: String
   field :changed_at, type: Time
@@ -53,7 +45,7 @@ class DigitalAsset
   scope :stale, -> {where(:updated_at.lte => 2.minutes.ago)}
   scope :orderable_is, ->(orderable) {where(:orderable => orderable)}
   scope :orderable, -> {where(orderable: true)}
-  scope :has_finra, -> {where(:'documents.content_type' => '549')}
+  scope :has_finra, -> {where(:'documents.content_type' => ContentType::FINRA)}
   scope :audience_in, ->(audience) {where(:audiences.in => audience)}
   scope :alphabetical, order_by(:title => :asc)
   # scope :order_by_fund, order_by[[:product_ids, :asc]]
@@ -93,27 +85,16 @@ class DigitalAsset
   end
 
   def finra_document
-    finra_docs = documents.select {|d| d.content_type == '549'}
-    finra_docs.size == 1 ? finra_docs[0] : nil
-  end
-
-  def asset_type
-    docs = documents.select { |d| d.content_type == PROSPECTUS || 
-                                  d.content_type == SAI ||
-                                  d.content_type == COMMENTARY ||
-                                  d.content_type == SEMIANNUAL_REPORT ||
-                                  d.content_type == ANNUAL_REPORT ||
-                                  d.content_type == FACTSHEET ||
-                                  d.content_type == SUMMARY_PROSPECTUS}
-    docs.size == 1 ? docs[0].content_type : OTHER
+    finra_idx = documents.index {|d| d.content_type == ContentType::FINRA}
+    documents[finra_idx] if finra_idx 
   end
 
   def is_investor_approved?
-    audiences.index('490') ? true : false
+    audiences.index(:audience_investor)
   end
 
   def is_institutional_use?
-    audiences.index('491') ? true : false
+    audiences.index(:audience_advisor)
   end
 
   def product
@@ -126,9 +107,12 @@ class DigitalAsset
     TaxonomyTerm.label_for_term(content_organization_ids[0])
   end
   def content_type
-    type_id = first_non_finra.try(:content_type)
-    TaxonomyTerm.label_for_term(type_id)
+    TaxonomyTerm.label_for_term(content_type_id)
+  end
+  def content_type_id
+   first_non_finra.try(:content_type) 
   end
+
   def pages; first_non_finra.pages end
   
   def audience
@@ -145,7 +129,7 @@ class DigitalAsset
 
   private
 
-  def first_non_finra; documents.detect{|d| d.content_type != '549'} end
+  def first_non_finra; documents.detect{|d| d.content_type != ContentType::FINRA} end
 
 
 end
@@ -170,3 +154,19 @@ class DigitalAsset::Document
   validates_format_of :path, without: /\/manifest|archives\// # dont accept manifest files
 
 end
+
+class DigitalAsset::ContentType
+  FINRA = '549' 
+  PROSPECTUS = '542'
+  FACTSHEET = '533'
+  COMMENTARY = '532'
+  FUND_YIELD = '538'
+  ANNUAL_REPORT = '529'
+  SEMIANNUAL_REPORT = '541'
+  SAI = '540'
+  SUMMARY_PROSPECTUS = '5380'
+  DAILY_HOLDINGS = 'MA53THCZQ'
+  MONTHLY_HOLDINGS = 'MA53Y14FY'
+  BUSINESS_CALENDAR = 'MA540I7SX'
+  WEEKLY_HOLDINGS = 'MA542HDIJ'
+end

data/app/models/taxonomy_term.rb

@@ -26,7 +26,7 @@ class TaxonomyTerm
   end
 
   def self.label_for_term(term_id)
-    where(term_id: term_id).try(:first).try(:label)
+    where(term_id: term_id).try(:first).try(:label) if term_id
   end
 
 end

data/lib/daengine/teamsite_metadata_parser.rb

@@ -138,7 +138,7 @@ module Daengine::TeamsiteMetadataParser
             if(File.mtime(file) > last_read)
               begin
                 exifdata = ::MiniExiftool.new(file) # spaces in filename
-                doc['pages'] = exifdata.pagecount # or exifdata['Slides']
+                doc['pages'] = exifdata.pagecount || exifdata.pages || exifdata.slides # or exifdata['Slides']
                 doc['size'] = exifdata.filesize
                 doc['mime_type'] = exifdata.mimetype
                 Daengine.log "Exif data for #{file} was pages:#{doc['pages']}, size:#{doc['size']}", "info"

data/lib/daengine/version.rb

@@ -1,3 +1,3 @@
 module Daengine
-  VERSION = "0.3.7.3"
+  VERSION = "0.3.7.4"
 end

metadata

@@ -2,7 +2,7 @@
 name: daengine
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.3.7.3
+  version: 0.3.7.4
 platform: ruby
 authors:
 - sbhatia
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000Z
+date: 2012-09-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails