active-fedora 9.13.0 → 10.0.0.beta1

data/spec/unit/rdf/indexing_service_spec.rb

@@ -3,26 +3,11 @@ require 'spec_helper'
 describe ActiveFedora::RDF::IndexingService do
   before do
     class MyDatastream < ActiveFedora::NtriplesRDFDatastream
-      Deprecation.silence(ActiveFedora::RDFDatastream) do
-        property :created, predicate: ::RDF::Vocab::DC.created do |index|
-          index.as :sortable, :displayable
-          index.type :date
-        end
-        property :title, predicate: ::RDF::Vocab::DC.title do |index|
-          index.as :stored_searchable, :sortable
-          index.type :text
-        end
-        property :publisher, predicate: ::RDF::Vocab::DC.publisher do |index|
-          index.as :facetable, :sortable, :stored_searchable
-        end
-        property :based_near, predicate: ::RDF::FOAF.based_near do |index|
-          index.as :facetable, :stored_searchable
-          index.type :text
-        end
-        property :related_url, predicate: ::RDF::RDFS.seeAlso do |index|
-          index.as :stored_searchable
-        end
-      end
+      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 :rights, predicate: ::RDF::Vocab::DC.rights
     end
   end
@@ -42,6 +27,33 @@ describe ActiveFedora::RDF::IndexingService do
     end
   end
 
+  let(:index_config) do
+    {}.tap do |index_config|
+      index_config[:created] = ActiveFedora::Indexing::Map::IndexObject.new(:created) do |index|
+        index.as :sortable, :displayable
+        index.type :date
+      end
+      index_config[:title] = ActiveFedora::Indexing::Map::IndexObject.new(:title) do |index|
+        index.as :stored_searchable, :sortable
+        index.type :text
+      end
+      index_config[:publisher] = ActiveFedora::Indexing::Map::IndexObject.new(:publisher) do |index|
+        index.as :facetable, :sortable, :stored_searchable
+      end
+      index_config[:based_near] = ActiveFedora::Indexing::Map::IndexObject.new(:based_near) do |index|
+        index.as :facetable, :stored_searchable
+        index.type :text
+      end
+      index_config[:related_url] = ActiveFedora::Indexing::Map::IndexObject.new(:related_url) do |index|
+        index.as :stored_searchable
+      end
+    end
+  end
+
+  before do
+    allow(MyDatastream).to receive(:index_config).and_return(index_config)
+  end
+
   let(:indexer) { described_class.new(f2) }
 
   describe "#generate_solr_document" do

data/spec/unit/rdf_resource_datastream_spec.rb

@@ -8,17 +8,10 @@ describe ActiveFedora::RDFDatastream do
     end
 
     class DummyResource < ActiveFedora::RDFDatastream
-      Deprecation.silence(ActiveFedora::RDFDatastream) do
-        property :title, predicate: ::RDF::Vocab::DC[:title], class_name: ::RDF::Literal do |index|
-          index.as :searchable, :displayable
-        end
-        property :license, predicate: ::RDF::Vocab::DC[:license], class_name: DummySubnode do |index|
-          index.as :searchable, :displayable
-        end
-        property :creator, predicate: ::RDF::Vocab::DC[:creator], class_name: 'DummyAsset' do |index|
-          index.as :searchable
-        end
-      end
+      property :title, predicate: ::RDF::Vocab::DC[:title], class_name: ::RDF::Literal
+      property :license, predicate: ::RDF::Vocab::DC[:license], class_name: DummySubnode
+      property :creator, predicate: ::RDF::Vocab::DC[:creator], class_name: 'DummyAsset'
+
       def serialization_format
         :ntriples
       end
@@ -26,10 +19,7 @@ describe ActiveFedora::RDFDatastream do
 
     class DummyAsset < ActiveFedora::Base
       has_subresource 'descMetadata', class_name: 'DummyResource'
-      Deprecation.silence(ActiveFedora::Attributes) do
-        has_attributes :title, :license, datastream: 'descMetadata', multiple: true
-        has_attributes :relation, datastream: 'descMetadata', at: [:license, :relation], multiple: false
-      end
+      property :something, predicate: ::RDF::URI('http://example.com/thing')
     end
   end
 
@@ -39,65 +29,20 @@ describe ActiveFedora::RDFDatastream do
     Object.send(:remove_const, "DummySubnode")
   end
 
-  subject { DummyAsset.new }
-
-  describe "#to_solr" do
-    before { subject.descMetadata.title = "bla" }
-
-    it "does not be blank" do
-      expect(subject.to_solr).not_to be_blank
-    end
-
-    it "solrizes" do
-      expect(subject.to_solr["desc_metadata__title_teim"]).to eq ["bla"]
-    end
-
-    context "with ActiveFedora::Base resources" do
-      let(:dummy_asset) { DummyAsset.new }
-
-      before do
-        allow(dummy_asset).to receive(:uri).and_return("http://foo")
-        subject.descMetadata.creator = dummy_asset
-      end
-
-      it "solrizes objects" do
-        expect(subject.to_solr["desc_metadata__creator_teim"]).to eq ["http://foo"]
-      end
-    end
-
-    context "with ActiveTriples resources" do
-      before { subject.descMetadata.license = DummySubnode.new('http://example.org/blah') }
-
-      it "solrizes uris" do
-        expect(subject.to_solr["desc_metadata__license_teim"]).to eq ['http://example.org/blah']
-      end
-    end
-  end
-
-  describe "delegation" do
-    it "retrieves values" do
-      subject.descMetadata.title = "bla"
-      expect(subject.title).to eq ["bla"]
-    end
-
-    it "sets values" do
-      subject.title = ["blah"]
-      expect(subject.descMetadata.title).to eq ["blah"]
-    end
-  end
+  subject { DummyResource.new("#{ActiveFedora.fedora.host}/test/test:1") }
 
   describe "attribute setting" do
     context "on text attributes" do
       before do
-        subject.descMetadata.title = "bla"
+        subject.title = "bla"
       end
 
       it "lets you access" do
-        expect(subject.descMetadata.title).to eq ["bla"]
+        expect(subject.title).to eq ["bla"]
       end
 
       it "marks it as changed" do
-        expect(subject.descMetadata).to be_changed
+        expect(subject).to be_changed
       end
 
       context "after it is persisted" do
@@ -107,7 +52,7 @@ describe ActiveFedora::RDFDatastream do
         end
 
         it "is persisted" do
-          expect(subject.descMetadata.resource).to be_persisted
+          expect(subject.resource).to be_persisted
         end
 
         context "and it's reloaded" do
@@ -116,29 +61,29 @@ describe ActiveFedora::RDFDatastream do
           end
 
           it "is accessible after being saved" do
-            expect(subject.descMetadata.title).to eq ["bla"]
+            expect(subject.title).to eq ["bla"]
           end
 
           it "serializes to content" do
-            expect(subject.descMetadata.content).not_to be_blank
+            expect(subject.content).not_to be_blank
           end
         end
 
         context "and it is found again" do
           before do
-            @object = DummyAsset.find(subject.id)
+            @object = DummyResource.new(subject.uri)
           end
 
           it "serializes to content" do
-            expect(@object.descMetadata.content).not_to be_blank
+            expect(@object.content).not_to be_blank
           end
 
           it "is accessible after being saved" do
-            expect(@object.descMetadata.title).to eq ["bla"]
+            expect(@object.title).to eq ["bla"]
           end
 
           it "has datastream content" do
-            expect(@object.descMetadata.remote_content).not_to be_blank
+            expect(@object.remote_content).not_to be_blank
           end
         end
       end
@@ -149,15 +94,15 @@ describe ActiveFedora::RDFDatastream do
         before do
           dummy = DummySubnode.new
           dummy.title = 'subbla'
-          subject.descMetadata.license = dummy
+          subject.license = dummy
         end
 
         it "lets you access" do
-          expect(subject.descMetadata.license.first.title).to eq ['subbla']
+          expect(subject.license.first.title).to eq ['subbla']
         end
 
         it "marks it as changed" do
-          expect(subject.descMetadata).to be_changed
+          expect(subject).to be_changed
         end
       end
       context "persisted to repository" do
@@ -168,15 +113,15 @@ describe ActiveFedora::RDFDatastream do
           # We want to have to manually persist to the repository.
           # Parent objects shouldn't be persisting children they share with other parents
           dummy.persist!
-          subject.descMetadata.license = dummy
+          subject.license = dummy
         end
 
         it "lets you access" do
-          expect(subject.descMetadata.license.first.title).to eq ['subbla']
+          expect(subject.license.first.title).to eq ['subbla']
         end
 
         it "marks it as changed" do
-          expect(subject.descMetadata).to be_changed
+          expect(subject).to be_changed
         end
       end
     end
@@ -184,38 +129,36 @@ describe ActiveFedora::RDFDatastream do
 
   describe "relationships" do
     before do
-      @new_object = DummyAsset.new
-      @new_object.title = ["subbla"]
-      @new_object.save
+      @new_object = DummyAsset.create(something: ["subbla"])
       subject.title = ["bla"]
-      subject.descMetadata.creator = @new_object
+      subject.creator = @new_object
     end
 
     it "has accessible relationship attributes" do
-      expect(subject.descMetadata.creator.first.title).to eq ["subbla"]
+      expect(subject.creator.first.something).to eq ["subbla"]
     end
 
     it "lets me get to an AF:Base object" do
       subject.save
-      subject.reload
-      expect(subject.descMetadata.creator.first).to be_kind_of(ActiveFedora::Base)
+      resource = DummyResource.new(subject.uri)
+      expect(resource.creator.first).to be_kind_of(ActiveFedora::Base)
     end
 
     context "when the AF:Base object is deleted" do
       before do
         subject.save
+        @resource = DummyResource.new(subject.uri)
         @new_object.destroy
       end
       it "gives back an ActiveTriples::Resource" do
-        subject.reload
-        expect(subject.descMetadata.creator.first).to be_kind_of(ActiveTriples::Resource)
-        expect(subject.descMetadata.creator.first.rdf_subject).to eq @new_object.resource.rdf_subject
+        expect(@resource.creator.first).to be_kind_of(ActiveTriples::Resource)
+        expect(@resource.creator.first.rdf_subject).to eq @new_object.resource.rdf_subject
       end
     end
 
     it "allows for deep attributes to be set directly" do
-      subject.descMetadata.creator.first.title = ["Bla"]
-      expect(subject.descMetadata.creator.first.title).to eq ["Bla"]
+      subject.creator.first.something = ["Bla"]
+      expect(subject.creator.first.something).to eq ["Bla"]
     end
 
     context "when the subject is set with base_uri" do
@@ -224,7 +167,7 @@ describe ActiveFedora::RDFDatastream do
         DummyResource.resource_class.configure base_uri: 'http://example.org/'
         new_object = DummyAsset.new
         new_object.save
-        subject.descMetadata.creator = new_object
+        subject.creator = new_object
       end
       after do
         DummyResource.resource_class.configure base_uri: @old_uri
@@ -232,32 +175,29 @@ describe ActiveFedora::RDFDatastream do
 
       it "lets me get to an AF:Base object" do
         subject.save
-        subject.reload
-        expect(subject.descMetadata.creator.first).to be_kind_of(ActiveFedora::Base)
+        resource = DummyResource.new(subject.uri)
+        expect(resource.creator.first).to be_kind_of(ActiveFedora::Base)
       end
     end
 
     context "when the object with a relationship is saved" do
       before do
         subject.save
-        @object = subject.class.find(subject.id)
       end
 
       it "is retrievable" do
-        expect(subject.descMetadata.creator.first.title).to eq ["subbla"]
+        expect(subject.creator.first.something).to eq ["subbla"]
       end
     end
 
     context "when the object with a relationship is frozen" do
       before do
         subject.save
-        @object = subject.class.find(subject.id)
-        @object.freeze
         subject.freeze
       end
 
       it "is retrievable" do
-        expect(subject.descMetadata.creator.first.title).to eq ["subbla"]
+        expect(subject.creator.first.something).to eq ["subbla"]
       end
     end
   end

data/spec/unit/solr_query_builder_spec.rb

@@ -1,14 +1,6 @@
 require 'spec_helper'
 
 describe ActiveFedora::SolrQueryBuilder do
-  describe "raw_query" do
-    it "generates a raw query clause" do
-      Deprecation.silence(described_class) do
-        expect(described_class.raw_query('id', "my:_ID1_")).to eq '_query_:"{!raw f=id}my:_ID1_"'
-      end
-    end
-  end
-
   describe "construct_query" do
     it "generates a query clause" do
       expect(described_class.construct_query('id' => "my:_ID1_")).to eq '_query_:"{!field f=id}my:_ID1_"'

data/spec/unit/solr_service_spec.rb

@@ -14,12 +14,6 @@ describe ActiveFedora::SolrService do
       expect(RSolr).to receive(:connect).with(read_timeout: 120, open_timeout: 120, url: 'http://localhost:8080/solr')
       described_class.register.conn
     end
-    it "accepts host arg into constructor" do
-      expect(RSolr).to receive(:connect).with(read_timeout: 120, open_timeout: 120, url: 'http://fubar')
-      Deprecation.silence(described_class) do
-        described_class.register('http://fubar').conn
-      end
-    end
     it "clobbers options" do
       expect(RSolr).to receive(:connect).with(read_timeout: 120, open_timeout: 120, url: 'http://localhost:8080/solr', autocommit: :off, foo: :bar)
       described_class.register(autocommit: :off, foo: :bar).conn
@@ -48,13 +42,6 @@ describe ActiveFedora::SolrService do
     end
   end
 
-  describe '#construct_query_for_pids' do
-    it "generates a useable solr query from an array of Fedora ids" do
-      expect(Deprecation).to receive(:warn)
-      expect(described_class.construct_query_for_pids(["my:_ID1_", "my:_ID2_", "my:_ID3_"])).to eq '{!terms f=id}my:_ID1_,my:_ID2_,my:_ID3_'
-    end
-  end
-
   describe "#get" do
     it "calls solr" do
       mock_conn = double("Connection")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.13.0
+  version: 10.0.0.beta1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -377,7 +377,6 @@ files:
 - Rakefile
 - active-fedora.gemspec
 - config/fedora.yml
-- config/predicate_mappings.yml
 - config/service_mappings.yml
 - config/solr.yml
 - lib/active-fedora.rb
@@ -439,12 +438,9 @@ files:
 - lib/active_fedora/attributes.rb
 - lib/active_fedora/attributes/active_triple_attribute.rb
 - lib/active_fedora/attributes/node_config.rb
-- lib/active_fedora/attributes/om_attribute.rb
 - lib/active_fedora/attributes/primary_key.rb
 - lib/active_fedora/attributes/property_builder.rb
-- lib/active_fedora/attributes/rdf_datastream_attribute.rb
 - lib/active_fedora/attributes/serializers.rb
-- lib/active_fedora/attributes/stream_attribute.rb
 - lib/active_fedora/autosave_association.rb
 - lib/active_fedora/base.rb
 - lib/active_fedora/caching_connection.rb
@@ -461,7 +457,6 @@ files:
 - lib/active_fedora/core.rb
 - lib/active_fedora/core/fedora_id_translator.rb
 - lib/active_fedora/core/fedora_uri_translator.rb
-- lib/active_fedora/datastream.rb
 - lib/active_fedora/datastreams.rb
 - lib/active_fedora/datastreams/nokogiri_datastreams.rb
 - lib/active_fedora/default_model_mapper.rb
@@ -495,7 +490,6 @@ files:
 - lib/active_fedora/loadable_from_json.rb
 - lib/active_fedora/locale/en.yml
 - lib/active_fedora/log_subscriber.rb
