rubydora 0.2.4 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/lib/rubydora/datastream.rb

@@ -156,7 +156,9 @@ module Rubydora
     # @return [Hash]
     def to_api_params
       h = default_api_params
-      changes.keys.map { |x| x.to_sym }.select { |x| DS_ATTRIBUTES.key? x }.each do |attribute|
+      valid_changed_attributes = changes.keys.map { |x| x.to_sym }.select { |x| DS_ATTRIBUTES.key? x }
+      ## if we don't provide a mimeType, application/octet-stream will be used instead
+      (valid_changed_attributes | [:mimeType]).each do |attribute|
         h[attribute] = send(attribute) if send(attribute)
       end
 

data/lib/rubydora/rest_api_client.rb

@@ -229,7 +229,7 @@ module Rubydora
       pid = options.delete(:pid)
       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'
+      content_type = options.delete(:content_type) || options[:mimeType] || (MIME::Types.type_for(file.path).first if file.respond_to? :path) || 'application/octet-stream'
       begin
         return client[datastream_url(pid, dsid, options)].post file, :content_type => content_type.to_s, :multipart => true
       rescue => e
@@ -247,10 +247,16 @@ module Rubydora
       pid = options.delete(:pid)
       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'
+      content_type = options.delete(:content_type) || options[:mimeType] || (MIME::Types.type_for(file.path).first if file.respond_to? :path) || 'application/octet-stream'
+
+      rest_client_options = {}
+      if file
+        rest_client_options[:multipart] = true
+        rest_client_options[:content_type] = content_type
+      end
 
       begin
-        return client[datastream_url(pid, dsid, options)].put(file, {:content_type => content_type.to_s, :multipart => true})
+        return client[datastream_url(pid, dsid, options)].put(file, rest_client_options)
       rescue => e
         logger.error e.response
         raise "Error modifying datastream #{dsid} for #{pid}. See logger for details"

data/spec/lib/datastream_spec.rb

@@ -119,18 +119,38 @@ describe Rubydora::Datastream do
   end
 
   describe "to_api_params" do
-    before(:each) do
-      @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
-      @datastream.stub(:profile) { {} }
-    end
-    it "should compile parameters to hash" do
-      @datastream.send(:to_api_params).should == {:checksumType=>"DISABLED", :versionable=>true,
-       :controlGroup=>"M", :dsState=>"A"}
-    end
-    it "should not send parameters that are set to nil" do
-      @datastream.dsLabel = nil
-      @datastream.send(:to_api_params).should == {:checksumType=>"DISABLED", :versionable=>true,
-       :controlGroup=>"M", :dsState=>"A"}
+
+    describe "with existing properties" do
+      before(:each) do
+        @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
+        @datastream.stub(:profile) { {'dsMIME' => 'application/rdf+xml', 'dsChecksumType' =>'DISABLED', 'dsVersionable'=>true, 'dsControlGroup'=>'M', 'dsState'=>'A'} }
+      end
+      it "should not set unchanged values except for mimeType" do
+        @datastream.send(:to_api_params).should == {:mimeType=>'application/rdf+xml'}
+      end
+      it "should send changed params except those set to nil" do
+        @datastream.dsLabel = nil
+        @datastream.mimeType = 'application/json'
+        @datastream.controlGroup = 'X'
+        @datastream.send(:to_api_params).should == {:controlGroup=>"X", :mimeType=>"application/json"}
+      end
+    end
+
+
+    describe "without existing properties" do
+      before(:each) do
+        @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
+        @datastream.stub(:profile) { {} }
+      end
+      it "should compile parameters to hash" do
+        @datastream.send(:to_api_params).should == {:checksumType=>"DISABLED", :versionable=>true,
+         :controlGroup=>"M", :dsState=>"A"}
+      end
+      it "should not send parameters that are set to nil" do
+        @datastream.dsLabel = nil
+        @datastream.send(:to_api_params).should == {:checksumType=>"DISABLED", :versionable=>true,
+         :controlGroup=>"M", :dsState=>"A"}
+      end
     end
   end
 end

data/spec/lib/integration_test_spec.rb

@@ -6,6 +6,8 @@ describe "Integration testing against a live Fedora repository" do
   REPOSITORY_CONFIG = { :url => 'http://localhost:8983/fedora', :user => 'fedoraAdmin', :password => 'fedoraAdmin' }
   before(:all) do
     @repository = Rubydora.connect REPOSITORY_CONFIG
+    @repository.find('test:1').delete rescue nil
+    @repository.find('test:2').delete rescue nil
   end
 
   it "should connect" do
@@ -91,9 +93,10 @@ 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
+  it "should update datastream attributes without changing the content (or mime type)" do
     obj = @repository.find('test:1')
     obj.datastreams["my_ds"].content = "XXX"
+    obj.datastreams["my_ds"].mimeType = "application/x-text"
     obj.save
 
     obj = @repository.find('test:1')
@@ -103,6 +106,62 @@ describe "Integration testing against a live Fedora repository" do
     obj = @repository.find('test:1')
     obj.datastreams["my_ds"].content.should == "XXX"
     obj.datastreams["my_ds"].dsLabel.should == "New Label"
