rubydora 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/rubydora/repository.rb

@@ -21,6 +21,31 @@ module Rubydora
       DigitalObject.find(pid, self)
     end
 
+    # High-level access to the Fedora find_objects API
+    #
+    # @params [String] query
+    # @params [Hash] options
+    # @yield [DigitalObject] Yield a DigitalObject for each search result
+    def search query, options = {}, &block
+      return to_enum(:search, query, options).to_a unless block_given?
+      
+      sessionToken = nil 
+      doc = nil
+
+      begin 
+        sessionOptions = {}
+        sessionOptions[:sessionToken] = sessionToken unless sessionToken.nil? or sessionToken.blank?
+
+        response = self.find_objects(options.merge(:query => query, :resultFormat => 'xml', :pid => true).merge(sessionOptions))
+
+        doc = Nokogiri::XML(response)
+        doc.xpath('//xmlns:objectFields/xmlns:pid', doc.namespaces).each { |pid| obj = self.find(pid.text); block.call(obj) }
+
+        sessionToken = doc.xpath('//xmlns:listSession/xmlns:token', doc.namespaces).text
+      end until sessionToken.nil? or sessionToken.empty? or doc.xpath('//xmlns:resultList/xmlns:objectFields', doc.namespaces).empty?
+
+    end
+
     # {include:DigitalObject.create}
     def create pid, options = {}
       DigitalObject.create(pid, options = {}, self)

data/spec/lib/integration_test_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 
 # These tests require a fedora repository with the resource index enabled (and with syncUpdates = true)
-describe "Integration testing against a live Fedora repository" do
+describe "Integration testing against a live Fedora repository", :integration => true do
   REPOSITORY_CONFIG = { :url => 'http://localhost:8983/fedora', :user => 'fedoraAdmin', :password => 'fedoraAdmin' }
   before(:all) do
     @repository = Rubydora.connect REPOSITORY_CONFIG
@@ -180,6 +180,23 @@ describe "Integration testing against a live Fedora repository" do
 
   end
 
+  describe "search" do
+
+    it "should return an array of fedora objects" do
+      objects = @repository.search('')
+
+      objects.map { |x| x.pid }.should include('test:1', 'test:2')
+    end
+
+    it "should include our new objects" do
+      pids = []
+      @repository.search('') { |obj| pids << obj.pid }
+
+      pids.should include('test:1', 'test:2')
+    end
+
+  end
+
 
   after(:all) do
     @repository.find('test:1').delete rescue nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubydora
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-13 00:00:00.000000000 Z
+date: 2011-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &2156235120 !ruby/object:Gem::Requirement
+  requirement: &70303469325600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156235120
+  version_requirements: *70303469325600
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2156233300 !ruby/object:Gem::Requirement
+  requirement: &70303469325100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156233300
+  version_requirements: *70303469325100
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2156231540 !ruby/object:Gem::Requirement
+  requirement: &70303469324580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156231540
+  version_requirements: *70303469324580
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &2156230120 !ruby/object:Gem::Requirement
+  requirement: &70303469324120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156230120
+  version_requirements: *70303469324120
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156229040 !ruby/object:Gem::Requirement
+  requirement: &70303469323660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156229040
+  version_requirements: *70303469323660
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2156244800 !ruby/object:Gem::Requirement
+  requirement: &70303469323200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156244800
+  version_requirements: *70303469323200
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &2156243860 !ruby/object:Gem::Requirement
+  requirement: &70303469322720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156243860
+  version_requirements: *70303469322720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156242420 !ruby/object:Gem::Requirement
+  requirement: &70303469322280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156242420
+  version_requirements: *70303469322280
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2156241260 !ruby/object:Gem::Requirement
+  requirement: &70303469321840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156241260
+  version_requirements: *70303469321840
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156240180 !ruby/object:Gem::Requirement
+  requirement: &70303469334820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 1.0.14
   type: :development
   prerelease: false
-  version_requirements: *2156240180
+  version_requirements: *70303469334820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156238420 !ruby/object:Gem::Requirement
+  requirement: &70303469334120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156238420
+  version_requirements: *70303469334120
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156253060 !ruby/object:Gem::Requirement
+  requirement: &70303469333480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156253060
+  version_requirements: *70303469333480
 - !ruby/object:Gem::Dependency
   name: jettywrapper
-  requirement: &2156252220 !ruby/object:Gem::Requirement
+  requirement: &70303469333060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156252220
+  version_requirements: *70303469333060
 description: ! 'Fedora Commons REST API ruby library : REQUIRES FCREPO 3.4+'
 email:
 - chris@cbeer.info
@@ -211,7 +211,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2204979303910544161
+      hash: 4478861482245070325
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2204979303910544161
+      hash: 4478861482245070325
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10