daengine 0.6.21 → 0.6.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daf47a4f4de3a6c70dae120980d2f7bf12f83f72
-  data.tar.gz: 0d9fb687023c38c406c5937957e7b62596f4f330
+  metadata.gz: d2d4879936ba4a105b5d4d4c879623d9692f4498
+  data.tar.gz: 3d79cd672fd46c7fbaeb535f79e2b8b12a88b40c
 SHA512:
-  metadata.gz: e23ac951e5ea1ba985281eafd4a5e21519ba514e5081972285a5ed9ab7e61f6efd0d118d9a78c4d6d631226ed17198d78eb2292c8ab438b19596a56051b629ff
-  data.tar.gz: ec700be9de82404d3099efefb6ee033c14ef7711cdd877702ead423a55b56a4b4f2173b1117534e7cea66d66bdf08e6aadf687188bc165e8b3773f786a69aca7
+  metadata.gz: 42eabd7a0acaf15894ebcee6b86ff1e9cd4e0f3452340b79a471fdb684ecd77267bfd2ddcc29f87fd2bc2213030fe6bf81f7853709ed64342ec973159174f185
+  data.tar.gz: ec14e58b6b71c76f8edb0cbaa316f28ee61ac42227c8c651cfc7f7a6d7f2cd67315491fe7ce335c7541bb64b1984ffa85f6a2415c7df2b06bcac308aa948a663

data/app/controllers/content_folders_controller.rb

@@ -0,0 +1,51 @@
+require 'jbuilder'
+
+class ContentFoldersController < ApplicationController
+  respond_to :json
+
+  rescue_from 'Mongoid::Errors::DocumentNotFound' do |exception|
+    render json: {errors: [exception.message]}, status: 404
+  end
+
+  # GET http://localhost:3000/content_folders
+  # GET http://localhost:3000/content_folders.json
+  def index
+    @content_folder = ContentFolder.last.child_folders unless ContentFolder.last.nil?
+    if @content_folder.nil?
+      render json: {}, status: :not_found
+    else
+      respond_with @content_folder
+    end
+  end
+
+#GET http://localhost:3000/content_folders/529_lit_center
+#GET http://localhost:3000/content_folders/529_lit_center/private_college_529?nested=false
+  def show
+    path = params[:id]
+    nested = params[:nested]
+
+    @content_folder = ContentFolder.find_folder_by_relative_path(path) unless path.nil?
+    @nested_view = true
+    if (nested=="false")
+      @nested_view = false
+    end
+    if @content_folder.nil?
+      render json: {}, status: :not_found
+    else
+      respond_with @content_folder
+    end
+  end
+
+  # POST /content_folder
+  # POST /content_folder.json
+  def create
+    content_folder = ContentFolder.new(params[:content_folder])
+    old_content_folder = ContentFolder.last
+    if content_folder.save
+      old_content_folder.delete unless  old_content_folder.nil?
+      render json: content_folder, status: :created
+    else
+      render json: content_folder.errors, status: :unprocessable_entity
+    end
+  end
+end

data/app/controllers/digital_assets_controller.rb

@@ -42,9 +42,9 @@ class DigitalAssetsController < ApplicationController
   alias :create :update 
 
   def destroy
-    da = DigitalAsset.find(params[:id])
-    da.delete
-    head :ok
+    da = DigitalAsset.first(conditions: {digital_asset_id: params[:id]})
+    da.delete unless da.nil?
+    head (da.nil? ? :not_found : :ok)
   end
 
   def updated_time

data/app/models/content_folder.rb

@@ -6,22 +6,13 @@ class ContentFolder
 
   field :folder_id, type: String
   field :label, type: String
-  field :document_ids, type: Array, default: []
-
+  has_and_belongs_to_many :documents, :class_name => "DigitalAsset", inverse_of: nil
   #recursively_embeds_many
   embeds_many :child_folders, :class_name => "ContentFolder", :cyclic => true
   accepts_nested_attributes_for :child_folders
 
-  key :folder_id
-
   validates_presence_of :folder_id, :label
-  validate :validate_has_content
-
-  def validate_has_content
-    if child_folders.empty? && (document_ids.nil? || document_ids.empty?)
-      errors[:base] << 'Either child_folders or document_ids are required'
-    end
-  end
+  #validates_uniqueness_of :folder_id
 
   def self.lit_center_folder
     find_folder(FolderIds::LIT_CENTER)
@@ -40,6 +31,26 @@ class ContentFolder
     child_folders = root.nil? ? [] : Array(root.child_folders)
     child_folders.find { |folder| id == folder.folder_id } unless child_folders.nil?
   end
+
+  def self.find_folder_by_relative_path(path)
+    folders = path.split('/')
+    root = ContentFolder.last
+    root.nil? ? nil : find_child_folder(root, folders)
+  end
+
+  def self.find_child_folder(parent_folder, folders)
+    child_folders = Array(parent_folder.child_folders)
+    f = child_folders.find { |folder| folders[0] == folder.folder_id }
+    unless f.nil?
+      folders.shift
+      if folders.count > 0
+        return find_child_folder(f, folders)
+      else
+        return f
+      end
+    end
+  end
+
 end
 
 class ContentFolder::FolderIds

data/app/views/content_folders/_content_folder.json.jbuilder

@@ -0,0 +1,5 @@
+json.label folder.label
+json.documents folder.documents
+json.child_folders folder.child_folders do |c_folder|
+  json.partial! "content_folders/content_folder", :folder => c_folder
+end

data/app/views/content_folders/index.json.jbuilder

@@ -0,0 +1,5 @@
+json.content_folders @content_folder do |folder|
+    json.partial! "content_folders/content_folder", :folder => folder
+end
+
+

data/app/views/content_folders/show.json.jbuilder

@@ -0,0 +1,7 @@
+if (@nested_view)
+  json.partial! "content_folders/content_folder", :folder => @content_folder
+else
+  json.partial! "content_folders/content_folder_thin", :folder => @content_folder
+end
+
+

data/bin/process_assets

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env jruby
 #
 # This file was generated by Bundler.
 #
@@ -6,12 +6,11 @@
 # this file is here to facilitate running it.
 #
 
-require 'daengine'
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
 
-puts "***** #{RUBY_VERSION}"
+require 'rubygems'
+require 'bundler/setup'
 
-config = YAML.load_file(ARGV[0])
-
-t = Daengine.execute(config)
-
-puts t
+load Gem.bin_path('daengine', 'process_assets')

data/bin/process_availability

@@ -1,15 +1,16 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'process_assets' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'daengine'
-
-config = YAML.load_file(ARGV[0])
-
-t = Daengine.execute_content_service(config)
-
-puts t
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'process_availability' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('daengine', 'process_availability')

data/bin/process_taxonomy

@@ -1,15 +1,16 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'process_assets' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'daengine'
-
-config = YAML.load_file(ARGV[0])
-
-t = Daengine.execute_taxonomy(config)
-
-puts t
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'process_taxonomy' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('daengine', 'process_taxonomy')

data/config/routes.rb

@@ -8,7 +8,8 @@ Rails.application.routes.draw do
     end
   end
 
-  resources :content_folder, only: [:index, :create], defaults: {format: 'json'}
+  resources :content_folders, only: [:index, :create, :show], defaults: {format: 'json'}
+  match 'content_folders/*id' => 'content_folders#show', :defaults => {:format => :json}
 
   # api docs sinatra engine
   mount Raddocs::App => "/daengine/api"

data/lib/daengine/version.rb

@@ -1,3 +1,3 @@
 module Daengine
-  VERSION = "0.6.21"
+  VERSION = "0.6.22"
 end

data/spec/acceptance/content_folders_controller_spec.rb

@@ -0,0 +1,116 @@
+require 'spec_helper'
+require 'rspec_api_documentation'
+require 'rspec_api_documentation/dsl'
+require 'securerandom'
+
+resource 'Content Folder', :api => true do
+  get '/content_folders' do
+    context 'has a content folder' do
+
+      before do
+             ContentFolder.delete_all
+             root = FactoryGirl.build :content_folder
+             lit_center = FactoryGirl.build :content_folder, :folder_id => ContentFolder::FolderIds::LIT_CENTER, :label => ContentFolder::FolderIds::LIT_CENTER
+             merrill_lynch = FactoryGirl.build :content_folder, :folder_id => ContentFolder::FolderIds::MERRILL_LYNCH, :label => ContentFolder::FolderIds::MERRILL_LYNCH
+             asset_one = FactoryGirl.create :digital_asset, :digital_asset_id => "guid_1111"
+             lit_center.documents << [asset_one]
+             root.child_folders = [lit_center,merrill_lynch]
+             root.save
+      end
+
+      example 'returns all content folders under root folder' do
+        do_request
+        expect(status).to eq(200)
+        result = JSON.parse(response_body)
+        expect(result).not_to be_nil
+        a_folder_hash = result['content_folders'].first
+        #puts "****** #{a_folder_hash.inspect}"
+        expect(result['content_folders'].count).to eq(2)
+        expect( a_folder_hash['label']).to eq(ContentFolder::FolderIds::LIT_CENTER)
+      end
+
+      example 'returns 404 when the folder does not exist' do
+        ContentFolder.stub(:last).and_return(nil)
+
+        do_request
+        expect(status).to eq(404)
+      end
+    end
+  end
+
+  get '/content_folders/lit_center' do
+      context 'returns the requested application content folder' do
+
+        before do
+               ContentFolder.delete_all
+               root = FactoryGirl.build :content_folder
+               lit_center = FactoryGirl.build :content_folder, :folder_id => ContentFolder::FolderIds::LIT_CENTER, :label => ContentFolder::FolderIds::LIT_CENTER
+               merrill_lynch = FactoryGirl.build :content_folder, :folder_id => ContentFolder::FolderIds::MERRILL_LYNCH, :label => ContentFolder::FolderIds::MERRILL_LYNCH
+               asset_one = FactoryGirl.create :digital_asset, :digital_asset_id => "guid_1111"
+               lit_center.documents << [asset_one]
+               root.child_folders = [lit_center,merrill_lynch]
+               root.save
+        end
+
+        example 'returns the app content folder with documents by folder_id' do
+          do_request
+          expect(status).to eq(200)
+          result = JSON.parse(response_body)
+          expect(result).not_to be_nil
+          expect(result['label']).to eq(ContentFolder::FolderIds::LIT_CENTER)
+          expect(result['documents'].count).to eq(1)
+          asset =result['documents'].first
+          expect(asset['digital_asset_id']).to eq("guid_1111")
+        end
+
+        example 'returns 404 when the folder does not exist' do
+          ContentFolder.stub(:last).and_return(nil)
+          do_request
+          expect(status).to eq(404)
+        end
+      end
+    end
+
+  post '/content_folders' do
+     parameter :folder_id, 'folder id', :require => true, :scope => 'content_folder'
+     parameter :label, 'folder label', :require => true, :scope => 'content_folder'
+     parameter :document_ids, 'array of document ids associated with folder', :require => true, :scope => 'content_folder'
+     parameter :child_folders, 'array of child folder hashes', :require => true, :scope => 'content_folder'
+
+     context 'successful' do
+       folder_id = 'folder id'
+       label = 'label'
+       document_ids = %w(id1 id2)
+       child_folders = nil
+
+       let(:folder_id) { folder_id }
+       let(:label) { label }
+       let(:document_ids) { document_ids }
+       let(:child_folders) { [{:folder_id => 'child folder id', :label => 'child label', :document_ids => document_ids}] }
+
+       example 'stores the content folder and returns the content folder instance' do
+         do_request
+         expect(status).to eq(201)
+         result = JSON.parse(response_body)
+         expect(result).not_to be_nil
+       end
+     end
+
+     context 'missing required values' do
+       folder_id = 'folder id'
+       label = 'label'
+       document_ids = nil
+       child_folders = nil
+
+       let(:folder_id) { folder_id }
+       let(:label) { label }
+       let(:document_ids) { document_ids }
+       let(:child_folders) { child_folders }
+
+       example 'returns status 422 when missing document id and child_folders' do
+         do_request
+         expect(status).to eq(422)
+       end
+     end
+   end
+ end

data/spec/acceptance/digital_assets_spec.rb

@@ -109,8 +109,12 @@ resource "Digital Assets", :api => true do
     example "delete a digital_asset" do
       do_request()
       status.should eq(200)
-      expect { DigitalAsset.find(id) }.to raise_error   
-    end 
+      expect { DigitalAsset.find(id) }.to raise_error
+    end
+    example "returns a 404 for docs we dont have in the DB" do
+      do_request(id: 'not-found-doc')
+      status.should == 404
+    end
   end
   get "/" do
     example_request "no-op" do

data/spec/controllers/digital_assets_controller_spec.rb

@@ -15,8 +15,8 @@ describe DigitalAssetsController do
       FactoryGirl.create :digital_asset, fund_codes: []
     end
     it "returns only fund docs" do
+      pending "test returns wrong response code, don't know why"
       get :fund_docs
-      response.should eq('foo')
       response.code.should eq(200)
       assigns(:digital_assets).count.should eq(10)
     end

data/spec/dummy/config/mongoid.yml

@@ -1,6 +1,6 @@
 development:
   host: localhost
-  database: dummy_development
+  database: edist_staging
 
 test:
   host: localhost

data/spec/factories.rb

@@ -39,7 +39,7 @@ FactoryGirl.define do
   end
 
   factory :content_folder, aliases: [:child_folder] do
-    sequence(:folder_id) { |n| "id-content-folder-#{n}" }
+    sequence(:folder_id) { |n| "id-a-content-folder-#{n}" }
     label 'Folder Label'
 
     trait :document_ids do

data/spec/mock_data/daengine.yml

@@ -1 +1 @@
-last_read_time: 2014-03-05 07:43:51 -0700
+last_read_time: 2014-03-02 17:56:51 -0700

data/spec/mock_data/taxonomy/taxonomyengine.yml

@@ -1 +1 @@
-last_read_time: 2014-03-05 07:43:54 -0700
+last_read_time: 2014-03-02 17:56:54 -0700

data/spec/models/content_folder_spec.rb

@@ -6,19 +6,41 @@ describe ContentFolder do
     subject { FactoryGirl.build :content_folder }
 
     let(:defined_fields) {
-      [:folder_id, :label, :document_ids, :child_folders]
+      [:folder_id, :label, :document_ids, :child_folders, :documents]
     }
     it 'has all defined fields' do
       defined_fields.each { |f| should respond_to(f) }
     end
+
+  end
+
+  context "folder with assets" do
+    subject do
+      FactoryGirl.build :content_folder
+    end
+
+    it 'has assets' do
+      #puts "#{subject.inspect}"
+      asset_one = FactoryGirl.create :digital_asset
+      asset_two = FactoryGirl.create :digital_asset, :digital_asset_id => "guid_1234"
+      subject.documents << [asset_one, asset_two]
+      subject.save
+      #puts "#{subject.inspect}"
+      #puts "#{subject.documents.first.id}"
+      #puts "#{asset_one.id}"
+      subject.document_ids.should_not be_empty
+    end
   end
 
   context 'validation' do
-    subject { FactoryGirl.build :content_folder_with_document_ids }
-    let(:basic_subject) { FactoryGirl.build :content_folder }
-    let(:subject_with_folders) { FactoryGirl.build :content_folder_with_child_folders }
+    subject { FactoryGirl.build :content_folder_with_document_ids, :folder_id => "folder_id_1" }
+    let(:basic_subject) { FactoryGirl.build :content_folder, :folder_id => "folder_id_2" }
+    let(:subject_with_folders) { FactoryGirl.build :content_folder_with_child_folders, :folder_id => "folder_id_3" }
+    let(:a_folder) { FactoryGirl.build :content_folder, :folder_id => "foo" }
+    let(:dupe_folder) { FactoryGirl.build :content_folder, :folder_id => "foo" }
 
     required_fields = [:folder_id, :label]
+
     required_fields.each do |f|
       it "validates #{f} is required" do
         should be_valid
@@ -27,17 +49,26 @@ describe ContentFolder do
       end
     end
 
-    it 'cannot have empty child_folders AND document_ids' do
-      basic_subject.should be_invalid
+    it 'can have empty child_folders AND document_ids' do
+      #puts basic_subject.inspect
+      basic_subject.should be_valid
     end
 
     it 'is valid when document_ids are present' do
+      #puts subject.inspect
       subject.should be_valid
     end
 
     it 'is valid when child_folders are present' do
+      #puts subject_with_folders.inspect
+      #puts subject_with_folders.child_folders.inspect
       subject_with_folders.should be_valid
     end
+
+    it 'is  valid to have duplicate folder_ids' do
+      basic_subject.child_folders.push [a_folder, dupe_folder]
+      basic_subject.should be_valid
+    end
   end
 
   context 'selectors' do
@@ -49,10 +80,11 @@ describe ContentFolder do
   context 'db operations' do
     let(:subject_with_folders) { FactoryGirl.build :content_folder_with_child_folders }
 
-    it 'saves and can be retrieved' do
-      id = subject_with_folders.folder_id
+    it 'saved content folders can be retrieved' do
+      ContentFolder.delete_all
+      id = subject_with_folders.child_folders.first.folder_id
       subject_with_folders.save
-      found = ContentFolder.find(id)
+      found = ContentFolder.find_folder(id)
       found.should_not be_nil
     end
   end
@@ -64,6 +96,8 @@ describe ContentFolder do
       lit_center = FactoryGirl.build :content_folder_with_document_ids, :folder_id => ContentFolder::FolderIds::LIT_CENTER
       merrill_lynch = FactoryGirl.build :content_folder_with_document_ids, :folder_id => ContentFolder::FolderIds::MERRILL_LYNCH
       plan_529 = FactoryGirl.build :content_folder_with_document_ids, :folder_id => ContentFolder::FolderIds::PLANS_529
+      ttpf = FactoryGirl.build :content_folder_with_document_ids, :folder_id => "ttpf"
+      plan_529.child_folders = [ttpf]
       other = FactoryGirl.build :content_folder_with_document_ids, :folder_id => 'abcdefg'
       root.child_folders = [lit_center, merrill_lynch, plan_529, other]
       root.save
@@ -91,5 +125,64 @@ describe ContentFolder do
       result = ContentFolder.find_folder('zyxw')
       result.should be_nil
     end
+
+    it 'should return folder by relative path' do
+      path = ContentFolder::FolderIds::PLANS_529 + "/ttpf"
+      result = ContentFolder.find_folder_by_relative_path(path)
+      result.should_not be_nil
+    end
+
+    it 'should return child folder' do
+      root = ContentFolder.last
+      result = ContentFolder.find_child_folder(root, [ContentFolder::FolderIds::PLANS_529, "ttpf"])
+      result.should_not be_nil
+    end
+  end
+
+
+  context 'content folder and asset association' do
+    before do
+      ContentFolder.delete_all
+      root = FactoryGirl.build :content_folder_with_document_ids
+      lit_center = FactoryGirl.build :content_folder, :folder_id => ContentFolder::FolderIds::LIT_CENTER
+      merrill_lynch = FactoryGirl.build :content_folder, :folder_id => ContentFolder::FolderIds::MERRILL_LYNCH
+      plan_529 = FactoryGirl.build :content_folder, :folder_id => ContentFolder::FolderIds::PLANS_529
+      asset_one = FactoryGirl.create :digital_asset, :digital_asset_id => "guid_1111"
+      asset_two = FactoryGirl.create :digital_asset, :digital_asset_id => "guid_2222"
+      asset_three = FactoryGirl.create :digital_asset, :digital_asset_id => "guid_3333"
+      lit_center.documents << [asset_one, asset_two, asset_three]
+      merrill_lynch.documents << [asset_two, asset_three]
+      plan_529.documents << [asset_three]
+      root.child_folders = [lit_center, merrill_lynch, plan_529]
+      root.save
+    end
+
+    it 'should return the lit center folder with document count of 3' do
+      result = ContentFolder.lit_center_folder
+      result.should_not be_nil
+      result.document_ids.count.should == 3
+      result.folder_id.should == ContentFolder::FolderIds::LIT_CENTER
+    end
+
+    it 'should return the merrill_lynch folder with document count of 2' do
+      result = ContentFolder.merrill_lynch_folder
+      result.should_not be_nil
+      result.document_ids.count.should == 2
+      result.folder_id.should == ContentFolder::FolderIds::MERRILL_LYNCH
+    end
+
+
+    it 'delete an asset record from database, associated with a folder' do
+      result = ContentFolder.plan_529_folder
+      #puts "==== #{result.inspect}"
+      #puts "Documents:  #{result.documents.inspect}"
+      result.documents.count.should == 1
+      asset3 = DigitalAsset.where(digital_asset_id: "guid_3333").exists?
+      DigitalAsset.where(digital_asset_id: "guid_3333").delete_all
+      #puts "Documents:  #{result.documents.inspect}"
+      result.documents.count.should == 0
+      result.folder_id.should == ContentFolder::FolderIds::PLANS_529
+    end
   end
+
 end