-- lib/active_fedora/model.rb
 - lib/active_fedora/model_classifier.rb
 - lib/active_fedora/nested_attributes.rb
 - lib/active_fedora/nom_datastream.rb
@@ -508,7 +502,6 @@ files:
 - lib/active_fedora/orders/target_proxy.rb
 - lib/active_fedora/pathing.rb
 - lib/active_fedora/persistence.rb
-- lib/active_fedora/predicates.rb
 - lib/active_fedora/profile_indexing_service.rb
 - lib/active_fedora/property.rb
 - lib/active_fedora/qualified_dublin_core_datastream.rb
@@ -546,7 +539,6 @@ files:
 - lib/active_fedora/scoping/default.rb
 - lib/active_fedora/scoping/named.rb
 - lib/active_fedora/serialization.rb
-- lib/active_fedora/simple_datastream.rb
 - lib/active_fedora/solr_hit.rb
 - lib/active_fedora/solr_instance_loader.rb
 - lib/active_fedora/solr_query_builder.rb
@@ -624,7 +616,6 @@ files:
 - 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/predicate_mappings.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
@@ -649,7 +640,6 @@ files:
 - spec/integration/directly_contains_one_association_spec.rb
 - spec/integration/eradicate_spec.rb
 - spec/integration/fedora_solr_sync_spec.rb
-- spec/integration/field_to_solr_name_spec.rb
 - spec/integration/file_fixity_spec.rb
 - spec/integration/file_spec.rb
 - spec/integration/generators/fedora_generator_spec.rb
@@ -662,7 +652,6 @@ files:
 - spec/integration/indirect_container_spec.rb
 - spec/integration/json_serialization_spec.rb
 - spec/integration/marshal_spec.rb
-- spec/integration/model_spec.rb
 - spec/integration/nested_attribute_spec.rb
 - spec/integration/nested_hash_resources_spec.rb
 - spec/integration/ntriples_datastream_spec.rb
@@ -673,6 +662,7 @@ files:
 - spec/integration/relation_delegation_spec.rb
 - spec/integration/relation_spec.rb
 - 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
@@ -694,7 +684,6 @@ files:
 - spec/unit/attributes_spec.rb
 - spec/unit/base_active_model_spec.rb
 - spec/unit/base_cma_spec.rb
-- spec/unit/base_datastream_management_spec.rb
 - spec/unit/base_extra_spec.rb
 - spec/unit/base_spec.rb
 - spec/unit/builder/has_and_belongs_to_many_spec.rb
@@ -728,7 +717,6 @@ files:
 - spec/unit/loadable_from_json_spec.rb
 - spec/unit/logger_spec.rb
 - spec/unit/model_classifier_spec.rb
-- spec/unit/model_spec.rb
 - spec/unit/nom_datastream_spec.rb
 - spec/unit/ntriples_datastream_spec.rb
 - spec/unit/om_datastream_spec.rb
@@ -738,12 +726,12 @@ files:
 - spec/unit/orders/reflection_spec.rb
 - spec/unit/pathing_spec.rb
 - spec/unit/persistence_spec.rb
-- spec/unit/predicates_spec.rb
 - spec/unit/property_predicate_spec.rb
 - spec/unit/property_spec.rb
 - spec/unit/qualified_dublin_core_datastream_spec.rb
 - spec/unit/query_result_builder_spec.rb
 - spec/unit/query_spec.rb
+- spec/unit/querying_spec.rb
 - spec/unit/rdf/indexing_service_spec.rb
 - spec/unit/rdf_datastream_spec.rb
 - spec/unit/rdf_resource_datastream_spec.rb
@@ -757,7 +745,6 @@ files:
 - spec/unit/schema_indexing_strategy_spec.rb
 - spec/unit/scoping_spec.rb
 - spec/unit/serializers_spec.rb
-- spec/unit/simple_datastream_spec.rb
 - spec/unit/solr_config_options_spec.rb
 - spec/unit/solr_hit_spec.rb
 - spec/unit/solr_query_builder_spec.rb
@@ -780,9 +767,9 @@ 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.5.1