active-fedora 3.1.0.rc2 → 3.1.0.rc3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (3.1.0.pre10)
+    active-fedora (3.1.0.rc2)
       activeresource (~> 3.0.0)
       activesupport (~> 3.0.0)
       equivalent-xml
@@ -13,7 +13,7 @@ PATH
       om (>= 1.4.3)
       rdf
       rdf-rdfxml
-      rubydora (~> 0.1.9)
+      rubydora (= 0.2.1)
       solr-ruby (>= 0.0.6)
       solrizer (> 1.0.0)
       xml-simple (>= 1.0.12)
@@ -59,7 +59,7 @@ GEM
     logger (1.2.8)
     mediashelf-loggable (0.4.7)
     metaclass (0.0.1)
-    mime-types (1.16)
+    mime-types (1.17.2)
     mocha (0.10.0)
       metaclass (~> 0.0.1)
     multipart-post (1.1.2)
@@ -87,7 +87,7 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    rubydora (0.1.9)
+    rubydora (0.2.1)
       activemodel
       activesupport
       fastercsv

data/active-fedora.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency("mediashelf-loggable")
   s.add_dependency("equivalent-xml")
   s.add_dependency("facets")
-  s.add_dependency("rubydora", '~>0.1.9')
+  s.add_dependency("rubydora", '0.2.1')
   s.add_dependency("rdf")
   s.add_dependency("rdf-rdfxml")
   s.add_development_dependency("yard")

data/lib/active_fedora/rels_ext_datastream.rb

@@ -10,7 +10,6 @@ module ActiveFedora
     include Solrizer::FieldNameMapper
     attr_accessor :model
     
-    
     def changed?
       (model && model.relationships_are_dirty) || super
     end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.1.0.rc2"
+    VERSION = "3.1.0.rc3"
 end

data/spec/integration/base_spec.rb

@@ -36,6 +36,31 @@ class MockAFBaseFromSolr < ActiveFedora::Base
   end
 end
 
+describe "Datastreams synched together" do
+  before do
+    class DSTest < ActiveFedora::Base
+      def configure_defined_datastreams
+        super
+        unless self.datastreams.keys.include? 'test_ds'
+         add_file_datastream("XXX",:dsid=>'test_ds', :mimeType=>'text/html')
+        end
+      end
+    end
+  end
+  it "Should update datastream" do
+    @nc = DSTest.new
+    @nc.save
+    @nc.test_ds.content.should == 'XXX'
+    ds  = @nc.datastreams['test_ds']
+    ds.content = "Foobar"
+    @nc.save
+    DSTest.find(@nc.pid).datastreams['test_ds'].content.should == 'Foobar'
+    DSTest.find(@nc.pid).test_ds.content.should == 'Foobar'
+  end
+
+end
+
+
 describe ActiveFedora::Base do
   
   before(:all) do
@@ -738,8 +763,8 @@ describe ActiveFedora::Base do
       minivan = f.read
       f.rewind
       f2 = File.new(File.join( File.dirname(__FILE__), "../fixtures/dino.jpg" ))
-      dino = f.read
-      f.rewind
+      dino = f2.read
+      f2.rewind
       f.stubs(:content_type).returns("image/jpeg")
       f.stubs(:original_filename).returns("minivan.jpg")
       f2.stubs(:content_type).returns("image/jpeg")

data/spec/unit/base_spec.rb

@@ -400,8 +400,8 @@ describe ActiveFedora::Base do
 
       rels_ext = ActiveFedora::RelsExtDatastream.new(@test_object.inner_object, 'RELS-EXT')
       rels_ext.model = @test_object
-      rels_ext.expects(:new?).returns(true)
-       rels_ext.expects(:save).returns(true)
+      rels_ext.expects(:changed?).returns(true).times(3) # FIXME Rubydora is holding one object, while we have a different one. 
+      rels_ext.expects(:save).returns(true).twice #TODO why two times?
       rels_ext.expects(:serialize!)
       clean_ds = mock("ds2")
       clean_ds.stubs(:dirty? => false, :changed? => false, :new? => false)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 15424097
+  hash: 15424099
   prerelease: 6
   segments: 
   - 3
   - 1
   - 0
   - rc
-  - 2
-  version: 3.1.0.rc2
+  - 3
+  version: 3.1.0.rc3
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-28 00:00:00 -05:00
+date: 2011-10-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -210,14 +210,14 @@ dependencies:
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 21
         segments: 
         - 0
+        - 2
         - 1
-        - 9
-        version: 0.1.9
+        version: 0.2.1
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency