daengine 0.3.8.2 → 0.3.8.3

data/app/models/digital_asset.rb

@@ -72,7 +72,7 @@ class DigitalAsset
   end
 
   def path_is(path)
-    documents.where(path: path).first
+    documents.where(path: path).first unless documents.blank?
   end
 
   def doc_changed_at(path)
@@ -139,7 +139,11 @@ class DigitalAsset
 
   private
 
-  def first_non_finra; documents.detect{|d| d.content_type != ContentType::FINRA} end
+  def first_non_finra
+   documents.try(:detect) do |d| 
+    d.content_type != ContentType::FINRA
+   end
+  end
 
 
 end
@@ -172,8 +176,8 @@ class DigitalAsset::ContentType
   COMMENTARY = '532'
   FUND_YIELD = '538'
   FLYER = '511'
-  YIELD_L = 'LNGSXEDJB'
-  YIELD_P = 'LNGSYWJCX'
+  L_SHARE_YIELD_SHEET = 'MCOBX14FY'
+  P_SHARE_YIELD_SHEET = 'MCOBYY7SX'
   ANNUAL_REPORT = '529'
   SEMIANNUAL_REPORT = '541'
   SAI = '540'
@@ -182,6 +186,8 @@ class DigitalAsset::ContentType
   MONTHLY_HOLDINGS = 'MA53Y14FY'
   BUSINESS_CALENDAR = 'MA540I7SX'
   WEEKLY_HOLDINGS = 'MA542HDIJ'
+  FUND_DOCUMENTS = '528'
+  FORMS_AND_APPLICATIONS = '496'
 end
 
 class DigitalAsset::Audience

data/app/models/taxonomy_term.rb

@@ -29,4 +29,19 @@ class TaxonomyTerm
     where(term_id: term_id).try(:first).try(:label) if term_id
   end
 
+  def ancestor?(term)
+    if(parent_term)
+      (parent_term == term) or parent_term.ancestor?(term)
+    else
+      false
+    end
+  end
+
+  def descendant?(term)
+    # accept either an ID string or a term
+    term_id = term.is_a?(String) ? term : term.try(:term_id)
+    # loop thru child terms and look for the id
+    child_term_ids.index(term_id) or child_terms.detect {|c| c.descendant? term_id }
+  end
+
 end

data/lib/daengine/taxonomy_parser.rb

@@ -45,6 +45,7 @@ module Daengine::TaxonomyParser
     unless my_terms.nil?
       entity.xpath('term').map do |j|
         a_term = parse_taxonomy_term(j)
+        a_term.parent_term = category
         category.child_terms << a_term
       end
     end
@@ -52,7 +53,7 @@ module Daengine::TaxonomyParser
       category.save!
     rescue Exception => e
       #puts "--**Exception**-- #{e}"
-      @error_msg << "Failed to add record #{category.try(:label)}, #{category.try(:errors).try(:full_messages)}"
+      p "Failed to add record #{category.try(:label)}, #{category.try(:errors).try(:full_messages)}"
     end
     category
   end

data/lib/daengine/version.rb

@@ -1,3 +1,3 @@
 module Daengine
-  VERSION = "0.3.8.2"
+  VERSION = "0.3.8.3"
 end

metadata

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