rubydora 0.1.4 → 0.1.5

data/Rakefile

@@ -33,3 +33,8 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+desc "Open an irb session preloaded with this library"
+task :console do
+  sh "irb -rubygems -I lib -r rubydora.rb"
+end

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/rubydora/datastream.rb

@@ -13,9 +13,9 @@ module Rubydora
     attr_reader :digital_object, :dsid
 
     # mapping datastream attributes (and api parameters) to datastream profile names
-    DS_ATTRIBUTES = {:controlGroup => :dsControlGroup, :dsLocation => :dsLocation, :altIDs => nil, :dsLabel => :dsLabel, :versionable => :dsVersionable, :dsState => :dsState, :formatURI => :dsFormatURI, :checksumType => :dsChecksumType, :checksum => :dsChecksum, :mimeType => :dsMIME, :logMessage => nil, :ignoreContent => nil, :lastModifiedDate => nil, :file => nil}
+    DS_ATTRIBUTES = {:controlGroup => :dsControlGroup, :dsLocation => :dsLocation, :altIDs => nil, :dsLabel => :dsLabel, :versionable => :dsVersionable, :dsState => :dsState, :formatURI => :dsFormatURI, :checksumType => :dsChecksumType, :checksum => :dsChecksum, :mimeType => :dsMIME, :logMessage => nil, :ignoreContent => nil, :lastModifiedDate => nil, :content => nil}
 
-    define_attribute_methods DS_ATTRIBUTES.keys + [:content]
+    define_attribute_methods DS_ATTRIBUTES.keys
     
     # accessors for datastream attributes 
     DS_ATTRIBUTES.each do |attribute, profile_name|
@@ -68,6 +68,8 @@ module Rubydora
         @content ||= repository.datastream_dissemination :pid => pid, :dsid => dsid
       rescue RestClient::ResourceNotFound
       end
+
+      (@content.read and @content.rewind if @content.is_a? IO) || @content
     end
     alias_method :read, :content
 
@@ -80,12 +82,9 @@ module Rubydora
     # Set the content of the datastream
     # @param [String or IO] 
     # @return [String or IO]
-    def content= content
+    def content= new_content
        content_will_change!
-       @file = content
-       @content = content.dup
-       @content &&= @content.read if @content.respond_to? :read
-       @content &&= @content.to_s if @content.respond_to? :read
+       @content = new_content
     end
 
     # Retrieve the datastream profile as a hash (and cache it)

data/lib/rubydora/rest_api_client.rb

@@ -151,9 +151,9 @@ module Rubydora
     def add_datastream options = {}
       pid = options.delete(:pid)
       dsid = options.delete(:dsid)
-      file = options.delete(:file)
+      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
+      client[datastream_url(pid, dsid, options)].post file, :content_type => content_type.to_s, :multipart => true
     end
 
     # {include:RestApiClient::API_DOCUMENTATION}
@@ -164,9 +164,9 @@ module Rubydora
     def modify_datastream options = {}
       pid = options.delete(:pid)
       dsid = options.delete(:dsid)
-      file = options.delete(:file)
+      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
+      client[datastream_url(pid, dsid, options)].put file, :content_type => content_type.to_s, :multipart => true
     end
 
     # {include:RestApiClient::API_DOCUMENTATION}

data/spec/datastream_spec.rb

@@ -93,6 +93,13 @@ describe Rubydora::Datastream do
       @datastream.save
     end
 
+    it "should update the datastream when the content is changed" do
+      @mock_repository.should_receive(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('asdf') 
+      @mock_repository.should_receive(:modify_datastream).with(hash_including(:content => 'test'))
+      @datastream.content = "test"
+      @datastream.save
+    end
+
     it "should be marked as changed when the content is updated" do
       @datastream.changed?.should be_false
       @mock_repository.should_receive(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('test') 

metadata

@@ -1,201 +1,155 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rubydora
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.1.5
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 4
-  version: 0.1.4
 platform: ruby
-authors: 
+authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-04 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+date: 2011-10-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fastercsv
+  requirement: &2168473420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *2168473420
+- !ruby/object:Gem::Dependency
   name: rest-client
+  requirement: &2168472960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *2168472960
+- !ruby/object:Gem::Dependency
   name: nokogiri
+  requirement: &2168472500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *2168472500
+- !ruby/object:Gem::Dependency
   name: mime-types
+  requirement: &2168472040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *2168472040
+- !ruby/object:Gem::Dependency
   name: activesupport
+  requirement: &2168471620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *2168471620
+- !ruby/object:Gem::Dependency
   name: activemodel
+  requirement: &2168471160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *2168471160
+- !ruby/object:Gem::Dependency
   name: savon
+  requirement: &2168470720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *2168470720
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: &2168470260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *2168470260
+- !ruby/object:Gem::Dependency
   name: shoulda
+  requirement: &2168469760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *2168469760
+- !ruby/object:Gem::Dependency
   name: bundler
+  requirement: &2168469320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *2168469320
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: &2153014860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  requirement: *id011
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *2153014860
+- !ruby/object:Gem::Dependency
   name: yard
+  requirement: &2153014420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  requirement: *id012
-description: "Fedora Commons REST API ruby library : REQUIRES FCREPO 3.4+"
-email: 
+  version_requirements: *2153014420
+description: ! 'Fedora Commons REST API ruby library : REQUIRES FCREPO 3.4+'
+email:
 - chris@cbeer.info
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -231,41 +185,37 @@ files:
 - spec/rest_api_client_spec.rb
 - spec/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: -3635636805451402877
+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: -3635636805451402877
 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/datastream_spec.rb
 - spec/digital_object_spec.rb
 - spec/ext_model_loader_spec.rb