rubydora 0.2.2 → 0.2.3

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "jetty"]
+	path = jetty
+	url = git://github.com/projecthydra/hydra-jetty.git

data/Rakefile

@@ -19,11 +19,9 @@ task :default => :spec
 
 desc "Run specs"
 RSpec::Core::RakeTask.new do |t|
-  t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
   # Put spec opts in a file named .rspec in root
 end
 
-
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
@@ -38,3 +36,25 @@ desc "Open an irb session preloaded with this library"
 task :console do
   sh "irb -rubygems -I lib -r rubydora.rb"
 end
+
+desc "Execute Continuous Integration build"
+task :ci do
+  unless ENV['environment'] == 'test'
+    exec("rake ci environment=test") 
+  end
+
+  require 'jettywrapper'
+  jetty_params = {
+    :jetty_home => File.expand_path(File.dirname(__FILE__) + '/jetty'),
+    :quiet => false,
+    :jetty_port => 8983,
+    :solr_home => File.expand_path(File.dirname(__FILE__) + '/jetty/solr'),
+    :fedora_home => File.expand_path(File.dirname(__FILE__) + '/jetty/fedora/default'),
+    :startup_wait => 30
+  }
+
+  error = Jettywrapper.wrap(jetty_params) do
+    Rake::Task['spec'].invoke
+  end
+  raise "test failures: #{error}" if error
+end

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/rubydora/digital_object.rb

@@ -160,9 +160,8 @@ module Rubydora
     def save
       run_callbacks :save do
         if self.new?
-          run_callbacks :create do
-            self.pid = repository.ingest to_api_params.merge(:pid => pid)
-          end
+          self.pid = repository.ingest to_api_params.merge(:pid => pid)
+          @profile = nil #will cause a reload with updated data
         else                       
           p = to_api_params
           repository.modify_object p.merge(:pid => pid) unless p.empty?
@@ -170,18 +169,20 @@ module Rubydora
       end
 
       self.datastreams.select { |dsid, ds| ds.changed? }.each { |dsid, ds| ds.save }
-      reset
       self
     end
 
     # Purge the object from Fedora
     # @return [Rubydora::DigitalObject] `self`
     def delete
+      my_pid = pid
       run_callbacks :destroy do
-        repository.purge_object(:pid => pid)
-        reset
-        self
+        @datastreams = nil
+        @profile = nil
+        @pid = nil
+        nil
       end
+      repository.purge_object(:pid => my_pid) ##This can have a meaningful exception, don't put it in the callback
     end
 
     # repository reference from the digital object
@@ -215,25 +216,6 @@ module Rubydora
       OBJ_DEFAULT_ATTRIBUTES.dup
     end
 
-    # reset all profile attributes
-    # @return [Hash]
-    def reset_profile_attributes
-      @profile = nil
-      @changed_attributes = {}
-    end
-
-    # reset the datastreams cache
-    def reset_datastreams
-      @datastreams = nil
-    end
-
-    # reset local data so that it is requested from Fedora
-    def reset
-      reset_profile_attributes
-      reset_datastreams
-      self
-    end
-
     # instantiate a datastream object for a dsid
     # @param [String] dsid
     # @return [Datastream]

data/lib/rubydora/rest_api_client.rb

@@ -20,7 +20,12 @@ module Rubydora
     # @return [String]
     def next_pid options = {}
       options[:format] ||= 'xml'
-      client[url_for(object_url() + "/nextPID", options)].post nil
+      begin
+        return client[url_for(object_url() + "/nextPID", options)].post nil
+      rescue => e
+        logger.error e.response
+        raise "Error getting nextPID. See logger for details"
+      end
     end
 
     # {include:RestApiClient::API_DOCUMENTATION}
@@ -30,7 +35,12 @@ module Rubydora
       raise "" if options[:terms] and options[:query]
       options[:resultFormat] ||= 'xml'
 
-      client[object_url(nil, options)].get
+      begin
+        return client[object_url(nil, options)].get
+      rescue => e
+        logger.error e.response
+        raise "Error finding objects. See logger for details"
+      end
     end
 
     # {include:RestApiClient::API_DOCUMENTATION}
