hydra-collections 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0848c18173f62f89254d85e85b584440db5c9360
-  data.tar.gz: f1f144ffa8fbc44c61ab2ad810c89ce8e7b18f38
+  metadata.gz: d18580cc6f615f6c2db8d172eafc3295c15112d2
+  data.tar.gz: 62d0fcd015fe10ddbea811c97d510ea851834af2
 SHA512:
-  metadata.gz: 025f951414c29038af78092e552353de53181095da0f5fe6c16831a4a12e7d6e8c6de5fb30f68cab3f75e44bae2ee95d830c13a6455821339dd800332de82031
-  data.tar.gz: 7825b8ed470364197333795a2edd070df64a4935734864721a4914cf82970df572db73142fb33e031f8594045656ccc8b84754a9fe86647fff941b8ee9145a1e
+  metadata.gz: c2a9e3f91da266b5d23af91de3ff2ae4aae0252d69fb3c7feed87e9323f953528b053f9d8399418377832084e8ea212466d14370098251af22d0c3564ff77a5a
+  data.tar.gz: 0d571aa1c5108c78d46e4d6d6dc0e75c76d1b07fe77105774a068a12da2642f7e5ed3d6b2cf8d3b50fbf5af49312ab9d27a8bacfcb7e80f0ff0ca8579971864e

data/app/models/collection.rb

@@ -1,16 +1,3 @@
-# Copyright © 2013 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 class Collection < ActiveFedora::Base
   include Hydra::Collection
 end

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

@@ -1,4 +1,3 @@
-
 module Hydra
   module Collection
     extend ActiveSupport::Concern
@@ -11,7 +10,7 @@ module Hydra
       has_metadata "descMetadata", type: Hydra::CollectionRdfDatastream
       has_metadata "properties", type: Hydra::Datastream::Properties
 
-      has_and_belongs_to_many :members, :property => :has_collection_member, :class_name => "ActiveFedora::Base" , :after_remove => :update_member
+      has_and_belongs_to_many :members, property: :has_collection_member, class_name: "ActiveFedora::Base" , after_remove: :update_member
 
       has_attributes :depositor, datastream: :properties, multiple: false
       
@@ -44,6 +43,8 @@ module Hydra
 
     # TODO: Use solr atomic updates to accelerate this process
     def update_member member
+      # because the member may have its collections cached, reload that cache so that it indexes the correct fields.
+      member.collections(true) if member.respond_to? :collections
       member.update_index
     end
 

data/lib/hydra/collections/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Collections
-    VERSION = "2.0.4"
+    VERSION = "2.0.5"
   end
 end

data/spec/controllers/collections_controller_spec.rb

@@ -2,8 +2,12 @@ require 'spec_helper'
 
 describe CollectionsController, :type => :controller do
   before(:all) do
+    CollectionsController.configure_blacklight do |config|
+      config.default_solr_params = {:qf => 'label_tesim'}
+    end
+
     @user = FactoryGirl.find_or_create(:user)
-#    CollectionsController.config.default_solr_params = {:qf => 'title_tesim'}
+
     class GenericFile < ActiveFedora::Base
       include Hydra::Collections::Collectible
 

data/spec/helpers/collections_helper_spec.rb

@@ -103,10 +103,9 @@ describe CollectionsHelper, :type => :helper do
     it "should create a button with my text" do
       str = button_for_remove_selected_from_collection @collection, "Remove My Button"
       doc = Nokogiri::HTML(str)
-      form = doc.xpath('//form').first
-      expect(form.attr('action')).to eq("#{collections.collection_path(@collection.pid)}")
-      i = form.children[3]
-      expect(i.attr('value')).to eq("Remove My Button")
+      form = doc.css('form').first
+      expect(form.attr('action')).to eq collections.collection_path(@collection.id)
+      expect(form.css('input[type="submit"]').attr('value').value).to eq "Remove My Button"
     end
   end
 

data/spec/models/collection_spec.rb

@@ -1,17 +1,3 @@
-# Copyright © 2013 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 require 'spec_helper'
 
 describe Collection, :type => :model do
@@ -71,6 +57,9 @@ describe Collection, :type => :model do
   it "should allow files to be removed" do
     @collection.members = [@gf1, @gf2]
     @collection.save
+
+    expect(@gf1.collections).to eq [@collection] # 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.pid).send(:solr_doc)
     expect(solr_doc_before_remove["collection_tesim"]).to eq([@collection.pid])
     @collection.reload.members.delete(@gf1)

data/spec/spec_helper.rb

@@ -20,6 +20,7 @@ RSpec.configure do |config|
   config.include Devise::TestHelpers, :type => :controller
   config.before(:each, :type=>"controller") { @routes = Hydra::Collections::Engine.routes }
   config.include EngineRoutes, :type => :controller
+  config.infer_spec_type_from_file_location!
 end
 
 module FactoryGirl

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-collections
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Carolyn Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: A rails engine for managing Hydra Collections
@@ -214,3 +214,4 @@ test_files:
 - spec/support/db/migrate/20111101221803_create_searches.rb
 - spec/support/lib/generators/test_app_generator.rb
 - spec/support/lib/tasks/rspec.rake
+has_rdoc: