active-fedora 10.1.0 → 10.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87658dd9989ef6b9dcb8e43ec5b1cd5d7cb05348
-  data.tar.gz: 86e4e8778223f2c8716cfafa305da4a6b1fc6e4c
+  metadata.gz: edd51836aa6c45e18a108d020753474a74b39a8a
+  data.tar.gz: 467181b690984218af00de00f2d0644e6d059601
 SHA512:
-  metadata.gz: 240c154b9a54a470c1837752ec2763d2cec77ecdee788e9e82f75c48175f39d56cf8e71ee90ffa4a4c3ef8b4df25341a5755640cfa20a1c89b46d442a7d113fa
-  data.tar.gz: 50c233379480b07d252afdb6192721fdded0235ff776f579049b619961c9986f14b82bef9b9192261639664d1abc9d8b1af012ef30e240b8aa130ad8db9fda65
+  metadata.gz: 9b8c013c28881485042b14d79d37ec2123fcc8e2647ede3fe9c99875afc3d02dbc1e797405c1b355f271c480e3303f6790df3f8f494cafc068aa25d19a59f46b
+  data.tar.gz: 8e8ea6f566fcc5f4067be91e28f5d4e594a711a623dae5364445cc52f3fdc017063e8f568f2d53a62e740f2856633fabf52b50a09df1ca3b7f8439d44d844b8c

data/active-fedora.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
   s.add_dependency "activemodel", '>= 4.2', '< 6'
   s.add_dependency "active-triples", '~> 0.7.1'
   s.add_dependency "rdf-rdfxml", '~> 1.1'
-  s.add_dependency "linkeddata"
   s.add_dependency "deprecation"
   s.add_dependency "ldp", '~> 0.5.0'
 

data/lib/active_fedora/associations/has_subresource_association.rb

@@ -25,12 +25,12 @@ module ActiveFedora
 
         def find_or_initialize_target(&block)
           if reflection.klass < ActiveFedora::File
-            reflection.build_association(target_uri, &block)
+            reflection.build_association(id: target_uri, &block)
           else
             reflection.klass.find(target_uri)
           end
         rescue ActiveFedora::ObjectNotFoundError
-          reflection.build_association(target_uri, &block)
+          reflection.build_association(id: target_uri, &block)
         end
 
         def replace(record)

data/lib/active_fedora/containers/container.rb

@@ -22,7 +22,7 @@ module ActiveFedora
     def self.find_or_initialize(id)
       find(id)
     rescue ActiveFedora::ObjectNotFoundError
-      new(id)
+      new(id: id)
     end
 
     private

data/lib/active_fedora/core.rb

@@ -2,6 +2,7 @@ module ActiveFedora
   module Core
     extend ActiveSupport::Autoload
     extend ActiveSupport::Concern
+    extend Deprecation
     include ActiveFedora::Common
 
     autoload :FedoraIdTranslator
@@ -148,6 +149,7 @@ module ActiveFedora
       def initialize_attributes(attributes_or_id)
         case attributes_or_id
         when String
+          Deprecation.warn(Core, "calling #{self.class}.new with a string is deprecated. Pass a hash with id instead.")
           attributes = { id: attributes_or_id }.with_indifferent_access
         when Hash
           attributes = attributes_or_id.with_indifferent_access

data/lib/active_fedora/file.rb

@@ -30,7 +30,7 @@ module ActiveFedora
     # @yield [self] Yields self
     # @yieldparam [File] self the newly created file
     def initialize(identifier = nil, &_block)
-      identifier = nil if identifier.is_a? Hash
+      identifier = identifier.delete(:id) if identifier.is_a? Hash
       run_callbacks(:initialize) do
         case identifier
         when nil, ::RDF::URI

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "10.1.0".freeze
+  VERSION = "10.2.0".freeze
 end

data/solr/config/solrconfig.xml

@@ -17,11 +17,11 @@
 -->
 
 <!--
- This is a stripped down config file used for a simple example...  
- It is *not* a good example to work from. 
+ This is a stripped down config file used for a simple example...
+ It is *not* a good example to work from.
 -->
 <config>
-  
+
   <!-- Controls what version of Lucene various components of Solr
        adhere to.  Generally, you want to use the latest version to
        get all bug fixes and improvements. It is highly recommended
@@ -29,30 +29,29 @@
        affect both how text is indexed and queried.
   -->
   <luceneMatchVersion>5.0.0</luceneMatchVersion>
-  
+
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
   <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
   <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
 
-  <directoryFactory name="DirectoryFactory" 
+  <directoryFactory name="DirectoryFactory"
                     class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}">
-  </directoryFactory> 
+  </directoryFactory>
 
   <codecFactory class="solr.SchemaCodecFactory"/>
 
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
-
   <dataDir>${solr.blacklight-core.data.dir:}</dataDir>
-  
+
   <requestDispatcher handleSelect="true" >
     <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048000" />
   </requestDispatcher>
-  
+
   <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
 
-  <!-- config for the admin interface --> 
+  <!-- config for the admin interface -->
   <admin>
     <defaultQuery>*:*</defaultQuery>
   </admin>
@@ -187,10 +186,21 @@
     </lst>
   </requestHandler>
 
+  <searchComponent name="termsComponent" class="solr.TermsComponent" />
+
+  <requestHandler name="/terms" class="solr.SearchHandler">
+    <lst name="defaults">
+      <bool name="terms">true</bool>
+    </lst>
+    <arr name="components">
+      <str>termsComponent</str>
+    </arr>
+  </requestHandler>
+
 <!-- Spell Check
 
         The spell check component can return a list of alternative spelling
-        suggestions.  
+        suggestions.
 
         http://wiki.apache.org/solr/SpellCheckComponent
      -->
@@ -245,7 +255,7 @@
        </lst>
      -->
 
-    <!-- a spellchecker that use an alternate comparator 
+    <!-- a spellchecker that use an alternate comparator
 
          comparatorClass be one of:
           1. score (default)
@@ -308,4 +318,3 @@
     <!-- </lst> -->
   </requestHandler>
 </config>
-

data/spec/integration/eradicate_spec.rb

@@ -19,7 +19,7 @@ describe ActiveFedora::Base do
     end
     context "in a typical sitation" do
       specify "it cannot be reused" do
-        expect { described_class.create(ghost) }.to raise_error(Ldp::Gone)
+        expect { described_class.create(id: ghost) }.to raise_error(Ldp::Gone)
       end
     end
     specify "remove its tombstone" do

data/spec/integration/ntriples_datastream_spec.rb

@@ -123,7 +123,7 @@ EOF
       subject.destroy
     end
 
-    subject { RdfTest.new('/test:99') }
+    subject { RdfTest.new(id: '/test:99') }
 
     it "writes rdf with proper subjects" do
       subject.reload

data/spec/unit/base_spec.rb

@@ -141,6 +141,7 @@ describe ActiveFedora::Base do
 
       context "with an id argument" do
         it "is able to create with a custom id" do
+          expect(Deprecation).to receive(:warn)
           expect(FooHistory).to receive(:id_to_uri).and_call_original
           f = FooHistory.new('baz_1')
           expect(f.id).to eq 'baz_1'

data/spec/unit/has_and_belongs_to_many_association_spec.rb

@@ -18,7 +18,7 @@ describe ActiveFedora::Associations::HasAndBelongsToManyAssociation do
       Object.send(:remove_const, :Book)
       Object.send(:remove_const, :Page)
     end
-    subject { Book.new('subject-a') }
+    subject { Book.new(id: 'subject-a') }
 
     context "a one way relationship " do
       describe "adding memeber" do

data/spec/unit/has_many_association_spec.rb

@@ -12,8 +12,8 @@ describe ActiveFedora::Associations::HasManyAssociation do
     Object.send(:remove_const, :Book)
     Object.send(:remove_const, :Page)
   end
-  let(:book) { Book.new('subject-a') }
-  let(:page) { Page.new('object-b') }
+  let(:book) { Book.new(id: 'subject-a') }
+  let(:page) { Page.new(id: 'object-b') }
 
   describe "setting the foreign key" do
     before do

data/spec/unit/orders/list_node_spec.rb

@@ -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("testing")
+            member = Member.new(id: "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/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('changeme-30'))
+        .and_return(SpecModel::Basic.new(id: 'changeme-30'))
       allow(relation).to receive(:load_from_fedora).with("changeme-22", nil)
-        .and_return(SpecModel::Basic.new('changeme-22'))
+        .and_return(SpecModel::Basic.new(id: '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('changeme-30'))
-        expect(relation).to receive(:load_from_fedora).with("changeme-22", nil).and_return(SpecModel::Basic.new('changeme-22'))
+        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(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 })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 10.1.0
+  version: 10.2.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -142,20 +142,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !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
@@ -782,3 +768,4 @@ signing_key:
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.
 test_files: []
+has_rdoc: