daengine 0.5.13 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebcd4cba573731d63a838c277fbfe4c1c215e41b
-  data.tar.gz: 74a976fc90d02603798519425d07b5111cc65b77
+  metadata.gz: fa5de682d42dc3019a48e76744f587b5069cc9e3
+  data.tar.gz: 7faca1c4e9ae36521292defd53daf425ec6663c8
 SHA512:
-  metadata.gz: c1b087c4e52e0ae3664e50c020cd313b1fe116f4195e7a3b7fbbe52b77c93730c008a76aa129b14fe9d5d4c86ebf556db84e63d36bd9785390bc4d25d9cf81fa
-  data.tar.gz: 4d71a5b4bb3156dadfed0b4e4c97e21679f1017efa69c7cecb6d35fd619fc2495aaeeb125e185ad30d669cedc1dec88b0b765786b5fef4ee9307168091f08c14
+  metadata.gz: 48d2ae730ab81c8680fe78a1de0ca08a509309b43bf24f5b00b1b3a79ce2cad2c781b19a82df2a304e916d514a5354c22ba7c2920a6c1c00a2f5badb7217e445
+  data.tar.gz: 7e9e48c77c9dda6ae586a69a2f63968cebf3c30886997c4be0e83590b8e2f1a3f0a8539f9801c30ec2c1dc8a49ef6566265b31de4ea9dca27603a4f284e37dba

data/Rakefile

@@ -11,6 +11,7 @@ rescue LoadError
   require 'rake/rdoctask'
   RDoc::Task = Rake::RDocTask
 end
+require 'rspec/core/rake_task'
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -23,6 +24,10 @@ end
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec
+spec = Gem::Specification.find_by_name 'rspec_api_documentation'
+load "#{spec.gem_dir}/lib/tasks/docs.rake"
 
 
 Bundler::GemHelper.install_tasks

data/app/controllers/digital_assets_controller.rb

@@ -7,10 +7,13 @@ class DigitalAssetsController < ApplicationController
   CACHE_LAST_PARSE_TIME = 'last_parse_time'
   # GET /digital_assets
   # GET /digital_assets.json
+  #/digital_assets/search/sami_code=92023
+  #/digital_assets/search/sami_code=NE00192&title=Fund%20Prospectus&fund_code=20293
   def index
-    @digital_assets = DigitalAsset.all
+    @digital_assets = request.query_parameters.present? ? search_da(request.query_parameters) : DigitalAsset.all
     respond_with(@digital_assets)
   end
+  alias :search :index
 
   # GET /digital_assets/1
   # GET /digital_assets/1.json
@@ -19,13 +22,33 @@ class DigitalAssetsController < ApplicationController
     respond_with(@digital_asset)
   end
 
-  #/digital_assets/search/sami_code=92023
-  #/digital_assets/search/sami_code=NE00192&title=Fund%20Prospectus&fund_code=20293
-  def search
-    @digital_assets = search_da(params)
-    respond_with(@digital_assets)
+  def update
+    da_passed = params[:digital_asset]
+    da = DigitalAsset.find_or_initialize_by(digital_asset_id: da_passed[:digital_asset_id])
+    da.update_attributes! da_passed
+    head :ok
   end
 
+  alias :create :update 
+
+  def destroy
+    da = DigitalAsset.where(:digital_asset_id => params[:id])
+    da[0].delete if da.present?
+    head :ok
+  end
+
+  def updated_time
+    Daengine.log "updated_time params #{params.inspect}", "info"
+    ids = params[:ids]
+    updated_time = Hash.new
+    ids.each do |id|
+      da = DigitalAsset.where(:digital_asset_id => id) 
+      updated_time[id] = da[0].doc_changed_at if da.present?
+    end
+    Daengine.log "updated_time result #{updated_time.inspect}", "info"
+    render json: updated_time.to_json, status: :ok
+  end  
+
   def fund_docs
     @digital_assets = []
     fund_doctypes = {:doctype => [
@@ -43,45 +66,5 @@ class DigitalAssetsController < ApplicationController
     respond_with(@digital_assets)
   end
 
-  def sync_assets
-    time0 = Rails.cache.read(CACHE_LAST_PARSE_TIME)
-    if time0.nil?
-      time0 = 2.days.ago
-    end
-    logger.info "Last time when ssc deploy files were read: #{time0.inspect}"
-    time1 = Time.new
-    logger.info "Current time: #{time1.inspect}"
-
-    Rails.cache.write(CACHE_LAST_PARSE_TIME, time1)
-    deploy_files= []
-
-    start_directory = EDIST['digital_assets_directory']
-    logger.info "Reading digital asset deployment files from #{start_directory}"
-    if (File::directory?(start_directory))
-      Dir.foreach(start_directory) do |entry|
-        if (!File::directory?(entry))
-          filename = start_directory + entry
-          difference0 = File.mtime(filename)- time0 #To-Do - We should be looking at created time - ctime
-          difference1 = File.mtime(filename) - time1
-          if ((difference0 >= 0) & (difference1 < 0))
-            if(/bulk-ssc_|selective-ssc_/ =~ filename)
-              deploy_files << filename
-            end
-          end
-        end
-      end
-    end
-
-    deploy_files.each do |filename|
-      #parse the file and add content to database.
-      logger.info "Processing file #{filename} found."
-      file = File.expand_path(filename, __FILE__)
-      open_file = open(file, 'rb')
-      Etl::TeamsiteMetadataParser.parse_tuple_file(open_file)
-      logger.info "Finished parsing #{filename}."
-    end
-
-    head :accepted
-  end
 
 end

data/app/helpers/digital_assets_helper.rb

@@ -3,11 +3,20 @@ module DigitalAssetsHelper
   def search_da(params)
     digital_assets = []
     # loop thru each parameter that matches one of the method signatures
+    # x_is for singular, x_in for arrays, x_since for dates
     digital_assets = params.keys.select do |pk|
-      DigitalAsset.respond_to?("#{pk}_is".to_sym) or DigitalAsset.respond_to?("#{pk}_in".to_sym)
+      DigitalAsset.respond_to?("#{pk}_is".to_sym) or DigitalAsset.respond_to?("#{pk}_in".to_sym) or DigitalAsset.respond_to?("#{pk}_since".to_sym) 
     end.reduce(DigitalAsset) do |sum, key|
       # for each key, call the 'named query' method with the value given and chain...
-      method = DigitalAsset.respond_to?("#{key}_in".to_sym) ? "#{key}_in".to_sym : "#{key}_is".to_sym
+      method = case 
+        when DigitalAsset.respond_to?("#{key}_in".to_sym)
+          "#{key}_in".to_sym 
+        when DigitalAsset.respond_to?("#{key}_since".to_sym)
+          "#{key}_since".to_sym  
+        else
+          "#{key}_is".to_sym
+        end
+      # method = DigitalAsset.respond_to?("#{key}_in".to_sym) ? "#{key}_in".to_sym : "#{key}_is".to_sym
       sum.send(method, method.to_s.end_with?('in') ? params[key].to_a : params[key]) # should return result of the send call for chaining
     end
     digital_assets.respond_to?(:each) ?  digital_assets : []

data/app/models/content_service_resource.rb

@@ -1,16 +1,16 @@
-require 'active_resource'
-require 'daengine'
-# Represents a generic piece of content for display on an OFI web property
-# This model represents the 'human edited' version of website content, final displayed
-# pages will be 'value added' with system-sourced data and 'mashed-in' data
-#
-  class ContentServiceResource < ActiveResource::Base	
-
-    # self.site = Daengine.config[:content_service_url]
-    self.prefix = "/litcenter-service/query/"
-    self.element_name = "resource"
-
-    def self.find_all 
-      ContentServiceResource.find(:all, :params => {:contentQuery => "audienceIds='490,5270';;expired='false'"})
-    end
+require 'active_resource'
+require 'daengine'
+# Represents a generic piece of content for display on an OFI web property
+# This model represents the 'human edited' version of website content, final displayed
+# pages will be 'value added' with system-sourced data and 'mashed-in' data
+#
+  class ContentServiceResource < ActiveResource::Base	
+
+    # self.site = Daengine.config[:content_service_url]
+    self.prefix = "/litcenter-service/query/"
+    self.element_name = "resource"
+
+    def self.find_all 
+      ContentServiceResource.find(:all, :params => {:contentQuery => "audienceIds='490,5270';;expired='false'"})
+    end
   end

data/app/models/digital_asset.rb

@@ -8,87 +8,86 @@ class DigitalAsset
   field :changed_at, type: Time
   field :audiences, type: Array, default: []
   field :sami_code, type: String
-  field :product_ids, type: Array, default: []
   field :published_at, type: Time
   field :unpublished_at, type: Time
   field :expires_at, type: Time
   field :guid, type: String
-  # field :fund_ids, type: Array, default: []
   field :business_owner, type: String
   field :summary, type: String
-  field :content_organization_ids, type: Array, default: []
-  field :program_ids, type: Array, default: []
-
   field :omniture_codes, type: Array, default: []
   field :orderable, :type => Boolean, default: false
-
-  field :ml_category, type: String
-  field :control_number, type: String
-  field :key_accounts, type: Array, default: []
-
-  key :guid
+  field :product_ids, type: Array, default: []
+  field :program_ids, type: Array, default: []
+  # refactor version:
+  field :path, type: String
+  field :legacy_path, type: String
+  field :doc_changed_at, type: Time
+  field :content_type, type: String
+  field :pages, type: Integer, default: 1
+  field :size, type: String
+  field :mime_type, type: String
+  field :subject, type: String
+  field :keywords, type: Array, default: []
+  field :author, type: String
+  field :finra_path, type: String
+  field :fund_codes, type: Array, default: []
+  field :digital_asset_id, type: String
+  key :digital_asset_id
 
   # field :documents, type: Hash
+  # embeds_many :documents, :class_name => 'DigitalAsset::Document'
+  # accepts_nested_attributes_for :documents
 
-  embeds_many :documents, :class_name => 'DigitalAsset::Document'
-
-  accepts_nested_attributes_for :documents
 
   #Exclude XBRL documents from all queries
-  default_scope excludes(:'documents.content_type' => "LDJDCMAIK") #Had to use static value instead of a Constant
+  # default_scope excludes(:'content_type' => "LDJDCMAIK") #Had to use static value instead of a Constant
 
   scope :title_is, ->(title) { where(:title => title)}
   scope :business_owner_is, ->(business_owner) { where(:business_owner => business_owner)}
   scope :guid_is, ->(guid) { where(:guid => guid)}
-  # scope :funds_in, ->(fund_id) { where(:fund_ids.in => fund_id)}
+  scope :digital_asset_id_is, ->(id) { where(:digital_asset_id => id)}
+  scope :fund_in, ->(fund_code) {where(:fund_codes.in => fund_code)}
   scope :audience_in, ->(audience_id) {where(:audiences.in => audience_id)}
   scope :audience_investor_approved, -> {where(:audiences.in => [Audience::INVESTOR_APPROVED])}
 
+  scope :published_since, ->(since) {where(:published_at.gte => since)}
   scope :content_organization_in, ->(content_organization_id) {where(:content_organization_ids.in => content_organization_id)}
   scope :program_id_in, ->(program_id) {where(:program_ids.in => program_id)}
   scope :sami_is, ->(sami_code) {where(:sami_code => sami_code)}
   scope :sami_in, ->(sami_codes) {where(:sami_code.in => sami_codes)}
-  scope :path_is, ->(path) {where(:'documents.path' => path)}
-  scope :doctype_in, ->(types) {where(:'documents.content_type'.in => types)}
-  scope :content_type_in, ->(types) {where(:'documents.content_type'.in => types)}
+  scope :path_is, ->(path) {where(:'path' => path)}
+  scope :doctype_in, ->(types) {where(:'content_type'.in => types)}
+  scope :content_type_in, ->(types) {where(:'content_type'.in => types)}
   scope :product_in, ->(types) {where(:product_ids.in => types)}
   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' => ContentType::FINRA)}
   scope :audience_in, ->(audience) {where(:audiences.in => audience)}
   scope :alphabetical, order_by(:title => :asc)
-  scope :not_xbrl, -> {excludes(:'documents.content_type' => ContentType::XBRL_DOCUMENT)}
-
-  scope :key_account_in, ->(key_account) {where(:key_accounts => key_account)}
-
-  #scope :order_by_fund, order_by[[:product_ids, :asc]]
-  #default_scope {not_in(:'documents.content_type' => ["LDJDCMAIK"])}
+  scope :not_xbrl, -> {excludes(:'content_type' => ContentType::XBRL_DOCUMENT)}
 
   # validations
-  validates_presence_of :guid, :title, :changed_at, :published_at,
-      :expires_at, :audiences, :documents
-
+  validates_presence_of :digital_asset_id, :title, :changed_at, :published_at,
+      :expires_at, :audiences, :path
+  validates_uniqueness_of :path, :digital_asset_id     
   validate :validate_future_expiration
 
-  # validates_uniqueness_of :guid
-
-  def as_json(opts = {})
-    super(opts).merge({:comp_fundcode => fund_code, :content_type_id => content_type_id, :latest_doc_changed_at => latest_doc_changed_at})
-  end
+  # def as_json(opts = {})
+  #   super(opts).merge({:comp_fundcode => fund_codes, :content_type_id => content_type_id, :latest_doc_changed_at => latest_doc_changed_at})
+  # end
 
   def self.purge!
-    # last_update = DigitalAsset.desc(:updated_at).try(:first).try :updated_at
     DigitalAsset.stale.destroy_all if bulk_processed?
   end
 
   def latest_doc_changed_at
-    documents.reduce(nil) do |latest_date, d|
-      unless d.content_type == '549'
-        latest_date = d.doc_changed_at if (latest_date == nil || latest_date < d.doc_changed_at)
-      end
-      latest_date
-    end
+    doc_changed_at
+    # documents.reduce(nil) do |latest_date, d|
+    #   unless d.content_type == '549'
+    #     latest_date = d.doc_changed_at if (latest_date == nil || latest_date < d.doc_changed_at)
+    #   end
+    #   latest_date
+    # end
   end
 
   def validate_future_expiration
@@ -99,39 +98,39 @@ class DigitalAsset
     (stale.count.to_f / self.count) <= 0.05
   end
 
-  def path_is(path)
-    documents.where(path: path).first unless documents.blank?
-  end
+  # def path_is(path)
+  #   documents.where(path: path).first unless documents.blank?
+  # end
 
-  def doc_changed_at(path)
-    path_is(path).try(:doc_changed_at)
-  end
+  # def doc_changed_at(path)
+  #   path_is(path).try(:doc_changed_at)
+  # end
 
-  def doc_size
-    first_non_finra.try(:size)
-  end
+  # def doc_size
+  #   first_non_finra.try(:size)
+  # end
 
-  def content_type_ids
-    ids = []
-    documents.try(:each) do |d|
-      ids << d.content_type
-    end
-    ids
-  end
-  alias :doctype_ids :content_type_ids
+  # def content_type_ids
+  #   ids = []
+  #   documents.try(:each) do |d|
+  #     ids << d.content_type
+  #   end
+  #   ids
+  # end
+  # alias :doctype_ids :content_type_ids
 
   def has_finra?
-    finra_document != nil
+    finra_path.present?
   end
 
   def expired?
     expires_at < Time.now
   end
 
-  def finra_document
-    finra_idx = documents.index {|d| d.content_type == ContentType::FINRA}
-    documents[finra_idx] if finra_idx
-  end
+  # def finra_document
+  #   finra_idx = documents.index {|d| d.content_type == ContentType::FINRA}
+  #   documents[finra_idx] if finra_idx
+  # end
 
   def is_investor_approved?
     audiences.index(DigitalAsset::Audience::INVESTOR_APPROVED)
@@ -153,66 +152,56 @@ class DigitalAsset
     TaxonomyTerm.label_for_term(content_organization_ids[0])
   end
 
-  def fund_code
-    pid = product_ids.find {|pid| TaxonomyTerm.term_id_is(pid)[0].try(:fund_code)}
-    pid and TaxonomyTerm.term_id_is(pid)[0].try(:fund_code).try(:rjust, 5, '0')
-  end
+  # def fund_code
+  #   pid = product_ids.find {|pid| TaxonomyTerm.term_id_is(pid)[0].try(:fund_code)}
+  #   pid and TaxonomyTerm.term_id_is(pid)[0].try(:fund_code).try(:rjust, 5, '0')
+  # end
 
   def content_type
     TaxonomyTerm.label_for_term(content_type_id)
   end
   def content_type_id
-   first_non_finra.try(:content_type)
+   :content_type
   end
 
-  def pages; first_non_finra.pages end
-
   def audience
     TaxonomyTerm.label_for_term(audiences[0])
   end
 
   def primary_path
-    first_non_finra.try(:path)
+    :path
   end
 
   def primary_extension
-    first_non_finra.try(:path).try(:split,'.').try(:last).try(:upcase)
+    self.try(:path).try(:split,'.').try(:last).try(:upcase)
   end
 
   private
 
-  def first_non_finra
-   documents.try(:detect) do |d|
-    d.content_type != ContentType::FINRA
-   end
-  end
+  # def first_non_finra
+  #  documents.try(:detect) do |d|
+  #   d.content_type != ContentType::FINRA
+  #  end
+  # end
 
 
 end
 
-class DigitalAsset::Document
-  include Mongoid::Document
+# class DigitalAsset::Document
+#   include Mongoid::Document
 
-  field :path, type: String
-  field :doc_changed_at, type: Time
-  field :content_type, type: String
-  field :pages, type: Integer, default: 1
-  field :size, type: String
-  field :mime_type, type: String
-  field :subject, type: String
-  field :keywords, type: Array, default: []
-  field :author, type: String
+  
 
-  embedded_in :digital_asset
+#   embedded_in :digital_asset
 
-  key :path
+#   key :path
 
-  validates_uniqueness_of :path
+#   validates_uniqueness_of :path
 
-  validates_presence_of :path #, :doc_changed_at, :content_type
-  validates_format_of :path, without: /\/manifest|archives\// # dont accept manifest files
+#   validates_presence_of :path #, :doc_changed_at, :content_type
+#   validates_format_of :path, without: /\/manifest|archives\// # dont accept manifest files
 
-end
+# end
 
 class DigitalAsset::ContentType
   FINRA = '549'