active-fedora 3.0.0 → 3.0.1

data/History.txt

@@ -1,3 +1,7 @@
+3.0.1
+
+HYDRA-654 -- Fixed reification using has_model as the class instead of active_fedora_model
+
 3.0.0
 
 added belongs_to and has_many model relationships

data/lib/active_fedora.rb

@@ -292,6 +292,7 @@ module ActiveFedora
   class PredicateMappingsNotFoundError < RuntimeError; end # :nodoc:
   class UnknownAttributeError < NoMethodError; end; # :nodoc:
   class ActiveFedoraConfigurationException < Exception; end # :nodoc:
+  class AssociationTypeMismatch < RuntimeError; end # :nodoc:
 
 end
 

data/lib/active_fedora/datastream.rb

@@ -21,6 +21,7 @@ module ActiveFedora
     #set this Datastream's content
     def content=(content)
       self.blob = content
+      self.dirty = true
     end
 
     def self.delete(parent_pid, dsid)

data/lib/active_fedora/nokogiri_datastream.rb

@@ -14,7 +14,8 @@ class ActiveFedora::NokogiriDatastream < ActiveFedora::Datastream
   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)
   
-  attr_accessor :ng_xml, :internal_solr_doc
+  attr_accessor :internal_solr_doc
+  attr_reader :ng_xml
   
   #constructor, calls up to ActiveFedora::Datastream's constructor
   def initialize(attrs=nil)
@@ -43,22 +44,22 @@ class ActiveFedora::NokogiriDatastream < ActiveFedora::Datastream
     Nokogiri::XML::Document.parse("<xml/>")
   end
   
-  # class << self
-  #   from_xml_original = self.instance_method(:from_xml)
-  #   
-  #   define_method(:from_xml, xml, tmpl=self.new) do
-  #     from_xml_original.bind(self).call(xml, tmpl)
-  #     tmpl.send(:dirty=, false)
-  #   end
-  #   
-  #   # def from_xml_custom(xml, tmpl=self.new)
-  #   #   from_xml_original(xml, tmpl)
-  #   #   tmpl.send(:dirty=, false)
-  #   # end
-  #   # 
-  #   # alias_method :from_xml_original, :from_xml 
-  #   # alias_method :from_xml, :from_xml_custom
-  # end
+  def ng_xml=(new_xml)
+    case new_xml 
+    when Nokogiri::XML::Document, Nokogiri::XML::Element, Nokogiri::XML::Node
+      @ng_xml = new_xml
+    when String 
+      @ng_xml = Nokogiri::XML::Document.parse(new_xml)
+    else
+      raise TypeError, "You passed a #{new_xml.class} into the ng_xml of the #{self.dsid} datastream. NokogiriDatastream.ng_xml= only accepts Nokogiri::XML::Document, Nokogiri::XML::Element, Nokogiri::XML::Node, or raw XML (String) as inputs."
+    end
+    self.dirty = true
+  end
+  
+  def content=(content)
+    super
+    self.ng_xml = Nokogiri::XML::Document.parse(content)
+  end
   
   
   def to_xml(xml = self.ng_xml)

data/lib/active_fedora/solr_service.rb

@@ -32,12 +32,7 @@ module ActiveFedora
       end
       results = []
       solr_result.hits.each do |hit|
-        model_value = hit[solr_name("active_fedora_model", :symbol)].first
-        if model_value.include?("::")
-          classname = eval(model_value)
-        else
-          classname = Kernel.const_get(model_value)
-        end
+        classname = class_from_solr_document(hit)
         if opts[:load_from_solr]
           results << classname.load_instance_from_solr(hit[SOLR_DOCUMENT_ID])
         else
@@ -46,6 +41,22 @@ module ActiveFedora
       end
       return results
     end
+  
+    def self.class_from_solr_document(hit)
+        model_value = hit[solr_name("has_model", :symbol)].first
+        if match_data = /info:fedora\/afmodel:(.+)$/.match(model_value)
+          model_value = match_data[1]
+          model_value.gsub!('_', '::')
+        else
+          raise "has_model assertion incorrectly formatted: #{model_value}"
+        end
+
+        if model_value.include?("::")
+          eval(model_value)
+        else
+          Kernel.const_get(model_value)
+        end
+    end
     
     # Construct a solr query for a list of pids
     # This is used to get a solr response based on the list of pids in an object's RELS-EXT relationhsips

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.0.0"
+    VERSION = "3.0.1"
 end

data/spec/unit/active_fedora_spec.rb

@@ -26,7 +26,6 @@ describe ActiveFedora do
       it "should use config_options[:environment] if set" do
         ActiveFedora.expects(:config_options).at_least_once.returns(:environment=>"ballyhoo")
         ActiveFedora.environment.should eql("ballyhoo")
-        ENV['environment']='test'
       end
 
       it "should use Rails.env if no config_options and Rails.env is set" do

data/spec/unit/datastream_spec.rb

@@ -60,6 +60,17 @@ describe ActiveFedora::Datastream do
     end
   end
   
+  describe '.content=' do
+    it "should update the content and ng_xml, marking the datastream as dirty" do
+      sample_xml = "<foo><xmlelement/></foo>"
+      @test_datastream.should_not be_dirty
+      @test_datastream.blob.should_not be_equivalent_to(sample_xml)
+      @test_datastream.content = sample_xml
+      @test_datastream.should be_dirty
+      @test_datastream.blob.should be_equivalent_to(sample_xml)
+    end
+  end
+  
   describe ".dirty?" do
     it "should return the value of the @dirty attribute" do
       @test_datastream.dirty.should equal(@test_datastream.dirty?)

data/spec/unit/nokogiri_datastream_spec.rb

@@ -10,7 +10,7 @@ describe ActiveFedora::NokogiriDatastream do
                       :empty_field => {:values => {}}
                       } 
     @sample_xml = XmlSimple.xml_in("<fields><coverage>coverage1</coverage><coverage>coverage2</coverage><creation_date>fake-date</creation_date><mydate>fake-date</mydate><publisher>publisher1</publisher></fields>")
-
+    @sample_raw_xml = "<foo><xmlelement/></foo>"
     @solr_doc = {"id"=>"hydrange_article1","name_role_roleTerm_t"=>["creator","submitter","teacher"],"name_0_role_t"=>"\r\ncreator\r\nsubmitter\r\n","name_1_role_t"=>"\r\n teacher \r\n","name_0_role_0_roleTerm_t"=>"creator","name_0_role_1_roleTerm_t"=>"submitter","name_1_role_0_roleTerm_t"=>["teacher"]}
   end
   
@@ -35,8 +35,8 @@ describe ActiveFedora::NokogiriDatastream do
       test_ds1.ng_xml.to_xml.should == "<?xml version=\"1.0\"?>\n<xml>\n  <foo/>\n</xml>\n"
     end
     it "should initialize from #xml_template if no xml is provided" do
-      ActiveFedora::NokogiriDatastream.expects(:xml_template).returns("fake template")
-      ActiveFedora::NokogiriDatastream.new.ng_xml.should == "fake template"
+      ActiveFedora::NokogiriDatastream.expects(:xml_template).returns("<fake template/>")
+      ActiveFedora::NokogiriDatastream.new.ng_xml.should be_equivalent_to("<fake template/>")
     end
   end
   
@@ -234,6 +234,32 @@ describe ActiveFedora::NokogiriDatastream do
     end
   end
   
+  describe '.content=' do
+    it "should update the content and ng_xml, marking the datastream as dirty" do
+      @test_ds.should_not be_dirty
+      @test_ds.blob.should_not be_equivalent_to(@sample_raw_xml)
+      @test_ds.ng_xml.to_xml.should_not be_equivalent_to(@sample_raw_xml)
+      @test_ds.content = @sample_raw_xml
+      @test_ds.should be_dirty
+      @test_ds.blob.should be_equivalent_to(@sample_raw_xml)
+      @test_ds.ng_xml.to_xml.should be_equivalent_to(@sample_raw_xml)
+    end
+  end
+  
+  describe 'ng_xml=' do
+    it "should parse raw xml for you" do
+      @test_ds.ng_xml.to_xml.should_not be_equivalent_to(@sample_raw_xml)
+      @test_ds.ng_xml = @sample_raw_xml
+      @test_ds.ng_xml.class.should == Nokogiri::XML::Document
+      @test_ds.ng_xml.to_xml.should be_equivalent_to(@sample_raw_xml)
+    end
+    it "should mark the datastream as dirty" do
+      @test_ds.should_not be_dirty
+      @test_ds.ng_xml = @sample_raw_xml
+      @test_ds.should be_dirty
+    end
+  end
+  
   describe '.to_xml' do
     it "should provide .to_xml" do
       @test_ds.should respond_to(:to_xml)

data/spec/unit/semantic_node_spec.rb

@@ -25,9 +25,9 @@ describe ActiveFedora::SemanticNode do
   before(:all) do
     @pid = "test:sample_pid"
     @uri = "info:fedora/#{@pid}"
-    @sample_solr_hits = [{"id"=>"_PID1_", "active_fedora_model_s"=>["AudioRecord"]},
-                          {"id"=>"_PID2_", "active_fedora_model_s"=>["AudioRecord"]},
-                          {"id"=>"_PID3_", "active_fedora_model_s"=>["AudioRecord"]}]
+    @sample_solr_hits = [{"id"=>"_PID1_", "has_model_s"=>["info:fedora/afmodel:AudioRecord"]},
+                          {"id"=>"_PID2_", "has_model_s"=>["info:fedora/afmodel:AudioRecord"]},
+                          {"id"=>"_PID3_", "has_model_s"=>["info:fedora/afmodel:AudioRecord"]}]
   end
   
   before(:each) do
@@ -347,7 +347,11 @@ describe ActiveFedora::SemanticNode do
         local_node.expects(:outbound_relationships).returns({:is_member_of => ["my:_PID1_", "my:_PID2_", "my:_PID3_"]}).times(2)      
         mock_repo = mock("repo")
         solr_result = mock("solr result", :is_a? => true)
-        solr_result.expects(:hits).returns([{"id"=> "my:_PID1_", "active_fedora_model_s" => ["SpecNode"]}, {"id"=> "my:_PID2_", "active_fedora_model_s" => ["SpecNode"]}, {"id"=> "my:_PID3_", "active_fedora_model_s" => ["SpecNode"]}])
+        solr_result.expects(:hits).returns(
+                      [{"id"=> "my:_PID1_", "has_model_s"=>["info:fedora/afmodel:SpecNode"]},
+                       {"id"=> "my:_PID2_", "has_model_s"=>["info:fedora/afmodel:SpecNode"]}, 
+                       {"id"=> "my:_PID3_", "has_model_s"=>["info:fedora/afmodel:SpecNode"]}])
+
         ActiveFedora::SolrService.instance.conn.expects(:query).with("id:my\\:_PID1_ OR id:my\\:_PID2_ OR id:my\\:_PID3_").returns(solr_result)
         mock_repo.expects(:find_model).with("my:_PID1_", SpecNode).returns("AR1")
         mock_repo.expects(:find_model).with("my:_PID2_", SpecNode).returns("AR2")

data/spec/unit/solr_service_spec.rb

@@ -47,9 +47,9 @@ describe ActiveFedora::SolrService do
   
   describe "#reify_solr_results" do
     before(:each) do
-      @sample_solr_hits = [{"id"=>"my:_PID1_", "active_fedora_model_s"=>["AudioRecord"]},
-                            {"id"=>"my:_PID2_", "active_fedora_model_s"=>["AudioRecord"]},
-                            {"id"=>"my:_PID3_", "active_fedora_model_s"=>["AudioRecord"]}]
+      @sample_solr_hits = [{"id"=>"my:_PID1_", "has_model_s"=>["info:fedora/afmodel:AudioRecord"]},
+                            {"id"=>"my:_PID2_", "has_model_s"=>["info:fedora/afmodel:AudioRecord"]},
+                            {"id"=>"my:_PID3_", "has_model_s"=>["info:fedora/afmodel:AudioRecord"]}]
     end
     it "should only take Solr::Response::Standard objects as input" do
       mocko = mock("input", :is_a? => false)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 3
   - 0
-  - 0
-  version: 3.0.0
+  - 1
+  version: 3.0.1
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-02 00:00:00 -05:00
+date: 2011-09-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency