rubydora 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/rubydora/rest_api_client.rb

@@ -4,6 +4,7 @@ module Rubydora
   module RestApiClient
     # Fedora API documentation available at {https://wiki.duraspace.org/display/FCR30/REST+API}
     API_DOCUMENTATION = 'https://wiki.duraspace.org/display/FCR30/REST+API'
+    VALID_CLIENT_OPTIONS = [:user, :password, :timeout, :open_timeout, :ssl_client_cert, :ssl_client_key]
     # Create an authorized HTTP client for the Fedora REST API
     # @param [Hash] config
     # @option config [String] :url
@@ -11,8 +12,16 @@ module Rubydora
     # @option config [String] :password
     # @return [RestClient::Resource]
     def client config = {}
-      config = self.config.merge(config)
-      @client ||= RestClient::Resource.new(config[:url], :user => config[:user], :password => config[:password], :timeout => config[:timeout], :open_timeout => config[:timeout])
+      client_config = self.config.merge(config)
+      if config.empty? or @config_hash.nil? or (client_config.hash == @config_hash)
+        @config_hash = client_config.hash
+        url = client_config[:url]
+        client_config.delete_if { |k,v| not VALID_CLIENT_OPTIONS.include?(k) }
+        client_config[:open_timeout] ||= client_config[:timeout]
+        @client ||= RestClient::Resource.new(url, client_config)
+      else
+        raise ArgumentError, "Attemping to re-initialize #{self.class}#client with different configuration parameters"
+      end
     end
 
     # {include:RestApiClient::API_DOCUMENTATION}

data/rubydora.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency("rake")
   s.add_development_dependency("shoulda")
-  s.add_development_dependency("bundler")
+  s.add_development_dependency("bundler", ">= 1.0.14")
   s.add_development_dependency("rspec")
   s.add_development_dependency("yard")
   s.add_development_dependency("jettywrapper")

data/spec/lib/integration_test_spec.rb

@@ -42,21 +42,10 @@ describe "Integration testing against a live Fedora repository" do
     obj.new?.should == false
   end
 
-  it "should create parts" do
-    obj = @repository.find('test:1')
-    obj2 = @repository.find('test:2')
-    obj.parts << obj2
-  end
-
   it "should persist parts" do
     obj = @repository.find('test:1')
   end
 
-  it "should have a RELS-EXT datastream" do
-    obj = @repository.find('test:1')
-    obj.datastreams.keys.should include("RELS-EXT")
-  end
-
   it "should create a managed datastream" do
     obj = @repository.find('test:1')
     obj.save

data/spec/lib/repository_spec.rb

@@ -7,29 +7,28 @@ describe Rubydora::Repository do
 
   describe "client" do
     it "should return a RestClient resource" do
-      client = @repository.client :url => 'http://example.org', :user => 'fedoraAdmin', :password => 'fedoraAdmin'
+      client = @repository.client
 
       client.should be_a_kind_of(RestClient::Resource)
     end
   end
 
   describe "find" do
+    it "should load objects by pid" do
+      @mock_object = mock(Rubydora::DigitalObject)
+      Rubydora::DigitalObject.should_receive(:find).with("pid", instance_of(Rubydora::Repository)).and_return @mock_object
 
-  it "should load objects by pid" do
-    @mock_object = mock(Rubydora::DigitalObject)
-    Rubydora::DigitalObject.should_receive(:find).with("pid", instance_of(Rubydora::Repository)).and_return @mock_object
-
-    @repository.find('pid')
-  end
-
+      @repository.find('pid')
+    end
   end
 
   describe "sparql" do
-  it "should return csv results for sparql queries" do
-    resource_index_query = ""
-    @repository.should_receive(:risearch).with(resource_index_query).and_return("pid\na\nb\nc\n")
+    it "should return csv results for sparql queries" do
+      resource_index_query = ""
+      @repository.should_receive(:risearch).with(resource_index_query).and_return("pid\na\nb\nc\n")
 
-    csv = @repository.sparql(resource_index_query)
+      csv = @repository.sparql(resource_index_query)
+    end
   end
 
   describe "profile" do
@@ -58,9 +57,6 @@ describe Rubydora::Repository do
     end
   end
 
-
-end
-
   describe "load_api_abstraction" do
     class ApiAbstractionTestClass < Rubydora::Repository 
       def version; 3.3; end
@@ -76,20 +72,20 @@ end
     end
   end
 
-describe "find_by_sparql" do
-  it "should attempt to load objects from the results of a sparql query" do
+  describe "find_by_sparql" do
+    it "should attempt to load objects from the results of a sparql query" do
 
-    resource_index_query = ""
-    @repository.should_receive(:risearch).with(resource_index_query).and_return("pid\na\nb\nc\n")
+      resource_index_query = ""
+      @repository.should_receive(:risearch).with(resource_index_query).and_return("pid\na\nb\nc\n")
 
-    @repository.should_receive(:find).with('a').and_return(1)
-    @repository.should_receive(:find).with('b').and_return(1)
-    @repository.should_receive(:find).with('c').and_return(1)
+      @repository.should_receive(:find).with('a').and_return(1)
+      @repository.should_receive(:find).with('b').and_return(1)
+      @repository.should_receive(:find).with('c').and_return(1)
 
-    objects = @repository.find_by_sparql(resource_index_query)
+      objects = @repository.find_by_sparql(resource_index_query)
 
-    objects.length.should == 3
-  end
+      objects.length.should == 3
+    end
   end
 
 end

data/spec/lib/rest_api_client_spec.rb

@@ -15,6 +15,27 @@ describe Rubydora::RestApiClient do
     @mock_repository.config = { :url => 'http://example.org',:user => 'fedoraAdmin', :password => 'fedoraAdmin'}
   end
 
+  it "should create a REST client" do
+    client = @mock_repository.client
+    
+    client.should be_a_kind_of(RestClient::Resource)
+    client.options[:user].should == 'fedoraAdmin'
+  end
+  
+  it "should create a REST client with a client certificate" do
+    client = @mock_repository.client :ssl_client_cert => OpenSSL::X509::Certificate.new, :ssl_client_key => OpenSSL::PKey::RSA.new
+
+    client.options[:user].should == 'fedoraAdmin'
+    client.options[:ssl_client_cert].should be_a_kind_of(OpenSSL::X509::Certificate)
+    client.options[:ssl_client_key].should be_a_kind_of(OpenSSL::PKey::PKey)
+  end
+
+  it "should raise an exception if client is called twice with different options" do
+    client = @mock_repository.client
+    lambda { client.should == @mock_repository.client }.should_not raise_error
+    lambda { @mock_repository.client(:timeout => 120) }.should raise_error(ArgumentError)
+  end
+  
   it "should call nextPID" do
     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/nextPID?format=xml"))
     @mock_repository.next_pid

metadata

@@ -1,215 +1,166 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rubydora
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.2.4
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 3
-  version: 0.2.3
 platform: ruby
-authors: 
+authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-02 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fastercsv
+  requirement: &2156043760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156043760
+- !ruby/object:Gem::Dependency
   name: rest-client
+  requirement: &2156043100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156043100
+- !ruby/object:Gem::Dependency
   name: nokogiri
+  requirement: &2156042500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156042500
+- !ruby/object:Gem::Dependency
   name: mime-types
+  requirement: &2156041960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156041960
+- !ruby/object:Gem::Dependency
   name: activesupport
+  requirement: &2156041220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156041220
+- !ruby/object:Gem::Dependency
   name: activemodel
+  requirement: &2156040420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156040420
+- !ruby/object:Gem::Dependency
   name: savon
+  requirement: &2156039900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156039900
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: &2156039180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156039180
+- !ruby/object:Gem::Dependency
   name: shoulda
+  requirement: &2156037700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156037700
+- !ruby/object:Gem::Dependency
   name: bundler
+  requirement: &2156035980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.14
   type: :development
   prerelease: false
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156035980
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: &2156033100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id011
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156033100
+- !ruby/object:Gem::Dependency
   name: yard
+  requirement: &2156029880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id012
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156029880
+- !ruby/object:Gem::Dependency
   name: jettywrapper
+  requirement: &2156028560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  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: 
+  version_requirements: *2156028560
+description: ! 'Fedora Commons REST API ruby library : REQUIRES FCREPO 3.4+'
+email:
 - chris@cbeer.info
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .gitmodules
 - Gemfile
@@ -246,41 +197,37 @@ files:
 - 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
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2660556362758107972
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -2660556362758107972
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Fedora Commons REST API ruby library
-test_files: 
+test_files:
 - spec/lib/datastream_spec.rb
 - spec/lib/digital_object_spec.rb
 - spec/lib/ext_model_loader_spec.rb
@@ -292,3 +239,4 @@ test_files:
 - spec/lib/rest_api_client_spec.rb
 - spec/lib/soap_spec.rb
 - spec/spec_helper.rb
+has_rdoc: