active-fedora 2.3.8 → 3.0.0

data/spec/unit/connection_spec.rb

@@ -2,24 +2,24 @@ require File.join( File.dirname(__FILE__),  "../spec_helper" )
 
 require 'active_resource'
 require 'fedora/repository'
-### Removed by Justin 2011-9-23
-# describe Fedora::Connection do
-#   it "should be creatable w/ a surrogate id" do
-#     c = Fedora::Connection.new('http://127.0.0.1/fedora', 'fubar', 'bob')
-#     c.site.to_s.should == "http://127.0.0.1/fedora"
-#     c.format.should == 'fubar'
-#     c.surrogate.should == 'bob'
-#   end
-#   it "should set a from header if surrogate defined." do
-#     c = Fedora::Connection.new('http://127.0.0.1/fedora', ActiveResource::Formats[:xml], 'bob')
-#     h = Hash.new
-#     r= c.send(:build_request_headers,h)
-#     r['From'].should == 'bob'
-#   end
-#   it "should not set a from header if surrogate undefined." do
-#     c = Fedora::Connection.new('http://127.0.0.1/fedora' )
-#     h = Hash.new
-#     r= c.send(:build_request_headers,h)
-#     r['From'].should be_nil
-#   end
-# end
+
+describe Fedora::Connection do
+  it "should be creatable w/ a surrogate id" do
+    c = Fedora::Connection.new('http://127.0.0.1/fedora', 'fubar', 'bob')
+    c.site.to_s.should == "http://127.0.0.1/fedora"
+    c.format.should == 'fubar'
+    c.surrogate.should == 'bob'
+  end
+  it "should set a from header if surrogate defined." do
+    c = Fedora::Connection.new('http://127.0.0.1/fedora', ActiveResource::Formats[:xml], 'bob')
+    h = Hash.new
+    r= c.send(:build_request_headers,h)
+    r['From'].should == 'bob'
+  end
+  it "should not set a from header if surrogate undefined." do
+    c = Fedora::Connection.new('http://127.0.0.1/fedora' )
+    h = Hash.new
+    r= c.send(:build_request_headers,h)
+    r['From'].should be_nil
+  end
+end

data/spec/unit/datastream_spec.rb

@@ -60,17 +60,6 @@ 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/has_many_collection_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe ActiveFedora::Associations::HasManyAssociation do
+  it "should be able to replace the collection" do
+    @owner = stub(:new_record? => false)
+    @reflection = stub(:klass => Mocha::Mock, :options=>{:property=>'predicate'})
+    #ac = ActiveFedora::Associations::AssociationCollection.new(@owner, @reflection)
+    ac = ActiveFedora::Associations::HasManyAssociation.new(@owner, @reflection)
+    @target = [stub(:new_record? => false, :remove_relationship=>true), stub(:new_record? => false, :remove_relationship=>true), stub(:new_record? => false, :remove_relationship=>true)]
+    ac.target = @target 
+
+    @expected1 = stub(:new_record? => false, :add_relationship=>true, :save=>true)
+    @expected2 = stub(:new_record? => false, :add_relationship=>true, :save=>true)
+    ac.replace([@expected1, @expected2])
+    ac.target.should == [@expected1, @expected2]
+
+  end
+
+  it "should build" do
+    class Foo; end
+    @owner = stub(:new_record? => false)
+    @assoc = ActiveFedora::Associations::HasManyAssociation.new(@owner, @reflection)
+    @assoc.should respond_to :build
+      
+  end
+
+end

data/spec/unit/model_spec.rb

@@ -103,7 +103,7 @@ describe ActiveFedora::Model do
       mock_solr = mock("SolrConnection")
       mock_result = mock("MockResult")
       mock_result.expects(:hits).returns([{"id" => "changeme:30"}, {"id" => "changeme:22"}])
-      mock_solr.expects(:query).with('active_fedora_model_s:SpecModel\:\:Basic', :rows=>1001).returns(mock_result)
+      mock_solr.expects(:query).with('has_model_s:info\\:fedora/afmodel\\:SpecModel\:\:Basic', :rows=>1001).returns(mock_result)
       ActiveFedora::SolrService.expects(:instance).returns(mock("SolrService", :conn => mock_solr))
       Fedora::Repository.instance.expects(:find_model).with("changeme:30", SpecModel::Basic).returns("Fake Object1")
       Fedora::Repository.instance.expects(:find_model).with("changeme:22", SpecModel::Basic).returns("Fake Object2")

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 be_equivalent_to("<fake template/>")
+      ActiveFedora::NokogiriDatastream.expects(:xml_template).returns("fake template")
+      ActiveFedora::NokogiriDatastream.new.ng_xml.should == "fake template"
     end
   end
   
