active-fedora 10.3.0 → 11.0.0.rc1

data/spec/unit/orders/list_node_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe ActiveFedora::Orders::ListNode do
   subject { described_class.new(node_cache, rdf_subject, graph) }
   let(:node_cache) { {} }
   let(:rdf_subject) { RDF::URI("#bla") }
-  let(:graph) { RDF::Graph.new }
+  let(:graph) { ActiveTriples::Resource.new }
 
   describe "#target" do
     context "when a target is set" do
@@ -35,7 +35,7 @@ RSpec.describe ActiveFedora::Orders::ListNode do
         end
         context "and it doesn't exist" do
           it "returns an AT::Resource" do
-            member = Member.new(id: "testing")
+            member = Member.new("testing")
             graph << [rdf_subject, RDF::Vocab::ORE.proxyFor, member.resource.rdf_subject]
             expect(subject.target.rdf_subject).to eq member.uri
           end

data/spec/unit/orders/ordered_list_spec.rb

@@ -316,7 +316,7 @@ RSpec.describe ActiveFedora::Orders::OrderedList do
       graph = subject.to_graph
 
       expect(graph.statements.to_a.length).to eq 5
-      expect(graph.subjects.to_a).to eq subject.to_a.map(&:rdf_subject)
+      expect(graph.subjects.to_a).to contain_exactly(*subject.to_a.map(&:rdf_subject))
       expect(graph.query([nil, RDF::Vocab::ORE.proxyFor, nil]).to_a.last.object).to be_kind_of RDF::URI
     end
   end

data/spec/unit/query_spec.rb

@@ -128,9 +128,9 @@ describe ActiveFedora::Base do
         .and_return('response' => { 'docs' => mock_docs })
 
       allow(relation).to receive(:load_from_fedora).with("changeme-30", nil)
-        .and_return(SpecModel::Basic.new(id: 'changeme-30'))
+        .and_return(SpecModel::Basic.new('changeme-30'))
       allow(relation).to receive(:load_from_fedora).with("changeme-22", nil)
-        .and_return(SpecModel::Basic.new(id: 'changeme-22'))
+        .and_return(SpecModel::Basic.new('changeme-22'))
       SpecModel::Basic.find_each { |obj| obj.class == SpecModel::Basic }
     end
 
@@ -144,8 +144,8 @@ describe ActiveFedora::Base do
       let(:mock_docs) { [{ "id" => "changeme-30" }, { "id" => "changeme-22" }] }
 
       it "filters by the provided fields" do
-        expect(relation).to receive(:load_from_fedora).with("changeme-30", nil).and_return(SpecModel::Basic.new(id: 'changeme-30'))
-        expect(relation).to receive(:load_from_fedora).with("changeme-22", nil).and_return(SpecModel::Basic.new(id: 'changeme-22'))
+        expect(relation).to receive(:load_from_fedora).with("changeme-30", nil).and_return(SpecModel::Basic.new('changeme-30'))
+        expect(relation).to receive(:load_from_fedora).with("changeme-22", nil).and_return(SpecModel::Basic.new('changeme-22'))
 
         expect(mock_docs).to receive(:has_next?).and_return(false)
         expect(solr).to receive(:paginate).with(1, 1000, 'select', expected_params).and_return('response' => { 'docs' => mock_docs })

data/spec/unit/rdf/indexing_service_spec.rb

@@ -6,8 +6,8 @@ describe ActiveFedora::RDF::IndexingService do
       property :created, predicate: ::RDF::Vocab::DC.created
       property :title, predicate: ::RDF::Vocab::DC.title
       property :publisher, predicate: ::RDF::Vocab::DC.publisher
-      property :based_near, predicate: ::RDF::FOAF.based_near
-      property :related_url, predicate: ::RDF::RDFS.seeAlso
+      property :based_near, predicate: ::RDF::Vocab::FOAF.based_near
+      property :related_url, predicate: ::RDF::Vocab::RDFS.seeAlso
       property :rights, predicate: ::RDF::Vocab::DC.rights
     end
   end
@@ -73,8 +73,8 @@ describe ActiveFedora::RDF::IndexingService do
 
     it "returns the right values" do
       expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__related_url", type: :string)]).to eq ["http://example.org/blogtastic/"]
-      expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__based_near", type: :string)]).to eq ["Tacoma, WA", "Renton, WA"]
-      expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__based_near", :facetable)]).to eq ["Tacoma, WA", "Renton, WA"]
+      expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__based_near", type: :string)]).to contain_exactly "Tacoma, WA", "Renton, WA"
+      expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__based_near", :facetable)]).to contain_exactly "Tacoma, WA", "Renton, WA"
       expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", type: :string)]).to eq ["Bob's Blogtastic Publishing"]
       expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", :sortable)]).to eq "Bob's Blogtastic Publishing"
       expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", :facetable)]).to eq ["Bob's Blogtastic Publishing"]
@@ -90,7 +90,7 @@ describe ActiveFedora::RDF::IndexingService do
 
     it "returns the right values" do
       expect(fields["related_url"].values).to eq ["http://example.org/blogtastic/"]
-      expect(fields["based_near"].values).to eq ["Tacoma, WA", "Renton, WA"]
+      expect(fields["based_near"].values).to contain_exactly "Tacoma, WA", "Renton, WA"
     end
 
     it "returns the right type information" do

data/spec/unit/rdf_resource_datastream_spec.rb

@@ -134,6 +134,10 @@ describe ActiveFedora::RDFDatastream do
       subject.creator = @new_object
     end
 
+    it "can set sub-properties to AF objects" do
+      expect(subject.creator).to eq [@new_object]
+    end
+
     it "has accessible relationship attributes" do
       expect(subject.creator.first.something).to eq ["subbla"]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 10.3.0
+  version: 11.0.0.rc1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -120,28 +120,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: linkeddata
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
@@ -316,14 +330,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.38.0
+        version: 0.42.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.38.0
+        version: 0.42.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -353,7 +367,7 @@ files:
 - ".mailmap"
 - ".rspec"
 - ".rubocop.yml"
-- ".solr_wrapper"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CONTRIBUTING.md
 - CONTRIBUTORS.md
@@ -489,7 +503,6 @@ files:
 - lib/active_fedora/orders/target_proxy.rb
 - lib/active_fedora/pathing.rb
 - lib/active_fedora/persistence.rb
-- lib/active_fedora/profile_indexing_service.rb
 - lib/active_fedora/property.rb
 - lib/active_fedora/qualified_dublin_core_datastream.rb
 - lib/active_fedora/query_result_builder.rb
@@ -527,7 +540,6 @@ files:
 - lib/active_fedora/scoping/named.rb
 - lib/active_fedora/serialization.rb
 - lib/active_fedora/solr_hit.rb
-- lib/active_fedora/solr_instance_loader.rb
 - lib/active_fedora/solr_query_builder.rb
 - lib/active_fedora/solr_service.rb
 - lib/active_fedora/sparql_insert.rb
@@ -581,6 +593,22 @@ files:
 - script/console
 - script/destroy
 - script/generate
+- solr/config/_rest_managed.json
+- solr/config/admin-extra.html
+- solr/config/elevate.xml
+- solr/config/mapping-ISOLatin1Accent.txt
+- solr/config/protwords.txt
+- solr/config/schema.xml
+- solr/config/scripts.conf
+- solr/config/solrconfig.xml
+- solr/config/spellings.txt
+- solr/config/stopwords.txt
+- solr/config/stopwords_en.txt
+- solr/config/synonyms.txt
+- solr/config/xslt/example.xsl
+- solr/config/xslt/example_atom.xsl
+- solr/config/xslt/example_rss.xsl
+- solr/config/xslt/luke.xsl
 - spec/config_helper.rb
 - spec/fixtures/damsObjectModel.xml
 - spec/fixtures/dino.jpg
@@ -639,7 +667,6 @@ files:
 - spec/integration/scoped_query_spec.rb
 - spec/integration/scoping_spec.rb
 - spec/integration/solr_hit_spec.rb
