rubydora 1.2.0 → 1.2.1

data/History.textile

@@ -1,3 +1,7 @@
+h3. 1.2.1
+* Support for Rack::Test::UploadedFile
+* Allow reading content that is a kind of IO after save
+
 h3. 0.5.11
 * Ensure that the base rest resource is insulated from blocks passed to dissemination and datastream_dissemination.
 * Deprecated a behavior for DigitalObject.find that allowed one to call DigitalObject.find for a non-existent object. This will raise an exception in a future rubydora release. Instead, you should use the new DigitalObject.find_or_initialize for that behavior.

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/lib/rubydora/datastream.rb

@@ -129,7 +129,7 @@ module Rubydora
 
       @content ||= datastream_content
 
-      if @content.kind_of? IO
+      if behaves_like_io?(@content)
         begin
           @content.rewind
           @content.read
@@ -205,7 +205,7 @@ module Rubydora
 
       # return true if instance_variable_defined? :@content
 
-      @content.is_a?(IO) || !content.blank?
+      behaves_like_io?(@content) || !content.blank?
     end
 
     # Retrieve the datastream profile as a hash (and cache it)
@@ -367,6 +367,12 @@ module Rubydora
     end
 
     private
+
+    # Rack::Test::UploadedFile is often set via content=, however it's not an IO, though it wraps an io object.
+    def behaves_like_io?(obj)
+      obj.is_a?(IO) || (defined?(Rack) && obj.is_a?(Rack::Test::UploadedFile))
+    end
+
     def attribute_will_change! *args
       check_if_read_only
       super

data/lib/rubydora/rest_api_client.rb

@@ -279,7 +279,9 @@ module Rubydora
       file = query_options.delete(:content)
       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'
       run_hook :before_add_datastream, :pid => pid, :dsid => dsid, :file => file, :options => options
-      client[datastream_url(pid, dsid, query_options)].post((file.dup if file), :content_type => content_type.to_s, :multipart => true)
+      str = file.respond_to?(:read) ? file.read : file
+      file.rewind if file.respond_to?(:rewind)
+      client[datastream_url(pid, dsid, query_options)].post(str, :content_type => content_type.to_s, :multipart => true)
     rescue Exception => exception
         rescue_with_handler(exception) || raise
     end
@@ -303,7 +305,9 @@ module Rubydora
       end
 
       run_hook :before_modify_datastream, :pid => pid, :dsid => dsid, :file => file, :content_type => content_type, :options => options
-      client[datastream_url(pid, dsid, query_options)].put((file.dup if file), rest_client_options)
+      str = file.respond_to?(:read) ? file.read : file
+      file.rewind if file.respond_to?(:rewind)
+      client[datastream_url(pid, dsid, query_options)].put(str, rest_client_options)
 
     rescue Exception => exception
         rescue_with_handler(exception) || raise

data/spec/lib/datastream_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'stringio'
 
 describe Rubydora::Datastream do
   before do
@@ -187,26 +188,26 @@ describe Rubydora::Datastream do
       @datastream.content
       @datastream.content_changed?.should == false
     end
-    it "should be changed in the new content is different than the old content" do
+    it "should be changed when the new content is different than the old content" do
       @mock_repository.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('asdf') 
       @datastream.content = "test"
       @datastream.content_changed?.should == true 
     end
 
-    it "should not be changed in the new content is the same as the existing content (when eager-loading is enabled)" do
+    it "should not be changed when the new content is the same as the existing content (when eager-loading is enabled)" do
       @mock_repository.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('test') 
       @datastream.eager_load_datastream_content = true
       @datastream.content = "test"
       @datastream.content_changed?.should  == false 
     end
 
-    it "should  be changed in the new content is the same as the existing content (without eager loading, the default)" do
+    it "should  be changed when the new content is the same as the existing content (without eager loading, the default)" do
       @mock_repository.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('test') 
       @datastream.content = "test"
       @datastream.content_changed?.should  == true
     end
 
-    it "should not be changed in the new content is the same as the existing content (and we have accessed #content previously)" do
+    it "should not be changed when the new content is the same as the existing content (and we have accessed #content previously)" do
       @mock_repository.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('test') 
       @datastream.content
       @datastream.content = "test"

data/spec/lib/rest_api_client_spec.rb

@@ -183,9 +183,20 @@ describe Rubydora::RestApiClient do
     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"))
-    @mock_repository.add_datastream :pid => 'mypid', :dsid => 'aaa' 
+  describe "add_datastream" do
+    it "should post to the correct url" do
+       RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa"))
+      @mock_repository.add_datastream :pid => 'mypid', :dsid => 'aaa' 
+    end
+
+    describe "when a file is passed" do
+      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 IOError
+      end
+    end
   end
 
   describe "modify datastream" do
@@ -197,6 +208,14 @@ describe Rubydora::RestApiClient 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
+    describe "when a file is passed" do
+      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 IOError
+      end
+    end
   end
 
   it "purge_datastream" do

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rubydora
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
+  prerelease: 
 platform: ruby
 authors:
 - Chris Beer
@@ -13,6 +14,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hooks
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -153,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +182,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -167,6 +190,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,6 +198,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -181,6 +206,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -188,6 +214,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -195,6 +222,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -202,6 +230,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -209,6 +238,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -216,6 +246,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -259,26 +290,33 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/cbeer/rubydora
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3546053973135231573
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3546053973135231573
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.preview2
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Fedora Commons REST API ruby library
 test_files:
 - spec/lib/datastream_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: b471f631fe74aa333385b88af3fb621679fea835
-  data.tar.gz: 4e9c15f0e4a3959de2934bea864a4c1550223637
-!binary "U0hBNTEy":
-  metadata.gz: fc01978351b753e111973460f21bb896a4fdbac75f836ae9af037f83918c24446eab644d39483d2159b81619f5045113d3ae8d8658ccc366f964de028b485b9a
-  data.tar.gz: 226bbe9530df3e60345f46dccc5159fe89836f3fbb0e79e3ce927d378e553d670d14a0aba3c11f82498e53a7dfe342d7ee8a35b9add5e5b263a6819f17225760