+    obj.datastreams["my_ds"].mimeType.should == "application/x-text"
+  end
+
+  context "mime types" do
+    before(:each) do
+      obj = @repository.find('test:1')
+      obj.datastreams["my_ds"].delete rescue nil
+    end
+
+    it "should default to application/octet-stream" do
+      obj = @repository.find('test:1')
+      obj.datastreams["my_ds"].content = "XXX"
+      obj.save
+
+      obj = @repository.find('test:1')
+      obj.datastreams["my_ds"].mimeType.should == "application/octet-stream"
+    end
+
+    it "should allow the user to specify a mimetype" do
+      obj = @repository.find('test:1')
+      obj.datastreams["my_ds"].content = "XXX"
+      obj.datastreams["my_ds"].mimeType = "text/plain"
+      obj.save
+
+      obj = @repository.find('test:1')
+      obj.datastreams["my_ds"].mimeType.should == "text/plain"
+    end
+
+    it "should preserve the mimetype on update" do
+      obj = @repository.find('test:1')
+      obj.datastreams["my_ds"].content = "XXX"
+      obj.datastreams["my_ds"].mimeType = "text/plain"
+      obj.save
+
+      obj = @repository.find('test:1')
+      obj.datastreams["my_ds"].content = "ZZZ"
+      obj.save
+
+      obj = @repository.find('test:1')
+      obj.datastreams["my_ds"].mimeType.should == "text/plain"
+    end
+
+    it "should allow the mimetype to be changed" do
+      obj = @repository.find('test:1')
+      obj.datastreams["my_ds"].content = "XXX"
+      obj.datastreams["my_ds"].mimeType = "text/plain"
+      obj.save
+
+      obj = @repository.find('test:1')
+      obj.datastreams["my_ds"].mimeType = "application/json"
+      obj.save
+
+      obj = @repository.find('test:1')
+      obj.datastreams["my_ds"].mimeType.should == "application/json"
+    end
+
   end
 
 

data/spec/lib/rest_api_client_spec.rb

@@ -11,21 +11,23 @@ describe Rubydora::RestApiClient do
   end
 
   before(:each) do
+    @fedora_user = 'fedoraAdmin'
+    @fedora_password = 'fedoraAdmin'
     @mock_repository = MockRepository.new
-    @mock_repository.config = { :url => 'http://example.org',:user => 'fedoraAdmin', :password => 'fedoraAdmin'}
+    @mock_repository.config = { :url => 'http://example.org',:user => @fedora_user, :password => @fedora_password}
   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'
+    client.options[:user].should == @fedora_user
   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[:user].should == @fedora_user
     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
@@ -127,9 +129,15 @@ describe Rubydora::RestApiClient do
     @mock_repository.add_datastream :pid => 'mypid', :dsid => 'aaa' 
   end
 
-  it "modify_datastream" do
-     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa"))
-    @mock_repository.modify_datastream :pid => 'mypid', :dsid => 'aaa' 
+  describe "modify datastream" do
+    it "should not set mime-type when it's not provided" do
+       RestClient::Request.should_receive(:execute).with(:url => "http://example.org/objects/mypid/datastreams/aaa",:open_timeout=>nil, :payload=>nil, :user=>@fedora_user, :password=>@fedora_password, :method=>:put, :headers=>{})
+      @mock_repository.modify_datastream :pid => 'mypid', :dsid => 'aaa' 
+    end
+    it "should pass the provided mimeType header" do
+       RestClient::Request.should_receive(:execute).with(:url => "http://example.org/objects/mypid/datastreams/aaa?mimeType=application%2Fjson",:open_timeout=>nil, :payload=>nil, :user=>@fedora_user, :password=>@fedora_password, :method=>:put, :headers=>{})
+      @mock_repository.modify_datastream :pid => 'mypid', :dsid => 'aaa', :mimeType=>'application/json'
+    end
   end
 
   it "purge_datastream" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubydora
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-18 00:00:00.000000000 Z
+date: 2011-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &2156043760 !ruby/object:Gem::Requirement
+  requirement: &2152300120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156043760
+  version_requirements: *2152300120
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2156043100 !ruby/object:Gem::Requirement
+  requirement: &2152296900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156043100
+  version_requirements: *2152296900
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2156042500 !ruby/object:Gem::Requirement
+  requirement: &2152295960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156042500
+  version_requirements: *2152295960
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &2156041960 !ruby/object:Gem::Requirement
+  requirement: &2152294860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156041960
+  version_requirements: *2152294860
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156041220 !ruby/object:Gem::Requirement
+  requirement: &2152293940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156041220
+  version_requirements: *2152293940
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2156040420 !ruby/object:Gem::Requirement
+  requirement: &2152292840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156040420
+  version_requirements: *2152292840
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &2156039900 !ruby/object:Gem::Requirement
+  requirement: &2152288800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156039900
+  version_requirements: *2152288800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156039180 !ruby/object:Gem::Requirement
+  requirement: &2152286960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156039180
+  version_requirements: *2152286960
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2156037700 !ruby/object:Gem::Requirement
+  requirement: &2152286080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156037700
+  version_requirements: *2152286080
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156035980 !ruby/object:Gem::Requirement
+  requirement: &2152284820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 1.0.14
   type: :development
   prerelease: false
-  version_requirements: *2156035980
+  version_requirements: *2152284820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156033100 !ruby/object:Gem::Requirement
+  requirement: &2152283500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156033100
+  version_requirements: *2152283500
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156029880 !ruby/object:Gem::Requirement
+  requirement: &2152281700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156029880
+  version_requirements: *2152281700
 - !ruby/object:Gem::Dependency
   name: jettywrapper
-  requirement: &2156028560 !ruby/object:Gem::Requirement
+  requirement: &2152275140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156028560
+  version_requirements: *2152275140
 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: -2660556362758107972
+      hash: 4297992764557344518
 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: -2660556362758107972
+      hash: 4297992764557344518
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10