@@ -234,32 +234,6 @@ 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/repository_spec.rb

@@ -99,14 +99,14 @@ describe Fedora::Repository do
     it "should post the provided xml or file to fedora" do
       foxml = fixture("test_12.foxml.xml").read
       connection = Fedora::Repository.instance.send(:connection)
-      connection.expects(:post).with("/fedora/objects/new",:body=>foxml)
+      connection.expects(:post).with("/fedora/objects/new",foxml)
       Fedora::Repository.instance.ingest(foxml)
     end
     it "should accept a file as its input" do
       foxml_file = fixture("test_12.foxml.xml")
       foxml = fixture("test_12.foxml.xml").read
       connection = Fedora::Repository.instance.send(:connection)
-      connection.expects(:post).with("/fedora/objects/new",:body=>foxml)
+      connection.expects(:post).with("/fedora/objects/new",foxml)
       Fedora::Repository.instance.ingest(foxml_file)
     end
   end

data/spec/unit/semantic_node_spec.rb

@@ -10,6 +10,7 @@ require 'xmlsimple'
 @@last_pid = 0
 
 class SpecNode2
+  include ActiveFedora::RelationshipsHelper
   include ActiveFedora::SemanticNode
   
   attr_accessor :pid
@@ -31,6 +32,7 @@ describe ActiveFedora::SemanticNode do
   
   before(:each) do
     class SpecNode
+      include ActiveFedora::RelationshipsHelper
       include ActiveFedora::SemanticNode
       
       attr_accessor :pid

data/spec/unit/solr_service_spec.rb

@@ -84,11 +84,4 @@ describe ActiveFedora::SolrService do
     end
   end
   
-  describe "escape_characters_for_query" do
-    it "should escape the Solr special characters" do
-      test_val = '# + - || ! ( ) { } [ ] ^ " ~ * ? : \\'
-      expected_result = '\\# \\+ \\- \\|\\| \\! \\( \\) \\{ \\} \\[ \\] \\^ \\" \\~ \\* \\? \\: \\\\'
-      ActiveFedora::SolrService.escape_characters_for_query(test_val).should == expected_result
-    end
-  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 7
   prerelease: 
   segments: 
-  - 2
   - 3
-  - 8
-  version: 2.3.8
+  - 0
+  - 0
+  version: 3.0.0
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-23 00:00:00 -05:00
+date: 2011-09-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -133,7 +133,7 @@ dependencies:
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -144,21 +144,23 @@ dependencies:
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: mediashelf-loggable
+  name: activesupport
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
+        - 3
         - 0
-        version: "0"
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: equivalent-xml
+  name: mediashelf-loggable
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -172,7 +174,7 @@ dependencies:
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: facets
+  name: equivalent-xml
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -186,7 +188,7 @@ dependencies:
   type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: net-http-persistent
+  name: facets
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
@@ -514,18 +516,26 @@ files:
 - config/solr_mappings_bl_2.4.yml
 - lib/active-fedora.rb
 - lib/active_fedora.rb
-- lib/active_fedora/active_fedora_configuration_exception.rb
+- lib/active_fedora/associations.rb
+- lib/active_fedora/associations/association_collection.rb
+- lib/active_fedora/associations/association_proxy.rb
+- lib/active_fedora/associations/belongs_to_association.rb
+- lib/active_fedora/associations/has_many_association.rb
+- lib/active_fedora/attribute_methods.rb
 - lib/active_fedora/base.rb
 - lib/active_fedora/content_model.rb
 - lib/active_fedora/datastream.rb
+- lib/active_fedora/delegating.rb
 - lib/active_fedora/fedora_object.rb
 - lib/active_fedora/metadata_datastream.rb
 - lib/active_fedora/metadata_datastream_helper.rb
 - lib/active_fedora/model.rb
+- lib/active_fedora/nested_attributes.rb
 - lib/active_fedora/nokogiri_datastream.rb
 - lib/active_fedora/property.rb
 - lib/active_fedora/qualified_dublin_core_datastream.rb
 - lib/active_fedora/railtie.rb
+- lib/active_fedora/reflection.rb
 - lib/active_fedora/relationship.rb
 - lib/active_fedora/relationships_helper.rb
 - lib/active_fedora/rels_ext_datastream.rb
