hydra-collections 1.1.0 → 1.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a23c9e212041b2816a048695daa5248aad7430d4
-  data.tar.gz: 1fe561ef9cdf68b337e1940484c9abfabfeab8ed
+  metadata.gz: dfc74ceeb87a7e976490787be510f702cb5f1c6b
+  data.tar.gz: 9a05555f089870f45e68642505108003f63d476b
 SHA512:
-  metadata.gz: 0281f3b8a8de3e273d261803addccf4a5755f654e5e4b19236030aab299992b491b19abcb7e4fa7de7451220a664db640e80e37b613505ba62d0a886b264b2c5
-  data.tar.gz: 767db121ed138d32b5c49c5cec0de22f159470ee661f91251cdaf45375f47f446c6851d20bad742d2efad825b6613d0cb09cf916b6e4069dca887fb448eab9f3
+  metadata.gz: 9133fe138d20652cc03f90cd4876420e745b682b373e43c080f925c343c6383e804b36b7fa2941444fc895ea490cf6be3471000aaa08969711fdbee5271afbd3
+  data.tar.gz: 8f45f09aafabd41dff06921e75630140369a19fcd69909c20210a4a0deec1971b465c91bd565fc6ca8130cff4f6c4ca156c4cd94e02f5de529d1fe21dd33ecec

data/Changelog.md

@@ -1,3 +1,7 @@
+# 1.2.0.rc1
+
+* Made compatible with hydra-head 6.4.0
+
 # 1.1.0 
 
 * 2013-09-30: Refactor to load modules after engine is initialized (concerns)

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

@@ -1,4 +1,3 @@
-require 'hydra/head'
 require 'hydra/datastreams/collection_rdf_datastream'
 
 module Hydra
@@ -6,23 +5,22 @@ module Hydra
     extend ActiveSupport::Concern
     extend ActiveSupport::Autoload
     include Hydra::ModelMethods # for access to apply_depositor_metadata
-    include Hydra::ModelMixins::RightsMetadata
+    include Hydra::AccessControls::Permissions
     include Hydra::Collections::Collectible
 
     included do
-      has_metadata :name => "descMetadata", :type => CollectionRdfDatastream
-      has_metadata :name => "properties", :type => Hydra::Datastream::Properties
-      has_metadata :name => "rightsMetadata", :type => Hydra::Datastream::RightsMetadata
+      has_metadata "descMetadata", type: 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
 
-      delegate_to :properties, [:depositor], :unique => true
+      delegate_to :properties, [:depositor], multiple: false
       
       delegate_to :descMetadata, [:title, :date_uploaded, :date_modified,
-                                  :description], :unique => true         
+                                  :description], multiple: false
       delegate_to :descMetadata, [:creator, :contributor, :based_near, :part_of, 
                                 :publisher, :date_created, :subject,:resource_type, :rights, :identifier,
-                                :language, :tag, :related_url]                            
+                                :language, :tag, :related_url], multiple: true                            
 
       before_create :set_date_uploaded
       before_save :set_date_modified

data/hydra-collections.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "blacklight"
-  spec.add_dependency "hydra-head"
+  spec.add_dependency "hydra-head", ">= 6.4.0.rc2", "< 6.5"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/hydra/collections/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Collections
-    VERSION = "1.1.0"
+    VERSION = "1.2.0.rc1"
   end
 end

data/spec/controllers/selects_collections_spec.rb

@@ -45,7 +45,7 @@ describe SelectsCollectionsController do
       @collection4.save 
     end
     after (:all) do
-      Collection.find(:all).map(&:delete)
+      Collection.delete_all
     end
     describe "Public Access" do
       before (:each) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-collections
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0.rc1
 platform: ruby
 authors:
 - Carolyn Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -30,14 +30,20 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.4.0.rc2
+    - - <
+      - !ruby/object:Gem::Version
+        version: '6.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.4.0.rc2
+    - - <
+      - !ruby/object:Gem::Version
+        version: '6.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -204,9 +210,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3