rubydora 0.5.7 → 0.5.8

data/VERSION

@@ -1 +1 @@
-0.5.7
+0.5.8

data/lib/rubydora/datastream.rb

@@ -180,9 +180,9 @@ module Rubydora
                    sum[node.name] ||= []
                    sum[node.name] << node.text
                    sum
-                 end
-      h.select { |key, value| value.length == 1 }.each do |key, value|
-        h[key] = value.first
+                 end.reject { |key, values| values.empty? }
+      h.select { |key, values| values.length == 1 }.each do |key, values|
+        h[key] = values.reject { |x| x.empty? }.first 
       end
 
       h['dsSize'] &&= h['dsSize'].to_i rescue h['dsSize']
@@ -245,7 +245,7 @@ module Rubydora
       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)
+        h[attribute.to_sym] = send(attribute) unless send(attribute).nil?
       end
 
       h

data/lib/rubydora/digital_object.rb

@@ -125,10 +125,11 @@ module Rubydora
                      end
 
                      sum
-                   end
-        h.select { |key, value| value.length == 1 }.each do |key, value|
+                   end.reject { |key, values| values.empty? }
+
+        h.select { |key, values| values.length == 1 }.each do |key, values|
           next if key == "objModels"
-          h[key] = value.first
+          h[key] = values.reject { |x| x.empty? }.first
         end
         @new = false
 

data/spec/lib/datastream_spec.rb

@@ -56,7 +56,7 @@ describe Rubydora::Datastream do
     before(:each) do
       @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
     end
-    it "should be nil when it hasn't been set" do
+    it "should be true by default" do
       @mock_repository.should_receive(:datastream).and_return <<-XML
         <datastreamProfile>
         </datastreamProfile>

data/spec/lib/digital_object_spec.rb

@@ -33,7 +33,11 @@ describe Rubydora::DigitalObject do
       h = @object.profile
 
       expect { h['asdf'] = 'asdf' }.to raise_error
+    end
 
+    it "should return nil for empty profile fields" do
+      @mock_repository.should_receive(:object).with(:pid => 'pid').and_return("<objectProfile><a></a></objectProfile>")
+      @object.profile['a'].should be_nil
     end
   end
 

data/spec/lib/integration_test_spec.rb

@@ -200,6 +200,27 @@ describe "Integration testing against a live Fedora repository", :integration =>
       versions = obj.datastreams["my_ds"].versions
       versions.map { |x| x.content }.should include("XXX", "YYY") 
     end
+
+    it "should allow the user to go from a versioned datastream to an unversioned datastream" do
+      obj = @repository.find('test:1')
+      versions_count = obj.datastreams["my_ds"].versions.length
+
+      obj.datastreams["my_ds"].versionable.should be_true
+
+      obj.datastreams["my_ds"].versionable = false
+      obj.datastreams["my_ds"].content = "ZZZ"
+      obj.datastreams["my_ds"].save
+
+      obj.datastreams["my_ds"].content = "111"
+      obj.datastreams["my_ds"].save
+
+      obj.datastreams["my_ds"].content = "222"
+      obj.datastreams["my_ds"].save
+
+      obj = @repository.find('test:1')
+      obj.datastreams["my_ds"].versionable.should be_false
+      obj.datastreams["my_ds"].versions.length.should == (versions_count + 1)
+    end
   end
 
   context "mime types" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubydora
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-14 00:00:00.000000000 Z
+date: 2012-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &70357365893180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357365893180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70357365887520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357365887520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70357365901640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357365901640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70357365901000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357365901000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70357365900400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357365900400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70357365899700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357365899700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &70357365897940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357365897940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70357365895460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70357365895460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70357365893860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70357365893860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70357365920960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
         version: 1.0.14
   type: :development
   prerelease: false
-  version_requirements: *70357365920960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.14
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70357365914820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +181,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70357365914820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70357365934120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +197,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70357365934120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jettywrapper
-  requirement: &70357365933200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +213,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70357365933200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'Fedora Commons REST API ruby library : REQUIRES FCREPO 3.4+'
 email:
 - chris@cbeer.info
@@ -213,7 +278,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4514414545578735851
+      hash: -1624989278098246824
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -222,10 +287,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4514414545578735851
+      hash: -1624989278098246824
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Fedora Commons REST API ruby library