@@ -547,7 +557,6 @@ files:
 - lib/ruby-fedora.rb
 - lib/tasks/active_fedora.rake
 - lib/tasks/active_fedora_dev.rake
-- lib/util/class_level_inheritable_attributes.rb
 - script/console
 - script/destroy
 - script/generate
@@ -572,6 +581,7 @@ files:
 - spec/fixtures/rails_root/config/solr_mappings_bl_2.4.yml
 - spec/fixtures/test_12.foxml.xml
 - spec/hydrangea_fixture_mods_article1.foxml.xml
+- spec/integration/associations_spec.rb
 - spec/integration/base_file_management_spec.rb
 - spec/integration/base_find_by_fields_spec.rb
 - spec/integration/base_loader_spec.rb
@@ -584,6 +594,7 @@ files:
 - spec/integration/metadata_datastream_helper_spec.rb
 - spec/integration/model_spec.rb
 - spec/integration/mods_article_integration_spec.rb
+- spec/integration/nested_attribute_spec.rb
 - spec/integration/nokogiri_datastream_spec.rb
 - spec/integration/rels_ext_datastream_spec.rb
 - spec/integration/repository_spec.rb
@@ -632,8 +643,11 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/unit/active_fedora_spec.rb
+- spec/unit/association_proxy_spec.rb
+- spec/unit/base_active_model_spec.rb
 - spec/unit/base_cma_spec.rb
 - spec/unit/base_datastream_management_spec.rb
+- spec/unit/base_delegate_spec.rb
 - spec/unit/base_extra_spec.rb
 - spec/unit/base_file_management_spec.rb
 - spec/unit/base_named_datastream_spec.rb
@@ -643,6 +657,7 @@ files:
 - spec/unit/datastream_concurrency_spec.rb
 - spec/unit/datastream_spec.rb
 - spec/unit/fedora_object_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
@@ -708,6 +723,7 @@ test_files:
 - spec/fixtures/rails_root/config/solr_mappings_bl_2.4.yml
 - spec/fixtures/test_12.foxml.xml
 - spec/hydrangea_fixture_mods_article1.foxml.xml
+- spec/integration/associations_spec.rb
 - spec/integration/base_file_management_spec.rb
 - spec/integration/base_find_by_fields_spec.rb
 - spec/integration/base_loader_spec.rb
@@ -720,6 +736,7 @@ test_files:
 - spec/integration/metadata_datastream_helper_spec.rb
 - spec/integration/model_spec.rb
 - spec/integration/mods_article_integration_spec.rb
+- spec/integration/nested_attribute_spec.rb
 - spec/integration/nokogiri_datastream_spec.rb
 - spec/integration/rels_ext_datastream_spec.rb
 - spec/integration/repository_spec.rb
@@ -768,8 +785,11 @@ test_files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/unit/active_fedora_spec.rb
+- spec/unit/association_proxy_spec.rb
+- spec/unit/base_active_model_spec.rb
 - spec/unit/base_cma_spec.rb
 - spec/unit/base_datastream_management_spec.rb
+- spec/unit/base_delegate_spec.rb
 - spec/unit/base_extra_spec.rb
 - spec/unit/base_file_management_spec.rb
 - spec/unit/base_named_datastream_spec.rb
@@ -779,6 +799,7 @@ test_files:
 - spec/unit/datastream_concurrency_spec.rb
 - spec/unit/datastream_spec.rb
 - spec/unit/fedora_object_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

data/lib/active_fedora/active_fedora_configuration_exception.rb

@@ -1,2 +0,0 @@
-class ActiveFedoraConfigurationException < Exception
-end

data/lib/util/class_level_inheritable_attributes.rb

@@ -1,23 +0,0 @@
-module MediaShelfClassLevelInheritableAttributes
-  def self.included(base)
-    base.extend(MSClassMethods)
-  end
-  module MSClassMethods
-    def ms_inheritable_attributes(*args)
-      @ms_inheritable_attributes ||=[:ms_inheritable_attributes]
-      @ms_inheritable_attributes+=args
-      args.each do |arg|
-        class_eval %(
-          class <<self;attr_accessor :#{arg} end
-        )
-      end
-      @ms_inheritable_attributes
-    end
-    def inherited(subclass)
-      @ms_inheritable_attributes.each do |attrib|
-        instance_var = "@#{attrib}"
-        subclass.instance_variable_set(instance_var, instance_variable_get(instance_var))
-      end
-    end
-  end
-end