rubydora 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be337fe4d014e05130587d975c1388050ab192e6
-  data.tar.gz: 6eca752e25d923e8832c0b24cb2e724a90b932fc
+  metadata.gz: 367d66a9cebd58fd4efd62fb00f6e644f9c998a6
+  data.tar.gz: 9303285358a919f262b9e99329c5788ec7136025
 SHA512:
-  metadata.gz: 48229e6eeee8bb507b7914aee56244ba2bf179c75bcb7f61b9c1711860c27cd9cf27ac0f7bff6ced99221c021868f05dd54278a15da897801964abe26857ee0f
-  data.tar.gz: 87b6f2cc39e89dd69c39c15f6b5003ae5c99dee2cc04159ab06ff839117289bba4ce70a42c7692c9214624f8a9a27d6d1c9381d9d5009cf0ae9e941a932214b5
+  metadata.gz: a47dacdf70d4fd80ae03cfb0deac47685fa6fad96e49d018d5ce5da1b8a4694767d11e1e020101c7ffd7602dc0b4618035786ba2c7c9fe7de40ca5bca9cc5f05
+  data.tar.gz: bbfa8466a29af4ac8801e53383a0165839f4162d7e0fe7d862ae885931db73608aadc16c1a99fef6b739cd560a0a18e3647c95299b4659eedd7d1440e5baded0

data/VERSION

@@ -1 +1 @@
-1.7.0
+1.7.1

data/lib/rubydora/datastream.rb

@@ -204,14 +204,18 @@ module Rubydora
       # persisted objects are required to have content
       return true unless new?
 
-      # type E and R objects should have content.
-      return !dsLocation.blank? if ['E','R'].include? controlGroup
+      # type E and R have content if dsLocation is set.
+      return dsLocation.present? if ['E','R'].include? controlGroup
 
-      # if we've set content, then we have content.
+      # type M has content if dsLocation is not empty
+      return true if controlGroup == 'M' and dsLocation.present?
 
-      # return true if instance_variable_defined? :@content
+      # if we've set content, then we have content
+      behaves_like_io?(@content) || content.present?
+    end
 
-      behaves_like_io?(@content) || !content.blank?
+    def empty?
+      !has_content?
     end
 
     # Returns a streaming response of the datastream.  This is ideal for large datasteams because

data/lib/rubydora/digital_object.rb

@@ -154,14 +154,20 @@ module Rubydora
         h = Hash.new { |h,k| h[k] = datastream_object_for(k) }                
 
         begin
-          options = { :pid => pid }
+          options = { :pid => pid, :profiles => 'true' }
           options[:asOfDateTime] = asOfDateTime if asOfDateTime
           datastreams_xml = repository.datastreams(options)
+          # pre-3.6, the profiles parm will be ignored
           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_object_for ds['dsid'] 
           end
+          # post-3.6, full ds profiles will be returned
+          doc.xpath('//access:datastreamProfile', {'access' => "http://www.fedora.info/definitions/1/0/access/"}).each do |ds|
+            # n.b. that the dsID attribute has a different name in the profile response
+            h[ds['dsID']] = datastream_object_for(ds['dsID'], {:profile => ProfileParser.hash_datastream_profile_node(ds)})
+          end
         rescue RestClient::ResourceNotFound
         end
 

data/lib/rubydora/fc3_service.rb

@@ -59,7 +59,7 @@ module Rubydora
         raise e
       rescue RestClient::ResourceNotFound
         # the datastream is new
-        ''
+        return {}
       end
 
       ProfileParser.parse_datastream_profile(xml)

data/lib/rubydora/profile_parser.rb

@@ -1,13 +1,23 @@
 module Rubydora
   module ProfileParser
     def self.parse_datastream_profile profile_xml
-      profile_xml.gsub! '<datastreamProfile', '<datastreamProfile xmlns="http://www.fedora.info/definitions/1/0/management/"' unless profile_xml =~ /xmlns=/
-      doc = Nokogiri::XML(profile_xml)
-      h = doc.xpath('/management:datastreamProfile/*', {'management' => "http://www.fedora.info/definitions/1/0/management/"} ).inject({}) do |sum, node|
+      # since the profile may be in the management or the access namespace, use the CSS selector
+      ndoc = Nokogiri::XML(profile_xml)
+      doc = (ndoc.name == 'datastreamProfile') ? ndoc : ndoc.css('datastreamProfile').first
+      if doc.nil?
+        # the datastream is new
+        {}.with_indifferent_access
+      else
+        hash_datastream_profile_node(doc)
+      end
+    end
+
+    def self.hash_datastream_profile_node doc
+      h = doc.xpath('./*').inject({}) do |sum, node|
                    sum[node.name] ||= []
                    sum[node.name] << node.text
                    sum
-                 end.reject { |key, values| values.empty? }
+                 end.reject { |key, values| values.nil? or values.empty? }
       h.select { |key, values| values.length == 1 }.each do |key, values|
         h[key] = values.reject { |x| x.empty? }.first 
       end

data/lib/rubydora/rest_api_client.rb

@@ -12,7 +12,7 @@ module Rubydora
     include ActiveSupport::Benchmarkable    
     extend Deprecation
 
-
+    DEFAULT_CONTENT_TYPE = "application/octet-stream"
 
     VALID_CLIENT_OPTIONS = [:user, :password, :timeout, :open_timeout, :ssl_client_cert, :ssl_client_key]
 
@@ -336,9 +336,7 @@ module Rubydora
       pid = query_options.delete(:pid)
       dsid = query_options.delete(:dsid)
       file = query_options.delete(:content)
-      # In ruby 1.8.7 StringIO (file) responds_to? :path, but it always returns nil,  In ruby 1.9.3 StringIO doesn't have path.
-      # When we discontinue ruby 1.8.7 support we can remove the `|| ''` part.
-      content_type = query_options.delete(:content_type) || query_options[:mimeType] || (MIME::Types.type_for(file.path || '').first if file.respond_to? :path) || 'application/octet-stream'
+      content_type = query_options.delete(:content_type) || query_options[:mimeType] || file_content_type(file)
       run_hook :before_add_datastream, :pid => pid, :dsid => dsid, :file => file, :options => options
       str = file.respond_to?(:read) ? file.read : file
       file.rewind if file.respond_to?(:rewind)
@@ -357,10 +355,7 @@ module Rubydora
       pid = query_options.delete(:pid)
       dsid = query_options.delete(:dsid)
       file = query_options.delete(:content)
-      # In ruby 1.8.7 StringIO (file) responds_to? :path, but it always returns nil,  In ruby 1.9.3 StringIO doesn't have path.
-      # When we discontinue ruby 1.8.7 support we can remove the `|| ''` part.
-      content_type = query_options.delete(:content_type) || query_options[:mimeType] || (MIME::Types.type_for(file.path || '').first if file.respond_to? :path) || 'application/octet-stream'
-
+      content_type = query_options.delete(:content_type) || query_options[:mimeType] || file_content_type(file)
       rest_client_options = {}
       if file
         rest_client_options[:multipart] = true
@@ -465,5 +460,12 @@ module Rubydora
         client.class.new(url, options)
       end
     end
+
+    private
+
+    def file_content_type(file)
+      (file.content_type if file.respond_to? :content_type) || (MIME::Types.type_for(file.path).first if file.respond_to? :path) || DEFAULT_CONTENT_TYPE
+    end
+
   end
 end

data/rubydora.gemspec

@@ -30,6 +30,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency("bundler", ">= 1.0.14")
   s.add_development_dependency("rspec")
   s.add_development_dependency("yard")
-  s.add_development_dependency("jettywrapper")
+  s.add_development_dependency("jettywrapper", ">= 1.4.0")
   s.add_development_dependency("webmock")
 end

data/spec/lib/datastream_spec.rb

@@ -8,6 +8,18 @@ describe Rubydora::Datastream do
     @mock_object.stub(:repository => @mock_repository, :pid => 'pid', :new_record? => false)
   end
 
+  describe "empty?" do
+    subject { Rubydora::Datastream.new @mock_object, 'dsid' }
+    context "has content" do
+      before { subject.stub(:has_content? => true) }
+      it { should_not be_empty }
+    end
+    context "does not have content" do
+      before { subject.stub(:has_content? => false) }
+      it { should be_empty }
+    end
+  end
+
   describe "stream" do
     subject { Rubydora::Datastream.new @mock_object, 'dsid' }
     before do
@@ -21,7 +33,7 @@ describe Rubydora::Datastream do
       XML
       subject.profile = Rubydora::ProfileParser.parse_datastream_profile(prof)
     end
-    it "should send the whold thing" do
+    it "should send the whole thing" do
       e = subject.stream()
       result = ''
       e.each do |blk|
@@ -346,11 +358,20 @@ describe Rubydora::Datastream do
       subject.should have_content     
     end
 
-    it "should have content if it has a dsLocation" do
-
-      subject.dsLocation = "urn:abc"
-      subject.controlGroup = 'E'
-      subject.should have_content     
+    context "it has a dsLocation" do
+      before { subject.dsLocation = "urn:abc" }
+      context "controlGroup 'E'" do
+        before { subject.controlGroup = 'E' }
+        it { should have_content }
+      end
+      context "controlGroup 'R'" do
+        before { subject.controlGroup = 'R' }
+        it { should have_content }
+      end
+      context "controlGroup 'M'" do
+        before { subject.controlGroup = 'M' }
+        it { should have_content }
+      end
     end
 
     it "should not have content otherwise" do

data/spec/lib/rest_api_client_spec.rb

@@ -215,22 +215,43 @@ describe Rubydora::RestApiClient do
 
   describe "add_datastream" do
     it "should post to the correct url" do
-       RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + datastream_url('mypid', 'aaa')))
+      RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + datastream_url('mypid', 'aaa')))
       @mock_repository.add_datastream :pid => 'mypid', :dsid => 'aaa' 
     end
-
     describe "when a file is passed" do
+      let!(:file) { StringIO.new('test', 'r') } # StringIO is a good stand it for a real File (it has read, rewind and close)
       it "should rewind the file" do
         RestClient::Request.any_instance.should_receive(:transmit) #stub transmit so that Request.execute can close the file we pass
-        file = StringIO.new('test', 'r') # StringIO is a good stand it for a real File (it has read, rewind and close)
         @mock_repository.add_datastream :pid => 'mypid', :dsid => 'aaa', :content=>file
         lambda {file.read}.should_not raise_error
       end
+      describe "and mimeType is not provided" do
+        describe "and file responds to :content_type" do
+          it "should set the mimeType to file.content_type" do
+            file.stub(:content_type).and_return('image/tiff')
+            RestClient::Request.should_receive(:execute).with(hash_including(:headers=>{:multipart=>true, :content_type=>"image/tiff"}))
+            @mock_repository.add_datastream :pid => 'mypid', :dsid => 'aaa', :content=>file
+          end
+        end
+        describe "and file responds to :path" do
+          it "should should try to discern the mime-type from file.path" do
+            file.stub(:path).and_return('foo.tiff')
+            RestClient::Request.should_receive(:execute).with(hash_including(:headers=>{:multipart=>true, :content_type=>"image/tiff"}))
+            @mock_repository.add_datastream :pid => 'mypid', :dsid => 'aaa', :content=>file
+          end
+        end
+        describe "otherwise" do
+          it "should set the mimeType to 'application/octet-stream'" do
+            RestClient::Request.should_receive(:execute).with(hash_including(:headers=>{:multipart=>true, :content_type=>"application/octet-stream"}))
+            @mock_repository.add_datastream :pid => 'mypid', :dsid => 'aaa', :content=>file
+          end
+        end
+      end
     end
   end
 
   describe "modify datastream" do
-    it "should not set mime-type when it's not provided" do
+    it "should not set mime-type when it's not provided (and a file is not passed)" do
        RestClient::Request.should_receive(:execute).with(:url => base_url + "/" + datastream_url('mypid', 'aaa'),:open_timeout=>nil, :payload=>nil, :user=>@fedora_user, :password=>@fedora_password, :method=>:put, :headers=>{})
       @mock_repository.modify_datastream :pid => 'mypid', :dsid => 'aaa' 
     end
@@ -239,12 +260,34 @@ describe Rubydora::RestApiClient do
       @mock_repository.modify_datastream :pid => 'mypid', :dsid => 'aaa', :mimeType=>'application/json'
     end
     describe "when a file is passed" do
+      let!(:file) { StringIO.new('test', 'r') } # StringIO is a good stand it for a real File (it has read, rewind and close) 
       it "should rewind the file" do
         RestClient::Request.any_instance.should_receive(:transmit) #stub transmit so that Request.execute can close the file we pass
-        file = StringIO.new('test', 'r') # StringIO is a good stand it for a real File (it has read, rewind and close)
         @mock_repository.modify_datastream :pid => 'mypid', :dsid => 'aaa', :content=>file
         lambda {file.read}.should_not raise_error
       end
+      describe "and mimeType is not provided" do
+        describe "and file responds to :content_type" do
+          it "should set the mimeType to file.content_type" do
+            file.stub(:content_type).and_return('image/tiff')
+            RestClient::Request.should_receive(:execute).with(hash_including(:headers=>{:multipart=>true, :content_type=>"image/tiff"}))
+            @mock_repository.modify_datastream :pid => 'mypid', :dsid => 'aaa', :content=>file
+          end
+        end
+        describe "and file responds to :path" do
+          it "should should try to discern the mime-type from file.path" do
+            file.stub(:path).and_return('foo.tiff')
+            RestClient::Request.should_receive(:execute).with(hash_including(:headers=>{:multipart=>true, :content_type=>"image/tiff"}))
+            @mock_repository.modify_datastream :pid => 'mypid', :dsid => 'aaa', :content=>file
+          end
+        end
+        describe "otherwise" do
+          it "should set the mimeType to 'application/octet-stream'" do
+            RestClient::Request.should_receive(:execute).with(hash_including(:headers=>{:multipart=>true, :content_type=>"application/octet-stream"}))
+            @mock_repository.modify_datastream :pid => 'mypid', :dsid => 'aaa', :content=>file
+          end
+        end
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubydora
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -287,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Fedora Commons REST API ruby library