@@ -40,7 +50,14 @@ module Rubydora
     def object options = {}
       pid = options.delete(:pid)
       options[:format] ||= 'xml'
-      client[object_url(pid, options)].get
+      begin
+        return client[object_url(pid, options)].get
+      rescue RestClient::ResourceNotFound => e
+        raise e
+      rescue => e
+        logger.error e.response
+        raise "Error getting object #{pid}. See logger for details"
+      end
     end
 
     # {include:RestApiClient::API_DOCUMENTATION}
@@ -50,7 +67,12 @@ module Rubydora
     def ingest options = {}
       pid = options.delete(:pid) || 'new'
       file = options.delete(:file)
-      client[object_url(pid, options)].post file, :content_type => 'text/xml'
+      begin
+        return client[object_url(pid, options)].post file, :content_type => 'text/xml'
+      rescue => e
+        logger.error e.response
+        raise "Error ingesting object #{pid}. See logger for details"
+      end
     end
 
     # {include:RestApiClient::API_DOCUMENTATION}
@@ -59,7 +81,12 @@ module Rubydora
     # @return [String]
     def modify_object options = {}
       pid = options.delete(:pid)
-      client[object_url(pid, options)].put nil
+      begin
+        return client[object_url(pid, options)].put nil
+      rescue => e
+        logger.error e.response
+        raise "Error modifying object #{pid}. See logger for details"
+      end
     end
 
     # {include:RestApiClient::API_DOCUMENTATION}
@@ -68,7 +95,14 @@ module Rubydora
     # @return [String]
     def purge_object options = {}
       pid = options.delete(:pid)
-      client[object_url(pid, options)].delete
+      begin
+        return client[object_url(pid, options)].delete
+      rescue RestClient::ResourceNotFound => e
+        raise e
+      rescue => e
+        logger.error e.response
+        raise "Error purging object #{pid}. See logger for details"
+      end
     end
 
     # {include:RestApiClient::API_DOCUMENTATION}
@@ -79,7 +113,12 @@ module Rubydora
       pid = options.delete(:pid)
       options[:format] ||= 'xml'
       raise "" unless pid
-      client[url_for(object_url(pid) + "/versions", options)].get
+      begin
+        return client[url_for(object_url(pid) + "/versions", options)].get
+      rescue => e
+        logger.error e.response
+        raise "Error getting versions for object #{pid}. See logger for details"
+      end
     end
 
     # {include:RestApiClient::API_DOCUMENTATION}
@@ -90,7 +129,12 @@ module Rubydora
       pid = options.delete(:pid)
       raise "" unless pid
       options[:format] ||= 'xml'
-      client[url_for(object_url(pid) + "/objectXML", options)].get
+      begin
+        return client[url_for(object_url(pid) + "/objectXML", options)].get
+      rescue => e
+        logger.error e.response
+        raise "Error getting objectXML for object #{pid}. See logger for details"
+      end
     end
 
     # {include:RestApiClient::API_DOCUMENTATION}
@@ -102,7 +146,14 @@ module Rubydora
       pid = options.delete(:pid)
       dsid = options.delete(:dsid)
       options[:format] ||= 'xml'
-      client[datastream_url(pid, dsid, options)].get
+      begin
+        return client[datastream_url(pid, dsid, options)].get
+      rescue RestClient::ResourceNotFound => e
+        raise e
+      rescue => e
+        logger.error e.response
+        raise "Error getting datastream '#{dsid}' for object #{pid}. See logger for details"
+      end
     end
 
     alias_method :datastreams, :datastream
@@ -115,7 +166,12 @@ module Rubydora
     def set_datastream_options options = {}
       pid = options.delete(:pid)
       dsid = options.delete(:dsid)
-      client[datastream_url(pid, dsid, options)].put nil
+      begin
+        return client[datastream_url(pid, dsid, options)].put nil
+      rescue => e
+        logger.error e.response
+        raise "Error setting datastream options on #{dsid} for object #{pid}. See logger for details"
+      end
     end
 
     # {include:RestApiClient::API_DOCUMENTATION}
@@ -128,7 +184,12 @@ module Rubydora
       dsid = options.delete(:dsid)
       raise ArgumentError, "Must supply dsid" unless dsid
       options[:format] ||= 'xml'
