hydra-core 6.4.2 → 6.5.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfc10f2caedd654bbf136fc596a5abce3f287896
-  data.tar.gz: ff88b04dfd7d0c8c6a6306ddfd202fc8e8fdf062
+  metadata.gz: 44187ec5c96d9328f05c2c23cb651d0e271f4aa3
+  data.tar.gz: 44f3c8e4493d072cd466a5763ff877f0b709d4fb
 SHA512:
-  metadata.gz: 369b83e34479aa15f8641f52cfbd3a7a337e39069b4315f52c9cf0761dd57df374f105cfc805b6bb09b552b25fec2a018f0cdbe29accfc262616cc58ea9fae2d
-  data.tar.gz: b76b05a6874330f0720c76193021ce515c2b7a38f8b603f322c45c7560063bff5afdcaf33d79b36138a6621bd794e56da15902860c60ad9aa2686b9257cec1e0
+  metadata.gz: ee6f4754df8e88d9cf6a8ac1a7930f2b3759a5b2b18bdb7a2d010d8a9137963dfbfba07596fa937f856405e0bc323f28b795fcde8a2caf80e71522800208cfa8
+  data.tar.gz: dfac686d7d22f862c4cd4a5f440c06dc37a535be72ab7567ffc7f18f02cd13d6c603321d01c5324cfd41312f84b3d57123c8459df2ce8db2ee910353993c72fd

data/hydra-core.gemspec

@@ -19,10 +19,9 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 1.9.3'
 
-
   gem.add_dependency "rails", '>= 3.2.3', '< 5' 
-  gem.add_dependency "blacklight", '~> 4.0'  
-  gem.add_dependency "active-fedora"
+  gem.add_dependency "blacklight", '~> 4.7'  
+  gem.add_dependency "active-fedora", '~> 6.7'
   gem.add_dependency 'block_helpers'
   gem.add_dependency 'deprecation', ">= 0.0.5"
   gem.add_dependency 'hydra-access-controls', version

data/lib/hydra-core.rb

@@ -10,7 +10,6 @@ module Hydra
   autoload :Solr
   module ModelMixins
     # ModelMixins already loaded by hydra-access-controls
-    autoload :CommonMetadata
     autoload :SolrDocumentExtension
   end
   autoload :Models

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "6.4.2"
+  VERSION = "6.5.0.rc2"
 end
 

data/spec/controllers/catalog_controller_spec.rb

@@ -56,7 +56,7 @@ describe CatalogController do
       before(:all) do
         fq = "read_access_group_ssim:public OR edit_access_group_ssim:public OR discover_access_group_ssim:public"
         solr_opts = {:fq=>fq}
-        response = Blacklight.solr.get('select', :params=> solr_opts)
+        response = ActiveFedora::SolrService.instance.conn.get('select', :params=>solr_opts)
         @public_only_results = Blacklight::SolrResponse.new(response, solr_opts)
       end
 

data/spec/lib/model_methods_spec.rb

@@ -4,7 +4,7 @@ describe Hydra::ModelMethods do
   
   before :all do
     class TestModel < ActiveFedora::Base
-      include Hydra::ModelMixins::CommonMetadata
+      include Hydra::AccessControls::Permissions
       include Hydra::ModelMethods
       has_metadata :name => "properties", :type => Hydra::Datastream::Properties
     end

data/spec/lib/solr_document_extension_spec.rb

@@ -6,7 +6,7 @@ describe Hydra::ModelMixins::SolrDocumentExtension do
   end
 
   it "should get_file_asset_count" do
-
+    Deprecation.stub(:warn).and_return(nil)
     mock_result = {'response'=>{'numFound'=>0}}
     ActiveFedora::SolrService.should_receive(:query).with("is_part_of_t:\"changeme\\:99\"", :rows=>0, :raw=>true).and_return(mock_result)
     @doc.get_file_asset_count.should == 0

data/spec/support/lib/generators/test_app_generator.rb

@@ -12,15 +12,10 @@ class TestAppGenerator < Rails::Generators::Base
   end
 
   def copy_test_fixtures
