active-fedora 9.0.2 → 9.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d965581bccc2e324f6336a4f7c5efb78efad4fcc
-  data.tar.gz: 72afbee2a1034a97575d0bfbfb74fed1e3d1ca14
+  metadata.gz: 505a6045300f42aa08d9d68632b7847cddc7b9a7
+  data.tar.gz: 05360af6100e21a5513b612292da24cf01cf9b16
 SHA512:
-  metadata.gz: e72f35a6d6effd301066113a82479a9924e67b6f137e97db989cef3e9d7ac48790835d074fb617f222a07d7b9641ca49aac0bba4ec6e778da23340eff3edf857
-  data.tar.gz: 0689886286c8acc0aea9f4a19b70fac85b7da7d011ecdfcf13c140ab5e5479f900063d5ca5d88e94a315a83d88d72ccdd26b268240a6615596a481542f16c89b
+  metadata.gz: 399d4f0a75a882db61ccaece0343dcdfa509670cc0e8aa8e11aa830a87797825ac3f923e9c577ef83f70ec02bd1bc7b7f770f7d242807fb443641677c504e70b
+  data.tar.gz: 7a9b1ae26cbed3732b28bd337304765790393f4af1b3b8b4ebf1c98ae8036b1a2d7a8a2ce0779dbe98b8bdd49c5373f4e4900eed005d46806fda0f37740c5e6f

data/History.txt

@@ -1,3 +1,10 @@
+v9.0.3
+  2015-03-04: Encapsulate solr_escape and make it private [Justin Coyne]
+
+  2015-03-04: Update readme [Justin Coyne]
+
+  2015-02-28: Use modified RSolr.solr_escape method [Adam Wead]
+
 v9.0.0
   2015-01-30: When save! is called only validate once [Justin Coyne]
 

data/README.md

@@ -6,12 +6,10 @@ Description
 [![Dependencies](https://gemnasium.com/projecthydra/active_fedora.png)](https://gemnasium.com/projecthydra/active\_fedora)
 [![Coverage Status](https://img.shields.io/coveralls/projecthydra/active_fedora.svg)](https://coveralls.io/r/projecthydra/active_fedora)
 
-Rubydora and ActiveFedora provide a set of Ruby gems for creating and
+ActiveFedora is a Ruby gem for creating and
 managing objects in the Fedora Repository Architecture
 ([http://fedora-commons.org](http://fedora-commons.org)). ActiveFedora
-is loosely based on “ActiveRecord” in Rails. The 3.x series of
-ActiveFedora depends on Rails 3, specifically activemodel and
-activesupport.
+is loosely based on “ActiveRecord” in Rails. Version 9.0+ works with Fedora 4 and prior versions work on Fedora 3.
 
 Getting Help
 ------------

data/lib/active_fedora/relation/finder_methods.rb

@@ -264,10 +264,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 === :id)
-          "#{key}:#{RSolr.escape(value)}"
+          "#{key}:#{solr_escape(value)}"
         end
       end
     end
@@ -283,5 +283,12 @@ module ActiveFedora
       end
     end
 
+
+    private
+      # Adds esaping for spaces which are not handled by RSolr.solr_escape
+      # See rsolr/rsolr#101
+      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 = "9.0.2"
+  VERSION = "9.0.3"
 end

data/spec/integration/query_result_builder_spec.rb

@@ -30,7 +30,7 @@ describe ActiveFedora::QueryResultBuilder 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.id)} OR id\:#{RSolr.escape(@foo_object.id)}"
+      query = ActiveFedora::SolrQueryBuilder.construct_query_for_ids([@test_object.id, @foo_object.id])
       solr_result = ActiveFedora::SolrService.query(query)
       result = ActiveFedora::QueryResultBuilder.reify_solr_results(solr_result)
       expect(result.length).to eq 2
@@ -40,7 +40,7 @@ describe ActiveFedora::QueryResultBuilder do
     end
 
     it 'should #reify a lightweight object as a new instance' do
-      query = "id\:#{RSolr.escape(@foo_object.id)}"
+      query = ActiveFedora::SolrQueryBuilder.construct_query_for_ids([@foo_object.id])
       solr_result = ActiveFedora::SolrService.query(query)
       result = ActiveFedora::QueryResultBuilder.reify_solr_results(solr_result,{:load_from_solr=>true})
       expect(result.first).to be_instance_of FooObject

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.0.2
+  version: 9.0.3
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -565,4 +565,3 @@ signing_key:
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.
 test_files: []
-has_rdoc: