active-fedora 11.0.0.rc7 → 11.0.0

data/spec/unit/has_and_belongs_to_many_association_spec.rb

@@ -7,8 +7,6 @@ describe ActiveFedora::Associations::HasAndBelongsToManyAssociation do
       end
       class Page < ActiveFedora::Base
       end
-      allow_any_instance_of(Book).to receive(:load_datastreams).and_return(false)
-      allow_any_instance_of(Page).to receive(:load_datastreams).and_return(false)
 
       allow(book).to receive(:new_record?).and_return(false)
       allow(book).to receive(:save).and_return(true)

data/spec/unit/has_many_association_spec.rb

@@ -110,8 +110,8 @@ describe ActiveFedora::Associations::HasManyAssociation do
   end
 
   describe "#ids_reader" do
-    let(:owner) { double('owner') }
-    let(:reflection) { double('reflection', check_validity!: true) }
+    let(:owner) { instance_double(ActiveFedora::Base) }
+    let(:reflection) { instance_double(ActiveFedora::Reflection::AssociationReflection, check_validity!: true) }
     let(:association) { described_class.new(owner, reflection) }
 
     let(:r1) { ActiveFedora::Base.new(id: 'r1-id', &:mark_for_destruction) }

data/spec/unit/indexing_spec.rb

@@ -72,8 +72,8 @@ describe ActiveFedora::Indexing do
     end
 
     context "with attached files" do
-      let(:mock1) { double("ds1") }
-      let(:mock2) { double("ds2") }
+      let(:mock1) { instance_double(ActiveFedora::File) }
+      let(:mock2) { instance_double(ActiveFedora::File) }
 
       it "calls .to_solr on all datastreams, passing the resulting document to solr" do
         expect(mock1).to receive(:to_solr).and_return("one" => "title one")

data/spec/unit/logger_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe ActiveFedora::Base do
-  let(:logger1) { double(debug?: false) }
+  let(:logger1) { instance_double(::Logger, debug?: false) }
 
   before do
     @initial_logger = described_class.logger

data/spec/unit/orders/reflection_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe ActiveFedora::Reflection::OrdersReflection do
   let(:name) { "ordered_member_proxies" }
   let(:options) { {} }
   let(:scope) { nil }
-  let(:active_fedora) { double("active_fedora") }
+  let(:active_fedora) { instance_double(ActiveFedora::Base) }
 
   describe "#klass" do
     it "is a proxy" do

data/spec/unit/property_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe ActiveFedora::Property do
-  before(:each) do
-    @test_property = described_class.new(double("model_stub"), "file_name", :string)
+  before do
+    @test_property = described_class.new(instance_double(ActiveFedora::Base), "file_name", :string)
   end
 
   it 'provides .new' do

data/spec/unit/query_spec.rb

@@ -8,7 +8,7 @@ describe ActiveFedora::Base do
     end
   end
   let(:sort_query) { ActiveFedora.index_field_mapper.solr_name("system_create", :stored_sortable, type: :date) + ' asc' }
-  let(:model_query) { "_query_:\"{!field f=has_model_ssim}SpecModel::Basic\"" }
+  let(:model_query) { "_query_:\"{!raw f=has_model_ssim}SpecModel::Basic\"" }
 
   after(:all) do
     Object.send(:remove_const, :SpecModel)

data/spec/unit/reflection_spec.rb

@@ -4,14 +4,14 @@ describe ActiveFedora::Reflection::AssociationReflection do
   describe "#derive_foreign_key" do
     let(:name) { 'dummy' }
     let(:options) { { inverse_of: :default_permissions } }
-    let(:active_fedora) { double }
+    let(:active_fedora) { instance_double(ActiveFedora::Base) }
     subject { instance.send :derive_foreign_key }
 
     context "when a has_many" do
       let(:instance) { ActiveFedora::Reflection::HasManyReflection.new(name, nil, options, active_fedora) }
 
       context "and the inverse is a collection association" do
-        let(:inverse) { double(collection?: true) }
+        let(:inverse) { instance_double(ActiveFedora::Reflection::HasAndBelongsToManyReflection, collection?: true) }
         before { allow(instance).to receive(:inverse_of).and_return(inverse) }
         it { is_expected.to eq 'default_permission_ids' }
       end
@@ -28,7 +28,7 @@ describe ActiveFedora::Reflection::AssociationReflection do
     after { Object.send(:remove_const, :Dummy) }
     let(:name) { 'dummy' }
     let(:options) { { as: 'foothing' } }
-    let(:active_fedora) { double }
+    let(:active_fedora) { instance_double(ActiveFedora::Base) }
     subject { instance.send :automatic_inverse_of }
 
     context "when a has_many" do

data/spec/unit/solr_config_options_spec.rb

@@ -25,7 +25,7 @@ describe ActiveFedora do
     it "is used by ActiveFedora::Base#search_with_conditions" do
       mock_response = double("SolrResponse")
       expect(ActiveFedora::SolrService).to receive(:query)
-        .with("_query_:\"{!field f=has_model_ssim}SolrSpecModel::Basic\" AND " \
+        .with("_query_:\"{!raw f=has_model_ssim}SolrSpecModel::Basic\" AND " \
               "_query_:\"{!field f=#{field}}changeme:30\"",
               sort: ["#{described_class.index_field_mapper.solr_name('system_create', :stored_sortable, type: :date)} asc"])
         .and_return(mock_response)

data/spec/unit/solr_service_spec.rb

@@ -9,6 +9,8 @@ describe ActiveFedora::SolrService do
     described_class.reset!
   end
 
+  let(:mock_conn) { instance_double(RSolr::Client) }
+
   describe '#conn' do
     it "takes a n-arg constructor and configure for localhost" do
       expect(RSolr).to receive(:connect).with(read_timeout: 120, open_timeout: 120, url: 'http://localhost:8080/solr')
@@ -21,10 +23,9 @@ describe ActiveFedora::SolrService do
   end
 
   describe '#conn=' do
-    let(:new_connection) { double }
     it 'is settable' do
-      described_class.instance.conn = new_connection
-      expect(described_class.instance.conn).to eq new_connection
+      described_class.instance.conn = mock_conn
+      expect(described_class.instance.conn).to eq mock_conn
     end
   end
 
@@ -44,14 +45,12 @@ describe ActiveFedora::SolrService do
 
   describe "#get" do
     it "calls solr" do
-      mock_conn = double("Connection")
       stub_result = double("Result")
       expect(mock_conn).to receive(:get).with('select', params: { q: 'querytext', qt: 'standard' }).and_return(stub_result)
       allow(described_class).to receive(:instance).and_return(double("instance", conn: mock_conn))
       expect(described_class.get('querytext')).to eq stub_result
     end
     it "uses select_path" do
-      mock_conn = double("Connection")
       stub_result = double("Result")
       expect(mock_conn).to receive(:get).with('select_test', params: { q: 'querytext', qt: 'standard' }).and_return(stub_result)
       expect(described_class).to receive(:select_path).and_return('select_test')
@@ -65,7 +64,6 @@ describe ActiveFedora::SolrService do
     let(:docs) { [doc] }
 
     it "wraps the solr response documents in Solr hits" do
-      mock_conn = double("Connection")
       stub_result = { 'response' => { 'docs' => docs } }
       expect(mock_conn).to receive(:get).with('select', params: { q: 'querytext', qt: 'standard' }).and_return(stub_result)
       allow(described_class).to receive(:instance).and_return(double("instance", conn: mock_conn))
@@ -77,14 +75,12 @@ describe ActiveFedora::SolrService do
 
   describe ".count" do
     it "returns a count of matching records" do
-      mock_conn = double("Connection")
       stub_result = { 'response' => { 'numFound' => '7' } }
       expect(mock_conn).to receive(:get).with('select', params: { rows: 0, q: 'querytext', qt: 'standard' }).and_return(stub_result)
       allow(described_class).to receive(:instance).and_return(double("instance", conn: mock_conn))
       expect(described_class.count('querytext')).to eq 7
     end
     it "accepts query args" do
-      mock_conn = double("Connection")
       stub_result = { 'response' => { 'numFound' => '7' } }
       expect(mock_conn).to receive(:get).with('select', params: { rows: 0, q: 'querytext', qt: 'standard', fq: 'filter' }).and_return(stub_result)
       allow(described_class).to receive(:instance).and_return(double("instance", conn: mock_conn))
@@ -104,7 +100,6 @@ describe ActiveFedora::SolrService do
 
   describe ".add" do
     it "calls solr" do
-      mock_conn = double("Connection")
       doc = { 'id' => '1234' }
       expect(mock_conn).to receive(:add).with(doc, params: {})
       allow(described_class).to receive(:instance).and_return(double("instance", conn: mock_conn))
@@ -114,7 +109,6 @@ describe ActiveFedora::SolrService do
 
   describe ".commit" do
     it "calls solr" do
-      mock_conn = double("Connection")
       expect(mock_conn).to receive(:commit)
       allow(described_class).to receive(:instance).and_return(double("instance", conn: mock_conn))
       described_class.commit

data/spec/unit/with_metadata/default_metadata_class_factory_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe ActiveFedora::WithMetadata::DefaultMetadataClassFactory do
-  let(:parent) { double("Parent") }
+  let(:parent) { class_double(ActiveFedora::File) }
   let(:object) { described_class.new }
 
   describe "default class attributes" do

data/spec/unit/with_metadata/metadata_node_spec.rb

@@ -37,7 +37,7 @@ describe ActiveFedora::WithMetadata::MetadataNode do
       end
 
       it "is expected to have the rdf type statement" do
-        expect(changes_for_update[::RDF.type]).to be_kind_of RDF::Queryable::Enumerator
+        expect(changes_for_update[::RDF.type]).to be_present
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 11.0.0.rc7
+  version: 11.0.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -18,20 +18,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: solrizer
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
@@ -530,20 +530,15 @@ files:
 - script/destroy
 - script/generate
 - spec/config_helper.rb
-- spec/fixtures/damsObjectModel.xml
 - spec/fixtures/dino.jpg
 - spec/fixtures/dino_jpg_no_file_ext
-- spec/fixtures/dublin_core_rdf_descMetadata.nt
 - spec/fixtures/minivan.jpg
-- spec/fixtures/mixed_rdf_descMetadata.nt
-- spec/fixtures/mods_articles/mods_article1.xml
 - spec/fixtures/rails_root/config/fake_fedora.yml
 - spec/fixtures/rails_root/config/fedora.yml
 - spec/fixtures/rails_root/config/solr.yml
 - spec/fixtures/rails_root/config/solr_mappings.yml
 - spec/fixtures/rails_root/config/solr_mappings_af_0.1.yml
 - spec/fixtures/rails_root/config/solr_mappings_bl_2.4.yml
-- spec/fixtures/solr_rdf_descMetadata.nt
 - spec/integration/associations/rdf_spec.rb
 - spec/integration/associations_spec.rb
 - spec/integration/attached_files_spec.rb
@@ -586,8 +581,6 @@ files:
 - spec/integration/versionable_spec.rb
 - spec/integration/with_metadata_spec.rb
 - spec/rcov.opts
-- spec/samples/oral_history_sample.xml
-- spec/samples/oral_history_xml.xml
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/an_active_model.rb
@@ -676,9 +669,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1

data/spec/fixtures/damsObjectModel.xml

@@ -1,38 +0,0 @@
-<rdf:RDF
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:dams="http://library.ucsd.edu/ontology/dams#"
-    xmlns:mads="http://www.loc.gov/mads/rdf/v1#"
-    xmlns:damsid="http://library.ucsd.edu/ark:/20775/">
-  <dams:Object rdf:about="http://library.ucsd.edu/ark:/20775/">
-    <dams:title rdf:parseType="Resource">
-      <rdf:value>example title</rdf:value>
-      <dams:relatedTitle rdf:parseType="Resource">
-        <rdf:value xml:lang="fr">example translated relatedTitle</rdf:value>
-        <dams:type>translated</dams:type>
-      </dams:relatedTitle>
-    </dams:title>
-
-    <dams:date rdf:parseType="Resource">
-      <dams:beginDate>2012-11-27</dams:beginDate>
-      <dams:endDate>2012-11-30</dams:endDate>
-      <rdf:value>2012-11-29</rdf:value>
-    </dams:date>
-
-    <dams:language rdf:resource="http://library.ucsd.edu/ark:/20775/bb12345678"/>
-    <dams:typeOfResource>image</dams:typeOfResource>
-    <dams:otherResource>
-      <dams:RelatedResource>
-        <dams:type>online exhibit</dams:type>
-        <dams:description>foo</dams:description>
-        <dams:uri>http://library.ucsd.edu/test/foo/</dams:uri>
-      </dams:RelatedResource>
-    </dams:otherResource>
-    <dams:relationship>
-      <dams:Relationship>
-        <dams:role rdf:resource="http://library.ucsd.edu/ark:/20775/bd55639754"/>
-        <dams:name rdf:resource="http://library.ucsd.edu/ark:/20775/bb08080808"/>
-      </dams:Relationship>
-    </dams:relationship>
-    <dams:assembledCollection rdf:resource="http://library.ucsd.edu/ark:/20775/bb03030303"/>
-  </dams:Object>
-</rdf:RDF>

data/spec/fixtures/dublin_core_rdf_descMetadata.nt

@@ -1,13 +0,0 @@
-<http://id.psu.edu/object42> <http://purl.org/dc/terms/description> "This is a work by JD in the field of biology." .
-<http://id.psu.edu/object42> <http://purl.org/dc/terms/publisher> "Penn State" .
-<http://id.psu.edu/object42> <http://purl.org/dc/terms/contributor> "Department of Bioinformatics" .
-<http://id.psu.edu/object42> <http://purl.org/dc/terms/created> "2010-12-31"^^<http://www.w3.org/2001/XMLSchema#date> .
-<http://id.psu.edu/object42> <http://purl.org/dc/terms/title> "Title of work" .
-<http://id.psu.edu/object42> <http://purl.org/dc/terms/subject> "Biology" .
-<http://id.psu.edu/object42> <http://purl.org/dc/terms/language> "en" .
-<http://id.psu.edu/object42> <http://purl.org/dc/terms/date> "2009-12-31"^^<http://www.w3.org/2001/XMLSchema#date> .
-<http://id.psu.edu/object42> <http://purl.org/dc/terms/rights> "insert rights statement here" .
-<http://id.psu.edu/object42> <http://purl.org/dc/terms/type> <http://purl.org/dc/dcmitype/Image> .
-<http://id.psu.edu/object42> <http://purl.org/dc/terms/format> "image/jpeg" .
-<http://id.psu.edu/object42> <http://purl.org/dc/terms/creator> "John Doe" .
-<http://id.psu.edu/object42> <http://purl.org/dc/terms/identifier> "old:identifier:7779" .

data/spec/fixtures/mixed_rdf_descMetadata.nt

@@ -1,7 +0,0 @@
-<http://localhost:8983/fedora/rest/test/test:1> <http://purl.org/dc/terms/created> "2010-12-31"^^<http://www.w3.org/2001/XMLSchema#date> .
-<http://localhost:8983/fedora/rest/test/test:1> <http://purl.org/dc/terms/title> "Title of work" .
-<http://localhost:8983/fedora/rest/test/test:1> <http://purl.org/dc/terms/publisher> "Penn State" .
-<http://localhost:8983/fedora/rest/test/test:1> <http://xmlns.com/foaf/0.1/based_near> "New York, NY, US" .
-<http://localhost:8983/fedora/rest/test/test:1> <http://www.w3.org/2000/01/rdf-schema#seeAlso> <http://google.com/> .
-<http://localhost:8983/fedora/rest/test/test:1/content> <http://purl.org/dc/terms/title> "Title of datastream" .
-

data/spec/fixtures/mods_articles/mods_article1.xml

@@ -1,98 +0,0 @@
-<mods version="3.0" xsi:schemaLocation="http://www.loc.gov/mods/v3
-   http://www.loc.gov/standards/mods/v3/mods-3-0.xsd" xmlns="http://www.loc.gov/mods/v3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <titleInfo>
-        <nonSort>THE</nonSort>
-        <title>ARTICLE TITLE</title>
-        <subTitle>SUBTITLE</subTitle>
-    </titleInfo>
-    <titleInfo type="alternative">
-        <title>VARYING FORM OF TITLE</title>
-    </titleInfo>
-
-    <name type="personal">
-        <namePart type="family">FAMILY NAME</namePart>
-        <namePart type="given">GIVEN NAMES</namePart>
-        <namePart type="termsOfAddress">DR.</namePart>
-        <displayForm>NAME AS IT APPEARS</displayForm>
-        <affiliation>FACULTY, UNIVERSITY</affiliation>    
-        <role> 
-            <roleTerm authority="marcrelator" type="text">Creator</roleTerm>
-        </role>
-    </name>
-    <name type="personal">
-        <namePart type="family">Lacks</namePart>
-        <namePart type="given">Henrietta</namePart>
-        <displayForm>HeLa</displayForm>
-        <affiliation>Baltimore</affiliation>    
-        <role>
-            <roleTerm authority="marcrelator" type="text">Contributor</roleTerm>
-        </role>
-    </name>
-    <name type="corporate"> 
-      <namePart>NSF</namePart> 
-      <role> 
-        <roleTerm authority="marcrelator" type="text">Funder</roleTerm> 
-      </role> 
-    </name> 
-    <name type="conference"> 
-      <namePart>some conference</namePart> 
-      <role> 
-        <roleTerm authority="marcrelator" type="text">Host</roleTerm> 
-      </role> 
-    </name>
-      
-    <typeOfResource>text</typeOfResource>
-    <genre authority="local">journal article</genre>
-
-    <abstract>ABSTRACT</abstract>
-    <subject>
-        <topic>TOPIC 1</topic>
-        <topic>TOPIC 2</topic>
-    </subject>
-    <subject authority="AUTHORITY SOURCE (RFCD, LCSH)">
-        <topic>CONTROLLED TERM</topic>
-    </subject>
-
-    <language>
-        <languageTerm authority="iso639-2b" type="code">en-aus </languageTerm>
-    </language>
-
-    <physicalDescription>
-        <internetMediaType>application/pdf</internetMediaType>
-        <extent>36 p.</extent>
-    </physicalDescription>
-
-    <relatedItem type="host">
-        <titleInfo>
-            <title>TITLE OF HOST JOURNAL</title>
-        </titleInfo>
-        <originInfo>
-            <publisher>PUBLISHER</publisher>
-            <dateIssued>DATE</dateIssued>
-        </originInfo>
-        <identifier type="issn">0013-8908</identifier>    
-        <part>
-            <detail type="volume">
-                <number>2</number>
-            </detail>
-            <detail type="level">
-                <number>2</number>
-            </detail>
-            <extent unit="pages">
-                <start>195</start>
-                <end>230</end>
-            </extent>
-            <date>FEB. 2007</date>
-        </part>            
-    </relatedItem>
-
-    <identifier type="uri">http://URL.edu.au/</identifier>
-    <identifier type="doi">doi:10.1006/jmbi.1995.0238</identifier>
-    <location>
-        <url>http://URL.edu.au/</url>
-    </location>        
-    <accessCondition type="restrictionOnAccess">EMBARGO NOTE</accessCondition>
-    <accessCondition type="use and reproduction">OPEN ACCESS</accessCondition>
-
-</mods>