active-fedora 5.0.0.rc3 → 5.0.0.rc4

data/spec/integration/metadata_datastream_helper_spec.rb

@@ -4,7 +4,7 @@ require 'active-fedora'
 require "rexml/document"
 
 class MockMetaHelperSolr < ActiveFedora::Base
-  has_metadata :name => "properties", :type => ActiveFedora::MetadataDatastream do |m|
+  has_metadata :name => "properties", :type => ActiveFedora::SimpleDatastream do |m|
     m.field "holding_id", :string
   end
   

data/spec/unit/base_datastream_management_spec.rb

@@ -54,13 +54,4 @@ describe ActiveFedora::Base do
       @test_object.add_datastream(ds, :prefix => "FOO")
     end
   end
-
-
-  describe 'add' do
-    it "should call .add_datastream" do
-      @test_object.expects(:add_datastream)
-      @test_object.add(stub("datastream").stub_everything)
-    end
-  end
-  
 end

data/spec/unit/base_extra_spec.rb

@@ -13,14 +13,14 @@ describe ActiveFedora::Base do
       mock_mds1 = mock("metadata ds1")
       mock_mds2 = mock("metadata ds2")
       mock_fds = mock("file ds")
-      mock_fds.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(false)
+      mock_fds.expects(:kind_of?).with(ActiveFedora::RDFDatastream).returns(false)
       mock_ngds = mock("nokogiri ds")
-      mock_ngds.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(false)
+      mock_ngds.expects(:kind_of?).with(ActiveFedora::RDFDatastream).returns(false)
       mock_ngds.expects(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(true)
       
       
       [mock_mds1,mock_mds2].each do |ds|
-        ds.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(false)
+        ds.expects(:kind_of?).with(ActiveFedora::RDFDatastream).returns(false)
         ds.expects(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(true)
       end
       mock_fds.stubs(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(false) 
@@ -35,43 +35,6 @@ describe ActiveFedora::Base do
     end
   end
   
-  describe ".file_streams" do
-    #TODO move to datastreams_spec
-    it "should return all of the datastreams from the object that are kinds of SimpleDatastreams" do
-      mock_fds1 = mock("file ds", :dsid => "file1")
-      mock_fds1.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(false)
-      mock_fds1.expects(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(false)
-      mock_fds2 = mock("file ds", :dsid => "file2")
-      mock_fds2.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(false)
-      mock_fds2.expects(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(false)
-      mock_mds = mock("metadata ds")
-      mock_mds.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(false)
-      mock_mds.expects(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(true)
-      @test_object.expects(:datastreams).returns({:foo => mock_fds1, :bar=> mock_fds2, :baz => mock_mds})
-      
-      result = @test_object.file_streams
-      result.length.should == 2
-      result.should include(mock_fds1)
-      result.should include(mock_fds2)
-
-    end
-    it "should skip DC and RELS-EXT datastreams" do
-      mock_fds1 = mock("file ds", :dsid => "foo")
-      mock_fds1.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(false)
-      mock_fds1.expects(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(false)
-      dc = mock("DC")
-      dc.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(false)
-      dc.expects(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(true)
-      rels_ext = mock("RELS-EXT")
-      rels_ext.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(false)
-      rels_ext.expects(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(true)
-      @test_object.expects(:datastreams).returns({:foo => mock_fds1, :dc => dc, :rels_ext => rels_ext})
-      
-      result = @test_object.file_streams
-      result.length.should == 1
-      result.should include(mock_fds1)
-    end
-  end
 
   describe ".update_index" do
     before do

data/spec/unit/base_spec.rb

@@ -207,37 +207,6 @@ describe ActiveFedora::Base do
       end
     end
 
-
-
-    describe ".fields" do
-      it "should provide fields" do
-        @test_object.should respond_to(:fields)
-      end
-      it "should add pid, system_create_date and system_modified_date from object attributes" do
-        cdate = "2008-07-02T05:09:42.015Z"
-        mdate = "2009-07-07T23:37:18.991Z"
-        @test_object.expects(:create_date).returns(cdate)
-        @test_object.expects(:modified_date).returns(mdate)
-        fields = @test_object.fields
-        fields[:system_create_date][:values].should eql([cdate])
-        fields[:system_modified_date][:values].should eql([mdate])
-        fields[:id][:values].should eql([@test_object.pid])
-      end
-      
-      it "should add self.class as the :active_fedora_model" do
-        fields = @test_object.fields
-        fields[:active_fedora_model][:values].should eql([@test_object.class.inspect])
-      end
-      
-      it "should call .fields on all SimpleDatastreams and return the resulting document" do
-        mock1 = mock("ds1", :fields => {}, :class=>ActiveFedora::SimpleDatastream)
-        mock2 = mock("ds2", :fields => {}, :class=>ActiveFedora::SimpleDatastream)
-
-        @test_object.expects(:datastreams).returns({:ds1 => mock1, :ds2 => mock2})
-        @test_object.fields
-      end
-    end
-
     it 'should provide #find' do
       ActiveFedora::Base.should respond_to(:find)
     end
@@ -534,30 +503,6 @@ describe ActiveFedora::Base do
       end
     end
 
-    describe ".to_xml" do
-      it "should provide .to_xml" do
-        @test_object.should respond_to(:to_xml)
-      end
-
-      it "should add pid, system_create_date and system_modified_date from object attributes" do
-        @test_object.expects(:create_date).returns("2012-03-06T03:12:02Z")
-        @test_object.expects(:modified_date).returns("2012-03-07T03:12:02Z")
-        solr_doc = @test_object.to_solr
-        solr_doc["system_create_dt"].should eql("2012-03-06T03:12:02Z")
-        solr_doc["system_modified_dt"].should eql("2012-03-07T03:12:02Z")
-        solr_doc[:id].should eql("#{@test_object.pid}")
-      end
-
-      it "should call .to_xml on all SimpleDatastreams and return the resulting document" do
-        ds1 = ActiveFedora::SimpleDatastream.new(@test_object.inner_object, 'ds1')
-        ds2 = ActiveFedora::SimpleDatastream.new(@test_object.inner_object, 'ds2')
-        [ds1,ds2].each {|ds| ds.expects(:to_xml)}
-
-        @test_object.expects(:datastreams).returns({:ds1 => ds1, :ds2 => ds2})
-        @test_object.to_xml
-      end
-    end
-    
     describe ".to_solr" do
       after(:all) do
         # Revert to default mappings after running tests

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc3
+  version: 5.0.0.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -52,7 +52,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc6
+        version: 2.0.0.rc7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -60,7 +60,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc6
+        version: 2.0.0.rc7
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
@@ -361,7 +361,6 @@ files:
 - lib/active_fedora/fixture_exporter.rb
 - lib/active_fedora/fixture_loader.rb
 - lib/active_fedora/locale/en.yml
-- lib/active_fedora/metadata_datastream.rb
 - lib/active_fedora/metadata_datastream_helper.rb
 - lib/active_fedora/model.rb
 - lib/active_fedora/named_relationships.rb
@@ -388,7 +387,6 @@ files:
 - lib/active_fedora/unsaved_digital_object.rb
 - lib/active_fedora/validations.rb
 - lib/active_fedora/version.rb
-- lib/ruby-fedora.rb
 - lib/tasks/active_fedora.rake
 - lib/tasks/active_fedora_dev.rake
 - script/console
@@ -425,7 +423,6 @@ files:
 - spec/integration/datastreams_spec.rb
 - spec/integration/full_featured_model_spec.rb
 - spec/integration/metadata_datastream_helper_spec.rb
-- spec/integration/metadata_datastream_spec.rb
 - spec/integration/model_spec.rb
 - spec/integration/mods_article_integration_spec.rb
 - spec/integration/nested_attribute_spec.rb
@@ -502,7 +499,6 @@ files:
 - spec/unit/file_configurator_spec.rb
 - spec/unit/has_many_collection_spec.rb
 - spec/unit/inheritance_spec.rb
-- spec/unit/metadata_datastream_spec.rb
 - spec/unit/model_spec.rb
 - spec/unit/nokogiri_datastream_spec.rb
 - spec/unit/ntriples_datastream_spec.rb
@@ -578,7 +574,6 @@ test_files:
 - spec/integration/datastreams_spec.rb
 - spec/integration/full_featured_model_spec.rb
 - spec/integration/metadata_datastream_helper_spec.rb
-- spec/integration/metadata_datastream_spec.rb
 - spec/integration/model_spec.rb
 - spec/integration/mods_article_integration_spec.rb
 - spec/integration/nested_attribute_spec.rb
@@ -655,7 +650,6 @@ test_files:
 - spec/unit/file_configurator_spec.rb
 - spec/unit/has_many_collection_spec.rb
 - spec/unit/inheritance_spec.rb
-- spec/unit/metadata_datastream_spec.rb
 - spec/unit/model_spec.rb
 - spec/unit/nokogiri_datastream_spec.rb
 - spec/unit/ntriples_datastream_spec.rb

data/lib/active_fedora/metadata_datastream.rb

@@ -1,272 +0,0 @@
-module ActiveFedora
-  # A legacy class that creates and updates simple xml documents
-  # For much greater flexibility, use {ActiveFedora::NokogiriDatastream} instead.
-  # @example The simple, flat xml structure used by these datastreams
-  #   <fields>
-  #     <title>Foo</title>
-  #     <author>Bar</author>
-  #   </fields>
-  class MetadataDatastream < NokogiriDatastream 
-    
-    # .to_solr (among other things) is provided by ActiveFedora::MetadataDatastreamHelper
-    include ActiveFedora::MetadataDatastreamHelper
-
-    def initialize(digital_object, dsid)
-      ActiveSupport::Deprecation.warn("MetadataDatastream is deprecated and will be removed in a future release. Create a NokogiriDatastream to structure your data")
-      super
-    end
-
-    def to_solr(solr_doc = Hash.new) # :nodoc:
-      fields.each do |field_key, field_info|
-        if field_info.has_key?(:values) && !field_info[:values].nil?
-          field_symbol = ActiveFedora::SolrService.solr_name(field_key, field_info[:type])
-          values = field_info[:values]
-          values = [values] unless values.respond_to? :each
-          values.each do |val|    
-            ::Solrizer::Extractor.insert_solr_field_value(solr_doc, field_symbol, val )         
-          end
-        end
-      end
-
-      return solr_doc
-    end
-  
-    # ** EXPERIMENTAL **
-    #
-    # This is utilized by ActiveFedora::Base.load_instance_from_solr to set 
-    # metadata values in this object using the Solr document passed in.
-    # Any keys in the solr document that map to a metadata field key within a MetadataDatastream object
-    # are set to the corresponding value.  Any others are ignored. ActiveFedora::SolrService.solr_name
-    # is used to map solr key to field key name.
-    #
-    # ====Warning
-    #  Solr must be synchronized with data in Fedora.
-    #  @content is initialized to the empty document template to satisfy #ensure_xml_loaded
-    #    (called from #update_attributes and #update_indexed_attributes)
-    def from_solr(solr_doc)
-      @content = self.to_xml
-      self.xml_loaded = true
-      fields.each do |field_key, field_info|
-        field_symbol = ActiveFedora::SolrService.solr_name(field_key, field_info[:type])
-        value = (solr_doc[field_symbol].nil? ? solr_doc[field_symbol.to_s]: solr_doc[field_symbol]) 
-        unless value.nil?
-          if value.is_a? Array
-            update_attributes({field_key=>value})
-          else
-            update_indexed_attributes({field_key=>{0=>value}})
-          end
-        end
-      end
-    end
-  
-
-
-
-    def update_attributes(params={},opts={})
-      result = params.dup
-      params.each do |k,v|
-        if v == :delete || v == "" || v == nil
-          v = []
-        end
-        if self.fields.has_key?(k.to_sym)
-          result[k] = set_value(k, v)
-        else
-          result.delete(k)
-        end
-      end
-      return result
-    end
-    
-    # An ActiveRecord-ism to udpate metadata values.
-    #
-    # The passed in hash must look like this : 
-    #   {:name=>{"0"=>"a","1"=>"b"}}
-    #
-    # This will attempt to set the values for any field named fubar in the datastream. 
-    # If there is no field by that name, it returns an empty hash and doesn't change the object at all.
-    # If there is a field by that name, it will set the values for field of name :name having the value [a,b]
-    # and it returns a hash with the field name, value index, and the value as it was set.    
-    #
-    # An index of -1 will insert a new value. any existing value at the relevant index 
-    # will be overwritten.
-    #
-    # As in update_attributes, this overwrites _all_ available fields by default.
-    #
-    # Example Usage:
-    #
-    # ds.update_attributes({:myfield=>{"0"=>"a","1"=>"b"},:myotherfield=>{"-1"=>"c"}})
-    #
-    def update_indexed_attributes(params={}, opts={})
-      ensure_xml_loaded
-      
-      ##FIX this bug, it should delete it from a copy of params in case passed to another datastream for update since this will modify params
-      ##for subsequent calls if updating more than one datastream in a single update_indexed_attributes call
-      current_params = params.clone
-      
-      # remove any fields from params that this datastream doesn't recognize
-      current_params.delete_if do |field_name,new_values| 
-        if field_name.kind_of?(Array) then field_name = field_name.first end
-        !self.fields.include?(field_name.to_sym) 
-      end
-            
-      result = current_params.dup
-      current_params.each do |field_name,new_values|
-        if field_name.kind_of?(Array) then field_name = field_name.first end
-        
-        ##FIX this bug, it should delete it from a copy of params in case passed to another datastream for update
-        #if field does not exist just skip it
-        next if !self.fields.include?(field_name.to_sym)
-        field_accessor_method = "#{field_name}_values"
-        
-        if new_values.kind_of?(Hash)
-            result[field_name] = new_values.dup
-      
-            current_values = instance_eval(field_accessor_method)
-        
-            # current_values = get_values(field_name) # for some reason this leaves current_values unset?
-                
-            new_values.delete_if do |y,z| 
-              if current_values[y.to_i] and y.to_i > -1
-                current_values[y.to_i]=z
-                true
-              else
-                false
-              end
-            end 
-        
-            new_values.keys.sort { |a,b| a.to_i <=> b.to_i }.each do |y| 
-              z = new_values[y]
-              result[field_name].delete(y)
-              current_values<<z #just append everything left
-              new_array_index = current_values.length - 1
-              result[field_name][new_array_index.to_s] = z
-            end
-            current_values.delete_if {|x| x == :delete || x == "" || x == nil}
-            #set_value(field_name, current_values)
-            instance_eval("#{field_accessor_method}=(current_values)") #write it back to the ds
-            # result[field_name].delete("-1")
-        else
-          values = instance_eval("#{field_name}_values=(new_values)")
-          result[field_name] = {"0"=>values}           
-        end
-        self.dirty = true
-      end
-      return result
-    end
-    
-    
-    def get_values(field_name, default=[])
-      ensure_xml_loaded  
-      field_accessor_method = "#{field_name}_values"
-      if respond_to? field_accessor_method
-        values = self.send(field_accessor_method)
-      else
-        values = []
-      end
-      if values.empty?
-        if default.nil?
-          return default
-        else
-          return default
-        end
-      else
-        return values
-      end
-    end
-    
-    def set_value(field_name, values)
-      ensure_xml_loaded  
-      field_accessor_method = "#{field_name}_values="
-      if respond_to? field_accessor_method
-        values = self.send(field_accessor_method, values)
-        return self.send("#{field_name}_values")
-      end
-    end
-    
-    # Populate a MetadataDatastream object based on the "datastream" node from a FOXML file
-    # @param [ActiveFedora::Datastream] tmpl the Datastream object that you are building
-    # @param [Nokogiri::XML::Node] node the "foxml:datastream" node from a FOXML file.  Assumes that the content of this datastream is that of an ActiveFedora MetadataDatastream (<fields>...</fields>)
-    def self.from_xml(xml, tmpl) # :nodoc:
-      node = Nokogiri::XML::Document.parse(xml)
-      node.xpath("fields/node()").each do |f|
-          tmpl.send("#{f.name}_append", f.text) unless f.class == Nokogiri::XML::Text
-      end
-      tmpl.send(:dirty=, false)
-      tmpl
-    end
-
-    def to_xml(xml = Nokogiri::XML::Document.parse("<fields />")) #:nodoc:
-      if xml.instance_of?(Nokogiri::XML::Builder)
-        xml_insertion_point = xml.doc.root 
-      elsif xml.instance_of?(Nokogiri::XML::Document) 
-        xml_insertion_point = xml.root
-      else
-        xml_insertion_point = xml
-      end
-      
-      builder = Nokogiri::XML::Builder.with(xml_insertion_point) do |xml|
-        fields.each do |field,field_info|
-          element_attrs = field_info[:element_attrs].nil? ? {} : field_info[:element_attrs]
-          values = field_info[:values]
-          values = [values] unless values.respond_to? :each
-          values.each do |val|
-            builder_arg = "xml.#{field}(val, element_attrs)"
-            eval(builder_arg)
-          end
-        end
-      end
-      return builder.to_xml
-    end
-    
-    # This method generates the various accessor and mutator methods on self for the datastream metadata attributes.
-    # each field will have the 3 magic methods:
-    #   name_values=(arg) 
-    #   name_values 
-    #   name_append(arg)
-    #
-    #
-    # Calling any of the generated methods marks self as dirty.
-    #
-    # 'tupe' is a datatype, currently :string, :text and :date are supported.
-    #
-    # opts is an options hash, which  will affect the generation of the xml representation of this datastream.
-    #
-    # Currently supported modifiers: 
-    # For +QualifiedDublinCorDatastreams+:
-    #   :element_attrs =>{:foo=>:bar} -  hash of xml element attributes
-    #   :xml_node => :nodename  - The xml node to be used to represent this object (in dcterms namespace)
-    #   :encoding=>foo, or encodings_scheme  - causes an xsi:type attribute to be set to 'foo'
-    #   :multiple=>true -  mark this field as a multivalue field (on by default)
-    #
-    #At some point, these modifiers will be ported up to work for any +ActiveFedora::MetadataDatastream+.
-    #
-    #There is quite a good example of this class in use in spec/examples/oral_history.rb
-    #
-    #!! Careful: If you declare two fields that correspond to the same xml node without any qualifiers to differentiate them, 
-    #you will end up replicating the values in the underlying datastream, resulting in mysterious dubling, quadrupling, etc. 
-    #whenever you edit the field's values.
-    def field(name, tupe, opts={})
-      #TODO add term to terminology
-      @fields[name.to_s.to_sym]={:type=>tupe, :values=>[]}.merge(opts)
-      #eval <<-EOS
-      (class << self; self; end).class_eval do
-        define_method "#{name}_values=".to_sym do |arg|
-          ensure_xml_loaded  
-          @fields["#{name.to_s}".to_sym][:values]=[arg].flatten
-          self.dirty=true
-        end
-        define_method "#{name}_values".to_sym do 
-          ensure_xml_loaded  
-          @fields["#{name}".to_sym][:values]
-        end
-        define_method "#{name}_append".to_sym do |arg|
-          ensure_xml_loaded  
-          @fields["#{name}".to_sym][:values] << arg
-          self.dirty =true
-        end
-      end
-    end
-
-  end
-
-end