active-fedora 3.2.0.pre7 → 3.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (3.2.0.pre7)
+    active-fedora (3.2.0)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       equivalent-xml

data/History.txt

@@ -1,5 +1,6 @@
 3.2.0
 
+Deprecate ContentModel.pid_from_ruby_class, use Model.to_class_uri instead
 Added a count method
 HYDRA-731 running count on a has_many relationship returns zero unless the relationship has been loaded
 Added ActiveModel validations.
@@ -19,6 +20,9 @@ ActiveFedora::Relationship is deprecated (was not being used)
 Rails 3.1 compatibility
 Ruby 1.9 compatibility
 
+3.1.6
+HYDRA-733 When serializing, MetadataDatastream does not load the existing content, so it can overwrite with blank
+
 3.1.5
 HYDRA-722 updating AF::Base#label= and then saving doesn't persist the change
 JettyWrapper to 1.2.0

data/lib/active_fedora/content_model.rb

@@ -12,20 +12,10 @@ module ActiveFedora
       super
     end
     
-    ### TODO: Shouldn't this be the same as: klass.to_class_uri ?  - Justin
+    # @deprecated Please use {.to_class_uri} instead
     def self.pid_from_ruby_class(klass,attrs={})
-
-      unless klass.respond_to? :pid_suffix
-        pid_suffix = attrs.has_key?(:pid_suffix) ? attrs[:pid_suffix] : CMODEL_PID_SUFFIX
-      else
-        pid_suffix = klass.pid_suffix
-      end
-      unless klass.respond_to? :pid_namespace
-        namespace = attrs.has_key?(:namespace) ? attrs[:namespace] : CMODEL_NAMESPACE   
-      else
-        namespace = klass.pid_namespace
-      end
-      return "info:fedora/#{namespace}:#{sanitized_class_name(klass)}#{pid_suffix}" 
+      ActiveSupport::Deprecation.warn("pid_from_ruby_class is deprecated.  Use klass.to_class_uri instead")
+      klass.to_class_uri(attrs)
     end
     
     ###Override this, if you prefer your class names serialized some other way

data/lib/active_fedora/metadata_datastream.rb

@@ -8,10 +8,9 @@ module ActiveFedora
   #   </fields>
   class MetadataDatastream < Datastream
     
+    # .to_solr (among other things) is provided by ActiveFedora::MetadataDatastreamHelper
     include ActiveFedora::MetadataDatastreamHelper
 
-    # .to_solr and .to_xml (among other things) are provided by ActiveFedora::MetadataDatastreamHelper
-    self.xml_model = ActiveFedora::MetadataDatastream    
 
     def update_attributes(params={},opts={})
       result = params.dup
@@ -144,6 +143,29 @@ module ActiveFedora
       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_pair 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:

data/lib/active_fedora/metadata_datastream_helper.rb

@@ -7,8 +7,6 @@ module ActiveFedora::MetadataDatastreamHelper
   
   module ClassMethods
     
-    attr_accessor :xml_model
-    
     #get the Class's field list
     def fields
       @@classFields
@@ -34,7 +32,7 @@ module ActiveFedora::MetadataDatastreamHelper
   
   def serialize! # :nodoc:
     if dirty?
-      self.content = self.to_xml  ##TODO only do this when the xml will have changed to avoid a load of the datastream content. 
+      self.content = self.to_xml 
     end
   end
 
@@ -77,27 +75,5 @@ module ActiveFedora::MetadataDatastreamHelper
     end
   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_pair 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
 
 end

data/lib/active_fedora/model.rb

@@ -84,11 +84,18 @@ module ActiveFedora
       
       # Returns a suitable uri object for :has_model
       # Should reverse Model#from_class_uri
-      ### TODO: shouldn't this reverse ContentModel.pid_from_ruby_class
-      def to_class_uri
-        ns = (self.respond_to? :pid_namespace) ? self.pid_namespace : Model::DEFAULT_NS
-        pid = self.name.gsub(/::/,'_')
-        "info:fedora/#{ns}:#{pid}"
+      def to_class_uri(attrs = {})
+        unless self.respond_to? :pid_suffix
+          pid_suffix = attrs.has_key?(:pid_suffix) ? attrs[:pid_suffix] : ContentModel::CMODEL_PID_SUFFIX
+        else
+          pid_suffix = self.pid_suffix
+        end
+        unless self.respond_to? :pid_namespace
+          namespace = attrs.has_key?(:namespace) ? attrs[:namespace] : ContentModel::CMODEL_NAMESPACE   
+        else
+          namespace = self.pid_namespace
+        end
+        "info:fedora/#{namespace}:#{ContentModel.sanitized_class_name(self)}#{pid_suffix}" 
       end
       
       # Takes :all or a pid as arguments

data/lib/active_fedora/persistence.rb

@@ -23,7 +23,7 @@ module ActiveFedora
     # This can be overriden to assert a different model
     # It's normally called once in the lifecycle, by #create#
     def assert_content_model
-      add_relationship(:has_model, ActiveFedora::ContentModel.pid_from_ruby_class(self.class))
+      add_relationship(:has_model, self.class.to_class_uri)
     end
 
 

data/lib/active_fedora/semantic_node.rb

@@ -46,7 +46,7 @@ module ActiveFedora
         #check has model and class match
         mod = relationships.first(:predicate=>Predicates.find_graph_predicate(:has_model))
         if mod
-          expected = ActiveFedora::ContentModel.pid_from_ruby_class(self.class)
+          expected = self.class.to_class_uri
           if mod.object.to_s == expected
             return true
           else

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.2.0.pre7"
+    VERSION = "3.2.0"
 end

data/lib/tasks/active_fedora.rake

@@ -18,7 +18,6 @@ namespace :af do
       puts "You must specify a valid pid.  Example: rake fedora:delete pid=demo:12"
     else
       pid = ENV["pid"]
-      puts "Deleting '#{pid}' from #{ActiveFedora::RubydoraConnection.instance.options[:url]}"
       begin
         ActiveFedora::Base.load_instance(pid).delete
       rescue ActiveFedora::ObjectNotFoundError

data/spec/integration/base_spec.rb

@@ -407,7 +407,7 @@ describe ActiveFedora::Base do
       @test_object5.testing_bidirectional_append(@test_object4)
       @test_object2.save
       @test_object5.save
-      model_rel = ActiveFedora::ContentModel.pid_from_ruby_class(MockAFBaseRelationship)
+      model_rel = MockAFBaseRelationship.to_class_uri
       #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
       @test_object2.object_relations[:has_model].should include model_rel
       @test_object2.object_relations[:has_part].should include @test_object3
@@ -703,7 +703,7 @@ describe ActiveFedora::Base do
 #       @test_object5.testing2_append(@test_object3)
 #       @test_object2.save
 #       @test_object5.save
-#       model_rel = ActiveFedora::ContentModel.pid_from_ruby_class(MockAFBaseFromSolr)
+#       model_rel = MockAFBaseFromSolr.to_class_uri
 #       #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
 #       test_from_solr_object2 = MockAFBaseFromSolr.load_instance_from_solr(@test_object2.pid)
 #       test_from_solr_object3 = MockAFBaseFromSolr.load_instance_from_solr(@test_object3.pid)

data/spec/integration/bug_spec.rb

@@ -9,15 +9,20 @@ include ActiveFedora::Model
 include Mocha::API
 
 describe 'bugs' do
-class FooHistory < ActiveFedora::Base
-  has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"someData" do |m|
-    m.field "fubar", :string
-    m.field "swank", :text
+  before :all do
+    class FooHistory < ActiveFedora::Base
+      has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"someData" do |m|
+        m.field "fubar", :string
+        m.field "swank", :text
+      end
+      has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"withText" do |m|
+        m.field "fubar", :text
+      end
+    end
   end
-  has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"withText" do |m|
-    m.field "fubar", :text
+  after :all do
+    Object.send(:remove_const, :FooHistory)
   end
-end
 
   before(:each) do
     @test_object = FooHistory.new

data/spec/integration/rels_ext_datastream_spec.rb

@@ -113,7 +113,7 @@ describe ActiveFedora::RelsExtDatastream do
       @test_object5.testing2_append(@test_object3)
       @test_object2.save
       @test_object5.save
-      model_rel = ActiveFedora::ContentModel.pid_from_ruby_class(MockAFRelsSolr)
+      model_rel = MockAFRelsSolr.to_class_uri
       #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
       #get solr doc for @test_object2
       solr_doc = MockAFRelsSolr.find_by_solr(@test_object2.pid).hits.first

data/spec/integration/semantic_node_spec.rb

@@ -59,15 +59,15 @@ describe ActiveFedora::SemanticNode do
     class SpecialContainer; end;
     class SpecialPart; end;
     @special_container = ActiveFedora::Base.new()
-    @special_container.add_relationship(:has_model, ActiveFedora::ContentModel.pid_from_ruby_class(SpecialContainer))
+    @special_container.add_relationship(:has_model, SpecialContainer.to_class_uri)
     @special_container.save
 
     @special_container3 = ActiveFedora::Base.new()
-    @special_container3.add_relationship(:has_model, ActiveFedora::ContentModel.pid_from_ruby_class(SpecialContainer))
+    @special_container3.add_relationship(:has_model, SpecialContainer.to_class_uri)
     @special_container3.save
 
     @special_container4 = ActiveFedora::Base.new()
-    @special_container4.add_relationship(:has_model, ActiveFedora::ContentModel.pid_from_ruby_class(SpecialContainer))
+    @special_container4.add_relationship(:has_model, SpecialContainer.to_class_uri)
     @special_container4.save
 
     #even though adding container3 and 3 special containers, it should only include the special containers when returning via relationship name finder methods
@@ -80,7 +80,7 @@ describe ActiveFedora::SemanticNode do
     @test_object_query.save
 
     @special_container2 = ActiveFedora::Base.new()
-    @special_container2.add_relationship(:has_model, ActiveFedora::ContentModel.pid_from_ruby_class(SpecialContainer))
+    @special_container2.add_relationship(:has_model, SpecialContainer.to_class_uri)
     @special_container2.add_relationship(:has_member, 'info:fedora/'+@test_object_query.pid)
     @special_container2.save
 
@@ -89,7 +89,7 @@ describe ActiveFedora::SemanticNode do
     @part3.save
 
     @special_part = ActiveFedora::Base.new()
-    @special_part.add_relationship(:has_model, ActiveFedora::ContentModel.pid_from_ruby_class(SpecialPart))
+    @special_part.add_relationship(:has_model, SpecialPart.to_class_uri)
     @special_part.add_relationship(:is_part_of, @test_object_query)
     @special_part.save
    
@@ -442,7 +442,7 @@ describe ActiveFedora::SemanticNode do
 
     it 'should automatically update the relationships_by_name if relationships has changed (no refresh of relationships_by_name hash unless relationships hash has changed' do
       @test_object2 = MockSemNamedRelationships.new
-      @test_object2.add_relationship(:has_model, ActiveFedora::ContentModel.pid_from_ruby_class(MockSemNamedRelationships))
+      @test_object2.add_relationship(:has_model, MockSemNamedRelationships.to_class_uri)
       #should return expected named relationships
       @test_object2.relationships_by_name.should == {:self=>{"testing"=>[],"testing2"=>[], "collection_members"=>[], "part_of"=>[], "parts_outbound"=>[]}}
       @test_object2.add_relationship(:has_part, @test_object.internal_uri)

data/spec/samples/models/hydrangea_article.rb

@@ -1,4 +1,6 @@
 require "active-fedora"
+require "lib/active_fedora/samples/hydra-mods_article_datastream"
+require "lib/active_fedora/samples/hydra-rights_metadata_datastream"
 
 # This Model is used to load & index the hydrangea:fixture_mods_article1 fixture for use in tests.
 #

data/spec/unit/base_file_management_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper'
 
-# Some tentative extensions to ActiveFedora::Base
-
 describe ActiveFedora::Base do
   
   before(:each) do
@@ -11,9 +9,6 @@ describe ActiveFedora::Base do
   end
   
   describe ".file_objects" do
-    it "should be a supported method" do
-      @base.should respond_to("file_objects")
-    end
     it "should wrap .collection_members and .parts" do
       @base.expects(:collection_members).returns([])
       @base.expects(:parts).returns(["Foo"])

data/spec/unit/base_spec.rb

@@ -831,8 +831,8 @@ describe ActiveFedora::Base do
       ActiveFedora::RubydoraConnection.instance.stubs(:nextid).returns(next_pid)
       stub_get(next_pid)
       @test_object2 = MockNamedRelationships.new
-      @test_object2.add_relationship(:has_model, ActiveFedora::ContentModel.pid_from_ruby_class(MockNamedRelationships))
-      @test_object.add_relationship(:has_model, ActiveFedora::ContentModel.pid_from_ruby_class(ActiveFedora::Base))
+      @test_object2.add_relationship(:has_model, MockNamedRelationships.to_class_uri)
+      @test_object.add_relationship(:has_model, ActiveFedora::Base.to_class_uri)
       #should return expected named relationships
       @test_object2.relationships_by_name
       @test_object2.relationships_by_name[:self]["testing"].should == []
@@ -865,7 +865,7 @@ describe ActiveFedora::Base do
       @test_object2.should respond_to(:testing_append)
       @test_object2.should respond_to(:testing_remove)
       #test executing each one to make sure code added is correct
-      model_pid = ActiveFedora::ContentModel.pid_from_ruby_class(ActiveFedora::Base)
+      model_pid =ActiveFedora::Base.to_class_uri
       @test_object.add_relationship(:has_model,model_pid)
       @test_object2.add_relationship(:has_model,model_pid)
       @test_object2.testing_append(@test_object)

data/spec/unit/content_model_spec.rb

@@ -51,14 +51,15 @@ describe ActiveFedora::ContentModel do
     @test_cmodel.should respond_to(:pid_suffix=)
   end
   
-  it 'should provide #pid_from_ruby_class' do
-    ActiveFedora::ContentModel.should respond_to(:pid_from_ruby_class)
-  end
   
   describe "#pid_from_ruby_class" do
+    before do
+      ActiveSupport::Deprecation.stubs(:warn)
+    end
+  
     it "should construct pids" do
-     ActiveFedora::ContentModel.pid_from_ruby_class(@test_cmodel.class).should == "info:fedora/afmodel:ActiveFedora_ContentModel"
-     ActiveFedora::ContentModel.pid_from_ruby_class(@test_cmodel.class, :namespace => "foo", :pid_suffix => "BarBar").should == "info:fedora/foo:ActiveFedora_ContentModelBarBar"
+      ActiveFedora::ContentModel.pid_from_ruby_class(@test_cmodel.class).should == "info:fedora/afmodel:ActiveFedora_ContentModel"
+      ActiveFedora::ContentModel.pid_from_ruby_class(@test_cmodel.class, :namespace => "foo", :pid_suffix => "BarBar").should == "info:fedora/foo:ActiveFedora_ContentModelBarBar"
     end
     it "should construct pids with the namespace declared in the model" do
       ActiveFedora::ContentModel.stubs(:pid_namespace).returns("test-cModel")

data/spec/unit/relationships_spec.rb

@@ -114,7 +114,7 @@ describe ActiveFedora::Relationships do
           @test_object2.pid = increment_pid
           @test_object2.stubs(:testing_inbound).returns({})
           @test_object2.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true, :content =>'')).at_least_once
-          @test_object2.add_relationship(:has_model, ActiveFedora::ContentModel.pid_from_ruby_class(SpecNode))
+          @test_object2.add_relationship(:has_model, SpecNode.to_class_uri)
           @test_object2.should respond_to(:testing_append)
           @test_object2.should respond_to(:testing_remove)
           @test_object2.should respond_to(:testing2_append)
@@ -353,7 +353,7 @@ describe ActiveFedora::Relationships do
         @local_node.pid = "mypid1"
         @local_node2 = SpecNode.new
         @local_node2.pid = "mypid2"
-        model_def = ActiveFedora::ContentModel.pid_from_ruby_class(SpecNode)
+        model_def = SpecNode.to_class_uri
         @local_node.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true, :content=>'')).at_least_once
         @local_node.add_relationship(:has_model, model_def)
         @local_node2.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true, :content=>'')).at_least_once
@@ -428,7 +428,7 @@ describe ActiveFedora::Relationships do
       #add relationships that mirror 'testing' and 'testing2'
       graph = RDF::Graph.new
       subject = RDF::URI.new "info:fedora/test:sample_pid"
-      graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new(ActiveFedora::ContentModel.pid_from_ruby_class(MockRelationshipNames)))
+      graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new(MockRelationshipNames.to_class_uri))
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_member),  RDF::URI.new(@test_object4.internal_uri))
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_part),  RDF::URI.new(@test_object3.internal_uri))
       @test_object2.expects(:relationships).returns(graph).at_least_once
@@ -518,7 +518,7 @@ describe ActiveFedora::Relationships do
       #has_model relationship does not get created until save called
       graph = RDF::Graph.new
       subject = RDF::URI.new "info:fedora/test:sample_pid"
-      graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new(ActiveFedora::ContentModel.pid_from_ruby_class(SpecNode)))
+      graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new(SpecNode.to_class_uri))
       @test_object.expects(:relationships).returns(graph).at_least_once
       @test_object.conforms_to?(SpecNode).should == true
     end
@@ -538,7 +538,7 @@ describe ActiveFedora::Relationships do
       #has_model relationship does not get created until save called so need to add the has model rel here, is fine since not testing save
       graph = RDF::Graph.new
       subject = RDF::URI.new "info:fedora/test:sample_pid"
-      graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new(ActiveFedora::ContentModel.pid_from_ruby_class(SpecNode)))
+      graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new(SpecNode.to_class_uri))
       @test_object.expects(:relationships).returns(graph).at_least_once
       @test_object3.assert_conforms_to('object',@test_object,SpecNode)
     end
@@ -581,7 +581,7 @@ describe ActiveFedora::Relationships do
       @test_object2.pid = increment_pid
       @test_object3 = MockNamedRelationships3.new
       @test_object3.pid = increment_pid
-      model_pid = ActiveFedora::ContentModel.pid_from_ruby_class(MockNamedRelationships3)
+      model_pid = MockNamedRelationships3.to_class_uri
       graph = RDF::Graph.new
       subject = RDF::URI.new "info:fedora/test:sample_pid"
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new(model_pid))

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 1923832039
-  prerelease: 6
+  hash: 15
+  prerelease: 
   segments: 
   - 3
   - 2
   - 0
-  - pre
-  - 7
-  version: 3.2.0.pre7
+  version: 3.2.0
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -19,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-04 00:00:00 -06:00
+date: 2012-01-09 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -745,14 +743,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: rubyfedora