active-fedora 3.1.0.rc3 → 3.1.0.rc4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (3.1.0.rc2)
+    active-fedora (3.1.0.rc4)
       activeresource (~> 3.0.0)
       activesupport (~> 3.0.0)
       equivalent-xml
@@ -13,7 +13,7 @@ PATH
       om (>= 1.4.3)
       rdf
       rdf-rdfxml
-      rubydora (= 0.2.1)
+      rubydora (= 0.2.3)
       solr-ruby (>= 0.0.6)
       solrizer (> 1.0.0)
       xml-simple (>= 1.0.12)
@@ -69,7 +69,7 @@ GEM
       mediashelf-loggable
       nokogiri (>= 1.4.2)
     rack (1.3.5)
-    rake (0.9.2)
+    rake (0.9.2.2)
     rbx-require-relative (0.0.5)
     rcov (0.9.11)
     rdf (0.3.4.1)
@@ -87,7 +87,7 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    rubydora (0.2.1)
+    rubydora (0.2.3)
       activemodel
       activesupport
       fastercsv

data/Rakefile

@@ -1,6 +1,8 @@
 require 'rake/clean'
 require 'rubygems'
 require 'bundler'
+require "bundler/setup"
+
 
 $: << 'lib'
 

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.2.1')
+  s.add_dependency("rubydora", '0.2.3')
   s.add_dependency("rdf")
   s.add_dependency("rdf-rdfxml")
   s.add_development_dependency("yard")

data/lib/active_fedora/base.rb

@@ -112,7 +112,7 @@ module ActiveFedora
     def method_missing(name, *args)
       if datastreams.has_key? name.to_s
         ### Create and invoke a proxy method 
-        self.class.class_eval <<-end_eval
+        self.class.class_eval <<-end_eval, __FILE__, __LINE__
           def #{name.to_s}()
             datastreams["#{name.to_s}"]
           end
@@ -673,7 +673,7 @@ module ActiveFedora
     #  thumbnails        -  Get array of thumbnail datastreams
     #  thumbnails_ids    -  Get array of dsid's for thumbnail datastreams
     def self.create_named_datastream_finders(name, prefix)
-      class_eval <<-END
+      class_eval <<-END,  __FILE__, __LINE__
       def #{name}(opts={})
         id_array = []
         keys = datastreams.keys
@@ -735,7 +735,8 @@ module ActiveFedora
     # if there is no fedora object (loaded from solr) get the instance var
     # TODO make inner_object a proxy that can hold the pid
     def pid
-      @inner_object ?  @inner_object.pid : @pid
+      @pid ||= @inner_object.pid
+#      @inner_object ?  @inner_object.pid : @pid
     end
 
 
@@ -768,12 +769,12 @@ module ActiveFedora
 
     #return the create_date of the inner object (unless it's a new object)
     def create_date
-      @inner_object.profile["objCreateDate"] unless @inner_object.new?
+      @inner_object.new? ? Time.now : @inner_object.profile["objCreateDate"]
     end
 
     #return the modification date of the inner object (unless it's a new object)
     def modified_date
-      @inner_object.profile["objLastModDate"] unless @inner_object.new?
+      @inner_object.new? ? Time.now : @inner_object.profile["objLastModDate"]
     end
 
     #return the error list of the inner object (unless it's a new object)
@@ -835,8 +836,9 @@ module ActiveFedora
       end
       datastreams.each_value do |ds|
         ds.ensure_xml_loaded if ds.respond_to? :ensure_xml_loaded  ### Can't put this in the model because it's often implemented in Solrizer::XML::TerminologyBasedSolrizer 
-        solr_doc = ds.to_solr(solr_doc) if ds.kind_of?(ActiveFedora::MetadataDatastream) || ds.kind_of?(ActiveFedora::NokogiriDatastream) || ( ds.kind_of?(ActiveFedora::RelsExtDatastream) && !opts[:model_only] )
+        solr_doc = ds.to_solr(solr_doc) if ds.kind_of?(ActiveFedora::MetadataDatastream) || ds.kind_of?(ActiveFedora::NokogiriDatastream) 
       end
+      solr_doc = solrize_relationships(solr_doc) unless opts[:model_only]
       begin
         #logger.info("PID: '#{pid}' solr_doc put into solr: #{solr_doc.inspect}")
       rescue
@@ -845,6 +847,18 @@ module ActiveFedora
       return solr_doc
     end
 
+    # Serialize the datastream's RDF relationships to solr
+    # @param [Hash] solr_doc @deafult an empty Hash
+    def solrize_relationships(solr_doc = Hash.new)
+      relationships.each_statement do |statement|
+        predicate = RelsExtDatastream.short_predicate(statement.predicate)
+        literal = statement.object.kind_of?(RDF::Literal)
+        val = literal ? statement.object.value : statement.object.to_str
+        ::Solrizer::Extractor.insert_solr_field_value(solr_doc, solr_name(predicate, :symbol), val )
+      end
+      return solr_doc
+    end
+
     
     # ** EXPERIMENTAL **
     #
@@ -986,7 +1000,7 @@ module ActiveFedora
           else
             ds = ar.first.new(inner_object, name)
             ds.model = self if ar.first == RelsExtDatastream
-            ds.dsLabel = ar[1]
+            ds.dsLabel = ar[1] if ar[1].present?
             # If you called has_metadata with a block, pass the block into the Datastream class
             if ar.last.class == Proc
               ar.last.call(ds)
@@ -1007,11 +1021,16 @@ module ActiveFedora
     
     # Pushes the object and all of its new or dirty datastreams into Fedora
     def update
-      result = @inner_object.save
       datastreams.each {|k, ds| ds.serialize! }
       @metadata_is_dirty = datastreams.any? {|k,ds| ds.changed? && (ds.class.included_modules.include?(ActiveFedora::MetadataDatastreamHelper) || ds.instance_of?(ActiveFedora::RelsExtDatastream))}
-      ## TODO rubydora is saving datastreams, but not of our subclasses
-      datastreams.select {|k, ds| ds.changed? }.each do |k, ds| ds.save end  
+
+      result = @inner_object.save
+
+      ### Rubydora re-inits the datastreams after a save, so ensure our copy stays in synch
+      @inner_object.datastreams.each do |dsid, ds|
+        datastreams[dsid] = ds
+        ds.model = self if ds.kind_of? RelsExtDatastream
+      end 
       refresh
       return !!result
     end

data/lib/active_fedora/datastream.rb

@@ -11,18 +11,6 @@ module ActiveFedora
       super
     end
     
-    # #Return the xml content representing this Datastream from Fedora
-    # def content
-    #   result = Fedora::Repository.instance.fetch_custom(self.attributes[:pid], "datastreams/#{self.dsid}/content")
-    #   return result
-    # end
-  
-    #set this Datastream's content
-    def content=(content)
-      super
-      self.dirty = true
-    end
-
     def size
       self.profile['dsSize']
     end
@@ -35,6 +23,7 @@ module ActiveFedora
     end
     
     # Test whether this datastream been modified since it was last saved?
+    # TODO deprecate this, just use changed?
     def dirty?
       @dirty || changed?
     end
@@ -42,22 +31,27 @@ module ActiveFedora
     def new_object?
       new?
     end
-  
-    # Save the datastream into fedora.
-    # Also triggers {#before_save} and {#after_save} callbacks
+
     def save
-      before_save
       raise "No content #{dsid}" if @content.nil?
-      result = super
-      after_save
-      result
+      run_callbacks :save do
+        return create if new?
+        repository.modify_datastream to_api_params.merge({ :pid => pid, :dsid => dsid })
+        reset_profile_attributes
+        #Datastream.new(digital_object, dsid)
+        self
+      end
     end
-    
-    # Callback.  Does nothing by default.  Override this to insert behaviors before the save method.
-    def before_save 
-      #check_concurrency
+
+    def create
+      run_callbacks :create do
+        repository.add_datastream to_api_params.merge({ :pid => pid, :dsid => dsid })
+        reset_profile_attributes
+        self
+      end
     end
-    
+
+
     # serializes any changed data into the content field
     def serialize!
     end
@@ -70,10 +64,10 @@ module ActiveFedora
       tmpl
     end
     
-    # Callback.  Override this to insert behaviors after the save method.  By default, sets self.dirty = false
-    def after_save
-      self.dirty = false
-    end
+    # # Callback.  Override this to insert behaviors after the save method.  By default, sets self.dirty = false
+    # def after_save
+    #   self.dirty = false
+    # end
     
     # returns a datetime in the standard W3C DateTime Format.  
     # ie 2008-10-17T00:17:18.194Z

data/lib/active_fedora/datastream_hash.rb

@@ -13,5 +13,10 @@ module ActiveFedora
       end
       super
     end 
+
+    def []= (key, val)
+      @obj.inner_object.datastreams[key]=val# unless @obj.inner_object.new?
+      super
+    end 
   end
 end

data/lib/active_fedora/digital_object.rb

@@ -9,6 +9,25 @@ module ActiveFedora
       obj
     end
 
+    # def datastreams
+    #   @datastreams ||= begin
+    #     h = Hash.new { |h,k| h[k] = datastream_object_for(k) }                
+
+    #     begin
+    #       datastreams_xml = repository.datastreams(:pid => pid)
+    #       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
+    #     rescue RestClient::ResourceNotFound
+    #     end
+
+    #     h
+    #   end
+    # end
+
+
     def datastream_object_for dsid
       klass = original_class.datastream_class_for_name(dsid)
       klass.new self, dsid

data/lib/active_fedora/model.rb

@@ -226,7 +226,7 @@ module ActiveFedora
     end
     def create_property_getter(property) # :nodoc:
 
-      class_eval <<-END
+      class_eval <<-END, __FILE__, __LINE__
           def #{property.name}
             attribute_get("#{property.name}")
           end
@@ -234,7 +234,7 @@ module ActiveFedora
     end
 
     def create_property_setter(property)# :nodoc:
-      class_eval <<-END
+      class_eval <<-END, __FILE__, __LINE__  
           def #{property.name}=(value)
             attribute_set("#{property.name}", value)
           end

data/lib/active_fedora/rels_ext_datastream.rb

@@ -10,10 +10,6 @@ module ActiveFedora
     include Solrizer::FieldNameMapper
     attr_accessor :model
     
-    def changed?
-      (model && model.relationships_are_dirty) || super
-    end
-
     def serialize!
       self.content = to_rels_ext() if model.relationships_are_dirty
       model.relationships_are_dirty = false
@@ -70,17 +66,6 @@ module ActiveFedora
       end
     end
     
-    # Serialize the datastream's RDF relationships to solr
-    # @param [Hash] solr_doc @deafult an empty Hash
-    def to_solr(solr_doc = Hash.new)
-      model.relationships.each_statement do |statement|
-        predicate = self.class.short_predicate(statement.predicate)
-        literal = statement.object.kind_of?(RDF::Literal)
-        val = literal ? statement.object.value : statement.object.to_str
-        ::Solrizer::Extractor.insert_solr_field_value(solr_doc, solr_name(predicate, :symbol), val )
-      end
-      return solr_doc
-    end
     
     # ** EXPERIMENTAL **
     # 

data/lib/active_fedora/semantic_node.rb

@@ -420,7 +420,7 @@ module ActiveFedora
 
     
       def create_inbound_relationship_finders(name, predicate, opts = {})
-        class_eval <<-END
+        class_eval <<-END, __FILE__, __LINE__
         def #{name}(opts={})
           load_inbound_relationship('#{name}', '#{predicate}', opts)
         end
@@ -437,7 +437,7 @@ module ActiveFedora
       end
     
       def create_outbound_relationship_finders(name, predicate, opts = {})
-        class_eval <<-END
+        class_eval <<-END, __FILE__, __LINE__
         def #{name}(opts={})
           load_outbound_relationship(#{name.inspect}, #{predicate.inspect}, opts)
         end
@@ -471,7 +471,7 @@ module ActiveFedora
         #create methods that mirror the outbound append and remove with our bidirectional name, assume just add and remove locally        
         create_bidirectional_relationship_name_methods(name,outbound_method_name)
 
-        class_eval <<-END
+        class_eval <<-END, __FILE__, __LINE__
         def #{name}(opts={})
           load_bidirectional("#{name}", :#{inbound_method_name}, :#{outbound_method_name}, opts)
         end

data/lib/active_fedora/version.rb

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

data/lib/tasks/active_fedora_dev.rake

@@ -69,6 +69,7 @@ namespace :active_fedora do
     t.rcov_opts << ['--exclude', 'spec']
   end
 
+  desc "Refresh test fixtres"
   task :refresh_fixtures do
     Rake::Task["active_fedora:clean_jetty"].invoke
     Rake::Task["active_fedora:load_fixtures"].invoke

data/spec/integration/base_spec.rb

@@ -74,7 +74,7 @@ describe ActiveFedora::Base do
   
   after(:each) do
     begin
-    @test_object.delete
+      @test_object.delete
     rescue
     end
     begin
@@ -758,7 +758,6 @@ describe ActiveFedora::Base do
   describe '#update_named_datastream' do
     it 'should update a named datastream to have a new file' do
       @test_object2 = MockAFBaseDatastream.new
-#      @test_object2.new_object = true
       f = File.new(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"))
       minivan = f.read
       f.rewind
@@ -814,6 +813,7 @@ describe ActiveFedora::Base do
       @test_object2.named_datastreams_ids.should == {"high"=>[], "thumbnail"=>["THUMB1", "THUMB2"]}
     end
   end
+
   
 #   describe '#load_instance_from_solr' do
 #     it 'should populate an instance of an ActiveFedora::Base object using solr instead of Fedora' do

data/spec/spec_helper.rb

@@ -1,8 +1,11 @@
 ENV["environment"] ||= 'test'
+require "bundler/setup"
 require 'active-fedora'
 require 'spec'
 require 'equivalent-xml/rspec_matchers'
 
+require 'support/mock_fedora'
+
 
 logger.level = Logger::WARN if logger.respond_to? :level ###MediaShelf StubLogger doesn't have a level= method
 

data/spec/support/mock_fedora.rb

@@ -0,0 +1,37 @@
+def mock_client
+  return @mock_client if @mock_client
+  @mock_client = mock("client")
+  @getter = mock("getter")
+  @getter.stubs(:get).returns('')
+  @mock_client 
+end
+  
+def stub_get(pid, record_exists=false)
+  pid.gsub!(/:/, '%3A')
+  mock_client.stubs(:[]).with("objects/#{pid}?format=xml").returns(stub('get getter', :get=>'foobar')) if record_exists
+ # @mock_client.expects(:[]).with("objects/#{pid}?format=xml").raises(RestClient::ResourceNotFound) unless record_exists
+  mock_client.stubs(:[]).with("objects/#{pid}/datastreams?format=xml").returns(@getter)
+  ['someData', 'withText', 'withText2', 'RELS-EXT'].each do |dsid|
+    mock_client.stubs(:[]).with("objects/#{pid}/datastreams/#{dsid}?format=xml").returns(@getter)
+  end
+end
+def stub_ingest(pid)
+  mock_client.stubs(:[]).with("objects/#{pid || 'new'}").returns(stub("ingester", :post=>pid))
+end
+
+def stub_add_ds(pid, dsids)
+  dsids.each do |dsid|
+    client = mock_client.stubs(:[]).with do |params|
+      /objects\/#{pid}\/datastreams\/#{dsid}/.match(params)
+    end
+    client.returns(stub("ds_adder", :post=>pid, :get=>''))
+  end
+end
+
+def stub_get_content(pid, dsids)
+  pid.gsub!(/:/, '%3A')
+  dsids.each do |dsid|
+    mock_client.stubs(:[]).with { |params| /objects\/#{pid}\/datastreams\/#{dsid}\/content/.match(params)}.returns(stub("content_accessor", :post=>pid, :get=>''))
+  end
+end
+

data/spec/unit/base_datastream_management_spec.rb

@@ -3,9 +3,10 @@ require File.join( File.dirname(__FILE__), "../spec_helper" )
 describe ActiveFedora::Base do
   
   before(:each) do
+    stub_get('__nextid__')
     ActiveFedora::RubydoraConnection.instance.expects(:nextid).returns("__nextid__")
+    Rubydora::Repository.any_instance.stubs(:client).returns(@mock_client)
     @test_object = ActiveFedora::Base.new
-    #Fedora::Repository.instance.delete(@test_object.inner_object)
   end
   
   describe '.generate_dsid' do