-    copy_file "app/models/generic_content.rb"
-
     # Download controller
     copy_file "app/controllers/downloads_controller.rb"
 
     copy_file "spec/fixtures/hydrangea_fixture_mods_article1.foxml.xml" 
-
-    # For testing Hydra::SubmissionWorkflow
-    copy_file "spec/fixtures/hydra_test_generic_content.foxml.xml"
   end
 
   def copy_rspec_rake_task

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 6.4.2
+  version: 6.5.0.rc2
 platform: ruby
 authors:
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -37,28 +37,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.7'
 - !ruby/object:Gem::Dependency
   name: block_helpers
   requirement: !ruby/object:Gem::Requirement
@@ -93,14 +93,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.4.2
+        version: 6.5.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.4.2
+        version: 6.5.0.rc2
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
@@ -245,7 +245,6 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/app/controllers/downloads_controller.rb
-- spec/support/app/models/generic_content.rb
 - spec/support/app/models/sample.rb
 - spec/support/app/models/solr_document.rb
 - spec/support/db/migrate/20111101221803_create_searches.rb
@@ -253,7 +252,6 @@ files:
 - spec/support/lib/tasks/rspec.rake
 - spec/support/matchers/helper_matcher.rb
 - spec/support/matchers/solr_matchers.rb
-- spec/support/spec/fixtures/hydra_test_generic_content.foxml.xml
 - spec/support/spec/fixtures/hydrangea_fixture_mods_article1.foxml.xml
 - spec/unit/hydra-head-engine_spec.rb
 - spec/unit/hydra-head_spec.rb
@@ -275,12 +273,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 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.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Hydra-Head Rails Engine (requires Rails3)
@@ -305,7 +303,6 @@ test_files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/app/controllers/downloads_controller.rb
-- spec/support/app/models/generic_content.rb
 - spec/support/app/models/sample.rb
 - spec/support/app/models/solr_document.rb
 - spec/support/db/migrate/20111101221803_create_searches.rb
@@ -313,7 +310,6 @@ test_files:
 - spec/support/lib/tasks/rspec.rake
 - spec/support/matchers/helper_matcher.rb
 - spec/support/matchers/solr_matchers.rb
-- spec/support/spec/fixtures/hydra_test_generic_content.foxml.xml
 - spec/support/spec/fixtures/hydrangea_fixture_mods_article1.foxml.xml
 - spec/unit/hydra-head-engine_spec.rb
 - spec/unit/hydra-head_spec.rb

data/spec/support/app/models/generic_content.rb

@@ -1,21 +0,0 @@
-# GenericContent:  EXAMPLE Model that conforms to the Hydra genericContent and genericMetadata cModels 
-require 'deprecation'
-class GenericContent < ActiveFedora::Base
-  extend Deprecation
-
-  # Uses the Hydra Rights Metadata Schema for tracking access permissions & copyright
-  #  FIXME:  should this have   "include Hydra::ModelMixins::CommonMetadata" instead?
-  has_metadata :name => "rightsMetadata", :type => Hydra::Datastream::RightsMetadata 
-
-  # A place to put extra metadata values, e.g. the user id of the object depositor (for permissions)
-  has_metadata :name => "properties", :type => Hydra::Datastream::Properties
-  
-  # adds helpful methods for basic hydra objects.  
-  # FIXME:  redundate with  GenericContent include above??
-  include Hydra::ModelMethods
-  
-  def initialize( attrs={} )
-    Deprecation.warn(GenericContent, "GenericContent is deprecated and will be removed in hydra-head 5.x")
-    super
-  end
-end

data/spec/support/spec/fixtures/hydra_test_generic_content.foxml.xml

@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<foxml:digitalObject VERSION="1.1" PID="hydra:test_generic_content" xmlns:foxml="info:fedora/fedora-system:def/foxml#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-  <foxml:objectProperties>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE=""/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2011-07-14T01:28:47.221Z"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2011-07-14T01:30:56.432Z"/>
-  </foxml:objectProperties>
-  <foxml:datastream ID="DC" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
-    <foxml:datastreamVersion ID="DC1.0" LABEL="Dublin Core Record for this object" CREATED="2011-07-14T01:28:47.221Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="341">
-      <foxml:xmlContent>
-        <oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-          <dc:identifier>hydra:test_generic_content</dc:identifier>
-          <dc:description>A test object using the GenericContent (active)fedora model</dc:description>
-        </oai_dc:dc>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream ID="descMetadata" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
-    <foxml:datastreamVersion ID="descMetadata.1" LABEL="" CREATED="2011-07-14T01:30:13.169Z" MIMETYPE="text/xml" SIZE="1552">
-      <foxml:xmlContent>
-        <mods xmlns="http://www.loc.gov/mods/v3" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3" xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-3.xsd">
-          <titleInfo lang="">
-            <title>generic content</title>
-          </titleInfo>
-          <name type="personal">
-            <namePart type="given">Orlob</namePart>
-            <namePart type="family">Gryphon</namePart>
-            <affiliation>Fantasy</affiliation>
-            <role>
-              <roleTerm authority="marcrelator" type="text"/>
-            </role>
-            <description>Mythical Creatures</description>
-          </name>
-          <typeOfResource/>
-          <genre authority="marcgt"/>
-          <language>
-            <languageTerm authority="iso639-2b" type="code"/>
-          </language>
-          <physicalDescription>
-            <extent/>
-          </physicalDescription>
-          <abstract>A test object using the GenericContent (active)fedora model</abstract>
-          <subject>
-            <topic>flying creatures</topic>
-          </subject>
-          <relatedItem type="host">
-            <titleInfo>
-              <title/>
-            </titleInfo>
-            <identifier type="issn"/>
-            <originInfo>
-              <publisher/>
-              <dateIssued/>
-            </originInfo>
-            <part>
-              <detail type="volume">
-                <number/>
-              </detail>
-              <detail type="number">
-                <number/>
-              </detail>
-              <extent unit="pages">
-                <start/>
-                <end/>
-              </extent>
-              <date/>
-            </part>
-          </relatedItem>
-          <location>
-            <url/>
-          </location>
-        </mods>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream ID="RELS-EXT" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
-    <foxml:datastreamVersion ID="RELS-EXT.0" LABEL="" CREATED="2011-07-14T01:28:49.031Z" MIMETYPE="text/xml" SIZE="277">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/hydra:test_generic_content">
-            <hasModel xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/afmodel:GenericContent"/>
-          </rdf:Description>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream ID="rightsMetadata" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
-     <foxml:datastreamVersion ID="rightsMetadata.1" LABEL="" CREATED="2011-07-14T01:30:56.432Z" MIMETYPE="text/xml" SIZE="777">
-      <foxml:xmlContent>
-        <rightsMetadata xmlns="http://hydra-collab.stanford.edu/schemas/rightsMetadata/v1" version="0.1">
-          <copyright>
-            <human/>
-            <machine>
-              <uvalicense>no</uvalicense>
-            </machine>
-          </copyright>
-          <access type="discover">
-            <human/>
-            <machine/>
-          </access>
-          <access type="read">
-            <human/>
-            <machine>
-              <group>researcher</group>
-              <group>public</group>
-              <group>patron</group>
-              <group>donor</group>
-            </machine>
-          </access>
-          <access type="edit">
-            <human/>
-            <machine>
-              <person>archivist1</person>
-              <group>archivist</group>
-              <group>admin_policy_object_editor</group>
-            </machine>
-          </access>
-          <embargo>
-            <human/>
-            <machine/>
-          </embargo>
-        </rightsMetadata>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream ID="properties" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
-    <foxml:datastreamVersion ID="properties.0" LABEL="" CREATED="2011-07-14T01:28:49.367Z" MIMETYPE="text/xml" SIZE="99">
-      <foxml:xmlContent>
-        <fields>
-          <collection>generic_content</collection>
-          <depositor>archivist1</depositor>
-        </fields>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-</foxml:digitalObject>