hydra-collections 4.0.0.beta1 → 4.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c7e16cee43a7fdaf1ef7f112ae42f8eb1ddb684
-  data.tar.gz: d99f69ce5988cf2023a811344fa461bf3b859e2f
+  metadata.gz: 878b10998101cbd6d3b1420408215b6605180517
+  data.tar.gz: 015496e71bfabd20eb28668f4dd1d42ed3a83b48
 SHA512:
-  metadata.gz: fe6f6ae745110afbf7fa17e8139a075124421e9f39796b79eb6ede511e80cfdd75238469262be83dd929b941f6d43f66f03e1af5dc23096ce9d53b7e9a2cc533
-  data.tar.gz: b1a372ad7bfa3419d0fddc0350e11b6966b41dac9a30e53e996b05f494164af66e79afc06fc2325181889aa1477ed5945938b8d6976a2ad976e0d6e8c1939af6
+  metadata.gz: 374d069be8e10287435c0544a8c571da379cfd8e86d05176f327a4340cba7c95df59005ef599106a516d4f33b1ba0763d1ecded7a9b61546886f229e75c8c64d
+  data.tar.gz: ed325dd51ed6abbfd585702f9a6f796f9d66b088767b4230100669e4116cdcd0678d91a687f0cda705fe3a68f03dce186a3941ba97cf4370f082a1c355e56a6f

data/app/helpers/collections_search_helper.rb

@@ -5,7 +5,8 @@ module CollectionsSearchHelper
   # @return [String] the title of the collection if available, otherwise its pid
   def collection_name(collection_pid)
     #TODO this can be loaded from solr
-    Collection.find(collection_pid).title || collection_pid
+    # the .result is due to ActiveTriples/ActiveTripes#74
+    Collection.find(collection_pid).title.result || collection_pid
   end
 
 end

data/app/models/concerns/hydra/collection.rb

@@ -9,7 +9,7 @@ module Hydra
     included do
       has_and_belongs_to_many :members, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasCollectionMember, class_name: "ActiveFedora::Base" , after_remove: :update_member
 
-      property :depositor, predicate: RDF::URI.new("http://id.loc.gov/vocabulary/relators/dpt")
+      property :depositor, predicate: RDF::URI.new("http://id.loc.gov/vocabulary/relators/dpt"), multiple: false
 
       property :part_of, predicate: RDF::DC.isPartOf
       property :contributor, predicate: RDF::DC.contributor do |index|
@@ -18,10 +18,10 @@ module Hydra
       property :creator, predicate: RDF::DC.creator do |index|
         index.as :stored_searchable, :facetable
       end
-      property :title, predicate: RDF::DC.title do |index|
+      property :title, predicate: RDF::DC.title, multiple: false do |index|
         index.as :stored_searchable
       end
-      property :description, predicate: RDF::DC.description do |index|
+      property :description, predicate: RDF::DC.description, multiple: false do |index|
         index.type :text
         index.as :stored_searchable
       end
@@ -31,11 +31,11 @@ module Hydra
       property :date_created, predicate: RDF::DC.created do |index|
         index.as :stored_searchable
       end
-      property :date_uploaded, predicate: RDF::DC.dateSubmitted do |index|
+      property :date_uploaded, predicate: RDF::DC.dateSubmitted, multiple: false do |index|
         index.type :date
         index.as :stored_sortable
       end
-      property :date_modified, predicate: RDF::DC.modified do |index|
+      property :date_modified, predicate: RDF::DC.modified, multiple: false do |index|
         index.type :date
         index.as :stored_sortable
       end
@@ -62,27 +62,6 @@ module Hydra
       end
       property :related_url, predicate: RDF::RDFS.seeAlso
 
-      # Single-valued properties
-      def depositor
-        super.first
-      end
-
-      def title
-        super.first
-      end
-
-      def date_uploaded
-        super.first
-      end
-
-      def date_modified
-        super.first
-      end
-
-      def description
-        super.first
-      end
-
       before_create :set_date_uploaded
       before_save :set_date_modified
       before_destroy :update_all_members
@@ -96,8 +75,8 @@ module Hydra
 
     def terms_for_display
       [
-        :part_of, :contributor, :creator, :title, :description, :publisher, 
-        :date_created, :date_uploaded, :date_modified, :subject, :language, :rights, 
+        :part_of, :contributor, :creator, :title, :description, :publisher,
+        :date_created, :date_uploaded, :date_modified, :subject, :language, :rights,
         :resource_type, :identifier, :based_near, :tag, :related_url
       ]
     end

data/lib/hydra/collections/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Collections
-    VERSION = "4.0.0.beta1"
+    VERSION = "4.0.0.beta2"
   end
 end

data/spec/controllers/collections_controller_spec.rb

@@ -11,18 +11,7 @@ describe CollectionsController, :type => :controller do
     class GenericFile < ActiveFedora::Base
       include Hydra::Collections::Collectible
 
-      property :title, predicate: ::RDF::DC.title
-
-      # Hack until https://github.com/no-reply/ActiveTriples/pull/37 is merged
-      def title_with_first
-        title_without_first.first
-      end
-      alias_method_chain :title, :first
-
-      # use this until https://github.com/projecthydra/active_fedora/issues/457 is resolved
-      def to_param
-        id
-      end
+      property :title, predicate: ::RDF::DC.title, multiple: false
 
       def to_solr(solr_doc={})
         super.tap do |solr_doc|
@@ -293,7 +282,7 @@ describe CollectionsController, :type => :controller do
     context "When there are search matches that are not in the collection" do
       before do
         GenericFile.create!(title: "#{@asset1.id} #{@asset1.title}")
-        GenericFile.create!(title: @asset1.title)
+        GenericFile.create!(title: @asset1.title.to_s)
       end
       # NOTE: This test depends on title_tesim being in the qf in solrconfig.xml
       it "should query the collections and show only the collection assets" do

data/spec/helpers/collections_search_helper_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe CollectionsSearchHelper, :type => :helper do
   describe "collection_name" do
-    let (:collection_without_title) { Collection.create() }
+    let (:collection_without_title) { Collection.create!() }
     let (:collection_with_title) { Collection.create(title: "Title of Collection 2") }
 
     it "should return the pid if no title available" do

data/spec/models/collection_spec.rb

@@ -19,94 +19,153 @@ describe Collection, :type => :model do
     Object.send(:remove_const, :GenericFile)
   end
 
-  before do
-    @collection = Collection.new
-    @collection.apply_depositor_metadata(@user.user_key)
-    @collection.save!
-    @gf1 = GenericFile.create
-    @gf2 = GenericFile.create
-  end
+  let(:gf1) { GenericFile.create }
+  let(:gf2) { GenericFile.create }
 
-  it "should have a depositor" do
-    expect(@collection.depositor).to eq(@user.user_key)
-  end
+  let(:user) { @user }
+
+  describe "#to_solr" do
+    let(:collection) { Collection.new(title: "A good title") }
 
-  it "should allow the depositor to edit and read" do
-    ability = Ability.new(@user)
-    expect(ability.can?(:read, @collection)).to be true
-    expect(ability.can?(:edit, @collection)).to be true
+    subject { collection.to_solr }
+
+    it "should have title" do
+      expect(subject['title_tesim']).to eq ['A good title']
+    end
   end
 
-  it "should be empty by default" do
-    expect(@collection.members).to be_empty
+  describe "#depositor" do
+    before do
+      subject.apply_depositor_metadata(user)
+    end
+
+    it "should have a depositor" do
+      expect(subject.depositor).to eq(user.user_key)
+    end
   end
 
-  it "should have many files" do
-    @collection.members = [@gf1, @gf2]
-    @collection.save
-    expect(@collection.reload.members).to match_array [@gf1, @gf2]
+  describe "the ability" do
+    let(:collection) do
+      Collection.new.tap do |collection|
+        collection.apply_depositor_metadata(user)
+        collection.save
+      end
+    end
+    subject { Ability.new(user) }
+
+    it "should allow the depositor to edit and read" do
+      expect(subject.can?(:read, collection)).to be true
+      expect(subject.can?(:edit, collection)).to be true
+    end
   end
 
-  it "should allow new files to be added" do
-    @collection.members = [@gf1]
-    @collection.save
-    @collection.reload
-    @collection.members << @gf2
-    @collection.save
-    expect(@collection.reload.members).to match_array [@gf1, @gf2]
+  describe "#members" do
+    it "should be empty by default" do
+      expect(subject.members).to be_empty
+    end
+
+    context "adding members" do
+      context "using assignment" do
+        subject { Collection.create(members: [gf1, gf2]) }
+
+        it "should have many files" do
+          expect(subject.reload.members).to eq [gf1, gf2]
+        end
+      end
+
+      context "using append" do
+        before do
+          subject.members = [gf1]
+          subject.save
+        end
+        it "should allow new files to be added" do
+          subject.reload
+          subject.members << gf2
+          subject.save
+          expect(subject.reload.members).to eq [gf1, gf2]
+        end
+      end
+    end
+
+
+    context "removing members" do
+      before do
+        subject.members = [gf1, gf2]
+        subject.save
+      end
+
+      it "should allow files to be removed" do
+        expect(gf1.collections).to eq [subject] # This line forces the "collections" to be cached.
+        # We need to ensure that deleting causes the collection to be flushed.
+        solr_doc_before_remove = ActiveFedora::SolrInstanceLoader.new(ActiveFedora::Base, gf1.id).send(:solr_doc)
+        expect(solr_doc_before_remove["collection_tesim"]).to eq [subject.id]
+        subject.reload.members.delete(gf1)
+        subject.save
+        expect(subject.reload.members).to eq [gf2]
+        solr_doc_after_remove = ActiveFedora::SolrInstanceLoader.new(ActiveFedora::Base, gf1.id).send(:solr_doc)
+        expect(solr_doc_after_remove["collection_tesim"]).to be_nil
+      end
+    end
   end
 
   it "should set the date uploaded on create" do
-    @collection.save
-    expect(@collection.date_uploaded).to be_kind_of(Date)
-  end
-  it "should update the date modified on update" do
-    uploaded_date = Date.today
-    modified_date = Date.tomorrow
-    expect(Date).to receive(:today).twice.and_return(uploaded_date, modified_date)
-    @collection.save
-    expect(@collection.date_modified).to eq(uploaded_date)
-    @collection.members = [@gf1]
-    @collection.save
-    expect(@collection.date_modified).to eq(modified_date)
-    @gf1 = @gf1.reload
-    expect(@gf1.collections).to include(@collection)
-    expect(@gf1.to_solr[Solrizer.solr_name(:collection)]).to eq([@collection.id])
+    subject.save
+    expect(subject.date_uploaded).to be_kind_of(Date)
+  end
+
+  describe "when updating" do
+    let(:gf1) { GenericFile.create }
+
+    it "should update the date modified on update" do
+      uploaded_date = Date.today
+      modified_date = Date.tomorrow
+      subject.save
+      allow(Date).to receive(:today).and_return(uploaded_date, modified_date)
+      subject.save
+      expect(subject.date_modified).to eq uploaded_date
+      subject.members = [gf1]
+      subject.save
+      expect(subject.date_modified).to eq modified_date
+      expect(gf1.reload.collections).to include(subject)
+      expect(gf1.to_solr[Solrizer.solr_name(:collection)]).to eq [subject.id]
+    end
   end
+
   it "should have a title" do
-    @collection.title = "title"
-    @collection.save
-    expect(Collection.find(@collection.id).title).to eq(@collection.title)
+    subject.title = "title"
+    subject.save
+    expect(subject.title).to eq "title"
   end
+
   it "should have a description" do
-    @collection.description = "description"
-    @collection.save
-    expect(Collection.find(@collection.id).description).to eq(@collection.description)
+    subject.description = "description"
+    subject.save
+    expect(subject.reload.description).to eq "description"
   end
 
   it "should have the expected display terms" do
-    expect(@collection.terms_for_display).to include(
-      :part_of, :contributor, :creator, :title, :description, :publisher, 
-      :date_created, :date_uploaded, :date_modified, :subject, :language, :rights, 
-      :resource_type, :identifier, :based_near, :tag, :related_url
-    )
+    expect(subject.terms_for_display).to eq([:part_of, :contributor, :creator, :title, :description, :publisher, :date_created, :date_uploaded, :date_modified, :subject, :language, :rights, :resource_type, :identifier, :based_near, :tag, :related_url])
   end
+
   it "should have the expected edit terms" do
-    expect(@collection.terms_for_editing).to include(
-      :part_of, :contributor, :creator, :title, :description, :publisher, :date_created,
-      :subject, :language, :rights, :resource_type, :identifier, :based_near, :tag, :related_url
-     )
+    expect(subject.terms_for_editing).to eq([:part_of, :contributor, :creator, :title, :description, :publisher, :date_created, :subject, :language, :rights, :resource_type, :identifier, :based_near, :tag, :related_url])
   end
-  it "should not delete member files when deleted" do
-    @collection.members = [@gf1, @gf2]
-    @collection.save
-    @collection.destroy
-    expect(GenericFile).to exist(@gf1.id)
-    expect(GenericFile).to exist(@gf2.id)
+
+  describe "#destroy" do
+    before do
+      subject.members = [gf1, gf2]
+      subject.save
+      subject.destroy
+    end
+
+    it "should not delete member files when deleted" do
+      expect(GenericFile.exists?(gf1.id)).to be true
+      expect(GenericFile.exists?(gf2.id)).to be true
+    end
   end
 
   describe "Collection by another name" do
-    before (:all) do
+    before do
       class OtherCollection < ActiveFedora::Base
         include Hydra::Collection
       end
@@ -115,7 +174,7 @@ describe Collection, :type => :model do
         include Hydra::Collections::Collectible
       end
     end
-    after(:all) do
+    after do
       Object.send(:remove_const, :OtherCollection)
       Object.send(:remove_const, :Member)
     end
@@ -133,5 +192,4 @@ describe Collection, :type => :model do
       expect(member.collections).to eq [collection]
     end
   end
-
 end

data/spec/spec_helper.rb

@@ -9,11 +9,10 @@ require 'hydra-collections'
 FactoryGirl.definition_file_paths = [File.expand_path("../factories", __FILE__)]
 FactoryGirl.find_definitions
 
+# require 'http_logger'
 # HttpLogger.logger = Logger.new(STDOUT)
 # HttpLogger.ignore = [/localhost:8983\/solr/]
 # HttpLogger.colorize = false
-# # Patch for https://github.com/railsware/http_logger/issues/13
-# HttpLogger::HTTP_METHODS_WITH_BODY = Set.new(%w(POST PUT GET PATCH))
 
 module EngineRoutes
   def self.included(base)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-collections
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta1
+  version: 4.0.0.beta2
 platform: ruby
 authors:
 - Carolyn Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2014-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight