hydra-collections 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55d7ebe59b86c2f810f06634f7350711e7dcc5ab
-  data.tar.gz: 84e84c78c2d1e42e98fb3ec0d4d00e0390d7fed3
+  metadata.gz: a40774a6709a3b08238ba531159fcdbc422c4999
+  data.tar.gz: 83c247f517fed9c0a105cc33d4dc40a128af35cb
 SHA512:
-  metadata.gz: 28011db954e329b3846cfdb6ba6ad00f21f1d84d3f92d6305379c310695cf420cebff54c8c62a79b08dc7b8bfbb90da75920fb3ddffe7164a95e8b2c5b0a5366
-  data.tar.gz: 100026fd0761a2aaa084c8ab9d897fce4ca4b1c5894bd686d7043f669accc5a590880a6551ea9a74c93eebf98d988259a796b7ace8f10b5baa198bfc7530ab19
+  metadata.gz: 31a88c9b6891ab76d58886b2453ac1ff4f2c8abb1282cbbc28a1c3147518320ab14d0ca77649600b1dec2d941250ff95c3a88712e43745f517f8720f13392755
+  data.tar.gz: dc8a6a6df5719248144cd00429fcd0b6afeb6f9aee6b9e2de3d8ab7ffd969386ebe69fcc7c149add42c6067797b018ce7f751e188e55d3e830e82b4fb28c5bab

data/Gemfile

@@ -3,8 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in hydra-collections.gemspec
 gemspec
 
-gem 'blacklight', github:'projectblacklight/blacklight' ,ref:'2eb87e73ee81ee701982ca32e5eca37429e3c199'
-
 group :development, :test do
   gem 'sqlite3'
   gem "factory_girl_rails", "~> 4.1.0"

data/app/controllers/concerns/hydra/collections_controller_behavior.rb

@@ -178,12 +178,7 @@ module Hydra
     # include filters into the query to only include the collection memebers
     def include_collection_ids(solr_parameters, user_parameters)
       solr_parameters[:fq] ||= []
-      if @collection.member_ids.empty?
-        solr_parameters[:fq] << '{!lucene}-id:[* TO *]' # Don't match anything
-      else
-        query = @collection.member_ids.map{|id| 'id:"'+id+'"'}.join " OR "
-        solr_parameters[:fq] << query
-      end
+      solr_parameters[:fq] << Solrizer.solr_name(:collection)+':"'+@collection.id+'"'
     end
   end # module CollectionsControllerBehavior
 end # module Hydra

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

@@ -1,4 +1,3 @@
-require 'hydra/datastreams/collection_rdf_datastream'
 
 module Hydra
   module Collection
@@ -9,7 +8,7 @@ module Hydra
     include Hydra::Collections::Collectible
 
     included do
-      has_metadata "descMetadata", type: CollectionRdfDatastream
+      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 => :remove_member

data/lib/hydra-collections.rb

@@ -14,8 +14,8 @@ module Hydra
       config.autoload_paths += %W(
         #{config.root}/app/controllers/concerns
         #{config.root}/app/models/concerns
+        #{config.root}/app/models/datastreams
       )
     end
   end
-end
-
+end

data/lib/hydra/collections/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Collections
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
   end
 end

data/spec/controllers/collections_controller_spec.rb

@@ -224,7 +224,7 @@ describe CollectionsController do
       @asset1 = GenericFile.create!(title: "First of the Assets")
       @asset2 = GenericFile.create!(title: "Second of the Assets")
       @asset3 = GenericFile.create!(title: "Third of the Assets")
-      @collection = Collection.new
+      @collection = Collection.new(pid:"abc:123")
       @collection.title = "My collection"
       @collection.apply_depositor_metadata(@user.user_key)
       @collection.members = [@asset1,@asset2,@asset3]
@@ -240,15 +240,39 @@ describe CollectionsController do
       ids.should include @asset2.pid
       ids.should include @asset3.pid
     end
-    it "should show only the collections assets" do
-      @asset4 = GenericFile.create!(title: "#{@asset1.id}")
-      get :show, id: @collection.id
-      assigns[:collection].title.should == @collection.title
-      ids = assigns[:member_docs].map {|d| d.id}
-      ids.should include @asset1.pid
-      ids.should include @asset2.pid
-      ids.should include @asset3.pid
-      ids.should_not include @asset4.pid
+    describe "additional collections" do
+      before do
+        @asset4 = GenericFile.create!(title: "#{@asset1.id}")
+        @collection2 = Collection.new(pid:"abc:1234")
+        @collection2.title = "Other collection"
+        @collection2.apply_depositor_metadata(@user.user_key)
+        @collection2.members = [@asset4]
+        @collection2.save
+        @asset4 = @asset4.reload
+        @asset4.collections.should == [@collection2]
+      end
+
+      it "should show only the collections assets" do
+        get :show, id: @collection.pid
+        assigns[:collection].title.should == @collection.title
+        ids = assigns[:member_docs].map {|d| d.id}
+        ids.should include @asset1.pid
+        ids.should include @asset2.pid
+        ids.should include @asset3.pid
+        ids.should_not include @asset4.pid
+
+      end
+      it "should show only the other collections assets" do
+
+        get :show, id: @collection2.pid
+        assigns[:collection].title.should == @collection2.title
+        ids = assigns[:member_docs].map {|d| d.id}
+        ids.should_not include @asset1.pid
+        ids.should_not include @asset2.pid
+        ids.should_not include @asset3.pid
+        ids.should include @asset4.pid
+
+      end
     end
 
     it "when the collection is empty it should show no assets" do

data/spec/controllers/other_collections_controller_spec.rb

@@ -13,11 +13,24 @@ end
 class OtherCollection < ActiveFedora::Base
   include Hydra::Collection
   include Hydra::Collections::Collectible
+
+  def to_solr(solr_doc={}, opts={})
+    super(solr_doc, opts)
+    solr_doc = index_collection_pids(solr_doc)
+    return solr_doc
+  end
+
 end
 class Member < ActiveFedora::Base
   include Hydra::Collections::Collectible
   attr_accessor :title
 
+  def to_solr(solr_doc={}, opts={})
+    super(solr_doc, opts)
+    solr_doc = index_collection_pids(solr_doc)
+    return solr_doc
+  end
+
 end
 
 # make sure a collection by another name still assigns the @collection variable

data/spec/models/collection_spec.rb

@@ -18,6 +18,14 @@ describe Collection do
   before(:all) do
     @user = FactoryGirl.find_or_create(:user)
     class GenericFile < ActiveFedora::Base
+      include Hydra::Collections::Collectible
+
+      def to_solr(solr_doc={}, opts={})
+        super(solr_doc, opts)
+        solr_doc = index_collection_pids(solr_doc)
+        return solr_doc
+      end
+
     end
   end
   after(:all) do
@@ -73,6 +81,9 @@ describe Collection do
     @collection.members = [@gf1]
     @collection.save
     @collection.date_modified.should == modified_date
+    @gf1 = @gf1.reload
+    @gf1.collections.should include(@collection)
+    @gf1.to_solr[Solrizer.solr_name(:collection)].should == [@collection.id]
   end
   it "should have a title" do
     @collection.title = "title"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-collections
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Carolyn Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -142,6 +142,7 @@ files:
 - app/helpers/collections_search_helper.rb
 - app/models/collection.rb
 - app/models/concerns/hydra/collection.rb
+- app/models/datastreams/hydra/collection_rdf_datastream.rb
 - app/models/solr_document.rb
 - app/views/batch_select/_add_button.html.erb
 - app/views/batch_select/_check_all.html.erb
@@ -175,7 +176,6 @@ files:
 - lib/hydra/collections/selects_collections.rb
 - lib/hydra/collections/solr_document_behavior.rb
 - lib/hydra/collections/version.rb
-- lib/hydra/datastreams/collection_rdf_datastream.rb
 - solr_conf/conf/schema.xml
 - solr_conf/conf/solrconfig.xml
 - solr_conf/solr.xml
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: A rails engine for managing Hydra Collections
@@ -250,4 +250,3 @@ 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: