daengine 0.2.17 → 0.2.18

data/README.md

@@ -5,7 +5,7 @@ daengine is a rails engine plugin gem that provides access to digital assets, ak
 SSC documents/pdfs such as fund documents from the rails applications.  It also
 includes the parser code that reads digital-asset metadata produced by the 
 Teamsite legacy CMS and ingests it into a MongoDB instance for use by the client
-API.
+API..
 
 Installation
 -----------------------

data/app/models/taxonomy_term.rb

@@ -19,7 +19,7 @@ class TaxonomyTerm
   scope :term_id_is, ->(term_id) { where(:term_id => term_id) }
   scope :parent_term_in, ->(parent_term_id) { where(:parent_term.in => parent_term_id)}
   scope :label_is, ->(label) {where(:label => label)}
-  scope :fund_code_is, ->(fund_code) { where("term_type.FUND_CODE" => fund_code)}
+  scope :fund_code_is, ->(fund_code) { where(:'term_type.FUND_CODE' => fund_code.gsub(/^0*/, ""))}
 
   def self.purge!
     TaxonomyTerm.destroy_all

data/app/service/digital_asset_lookup_service.rb

@@ -1,25 +1,17 @@
 class DigitalAssetLookupService
 
-  def self.find_documents_by_fund_code(fund_code)
-    da=[]
-    taxonomy_term = TaxonomyTerm.send(:fund_code_is, fund_code)
-    unless taxonomy_term.empty?
-      p "Found product_id => #{taxonomy_term[0].term_id} for fund_code => #{fund_code} from Taxonomy."
-      da = DigitalAsset.send(:product_in, [taxonomy_term[0].term_id])
-    end
-    da
+  def self.find_documents_by_fund_code(fund_codes)
+    ids = fund_codes.collect {|c| term_id_from_fund_code(c)}
+    DigitalAsset.product_in ids
   end
 
   def self.fund_code_from_id(taxonomy_id)
     TaxonomyTerm.term_id_is(taxonomy_id).try(:term_type).try([], 'FUND_CODE')
   end
 
-  def self.fund_documents(fund_codes)
-    # return a hash containing fund_code => [docs]
-    fund_codes.reduce({}) do |sum, code|
-      sum[code] = find_documents_by_fund_code(code) 
-      sum
-    end
+  def self.term_id_from_fund_code(code) 
+   term = TaxonomyTerm.fund_code_is(code)
+   term.try(:first).try(:term_id)
   end
 
 end

data/lib/daengine/version.rb

@@ -1,3 +1,3 @@
 module Daengine
-  VERSION = "0.2.17"
+  VERSION = "0.2.18"
 end

data/spec/dummy/log/development.log

@@ -9,3 +9,11 @@ MONGODB (37ms) admin['$cmd'].find({:ismaster=>1}).limit(-1)
 MONGODB (352ms) dummy_development['system.namespaces'].find({})
 MONGODB (76ms) dummy_development['$cmd'].find({:create=>"digital_assets"}).limit(-1)
 MONGODB (14ms) dummy_development['$cmd'].find({"count"=>"digital_assets", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB [DEBUG] Logging level is currently :debug which could negatively impact client-side performance. You should set your logging level no lower than :info in production.
+MONGODB (71ms) admin['$cmd'].find({:ismaster=>1}).limit(-1)
+MONGODB (284ms) dummy_development['system.namespaces'].find({})
+MONGODB (51ms) dummy_development['$cmd'].find({:create=>"taxonomy_terms"}).limit(-1)
+MONGODB (6ms) dummy_development['taxonomy_terms'].find({:"term_type.FUND_CODE"=>"foo"}).limit(-1).sort([[:_id, :asc]])
+MONGODB (5ms) dummy_development['taxonomy_terms'].find({:"term_type.FUND_CODE"=>"735"}).limit(-1).sort([[:_id, :asc]])
+MONGODB (13ms) dummy_development['$cmd'].find({"count"=>"taxonomy_terms", "query"=>{:term_type=>{"$exists"=>true}}, "fields"=>nil}).limit(-1)
+MONGODB (5ms) dummy_development['taxonomy_terms'].find({}).limit(-1).sort([[:_id, :asc]])

data/spec/factories.rb

@@ -13,7 +13,6 @@ FactoryGirl.define do
     sequence(:guid) {|n| "guid-foobar-permanent-#{n}"} 
     published_at 10.days.ago
     expires_at 2.months.from_now
-    fund_ids ['420']
     sami_code 'IL1111.077'
     product_ids ['690', '420']
     business_owner 'biz owner'

metadata

@@ -2,7 +2,7 @@
 name: daengine
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.2.17
+  version: 0.2.18
 platform: ruby
 authors:
 - sbhatia
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000Z
+date: 2012-08-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -81,7 +81,6 @@ files:
 - app/helpers/digital_assets_helper.rb
 - app/models/content_service_resource.rb
 - app/models/digital_asset.rb
-- app/models/labeled_digital_asset.rb
 - app/models/taxonomy_term.rb
 - app/service/digital_asset_lookup_service.rb
 - app/views/digital_assets/index.html.erb

data/app/models/labeled_digital_asset.rb

@@ -1,28 +0,0 @@
-class LabeledDigitalAsset < DelegateClass(DigitalAsset)
-  def initialize(da)
-    super(da)
-  end
-
-  def audiences
-    auds = __getobj__.audiences
-    auds.map do |a| 
-      term = TaxonomyTerm.term_id_is(a).try(:first)
-      label = term.try(:label)
-      term => label
-    end
-  end
-
-  def fund
-    prods = __getobj__.product_ids
-    # for any product ids that have a FUND_CODE, return the first
-    prods.each do |p|
-      term = TaxonomyTerm.term_id_is(p).try(:first)
-      tt = term.try(:term_type)
-      if(tt.try(:[], 'FUND_CODE'))
-        return tt['FUND_CODE'] => term.label
-      end
-    end
-    return nil
-  end
-
-end