active-fedora 7.0.0.rc1 → 7.0.0.rc2

data/lib/active_fedora/digital_object.rb

@@ -4,10 +4,10 @@ module ActiveFedora
     attr_accessor :original_class
     
     module DatastreamBootstrap
-      def datastream_object_for dsid, ds_spec=nil
+      def datastream_object_for dsid, options={}, ds_spec=nil
         # ds_spec is nil when called from Rubydora for existing datastreams, so it should not be autocreated
         ds_spec ||= (original_class.ds_specs[dsid] || {}).merge(:autocreate=>false)
-        ds = ds_spec.fetch(:type, ActiveFedora::Datastream).new(self, dsid)
+        ds = ds_spec.fetch(:type, ActiveFedora::Datastream).new(self, dsid, options)
         attributes = {}
         attributes[:asOfDateTime] ||= asOfDateTime if self.respond_to? :asOfDateTime
         attributes[:dsLabel] = ds_spec[:label] if ds_spec[:label].present?

data/lib/active_fedora/indexing.rb

@@ -25,7 +25,7 @@ module ActiveFedora
         solrize_profile(solr_doc)
       end
       datastreams.each_value do |ds|
-        solr_doc = ds.to_solr(solr_doc)
+        solr_doc.merge! ds.to_solr()
       end
       solr_doc = solrize_relationships(solr_doc) unless opts[:model_only]
       solr_doc

data/lib/active_fedora/nom_datastream.rb

@@ -2,6 +2,9 @@ require  "nom"
 
 module ActiveFedora
   class NomDatastream < Datastream
+
+      include Datastreams::NokogiriDatastreams
+
       def self.set_terminology(options = {}, &block)
         @terminology_options = options || {}
         @terminology = block
@@ -29,35 +32,16 @@ module ActiveFedora
       ds
     end
 
-    def ng_xml
-      @ng_xml ||= begin
-         xml = Nokogiri::XML content
-         xml.set_terminology self.class.terminology_options, &self.class.terminology
-         xml.nom!
-         xml
-      end
+    def self.decorate_ng_xml(xml)
+      xml.set_terminology terminology_options, &terminology
+      xml.nom!
+      xml
     end
     
-    def ng_xml= ng_xml
-      @ng_xml = ng_xml
-      @ng_xml.set_terminology self.class.terminology_options, &self.class.terminology
-      content_will_change!
-      @ng_xml
-    end
-
     def serialize!
        self.content = @ng_xml.to_s if @ng_xml
     end
 
-    def content
-      @content || super
-    end
-
-    def content=(content)
-      super
-      @ng_xml = nil
-    end
-
     def to_solr
       solr_doc = {}
 

data/lib/active_fedora/om_datastream.rb

@@ -12,7 +12,8 @@ module ActiveFedora
 
     include OM::XML::Document
     include OM::XML::TerminologyBasedSolrizer # this adds support for calling .to_solr
-    
+    include Datastreams::NokogiriDatastreams
+
     alias_method(:om_term_values, :term_values) unless method_defined?(:om_term_values)
     alias_method(:om_update_values, :update_values) unless method_defined?(:om_update_values)
     
@@ -22,136 +23,12 @@ module ActiveFedora
       super.merge(:controlGroup => 'M', :mimeType => 'text/xml')
     end
 
-    # Create an instance of this class based on xml content
-    # @param [String, File, Nokogiri::XML::Node] xml the xml content to build from
-    # @param [ActiveFedora::OmDatastream] tmpl the Datastream object that you are building @default a new instance of this class
-    # Careful! If you call this from a constructor, be sure to provide something 'ie. self' as the @tmpl. Otherwise, you will get an infinite loop!
-    def self.from_xml(xml, tmpl=nil)
-      tmpl = self.new if tmpl.nil?  ## This path is used only for unit testing (e.g. MarpaDCDatastream.from_xml(fixture("data.xml")) )
-
-      if !xml.present?
-        tmpl.ng_xml = self.xml_template
-      elsif xml.kind_of? Nokogiri::XML::Node || xml.kind_of?(Nokogiri::XML::Document)
-        tmpl.ng_xml = xml
-      else
-        tmpl.ng_xml = Nokogiri::XML::Document.parse(xml)
-      end
-
-      tmpl.ng_xml_doesnt_change!
-
-      return tmpl
-    end
-    
-    def self.xml_template
-      Nokogiri::XML::Document.parse("<xml/>")
-    end
-
-    def ng_xml 
-      @ng_xml ||= begin
-      if new?
-        ## Load up the template
-        self.class.xml_template
-      else
-        Nokogiri::XML::Document.parse(datastream_content)
-      end
-      end
-    end
-    
-    def ng_xml=(new_xml)
-      # before we set ng_xml, we load the datastream so we know if the new value differs.
-      local_or_remote_content(true)
-
-      case new_xml 
-      when Nokogiri::XML::Document
-        self.content=new_xml.to_xml
-      when  Nokogiri::XML::Node 
-        ## Cast a fragment to a document
-        self.content=new_xml.to_s
-      when String 
-        self.content=new_xml
-      else
-        raise TypeError, "You passed a #{new_xml.class} into the ng_xml of the #{self.dsid} datastream. OmDatastream.ng_xml= only accepts Nokogiri::XML::Document, Nokogiri::XML::Element, Nokogiri::XML::Node, or raw XML (String) as inputs."
-      end
-    end
-    
-    # don't want content eagerly loaded by proxy, so implementing methods that would be implemented by define_attribute_methods 
-    def ng_xml_will_change!
-      changed_attributes['ng_xml'] = nil
-    end
-
-    def ng_xml_doesnt_change!
-      changed_attributes.delete('ng_xml')
-    end
-    
-    # don't want content eagerly loaded by proxy, so implementing methods that would be implemented by define_attribute_methods 
-    def ng_xml_changed?
-      changed_attributes.has_key? 'ng_xml'
-    end
-
     # Indicates that this datastream has metadata content. 
     # @return true 
     def metadata?
       true
     end
 
-    def local_or_remote_content(ensure_fetch = true)
-      @content = to_xml if ng_xml_changed? || autocreate?
-      super
-    end
-
-    def autocreate?
-      changed_attributes.has_key? :profile
-    end
-
-    def datastream_content
-      @datastream_content ||= Nokogiri::XML(super).to_xml  {|config| config.no_declaration}.strip
-    end
-    
-    def content=(new_content)
-      if inline?
-        # inline datastreams may be transformed by fedora 3, so we test for equivalence instead of equality
-        if !EquivalentXml.equivalent?(datastream_content, new_content)
-          ng_xml_will_change! 
-          @ng_xml = Nokogiri::XML::Document.parse(new_content)
-          super(@ng_xml.to_s)
-        end
-      else
-        if datastream_content != new_content
-          ng_xml_will_change! 
-          @ng_xml = Nokogiri::XML::Document.parse(new_content)
-          super(@ng_xml.to_s)
-        end
-      end
-    end
-
-    def content_changed?
-      return false if !xml_loaded
-      super
-    end
-
-    def to_xml(xml = nil)
-      xml = self.ng_xml if xml.nil?
-      ng_xml = self.ng_xml
-      if ng_xml.respond_to?(:root) && ng_xml.root.nil? && self.class.respond_to?(:root_property_ref) && !self.class.root_property_ref.nil?
-        ng_xml = self.class.generate(self.class.root_property_ref, "")
-        if xml.root.nil?
-          xml = ng_xml
-        end
-      end
-
-      unless xml == ng_xml || ng_xml.root.nil?
-        if xml.kind_of?(Nokogiri::XML::Document)
-            xml.root.add_child(ng_xml.root)
-        elsif xml.kind_of?(Nokogiri::XML::Node)
-            xml.add_child(ng_xml.root)
-        else
-            raise "You can only pass instances of Nokogiri::XML::Node into this method.  You passed in #{xml}"
-        end
-      end
-      
-      return xml.to_xml {|config| config.no_declaration}.strip
-    end
-    
     # ** Experimental **
     #
     # This method is called by ActiveFedora::Base.load_instance_from_solr
@@ -172,7 +49,7 @@ module ActiveFedora
     # value returned by the +prefix+ method.
     def to_solr(solr_doc = {})
       prefix = self.prefix
-      super.each_with_object({}) { |(key, value), new| new[[prefix,key].join] = value }
+      solr_doc.merge super({}).each_with_object({}) { |(key, value), new| new[[prefix,key].join] = value }
     end
 
 
@@ -422,9 +299,5 @@ module ActiveFedora
       end
     end
 
-    def xml_loaded
-      instance_variable_defined? :@ng_xml
-    end
-    
   end
 end

data/lib/active_fedora/rdf_datastream.rb

@@ -25,6 +25,10 @@ module ActiveFedora
       end
     end
 
+    def freeze
+      @graph.freeze
+    end
+
     def metadata?
       true
     end

data/lib/active_fedora/rdf_node.rb

@@ -77,6 +77,7 @@ module ActiveFedora
       predicate = options.predicate
       values = Array(values)
 
+      raise "can't modify frozen #{self.class}" if graph.frozen?
       remove_existing_values(subject, predicate, values)
 
       values.each do |arg|

data/lib/active_fedora/rdf_object.rb

@@ -7,13 +7,7 @@ module ActiveFedora
       attr_reader :rdf_subject, :graph
     end
 
-    def graph
-      @graph ||= RDF::Graph.new
-      @graph 
-    end
-
-
-    def initialize(graph, subject=nil)
+    def initialize(graph = RDF::Graph.new, subject=nil)
       subject ||= RDF::Node.new
       @graph = graph
       @rdf_subject = subject

data/lib/active_fedora/relation.rb

@@ -50,35 +50,6 @@ module ActiveFedora
       self
     end
 
-    # Limits the returned records to those that match the provided search conditions
-    #
-    # @option [Hash] opts a hash of solr conditions
-    #
-    # @example
-    #  Person.where(name_t: 'Mario', occupation_s: 'Plumber')
-    #    => [#<Person @id="foo:123" @name='Mario'>, #<Person @id="foo:125" @name='Mario'>, ...]
-    def where(opts)
-      return self if opts.blank?
-      relation = clone
-      relation.where_values = opts
-      relation
-    end
-
-    # Order the returned records by the field and direction provided
-    #
-    # @option [Array<String>] args a list of fields and directions to sort by 
-    #
-    # @example
-    #  Person.where(occupation_s: 'Plumber').order('name_t desc', 'color_t asc')
-    #    => [#<Person @id="foo:123" @name='Luigi'>, #<Person @id="foo:125" @name='Mario'>, ...]
-    def order(*args)
-      return self if args.blank?
-
-      relation = clone
-      relation.order_values += args.flatten
-      relation
-    end
-
     def to_a
       return @records if loaded?
       args = @klass == ActiveFedora::Base ? {:cast=>true} : {}

data/lib/active_fedora/relation/query_methods.rb

@@ -37,6 +37,42 @@ module ActiveFedora
       @values[:limit] = value
     end   
 
+    # Limits the returned records to those that match the provided search conditions
+    #
+    # @option [Hash] opts a hash of solr conditions
+    #
+    # @example
+    #  Person.where(name_t: 'Mario', occupation_s: 'Plumber')
+    #    => [#<Person @id="foo:123" @name='Mario'>, #<Person @id="foo:125" @name='Mario'>, ...]
+    def where(values)
+      spawn.where!(values)
+    end
+
+    def where!(values)
+      if values.is_a?(String)
+        self.where_values = values
+      else
+        self.where_values = self.where_values.merge(values)
+      end
+      self
+    end
+
+    # Order the returned records by the field and direction provided
+    #
+    # @option [Array<String>] args a list of fields and directions to sort by 
+    #
+    # @example
+    #  Person.where(occupation_s: 'Plumber').order('name_t desc', 'color_t asc')
+    #    => [#<Person @id="foo:123" @name='Luigi'>, #<Person @id="foo:125" @name='Mario'>, ...]
+    def order(*args)
+      spawn.order!(args)
+    end
+
+    def order!(*args)
+      self.order_values += args.flatten
+      self
+    end
+
     # Limits the number of returned records to the value specified
     #
     # @option [Integer] value the number of records to return

data/lib/active_fedora/simple_datastream.rb

@@ -63,6 +63,7 @@ module ActiveFedora
     end
     
     def update_indexed_attributes(params={}, opts={})
+      raise "can't modify frozen #{self.class}" if frozen?
       # if the params are just keys, not an array, make then into an array.
       new_params = {}
       params.each do |key, val|

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "7.0.0.rc1"
+  VERSION = "7.0.0.rc2"
 end

data/spec/integration/base_spec.rb

@@ -21,7 +21,8 @@ describe "A base object with metadata" do
       obj.foo.should_not be_new
       obj.foo.person.should == ['bob']
       person_field = ActiveFedora::SolrService.solr_name('person', type: :string)
-      ActiveFedora::SolrService.query("{!raw f=id}#{@obj.pid}", :fl=>"id #{person_field}").first.should == {"id"=>@obj.pid, person_field =>['bob']}
+      solr_result = ActiveFedora::SolrService.query("{!raw f=id}#{@obj.pid}", :fl=>"id #{person_field}").first
+      expect(solr_result).to eq("id"=>@obj.pid, person_field =>['bob'])
     end
   end
 

data/spec/integration/om_datastream_spec.rb

@@ -7,7 +7,7 @@ describe ActiveFedora::OmDatastream do
     before(:all) do 
       class ModsArticle3 < ActiveFedora::Base
         # Uses the Hydra MODS Article profile for tracking most of the descriptive metadata
-        has_metadata :name => "descMetadata", :type => Hydra::ModsArticleDatastream, :control_group => 'X', :autocreate => true
+        has_metadata "descMetadata", type: Hydra::ModsArticleDatastream, control_group: 'X', autocreate: true
       end
     end
 
@@ -56,7 +56,7 @@ describe ActiveFedora::OmDatastream do
     before(:all) do
       class ModsArticle2 < ActiveFedora::Base
         # Uses the Hydra MODS Article profile for tracking most of the descriptive metadata
-        has_metadata :name => "descMetadata", :type => Hydra::ModsArticleDatastream, :autocreate => true
+        has_metadata "descMetadata", type: Hydra::ModsArticleDatastream, autocreate: true
       end
     end
 

data/spec/integration/scoped_query_spec.rb

@@ -81,6 +81,10 @@ describe "scoped queries" do
         ModelIntegrationSpec::Basic.where(ActiveFedora::SolrService.solr_name('bar', type: :string) => 'Peanuts').order(ActiveFedora::SolrService.solr_name('foo', :sortable) + ' asc').limit(1).should == [test_instance2]
       end
 
+      it "should chain where queries" do
+        ModelIntegrationSpec::Basic.where(ActiveFedora::SolrService.solr_name('bar', type: :string) => 'Peanuts').where(ActiveFedora::SolrService.solr_name('foo', type: :string) => 'bar').where_values.should == {ActiveFedora::SolrService.solr_name('bar', type: :string) => 'Peanuts', ActiveFedora::SolrService.solr_name('foo', type: :string) => 'bar'}
+      end
+
       it "should chain count" do
         ModelIntegrationSpec::Basic.where(ActiveFedora::SolrService.solr_name('bar', type: :string) => 'Peanuts').count.should == 2 
       end
@@ -90,6 +94,15 @@ describe "scoped queries" do
         expect {relation.first}.not_to change {relation.to_a.size}
       end
 
+      it "calling where should not affect the relation's ability to get all results later" do
+        relation = ModelIntegrationSpec::Basic.where(ActiveFedora::SolrService.solr_name('bar', type: :string) => 'Peanuts')
+        expect {relation.where(ActiveFedora::SolrService.solr_name('foo', type: :string) => 'bar')}.not_to change {relation.to_a.size}
+      end
+
+      it "calling order should not affect the original order of the relation later" do
+        relation = ModelIntegrationSpec::Basic.order(ActiveFedora::SolrService.solr_name('foo', :sortable) + ' asc')
+        expect {relation.order(ActiveFedora::SolrService.solr_name('foo', :sortable) + ' desc')}.not_to change {relation.to_a}
+      end
     end
 
     describe "when one of the objects in solr isn't in fedora" do

data/spec/samples/hydra-mods_article_datastream.rb

@@ -506,7 +506,7 @@ module Hydra
       end
 
     def to_solr(solr_doc=Hash.new)
-      super(solr_doc)
+      solr_doc = super(solr_doc)
             
       ::Solrizer::Extractor.insert_solr_field_value(solr_doc, Solrizer.default_field_mapper.solr_name('object_type', :facetable), "Article")
       ::Solrizer::Extractor.insert_solr_field_value(solr_doc, Solrizer.default_field_mapper.solr_name('mods_journal_title_info', :facetable), "Unknown") if solr_doc["mods_journal_title_info_facet"].nil? 

data/spec/unit/datastream_spec.rb

@@ -19,47 +19,6 @@ describe ActiveFedora::Datastream do
     @test_datastream.inspect.should match /#<ActiveFedora::Datastream @pid=\"\" @dsid=\"abcd\" @controlGroup=\"M\" changed=\"true\" @mimeType=\"\" >/
   end
 
-  describe '#validate_content_present' do
-    before :each do
-      @test_datastream.content = nil
-      @test_datastream.dsLocation = nil
-    end
-
-    it "should expect content on an Inline (X) datastream" do
-      @test_datastream.controlGroup = 'X'
-      @test_datastream.dsLocation = "http://example.com/test/content/abcd"
-      @test_datastream.validate_content_present.should be_false
-      @test_datastream.content = "<foo><xmlelement/></foo>"
-      @test_datastream.validate_content_present.should be_true
-    end
-
-    it "should expect content on a Managed (M) datastream" do
-      @test_datastream.controlGroup = 'M'
-      @test_datastream.dsLocation = "http://example.com/test/content/abcd"
-      @test_datastream.validate_content_present.should be_false
-      @test_datastream.content = "<foo><xmlelement/></foo>"
-      @test_datastream.validate_content_present.should be_true
-      @test_datastream.should_not be_external
-    end
-
-    it "should expect a dsLocation on an External (E) datastream" do
-      @test_datastream.controlGroup = 'E'
-      @test_datastream.content = "<foo><xmlelement/></foo>"
-      @test_datastream.validate_content_present.should be_false
-      @test_datastream.dsLocation = "http://example.com/test/content/abcd"
-      @test_datastream.validate_content_present.should be_true
-      @test_datastream.should be_external
-    end
-
-    it "should expect a dsLocation on a Redirect (R) datastream" do
-      @test_datastream.controlGroup = 'R'
-      @test_datastream.content = "<foo><xmlelement/></foo>"
-      @test_datastream.validate_content_present.should be_false
-      @test_datastream.dsLocation = "http://example.com/test/content/abcd"
-      @test_datastream.validate_content_present.should be_true
-    end
-  end
-  
   it "should have mimeType accessors" do
     ds1 = ActiveFedora::Datastream.new
     ds1.mimeType = "text/foo"