active-fedora 8.0.0 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aea1558c0816156110cbe176ed93868a6b8afac9
-  data.tar.gz: d5b8fef8013f9185c01de29a517b46fa9369cd08
+  metadata.gz: 871db23f4245cc098c16e0c574421725780ed9a5
+  data.tar.gz: f36930059f1df74329c347afddfe0ba6dc99bf06
 SHA512:
-  metadata.gz: 15b14ced03030be3194d6e121db430fb783393e7a991343c8fed08ec251e2c3e75ab3c23cb40db314639981b6127e862a9a6b7762e8a87fc397815e8b8375681
-  data.tar.gz: d9a5f47ac1ff4421107381e1c45262cfe8cd55bc1f41f170f1cd11f83c225a465285d5cb07e5e067a08c1acb2f763308ca84685c7ff876f053b7ad54401d7b88
+  metadata.gz: 88fcb0f9e49bd039bb2d24bd3187a072e4344c1e63a6c205f75a3539dc2ce2e6bf5317025e2f96abe6fa15b57dc20ecce4a40989beec3fd53b46aed7d12637c1
+  data.tar.gz: 81faaa5d12bf5e92118c503eb3d934db8351f33ae26b00ecc4647e90803fd68a1dc9c8f50a2f9a81ef69408af3a20641087e4422c613a158044febe7dc92db7e

data/History.txt

@@ -1,3 +1,68 @@
+8.0.1
+
+  2015-03-11: Backport solr escape patch [Chris Colvard]
+
+8.0.0
+
+  2015-01-07: Can assign single ActiveTriples::Resource to single-valued attribute
+  (fixes #653) [David Chandek-Stark]
+
+  2014-12-04: point to FCRepo 3.x stable branch [Benjamin Armintor]
+
+  2013-02-28: github issue 48 tests and YARD [Benjamin Armintor]
+
+  2014-12-02: Removed pending deprecations omitted in 8.0.0.rc1 Bumped version to
+  8.0.0.rc2 [David Chandek-Stark]
+
+  2014-12-02: Bumped version to 8.0.0.rc1 [David Chandek-Stark]
+
+  2014-11-28: Removed pending deprecations for version 8.0.0. [David
+  Chandek-Stark]
+
+  2014-11-19: add RDF::Vocabulary subclasses for Fcrepo and ProjectHydra [Benjamin
+  Armintor]
+
+  2014-11-24: rename ActiveFedora::Rdf to ActiveFedora::RDF [Benjamin Armintor]
+
+  2014-11-21: Adding optional yml paramters as comments so people know they exist
+  [Carolyn Cole]
+
+  2014-11-18: Makes sure all values are handled as arrays [Hector Correa]
+
+  2014-11-17: Bumped version to 8.0.0.pre1 [David Chandek-Stark]
+
+  2014-10-02: Remove ObjectResource from RdfDatastream [Tom Johnson]
+
+  2014-09-22: Factors out behavior from ActiveFedora::Rdf::ObjectResource to mixin
+  ActiveFedora::Rdf::Persistence. [David Chandek-Stark]
+
+v7.1.2
+
+  2014-11-05: Revert "clarified a comment" [Adam Wead]
+
+  2014-11-04: clarified a comment [Brian Maddy]
+
+  2014-10-21: Correction to comment example [Joe Atzberger]
+
+  2014-10-07: Bug #479: Typo in XSD filename value stuck in config generator
+  templates [Joe Atzberger]
+
+v7.1.1
+
+  2014-09-16: RdfDatastream#deserialize should always return an RDF::Graph. Fixes
+  #471 [Justin Coyne]
+
+  2014-08-15: Set default mimeType for NtriplesRDFDatastream to
+  'application/n-triples' per W3C recommendation.
+  http://www.w3.org/TR/n-triples/#n-triples-mediatype Fixes #464 [David
+  Chandek-Stark]
+
+  2014-08-04: RDFDatastream#content= patched to accept IO, matching
+  Rubydora::Datastream API Fixes #461 [David Chandek-Stark]
+
+  2014-07-30: Only set ds content in #create_datastream for managed and inline
+  [David Chandek-Stark]
+
 v7.1.0
 
   2014-07-17: Update Om and Rubydora depencencies [Justin Coyne]

data/lib/active_fedora/relation/finder_methods.rb

@@ -233,10 +233,10 @@ module ActiveFedora
         if value.empty?
           "-#{key}:['' TO *]"
         elsif value.is_a? Array
-          value.map { |val| "#{key}:#{RSolr.escape(val)}" }
+          value.map { |val| "#{key}:#{solr_escape(val)}" }
         else
           key = SOLR_DOCUMENT_ID if (key === :id || key === :pid)
-          "#{key}:#{RSolr.escape(value)}"
+          "#{key}:#{solr_escape(value)}"
         end
       end
     end
@@ -248,5 +248,8 @@ module ActiveFedora
       end
     end
 
+    def solr_escape terms
+      RSolr.solr_escape(terms).gsub(/\s+/,"\\ ")
+    end
   end
 end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "8.0.0"
+  VERSION = "8.0.1"
 end

data/spec/integration/solr_service_spec.rb

@@ -36,7 +36,7 @@ describe ActiveFedora::SolrService do
       Object.send(:remove_const, :FooObject)
     end
     it "should return an array of objects that are of the class stored in active_fedora_model_s" do
-      query = "id\:#{RSolr.escape(@test_object.pid)} OR id\:#{RSolr.escape(@foo_object.pid)}"
+      query = "id\:#{RSolr.solr_escape(@test_object.pid)} OR id\:#{RSolr.solr_escape(@foo_object.pid)}"
       solr_result = ActiveFedora::SolrService.query(query)
       result = ActiveFedora::SolrService.reify_solr_results(solr_result)
       result.length.should == 2
@@ -46,7 +46,7 @@ describe ActiveFedora::SolrService do
     end
     
     it 'should load objects from solr data if a :load_from_solr option is passed in' do
-      query = "id\:#{RSolr.escape(@test_object.pid)} OR id\:#{RSolr.escape(@foo_object.pid)}"
+      query = "id\:#{RSolr.solr_escape(@test_object.pid)} OR id\:#{RSolr.solr_escape(@foo_object.pid)}"
       solr_result = ActiveFedora::SolrService.query(query)
       result = ActiveFedora::SolrService.reify_solr_results(solr_result,{:load_from_solr=>true})
       result.length.should == 2
@@ -67,7 +67,7 @@ describe ActiveFedora::SolrService do
     end
     
     it 'should #reify a lightweight object as a new instance' do
-      query = "id\:#{RSolr.escape(@foo_object.pid)}"
+      query = "id\:#{RSolr.solr_escape(@foo_object.pid)}"
       solr_result = ActiveFedora::SolrService.query(query)
       result = ActiveFedora::SolrService.reify_solr_results(solr_result,{:load_from_solr=>true})
       solr_foo = result.first
@@ -79,7 +79,7 @@ describe ActiveFedora::SolrService do
     end
     
     it 'should #reify! a lightweight object within the same instance' do
-      query = "id\:#{RSolr.escape(@foo_object.pid)}"
+      query = "id\:#{RSolr.solr_escape(@foo_object.pid)}"
       solr_result = ActiveFedora::SolrService.query(query)
       result = ActiveFedora::SolrService.reify_solr_results(solr_result,{:load_from_solr=>true})
       solr_foo = result.first
@@ -90,7 +90,7 @@ describe ActiveFedora::SolrService do
     end
     
     it 'should raise an exception when attempting to reify a first-class object' do
-      query = "id\:#{RSolr.escape(@foo_object.pid)}"
+      query = "id\:#{RSolr.solr_escape(@foo_object.pid)}"
       solr_result = ActiveFedora::SolrService.query(query)
       result = ActiveFedora::SolrService.reify_solr_results(solr_result,{:load_from_solr=>true})
       solr_foo = result.first
@@ -101,7 +101,7 @@ describe ActiveFedora::SolrService do
     end
   
     it 'should call load_instance_from_solr if :load_from_solr option passed in' do
-      query = "id\:#{RSolr.escape(@test_object.pid)} OR id\:#{RSolr.escape(@foo_object.pid)}"
+      query = "id\:#{RSolr.solr_escape(@test_object.pid)} OR id\:#{RSolr.solr_escape(@foo_object.pid)}"
       solr_result = ActiveFedora::SolrService.query(query)
       ActiveFedora::Base.should_receive(:load_instance_from_solr).once
       FooObject.should_receive(:load_instance_from_solr).once

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.0.1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr