rubydora 0.1.1 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.3

data/lib/rubydora/digital_object.rb

@@ -41,7 +41,7 @@ module Rubydora
     # @param [String] pid
     # @param [Rubydora::Repository] context
     def self.find pid, repository = nil
-      DigitalObject.new pid, repository
+      self.new pid, repository
     end
 
     # create a new fedora object (see also DigitalObject#save)
@@ -51,7 +51,7 @@ module Rubydora
     def self.create pid, options = {}, repository = nil
       repository ||= Rubydora.repository
       assigned_pid = repository.ingest(options.merge(:pid => pid))
-      DigitalObject.new assigned_pid, repository
+      self.new assigned_pid, repository
     end
 
     ##
@@ -121,13 +121,18 @@ module Rubydora
     def datastreams
       @datastreams ||= begin
         h = Hash.new { |h,k| h[k] = Datastream.new self, k }                
-        datastreams_xml = repository.datastreams(:pid => pid)
-        datastreams_xml.gsub! '<objectDatastreams', '<objectDatastreams xmlns="http://www.fedora.info/definitions/1/0/access/"' unless datastreams_xml =~ /xmlns=/
-        doc = Nokogiri::XML(datastreams_xml)
-        doc.xpath('//access:datastream', {'access' => "http://www.fedora.info/definitions/1/0/access/"}).each { |ds| h[ds['dsid']] = Datastream.new self, ds['dsid'] }
+
+        begin
+          datastreams_xml = repository.datastreams(:pid => pid)
+          datastreams_xml.gsub! '<objectDatastreams', '<objectDatastreams xmlns="http://www.fedora.info/definitions/1/0/access/"' unless datastreams_xml =~ /xmlns=/
+          doc = Nokogiri::XML(datastreams_xml)
+          doc.xpath('//access:datastream', {'access' => "http://www.fedora.info/definitions/1/0/access/"}).each do |ds| 
+            h[ds['dsid']] = Datastream.new self, ds['dsid'] 
+          end
+        rescue RestClient::ResourceNotFound
+        end
+
         h
-      rescue RestClient::ResourceNotFound
-        h = Hash.new { |h,k| h[k] = Datastream.new self, k }                
       end
     end
     alias_method :datastream, :datastreams
@@ -176,8 +181,8 @@ module Rubydora
     # set the pid of the object
     # @param [String] pid
     # @return [String] the base pid
-    def pid= pid
-      @pid = pid.gsub('info:fedora/', '')
+    def pid= pid=nil
+      @pid = pid.gsub('info:fedora/', '') if pid
     end
 
     # datastream parameters 

data/lib/rubydora/resource_index.rb

@@ -1,3 +1,5 @@
+require 'enumerator'
+
 module Rubydora
   # Fedora resource index helpers
   module ResourceIndex
@@ -7,7 +9,12 @@ module Rubydora
     # @option options [String] :binding the SPARQL binding name to create new objects from
     # @return [Array<Rubydora::DigitalObject>]
     def find_by_sparql query, options = { :binding => 'pid' }
-      self.sparql(query).map { |x| self.find(x[options[:binding]]) rescue nil }
+      return to_enum(:find_by_sparql, query, options).to_a unless block_given?
+
+      self.sparql(query).each do |x| 
+        obj = self.find(x[options[:binding]]) rescue nil
+        yield obj if obj
+      end
     end
 
     # Find new objects by their relationship to a subject

data/lib/rubydora/rest_api_client.rb

@@ -12,7 +12,7 @@ module Rubydora
     # @return [RestClient::Resource]
     def client config = {}
       config = self.config.merge(config)
-      @client ||= RestClient::Resource.new config[:url], :user => config[:user], :password => config[:password]
+      @client ||= RestClient::Resource.new(config[:url], :user => config[:user], :password => config[:password], :timeout => config[:timeout], :open_timeout => config[:timeout])
     end
 
     # {include:RestApiClient::API_DOCUMENTATION}

data/spec/digital_object_spec.rb

@@ -43,6 +43,14 @@ describe Rubydora::DigitalObject do
       @mock_repository.should_receive(:ingest).with(hash_including(:pid => 'pid')).and_return('pid')
       @object.save
     end
+
+    it "should create a new Fedora object with a generated PID if no PID is provided" do 
+      object = Rubydora::DigitalObject.new nil, @mock_repository
+      @mock_repository.should_receive(:ingest).with(hash_including(:pid => nil)).and_return('pid')
+      @mock_repository.should_receive(:datastreams).with(hash_including(:pid => 'pid')).and_raise(RestClient::ResourceNotFound)
+      object.save
+      object.pid.should == 'pid'
+    end
   end
 
   describe "create" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubydora
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-27 00:00:00.000000000 -04:00
+date: 2011-08-30 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &2157901820 !ruby/object:Gem::Requirement
+  requirement: &2160489700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157901820
+  version_requirements: *2160489700
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2157901380 !ruby/object:Gem::Requirement
+  requirement: &2160489140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157901380
+  version_requirements: *2160489140
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2157900960 !ruby/object:Gem::Requirement
+  requirement: &2160488580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157900960
+  version_requirements: *2160488580
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &2157900540 !ruby/object:Gem::Requirement
+  requirement: &2160488140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157900540
+  version_requirements: *2160488140
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2157900120 !ruby/object:Gem::Requirement
+  requirement: &2160487500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157900120
+  version_requirements: *2160487500
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2157899700 !ruby/object:Gem::Requirement
+  requirement: &2160482940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157899700
+  version_requirements: *2160482940
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &2157899280 !ruby/object:Gem::Requirement
+  requirement: &2160482400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157899280
+  version_requirements: *2160482400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157898860 !ruby/object:Gem::Requirement
+  requirement: &2160481860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157898860
+  version_requirements: *2160481860
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2157898440 !ruby/object:Gem::Requirement
+  requirement: &2160481260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157898440
+  version_requirements: *2160481260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157922340 !ruby/object:Gem::Requirement
+  requirement: &2160480780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157922340
+  version_requirements: *2160480780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157921920 !ruby/object:Gem::Requirement
+  requirement: &2160480220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157921920
+  version_requirements: *2160480220
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2157921500 !ruby/object:Gem::Requirement
+  requirement: &2160479760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +143,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157921500
+  version_requirements: *2160479760
 description: ! 'Fedora Commons REST API ruby library : REQUIRES FCREPO 3.4+'
 email:
 - chris@cbeer.info
@@ -201,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1990689017334122645
+      hash: -4272510233954143371
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1990689017334122645
+      hash: -4272510233954143371
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.6.2