-      client[url_for(datastream_url(pid, dsid) + "/versions", options)].get
+      begin
+        return client[url_for(datastream_url(pid, dsid) + "/versions", options)].get
+      rescue => e
+        logger.error e.response
+        raise "Error getting versions for datastream #{dsid} for object #{pid}. See logger for details"
+      end
     end
 
     # {include:RestApiClient::API_DOCUMENTATION}
@@ -140,7 +201,14 @@ module Rubydora
       pid = options.delete(:pid)
       dsid = options.delete(:dsid)
       raise "" unless dsid
-      client[url_for(datastream_url(pid, dsid) + "/content", options)].get
+      begin
+        return client[url_for(datastream_url(pid, dsid) + "/content", options)].get
+      rescue RestClient::ResourceNotFound => e
+        raise e
+      rescue => e
+        logger.error e.response
+        raise "Error getting dissemination for datastream #{dsid} for object #{pid}. See logger for details"
+      end
     end
 
     # {include:RestApiClient::API_DOCUMENTATION}
@@ -153,7 +221,12 @@ module Rubydora
       dsid = options.delete(:dsid)
       file = options.delete(:content)
       content_type = options.delete(:content_type) || options[:mimeType] || (MIME::Types.type_for(file.path).first if file.respond_to? :path) || 'text/plain'
-      client[datastream_url(pid, dsid, options)].post file, :content_type => content_type.to_s, :multipart => true
+      begin
+        return client[datastream_url(pid, dsid, options)].post file, :content_type => content_type.to_s, :multipart => true
+      rescue => e
+        logger.error e.response
+        raise "Error adding datastream #{dsid} for object #{pid}. See logger for details"
+      end
     end
 
     # {include:RestApiClient::API_DOCUMENTATION}
@@ -166,7 +239,13 @@ module Rubydora
       dsid = options.delete(:dsid)
       file = options.delete(:content)
       content_type = options.delete(:content_type) || options[:mimeType] || (MIME::Types.type_for(file.path).first if file.respond_to? :path) || 'text/plain'
-      client[datastream_url(pid, dsid, options)].put file, :content_type => content_type.to_s, :multipart => true
+
+      begin
+        return client[datastream_url(pid, dsid, options)].put(file, {:content_type => content_type.to_s, :multipart => true})
+      rescue => e
+        logger.error e.response
+        raise "Error modifying datastream #{dsid} for #{pid}. See logger for details"
+      end
     end
 
     # {include:RestApiClient::API_DOCUMENTATION}
@@ -177,7 +256,12 @@ module Rubydora
     def purge_datastream options = {}
       pid = options.delete(:pid)
       dsid = options.delete(:dsid)
-      client[datastream_url(pid, dsid, options)].delete
+      begin
+        client[datastream_url(pid, dsid, options)].delete
+      rescue => e
+        logger.error e.response
+        raise "Error purging datastream #{dsid} for #{pid}. See logger for details"
+      end
     end
 
     # {include:RestApiClient::API_DOCUMENTATION}
@@ -188,7 +272,12 @@ module Rubydora
       pid = options.delete(:pid) || options[:subject]
       raise "" unless pid
       options[:format] ||= 'xml'
-      client[url_for(object_url(pid) + "/relationships", options)].get
+      begin
+        return client[url_for(object_url(pid) + "/relationships", options)].get
+      rescue => e
+        logger.error e.response
+        raise "Error getting relationships for #{pid}. See logger for details"
+      end
     end
 
     # {include:RestApiClient::API_DOCUMENTATION}
@@ -197,7 +286,12 @@ module Rubydora
     # @return [String]
     def add_relationship options = {}
       pid = options.delete(:pid) || options[:subject]
-      client[url_for(object_url(pid) + "/relationships/new", options)].post nil
+      begin
+        return client[url_for(object_url(pid) + "/relationships/new", options)].post nil
+      rescue => e
+        logger.error e.response
+        raise "Error adding relationship for #{pid}. See logger for details"
+      end
     end
 
     # {include:RestApiClient::API_DOCUMENTATION}
@@ -206,7 +300,12 @@ module Rubydora
     # @return [String]
     def purge_relationship options = {}
       pid = options.delete(:pid) || options[:subject]
-      client[url_for(object_url(pid) + "/relationships", options)].delete
+      begin
+        return client[url_for(object_url(pid) + "/relationships", options)].delete
+      rescue => e
+        logger.error e.response
+        raise "Error purging relationships for #{pid}. See logger for details"
+      end
     end
 
     # {include:RestApiClient::API_DOCUMENTATION}
@@ -220,7 +319,12 @@ module Rubydora
       sdef = options.delete(:sdef)
       method = options.delete(:method)
       options[:format] ||= 'xml' unless pid and sdef and method
-      client[dissemination_url(pid,sdef,method,options)].get
+      begin
+        return client[dissemination_url(pid,sdef,method,options)].get
+      rescue => e
+        logger.error e.response
+        raise "Error getting dissemination for #{pid}. See logger for details"
+      end
     end
     
     # Generate a REST API compatible URI 

data/rubydora.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency("bundler")
   s.add_development_dependency("rspec")
   s.add_development_dependency("yard")
+  s.add_development_dependency("jettywrapper")
 end

data/spec/{digital_object_spec.rb → lib/digital_object_spec.rb}

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe Rubydora::DigitalObject do
+  before do
+    @mock_repository = mock(Rubydora::Repository)
+
+  end
   describe "new" do
     it "should load a DigitalObject instance" do
       Rubydora::DigitalObject.new("pid").should be_a_kind_of(Rubydora::DigitalObject)
@@ -9,7 +13,6 @@ describe Rubydora::DigitalObject do
 
   describe "profile" do
     before(:each) do
-      @mock_repository = mock(Rubydora::Repository)
       @object = Rubydora::DigitalObject.new 'pid', @mock_repository
     end
 
@@ -29,8 +32,7 @@ describe Rubydora::DigitalObject do
 
   describe "new" do
     before(:each) do
-      @mock_repository = mock(Rubydora::Repository)
-      @mock_repository.should_receive(:object).any_number_of_times.and_raise ""
+      @mock_repository.stub(:object) { raise "" }
       @object = Rubydora::DigitalObject.new 'pid', @mock_repository
     end
 
@@ -39,7 +41,7 @@ describe Rubydora::DigitalObject do
     end
 
     it "should call ingest on save" do
-      @object.should_receive(:datastreams).and_return({})
+      @object.stub(:datastreams) { {} }
       @mock_repository.should_receive(:ingest).with(hash_including(:pid => 'pid')).and_return('pid')
       @object.save
     end
@@ -55,14 +57,12 @@ describe Rubydora::DigitalObject do
 
   describe "create" do
     it "should call the Fedora REST API to create a new object" do
-      @mock_repository = mock(Rubydora::Repository)
       @mock_repository.should_receive(:ingest).with(instance_of(Hash)).and_return("pid")
       obj = Rubydora::DigitalObject.create "pid", { :a => 1, :b => 2}, @mock_repository
       obj.should be_a_kind_of(Rubydora::DigitalObject)
     end
 
     it "should return a new object with the Fedora response pid when no pid is provided" do
-      @mock_repository = mock(Rubydora::Repository)
       @mock_repository.should_receive(:ingest).with(instance_of(Hash)).and_return("pid")
       obj = Rubydora::DigitalObject.create "new", { :a => 1, :b => 2}, @mock_repository
       obj.should be_a_kind_of(Rubydora::DigitalObject)
@@ -72,7 +72,6 @@ describe Rubydora::DigitalObject do
 
   describe "retreive" do
     before(:each) do
-      @mock_repository = mock(Rubydora::Repository)
       @mock_repository.stub :datastreams do |hash|
         "<objectDatastreams><datastream dsid='a'></datastream>><datastream dsid='b'></datastream>><datastream dsid='c'></datastream></objectDatastreams>"
       end
@@ -125,12 +124,12 @@ describe Rubydora::DigitalObject do
 
   describe "save" do
     before(:each) do
-      @mock_repository = mock(Rubydora::Repository)
-      @mock_repository.should_receive(:object).any_number_of_times.with({:pid => 'pid'}).and_return <<-XML
+      @mock_repository.stub(:object) { <<-XML
       <objectProfile>
         <not>empty</not>
       </objectProfile>
       XML
+      }
 
       @object = Rubydora::DigitalObject.new 'pid', @mock_repository
     end
@@ -194,19 +193,10 @@ describe Rubydora::DigitalObject do
       @mock_repository.should_receive(:modify_object).with(hash_including(:pid => 'pid'))
       @object.save
     end
-
-    it "should reset the object state on save" do
-      @object.label = "asdf"
-      @object.should_receive(:datastreams).and_return({})
-      @mock_repository.should_receive(:modify_object).with(hash_including(:pid => 'pid'))
-      @object.profile.should_not be_nil
-      expect { @object.save }.to change { @object.instance_variable_get('@profile') }.to nil
-    end
   end
 
   describe "delete" do
     before(:each) do
-      @mock_repository = mock()
       @object = Rubydora::DigitalObject.new 'pid', @mock_repository
     end
 
@@ -218,11 +208,11 @@ describe Rubydora::DigitalObject do
 
   describe "models" do
     before(:each) do
-      @mock_repository = mock(Rubydora::Repository)
-      @mock_repository.should_receive(:object).any_number_of_times.with({:pid => 'pid'}).and_return <<-XML
+      @mock_repository.stub(:object) { <<-XML
       <objectProfile>
       </objectProfile>
       XML
+      }
       @object = Rubydora::DigitalObject.new 'pid', @mock_repository
     end
 
@@ -256,11 +246,11 @@ describe Rubydora::DigitalObject do
 
   describe "relations" do
     before(:each) do
-      @mock_repository = mock()
-      @mock_repository.should_receive(:object).any_number_of_times.with({:pid => 'pid'}).and_return <<-XML
+      @mock_repository.stub(:object) { <<-XML
       <objectProfile>
       </objectProfile>
       XML
+      }
       @object = Rubydora::DigitalObject.new 'pid', @mock_repository
     end
 
@@ -296,7 +286,6 @@ describe Rubydora::DigitalObject do
 
   describe "to_api_params" do
     before(:each) do
-      @mock_repository = mock(Rubydora::Repository)
       @object = Rubydora::DigitalObject.new 'pid', @mock_repository
     end
     it "should compile parameters to hash" do

data/spec/{integration_test_spec.rb → lib/integration_test_spec.rb}

@@ -102,6 +102,20 @@ describe "Integration testing against a live Fedora repository" do
     obj.datastreams["empty_ds"].new?.should == true
   end
 
+  it "should update datastream attributes without changing the content" do
+    obj = @repository.find('test:1')
+    obj.datastreams["my_ds"].content = "XXX"
+    obj.save
+
+    obj = @repository.find('test:1')
+    obj.datastreams["my_ds"].dsLabel = "New Label"
+    obj.save
+
+    obj = @repository.find('test:1')
+    obj.datastreams["my_ds"].content.should == "XXX"
+    obj.datastreams["my_ds"].dsLabel.should == "New Label"
+  end
+
 
   after(:all) do
     @repository.find('test:1').delete rescue nil

data/spec/{rest_api_client_spec.rb → lib/rest_api_client_spec.rb}

@@ -1,8 +1,11 @@
 require 'spec_helper' 
+require 'loggable'
 
 describe Rubydora::RestApiClient do
   class MockRepository
     include Rubydora::RestApiClient
+    include Loggable
+
 
     attr_accessor :config
   end
@@ -25,10 +28,16 @@ describe Rubydora::RestApiClient do
     @mock_repository.find_objects :query => 'a'
   end
 
+
   it "should show object properties" do
     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/z?format=xml"))
     @mock_repository.object :pid => 'z'
   end
+
+  it "should raise not found exception when retrieving object" do
+    RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/z?format=xml")).and_raise( RestClient::ResourceNotFound)
+    lambda {@mock_repository.object(:pid => 'z')}.should raise_error RestClient::ResourceNotFound
+  end
   
   it "ingest" do
      RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/new"))
@@ -53,6 +62,11 @@ describe Rubydora::RestApiClient do
     @mock_repository.purge_object :pid => 'mypid'
   end
 
+  it "should raise not found exception when purging" do
+    RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid")).and_raise( RestClient::ResourceNotFound)
+    lambda {@mock_repository.purge_object(:pid => 'mypid')}.should raise_error RestClient::ResourceNotFound
+  end
+
   it "object_versions" do
      RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/versions?format=xml"))
     @mock_repository.object_versions :pid => 'mypid'
@@ -73,10 +87,19 @@ describe Rubydora::RestApiClient do
     @mock_repository.datastream :pid => 'mypid', :dsid => 'aaa'
   end
 
+  it "should raise not found exception when getting a datastream" do
+     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa?format=xml")).and_raise( RestClient::ResourceNotFound)
+    lambda {@mock_repository.datastream :pid => 'mypid', :dsid => 'aaa'}.should raise_error RestClient::ResourceNotFound
+  end
+
   it "datastream_dissemination" do
      RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa/content"))
     @mock_repository.datastream_dissemination :pid => 'mypid', :dsid => 'aaa'
   end
+  it "should raise not found exception when retrieving datastream_dissemination" do
+     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa/content")).and_raise( RestClient::ResourceNotFound)
+    lambda {@mock_repository.datastream_dissemination :pid => 'mypid', :dsid => 'aaa'}.should raise_error RestClient::ResourceNotFound
+  end
 
   it "add_datastream" do
      RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa"))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubydora
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  segments_generated: true
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Chris Beer
@@ -15,177 +15,191 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-29 00:00:00 -04:00
+date: 2011-11-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fastercsv
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: rest-client
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: mime-types
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id005
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   name: activemodel
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id006
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   name: savon
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id007
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  type: :development
+  prerelease: false
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id008
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  type: :development
+  prerelease: false
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id009
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  type: :development
+  prerelease: false
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id010
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  type: :development
+  prerelease: false
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id011
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  type: :development
+  prerelease: false
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
+  requirement: *id012
+- !ruby/object:Gem::Dependency 
+  name: jettywrapper
   type: :development
   prerelease: false
-  version_requirements: *id012
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id013
 description: "Fedora Commons REST API ruby library : REQUIRES FCREPO 3.4+"
 email: 
 - chris@cbeer.info
@@ -197,6 +211,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .gitmodules
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -220,16 +235,16 @@ files:
 - lib/rubydora/soap.rb
 - lib/rubydora/version.rb
 - rubydora.gemspec
-- spec/datastream_spec.rb
-- spec/digital_object_spec.rb
-- spec/ext_model_loader_spec.rb
-- spec/ext_solr_spec.rb
-- spec/extension_parameters_spec.rb
-- spec/integration_test_spec.rb
-- spec/repository_spec.rb
-- spec/resource_index_spec.rb
-- spec/rest_api_client_spec.rb
-- spec/soap_spec.rb
+- spec/lib/datastream_spec.rb
+- spec/lib/digital_object_spec.rb
+- spec/lib/ext_model_loader_spec.rb
+- spec/lib/ext_solr_spec.rb
+- spec/lib/extension_parameters_spec.rb
+- spec/lib/integration_test_spec.rb
+- spec/lib/repository_spec.rb
+- spec/lib/resource_index_spec.rb
+- spec/lib/rest_api_client_spec.rb
+- spec/lib/soap_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/cbeer/rubydora
@@ -245,37 +260,35 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3650604307215364376
+      hash: 3
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3650604307215364376
+      hash: 3
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Fedora Commons REST API ruby library
 test_files: 
-- spec/datastream_spec.rb
-- spec/digital_object_spec.rb
-- spec/ext_model_loader_spec.rb
-- spec/ext_solr_spec.rb
-- spec/extension_parameters_spec.rb
-- spec/integration_test_spec.rb
-- spec/repository_spec.rb
-- spec/resource_index_spec.rb
-- spec/rest_api_client_spec.rb
-- spec/soap_spec.rb
+- spec/lib/datastream_spec.rb
+- spec/lib/digital_object_spec.rb
+- spec/lib/ext_model_loader_spec.rb
+- spec/lib/ext_solr_spec.rb
+- spec/lib/extension_parameters_spec.rb
+- spec/lib/integration_test_spec.rb
+- spec/lib/repository_spec.rb
+- spec/lib/resource_index_spec.rb
+- spec/lib/rest_api_client_spec.rb
+- spec/lib/soap_spec.rb
 - spec/spec_helper.rb