active-fedora 2.3.8 → 3.0.0

data/spec/integration/nested_attribute_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe "NestedAttribute behavior" do
+  before do
+    class Bar < ActiveFedora::Base
+      belongs_to :car, :property=>:has_member
+      has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"someData" do |m|
+        m.field "uno", :string
+        m.field "dos", :string
+      end
+      delegate :uno, :to=>'someData', :unique=>true
+      delegate :dos, :to=>'someData', :unique=>true
+    end
+    class Car < ActiveFedora::Base
+      has_many :bars, :property=>:has_member
+      accepts_nested_attributes_for :bars#, :allow_destroy=>true
+    end
+
+    @car = Car.new
+    @car.save
+    @bar1 = Bar.new(:car=>@car)
+    @bar1.save
+
+    @bar2 = Bar.new(:car=>@car)
+    @bar2.save
+
+  end
+
+  it "should update the child objects" do
+    @car.attributes = {:bars_attributes=>[{:id=>@bar1.pid, :uno=>"bar1 uno"}, {:uno=>"newbar uno"}, {:id=>@bar2.pid, :_destroy=>'1', :uno=>'bar2 uno'}]}
+    Bar.find(@bar1.pid).uno.should == 'bar1 uno'
+    # pending the fix of nested_attributes_options
+    #Bar.find(@bar2.pid).should be_nil
+
+  end
+
+    
+
+
+end

data/spec/integration/repository_spec.rb

@@ -140,8 +140,6 @@ end
 describe Fedora::Repository, "find_objects" do
   before(:all) do
     Fedora::Repository.register(ActiveFedora.fedora_config[:url])
-    @mock_response = mock("Response")
-    @mock_response.stubs(:body).returns(sample_response_xml)
   end
   
   def fields_to_s(fields)
@@ -158,33 +156,31 @@ describe Fedora::Repository, "find_objects" do
   
   it "should include all fields by default" do
     when_find_objects('label~Image*') { |conn|
-      conn.expects(:get).with('/fedora/objects?query=label%7EImage%2A&resultFormat=xml' + fields_to_s(Fedora::ALL_FIELDS)).returns(@mock_response)
+      conn.expects(:get).with('/fedora/objects?query=label%7EImage%2A&resultFormat=xml' + fields_to_s(Fedora::ALL_FIELDS))
     }
   end
   
   it "should include all fields when :include => :all " do
     when_find_objects('label~Image*', :include => :all) { |conn|
-      conn.expects(:get).with('/fedora/objects?query=label%7EImage%2A&resultFormat=xml' + fields_to_s(Fedora::ALL_FIELDS)).returns(@mock_response)
+      conn.expects(:get).with('/fedora/objects?query=label%7EImage%2A&resultFormat=xml' + fields_to_s(Fedora::ALL_FIELDS))
     }
   end
   
   it "should fetch results with limit" do
     when_find_objects('label~Image*', :limit => 10) { |conn|
-      conn.expects(:get).with('/fedora/objects?maxResults=10&query=label%7EImage%2A&resultFormat=xml' + fields_to_s(Fedora::ALL_FIELDS)).returns(@mock_response)
+      conn.expects(:get).with('/fedora/objects?maxResults=10&query=label%7EImage%2A&resultFormat=xml' + fields_to_s(Fedora::ALL_FIELDS))
     }
   end
   
   it "should fetch results with some fields but not :pid" do
     when_find_objects('label~Image*', :select => [:label, :mDate]) { |conn|
-      conn.expects(:get).with('/fedora/objects?query=label%7EImage%2A&resultFormat=xml' + fields_to_s([:pid, :label, :mDate])).returns(@mock_response)
-
+      conn.expects(:get).with('/fedora/objects?query=label%7EImage%2A&resultFormat=xml' + fields_to_s([:pid, :label, :mDate]))
     }
   end
   
   it "should fetch results with some fields with :pid" do
     when_find_objects('label~Image*', :select => [:pid, :label, :mDate]) { |conn|
-      conn.expects(:get).with('/fedora/objects?query=label%7EImage%2A&resultFormat=xml' + fields_to_s([:pid, :label, :mDate])).returns(@mock_response)
-
+      conn.expects(:get).with('/fedora/objects?query=label%7EImage%2A&resultFormat=xml' + fields_to_s([:pid, :label, :mDate]))
     }
   end
   
@@ -207,7 +203,7 @@ describe Fedora::Repository, "find_objects" do
   it "should convert xml response with 0 objectFields into array of FedoraObject" do
     objects = when_find_objects('label~Image*', :select => [:pid, :label, :mDate]) { |conn|
       conn.expects(:get).with('/fedora/objects?query=label%7EImage%2A&resultFormat=xml' + fields_to_s([:pid, :label, :mDate])).
-        returns(@mock_response)
+        returns(Fedora::XmlFormat.decode(sample_response_xml))
     }
     
     objects.session_token.should == 'aToken'
@@ -217,7 +213,7 @@ describe Fedora::Repository, "find_objects" do
   it "should return FedoraObjects with new_object set to false" do
     objects = when_find_objects('label~Image*', :select => [:pid, :label, :mDate]) { |conn|
       conn.expects(:get).with('/fedora/objects?query=label%7EImage%2A&resultFormat=xml' + fields_to_s([:pid, :label, :mDate])).
-        returns(@mock_response)
+        returns(Fedora::XmlFormat.decode(sample_response_xml))
     }
     objects.each do |obj|
       obj.should_not be_new_object
@@ -228,7 +224,7 @@ describe Fedora::Repository, "find_objects" do
   it "should convert xml response with single objectFields into array of FedoraObject" do
     objects = when_find_objects('label~Image*', :select => [:pid, :label, :mDate]) { |conn|
       conn.expects(:get).with('/fedora/objects?query=label%7EImage%2A&resultFormat=xml' + fields_to_s([:pid, :label, :mDate])).
-        returns(@mock_response)
+        returns(Fedora::XmlFormat.decode(sample_response_xml(1)))
     }
     
     objects.session_token.should == 'aToken'
@@ -238,10 +234,9 @@ describe Fedora::Repository, "find_objects" do
   end
   
   it "should convert xml response 2 objectFields into array of FedoraObject" do
-    @mock_response.stubs(:body).returns(sample_response_xml(2))
     objects = when_find_objects('label~Image*', :select => [:pid, :label, :mDate]) { |conn|
       conn.expects(:get).with('/fedora/objects?query=label%7EImage%2A&resultFormat=xml' + fields_to_s([:pid, :label, :mDate])).
-        returns(@mock_response)
+        returns(Fedora::XmlFormat.decode(sample_response_xml(2)))
     }
     
     objects.session_token.should == 'aToken'

data/spec/integration/semantic_node_spec.rb

@@ -6,6 +6,7 @@ describe ActiveFedora::SemanticNode do
   
   before(:all) do 
     class SpecNode
+      include ActiveFedora::RelationshipsHelper
       include ActiveFedora::SemanticNode
       has_relationship "collection_members", :has_collection_member
     end
@@ -430,6 +431,7 @@ describe ActiveFedora::SemanticNode do
   #putting this test here instead of relationships_helper because testing that relationships_by_name hash gets refreshed if the relationships hash is changed
   describe "relationships_by_name" do
     class MockSemNamedRelationships 
+      include ActiveFedora::RelationshipsHelper
       include ActiveFedora::SemanticNode
       has_relationship "testing", :has_part
       has_relationship "testing2", :has_member

data/spec/spec_helper.rb

@@ -14,10 +14,8 @@ end
 ENV["RAILS_ENV"] ||= 'test'
 RAILS_ENV = ENV["RAILS_ENV"]
 
-logger.level = Logger::WARN if logger.respond_to? :level ###MediaShelf StubLogger doesn't have a level= method
-
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-Dir[File.join(File.dirname(__FILE__)+'/../lib/')+'**/*.rb'].each{|x| require x unless x.match(/railtie.rb$/)}
+#Dir[File.join(File.dirname(__FILE__)+'/../lib/')+'**/*.rb'].each{|x| require x unless x.match(/railtie.rb$/)}
 $VERBOSE=nil
 
 # This loads the Fedora and Solr config info from /config/fedora.yml

data/spec/unit/active_fedora_spec.rb

@@ -26,6 +26,7 @@ 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
@@ -243,7 +244,7 @@ describe ActiveFedora do
 #ActiveFedora.config_path.should eql("#{@fake_rails_root}/config/fake_fedora.yml")
     end
     it "raises an error if you pass in a non-existant config file" do
-      lambda{ ActiveFedora.init("really_fake_fedora.yml") }.should raise_exception(ActiveFedoraConfigurationException)
+      lambda{ ActiveFedora.init("really_fake_fedora.yml") }.should raise_exception(ActiveFedora::ActiveFedoraConfigurationException)
     end
     
     describe "within Rails" do

data/spec/unit/association_proxy_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe ActiveFedora::Associations::AssociationProxy do
+  it "should delegate to_param" do
+    @owner = stub(:new_record? => false)
+    @assoc = ActiveFedora::Associations::AssociationProxy.new(@owner, @reflection)
+    @assoc.expects(:find_target).returns(stub(:to_param => '1234'))
+    @assoc.send(:load_target)
+    @assoc.to_param.should == '1234'
+  
+  end
+
+end

data/spec/unit/base_active_model_spec.rb

@@ -0,0 +1,61 @@
+require File.join( File.dirname(__FILE__), "../spec_helper" )
+
+describe ActiveFedora::Base do
+
+  describe "active model methods" do 
+    class BarStream < ActiveFedora::NokogiriDatastream 
+      set_terminology do |t|
+        t.root(:path=>"first", :xmlns=>"urn:foobar")
+        t.duck()
+      end
+
+      def self.xml_template
+            Nokogiri::XML::Document.parse '<first xmlns="urn:foobar"> 
+              <duck></duck>
+            </first>'
+      end
+    end
+
+    class BarHistory < 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
+      has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"withText2", :label=>"withLabel" do |m|
+        m.field "fubar", :text
+      end 
+
+      has_metadata :type=>BarStream, :name=>"xmlish"
+      delegate :fubar, :to=>'withText', :unique=>true
+      delegate :duck, :to=>'xmlish', :unique=>true
+    end
+    before :each do
+      @n = BarHistory.new(:pid=>"monkey:99")
+    end
+    describe "attributes=" do
+      it "should set attributes" do
+        @n.attributes = {:fubar=>"baz", :duck=>"Quack"}
+        @n.fubar.should == "baz"
+        @n.withText.get_values(:fubar).first.should == 'baz'
+        @n.duck.should == "Quack"
+        @n.xmlish.term_values(:duck).first.should == 'Quack'
+      end
+    end
+    describe "update_attributes" do
+      it "should set attributes and save " do
+        @n.update_attributes(:fubar=>"baz", :duck=>"Quack")
+        @q = BarHistory.find('monkey:99')
+        @q.fubar.should == "baz"
+        @q.duck.should == "Quack"
+      end
+      after do
+        @n.delete
+      end
+    end
+
+  end
+end
+

data/spec/unit/base_delegate_spec.rb

@@ -0,0 +1,59 @@
+require File.join( File.dirname(__FILE__), "../spec_helper" )
+
+describe ActiveFedora::Base do
+
+  describe "first level delegation" do 
+    class BarStream2 < ActiveFedora::NokogiriDatastream 
+      set_terminology do |t|
+        t.root(:path=>"first", :xmlns=>"urn:foobar")
+        t.duck()
+        t.cow()
+      end
+
+      def self.xml_template
+            Nokogiri::XML::Document.parse '<first xmlns="urn:foobar"> 
+              <duck></duck>
+              <cow></cow>
+            </first>'
+      end
+    end
+
+    class BarHistory2 < ActiveFedora::Base
+      has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"someData" do |m|
+        m.field "fubar", :string
+        m.field "bandana", :string
+        m.field "swank", :text
+      end
+      has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"withText" do |m|
+        m.field "fubar", :text
+      end
+      has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"withText2", :label=>"withLabel" do |m|
+        m.field "fubar", :text
+      end 
+
+      has_metadata :type=>BarStream2, :name=>"xmlish"
+      delegate :fubar, :to=>'withText', :unique=>true
+      delegate :duck, :to=>'xmlish', :unique=>true
+      delegate :cow, :to=>'xmlish'
+    end
+    before :each do
+      @n = BarHistory2.new(:pid=>"monkey:99")
+    end
+    it "should save a delegated property uniquely" do
+      @n.fubar="Quack"
+      @n.fubar.should == "Quack"
+      @n.withText.get_values(:fubar).first.should == 'Quack'
+      @n.duck="Quack"
+      @n.duck.should == "Quack"
+      @n.xmlish.term_values(:duck).first.should == 'Quack'
+    end
+    it "should return an array if not marked as unique" do
+      ### Metadata datastream does not appear to support multiple value setting
+      @n.cow=["one", "two"]
+      @n.cow.should == ["one", "two"]
+    end
+
+  end
+end
+
+

data/spec/unit/base_spec.rb

@@ -5,7 +5,6 @@ require 'active_fedora/base'
 require 'active_fedora/metadata_datastream'
 require 'time'
 require 'date'
-
 class FooHistory < ActiveFedora::Base
   has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"someData" do |m|
     m.field "fubar", :string
@@ -49,6 +48,13 @@ describe ActiveFedora::Base do
       result.inner_object.should be_kind_of(Fedora::FedoraObject)    
     end
 
+    it "should allow initialization with nil" do  
+      # for doing AFObject.new(params[:foo]) when nothing is in params[:foo]
+      Fedora::Repository.instance.expects(:save).never
+      result = ActiveFedora::Base.new(nil)  
+      result.inner_object.should be_kind_of(Fedora::FedoraObject)    
+    end
+
   end
 
   describe ".internal_uri" do
@@ -57,10 +63,35 @@ describe ActiveFedora::Base do
     end
   end
 
-  it "should have to_param" do
+  ### Methods for ActiveModel::Conversions
+  it "should have to_param once it's saved" do
+    @test_object.to_param.should be_nil
+    @test_object.expects(:create).returns(true)
+    @test_object.save
     @test_object.to_param.should == @test_object.pid
   end
 
+  it "should have to_key once it's saved" do 
+    @test_object.to_key.should be_nil
+    @test_object.expects(:create).returns(true)
+    @test_object.save
+    @test_object.to_key.should == [@test_object.pid]
+  end
+
+  it "should have to_model" do
+    @test_object.to_model.should be @test_object
+  end
+  ### end ActiveModel::Conversions
+
+  ### Methods for ActiveModel::Naming
+  it "Should know the model_name" do
+    FooHistory.model_name.should == 'FooHistory'
+    FooHistory.model_name.human.should == 'Foo history'
+  end
+  ### End ActiveModel::Naming 
+  
+ 
+
   it "should respond_to has_metadata" do
     ActiveFedora::Base.respond_to?(:has_metadata).should be_true
   end
@@ -87,6 +118,8 @@ describe ActiveFedora::Base do
 
   end
 
+
+
   describe ".fields" do
     it "should provide fields" do
       @test_object.should respond_to(:fields)
@@ -234,10 +267,13 @@ describe ActiveFedora::Base do
   describe '.save' do
     
     
-    it "should return true if object and datastreams all save successfully" do
+    it "should return true and set persisted if object and datastreams all save successfully" do
+      @test_object.persisted?.should be false 
       @test_object.expects(:create).returns(true)
       @test_object.save.should == true
+      @test_object.persisted?.should be true
     end
+
     
     it "should raise an exception if object fails to save" do
       server_response = mock("Server Error")
@@ -436,6 +472,7 @@ describe ActiveFedora::Base do
     end
     
   end
+  
 
   describe ".update_index" do
     it "should provide .update_index" do
@@ -509,65 +546,15 @@ describe ActiveFedora::Base do
   
   describe "update_attributes" do
 
-    it "should call .update_attributes on all metadata datastreams & nokogiri datastreams" do
+    it "should set the attributes and save" do
       m = FooHistory.new
-      att= {"fubar"=>{"-1"=>"mork", "0"=>"york", "1"=>"mangle"}}
+      att= {"fubar"=> '1234', "baz" =>'stuff'}
       
-      m.metadata_streams.each {|ds| ds.expects(:update_attributes)}
+      m.expects(:fubar=).with('1234')
+      m.expects(:baz=).with('stuff')
+      m.expects(:save)
       m.update_attributes(att)
     end
-    
-    it "should be able to update attr on text fields" do
-      m = FooHistory.new
-      m.should_not be_nil
-      m.datastreams['someData'].swank_values.should == []
-      m.update_attributes(:swank=>'baz')
-      m.should_not be_nil
-      m.datastreams['someData'].swank_values.should == ['baz']
-    end
-
-    it "should have update_attributes" do
-      n = FooHistory.new
-      n.update_attributes(:fubar=>'baz')
-      n.datastreams["someData"].fubar_values.should == ['baz']
-      n.update_attributes('fubar'=>'bak')
-      n.datastreams["someData"].fubar_values.should == ['bak']
-      #really? should it hit all matching datastreams?
-      n.datastreams["withText"].fubar_values.should == ['bak']
-    end
-
-    it "should allow deleting of values" do
-      n = FooHistory.new
-      n.datastreams["someData"].fubar_values.should == []
-      n.update_attributes(:fubar=>'baz')
-      n.datastreams["someData"].fubar_values.should == ['baz']
-      n.update_attributes(:fubar=>:delete)
-      n.datastreams["someData"].fubar_values.should == []
-      n.update_attributes(:fubar=>'baz')
-      n.datastreams["someData"].fubar_values.should == ['baz']
-      n.update_attributes(:fubar=>"")
-      n.datastreams["someData"].fubar_values.should == []
-    end
-    
-    it "should take a :datastreams argument" do 
-      m = FooHistory.new
-      m.should_not be_nil
-      m.datastreams['someData'].fubar_values.should == []
-      m.datastreams['withText'].fubar_values.should == []
-      m.datastreams['withText2'].fubar_values.should == []
-
-      m.update_attributes({:fubar=>'baz'}, :datastreams=>"someData")
-      m.should_not be_nil
-      m.datastreams['someData'].fubar_values.should == ['baz']
-      m.datastreams["withText"].fubar_values.should == []
-      m.datastreams['withText2'].fubar_values.should == []
-      
-      m.update_attributes({:fubar=>'baz'}, :datastreams=>["someData", "withText2"])
-      m.should_not be_nil
-      m.datastreams['someData'].fubar_values.should == ['baz']
-      m.datastreams["withText"].fubar_values.should == []
-      m.datastreams['withText2'].fubar_values.should == ['baz']
-    end
   end
   
   describe "update_indexed_attributes" do