-- spec/integration/solr_instance_loader_spec.rb
 - spec/integration/versionable_spec.rb
 - spec/integration/with_metadata_spec.rb
 - spec/rcov.opts
@@ -743,12 +770,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.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.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.

data/.solr_wrapper

@@ -1,6 +0,0 @@
-# Place any default configuration for solr_wrapper here
-# version: 6.1.0
-port: 8985
-collection:
-  dir: lib/generators/active_fedora/config/solr/templates/solr/config/
-  name: hydra-test

data/lib/active_fedora/profile_indexing_service.rb

@@ -1,11 +0,0 @@
-module ActiveFedora
-  class ProfileIndexingService
-    def initialize(object)
-      @object = object
-    end
-
-    def export
-      @object.serializable_hash.to_json
-    end
-  end
-end

data/lib/active_fedora/solr_instance_loader.rb

@@ -1,47 +0,0 @@
-module ActiveFedora
-  class FedoraSolrMismatchError < ActiveFedora::ObjectNotFoundError
-    def initialize(fedora_id, solr_document_id)
-      super("Solr ID and Fedora ID do not match; Solr ID=#{solr_document_id}, Fedora ID=#{fedora_id}")
-    end
-  end
-
-  # Responsible for loading an ActiveFedora::Base proxy from a Solr document.
-  class SolrInstanceLoader
-    attr_reader :context, :id
-    private :context, :id
-    def initialize(context, id, solr_doc = nil)
-      @context = context
-      @id = id
-      self.solr_doc = solr_doc
-    end
-
-    def object
-      return @object if @object
-      @object = solr_doc.instantiate_with_json
-      @object.readonly!
-      @object.freeze
-      @object
-    end
-
-    private
-
-      def solr_doc
-        @solr_doc ||= begin
-          self.solr_doc = context.search_by_id(id)
-        end
-      end
-
-      def solr_doc=(solr_doc)
-        unless solr_doc.nil?
-          solr_doc = ActiveFedora::SolrHit.for(solr_doc)
-          validate_solr_doc_and_id!(solr_doc)
-          @solr_doc = solr_doc
-        end
-      end
-
-      def validate_solr_doc_and_id!(document)
-        return if id == document.id
-        raise ActiveFedora::FedoraSolrMismatchError, id, document.id
-      end
-  end
-end

data/spec/integration/solr_instance_loader_spec.rb

@@ -1,156 +0,0 @@
-require 'spec_helper'
-
-describe ActiveFedora::SolrInstanceLoader do
-  before do
-    class MyDS < ActiveFedora::OmDatastream
-      set_terminology do |t|
-        t.root(path: "durh")
-        t.foo
-        t.bar
-      end
-    end
-
-    class Foo < ActiveFedora::Base
-      has_subresource 'descMetadata', class_name: 'MyDS'
-      property :title, predicate: ::RDF::Vocab::DC.title, multiple: false
-      property :description, predicate: ::RDF::Vocab::DC.description
-      belongs_to :another, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'Foo'
-      has_and_belongs_to_many :dates, predicate: ::RDF::Vocab::DC.date, class_name: 'Bar'
-      accepts_nested_attributes_for :dates, reject_if: :all_blank, allow_destroy: true
-    end
-    class Bar < ActiveFedora::Base
-      property :start, predicate: ::RDF::Vocab::EDM.begin, multiple: false
-      has_many :foos, inverse_of: :dates, class_name: 'Foo'
-    end
-  end
-
-  let(:another) { Foo.create }
-
-  let!(:obj) { Foo.create!(
-    id: 'test-123',
-    title: 'My Title',
-    description: ['first desc', 'second desc'],
-    another_id: another.id,
-    dates_attributes: [{ start: "2003" }, { start: "1996" }]
-  ) }
-
-  after do
-    Object.send(:remove_const, :Foo)
-    Object.send(:remove_const, :Bar)
-    Object.send(:remove_const, :MyDS)
-  end
-
-  context "without a solr doc" do
-    subject { loader.object }
-
-    context "with context" do
-      let(:loader) { described_class.new(Foo, obj.id) }
-
-      it "finds the document in solr" do
-        expect(subject).to be_instance_of Foo
-        expect(subject.title).to eq 'My Title'
-        expect(subject.description).to match_array ['first desc', 'second desc']
-        expect(subject.another_id).to eq another.id
-      end
-
-      it "does not be mutable" do
-        expect { subject.title = 'Foo' }.to raise_error ActiveFedora::ReadOnlyRecord
-      end
-
-      it "loads the correct number of nested attributes" do
-        expect(subject.date_ids.count).to eq 2
-      end
-
-      it "loads the correct number of regular attributes" do
-        expect(subject.description.count).to eq 2
-      end
-    end
-
-    context "without context" do
-      let(:loader) { described_class.new(ActiveFedora::Base, obj.id) }
-
-      it "finds the document in solr" do
-        expect_any_instance_of(ActiveFedora::File).to_not receive(:retrieve_content)
-        expect_any_instance_of(Ldp::Client).to_not receive(:get)
-        object = loader.object
-        expect(object).to be_instance_of Foo
-        expect(object.title).to eq 'My Title' # object assertion
-
-        # and it's frozen
-        expect { object.title = 'changed' }.to raise_error ActiveFedora::ReadOnlyRecord
-        expect(object.title).to eq 'My Title'
-      end
-    end
-
-    context "with children" do
-      let(:loader) { described_class.new(Foo, obj.id) }
-
-      it "has stub implementation of the children" do
-        expect(subject.descMetadata).to be_kind_of ActiveFedora::LoadableFromJson::SolrBackedMetadataFile
-      end
-    end
-  end
-
-  context "with a solr doc" do
-    let(:profile) { { "foo" => ["baz"], "bar" => "quix", "title" => "My Title" }.to_json }
-    let(:doc) { { 'id' => 'test-123', 'has_model_ssim' => ['Foo'], 'object_profile_ssm' => profile } }
-    let(:loader) { described_class.new(Foo, obj.id, doc) }
-
-    subject { loader.object }
-
-    it "finds the document in solr" do
-      expect(subject).to be_instance_of Foo
-      expect(subject.title).to eq 'My Title'
-    end
-  end
-
-  context "when the model has imperfect json" do
-    let(:doc) { { 'id' => 'test-123', 'has_model_ssim' => ['Foo'], 'object_profile_ssm' => profile } }
-    let(:loader) { described_class.new(Foo, obj.id, doc) }
-    context "when the json has extra values in it" do
-      let(:profile) { { "foo" => ["baz"], "bar" => "quix", "title" => "My Title", "extra_value" => "Bonus values!" }.to_json }
-      it "loads the object without trouble" do
-        expect(loader.object).to be_instance_of Foo
-      end
-    end
-
-    context "when the json is missing values" do
-      let(:profile) { { "foo" => ["baz"], "bar" => "quix" }.to_json }
-      it "loads the object without trouble" do
-        expect(loader.object).to be_instance_of Foo
-      end
-      it "missing scalar should be nil" do
-        expect(loader.object.title).to be_nil
-      end
-      it "missing multi-value should be []" do
-        expect(loader.object.description).to eql([])
-      end
-    end
-
-    context "when the json has scalar where multi-value is expected" do
-      let(:profile) { { "foo" => ["baz"], "bar" => "quix", "description" => "test description" }.to_json }
-      it "loads the object without trouble" do
-        expect(loader.object).to be_instance_of Foo
-      end
-      it "converts the scalar to an array" do
-        expect(loader.object.description).to eql(["test description"])
-      end
-    end
-  end
-
-  describe "loading system properties" do
-    before { allow(Deprecation).to receive(:warn) }
-    let(:obj_solr) { Foo.load_instance_from_solr(obj.id) }
-    it "loads create_date from solr" do
-      expect(obj.create_date).to be_present
-      expect(obj_solr).to be_present
-      expect(obj_solr.create_date).to be_a DateTime
-    end
-
-    it "loads modified_date from solr" do
-      expect(obj.modified_date).to be_present
-      expect(obj_solr).to be_present
-      expect(obj_solr.modified_date).to be_a DateTime
-    end
-  end
-end