active-fedora 3.2.0.pre3 → 3.2.0.pre4

data/spec/unit/callback_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe ActiveFedora::Base do
+  before :all do
+    class CallbackStub < ActiveFedora::Base
+      has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"someData" do |m|
+        m.field "fubar", :string
+        m.field "swank", :text
+      end
+      delegate :fubar, :to=>'someData'
+      delegate :swank, :to=>'someData'
+
+      after_initialize :a_init
+      before_save :b_save
+      after_save :a_save
+      before_create :b_create
+      after_create :a_create
+      before_update :b_update
+      after_update :a_update
+      after_find :a_find
+      
+    end
+  end
+  after :all do
+    Object.send(:remove_const, :CallbackStub)
+  end
+
+  it "Should have after_initialize, before_save,after_save, before_create, after_create, after_update, before_update" do
+    CallbackStub.any_instance.expects(:a_init).twice
+    CallbackStub.any_instance.expects :b_create
+    CallbackStub.any_instance.expects :a_create
+    CallbackStub.any_instance.expects(:b_save).twice
+    CallbackStub.any_instance.expects(:a_save).twice
+    CallbackStub.any_instance.expects(:a_find)
+    CallbackStub.any_instance.expects(:b_update)
+    CallbackStub.any_instance.expects(:a_update)
+    cb = CallbackStub.new
+    cb.save
+
+    cb2 = CallbackStub.find(cb.pid)
+    cb2.save
+  end
+
+end

data/spec/unit/relationship_graph_spec.rb

@@ -3,11 +3,12 @@ require 'spec_helper'
 describe ActiveFedora::RelationshipGraph do
   before do 
     @graph = ActiveFedora::RelationshipGraph.new
+    @n1 = ActiveFedora::Base.new()
+    @n1.stubs(:pid => 'foo:777')
   end
 
   
   it "should add relationships" do
-    @n1 = ActiveFedora::Base.new
     @n2 = ActiveFedora::Base.new
     @graph.add(:has_part, @n1)
     @graph.relationships[:has_part].should == [@n1]
@@ -23,7 +24,6 @@ describe ActiveFedora::RelationshipGraph do
     graph.should be_kind_of RDF::Graph
     graph.statements.to_a.should == []
 
-    @n1 = ActiveFedora::Base.new(:pid=>'foo:777')
     @graph.add(:has_part, @n1)
     graph = @graph.to_graph('info:fedora/foo:1')
     stmts = graph.statements.to_a
@@ -36,7 +36,6 @@ describe ActiveFedora::RelationshipGraph do
   end
 
   it "should have array accessor" do
-    @n1 = ActiveFedora::Base.new(:pid=>'foo:777')
     @graph.add(:has_part, @n1)
     @graph[:has_part].should == [@n1]
   end
@@ -44,7 +43,6 @@ describe ActiveFedora::RelationshipGraph do
 
   describe "delete" do
     it "should delete an object when an object is passed" do
-      @n1 = ActiveFedora::Base.new(:pid=>'foo:777')
       @graph.add(:has_part, @n1)
       @graph[:has_part].should == [@n1]
       @graph.delete(:has_part, @n1)
@@ -52,7 +50,6 @@ describe ActiveFedora::RelationshipGraph do
     end
     it "should delete an pid when an object is passed" do
       #a reloaded rels-ext is just a list of uris, not inflated.
-      @n1 = ActiveFedora::Base.new(:pid=>'foo:777')
       @graph.add(:has_part, 'info:fedora/foo:777')
       @graph[:has_part].should == ['info:fedora/foo:777']
       @graph.delete(:has_part, @n1)
@@ -60,7 +57,6 @@ describe ActiveFedora::RelationshipGraph do
     end
     it "should delete an pid when a string is passed" do
       #a reloaded rels-ext is just a list of uris, not inflated.
-      @n1 = ActiveFedora::Base.new(:pid=>'foo:777')
       @graph.add(:has_part, 'info:fedora/foo:777')
       @graph[:has_part].should == ['info:fedora/foo:777']
       @graph.delete(:has_part, 'info:fedora/foo:777')
@@ -68,7 +64,6 @@ describe ActiveFedora::RelationshipGraph do
     end
     it "should delete an object when a pid is passed" do
       #a reloaded rels-ext is just a list of uris, not inflated.
-      @n1 = ActiveFedora::Base.new(:pid=>'foo:777')
       @graph.add(:has_part, @n1)
       @graph[:has_part].should == [@n1]
       @graph.delete(:has_part, 'info:fedora/foo:777')

data/spec/unit/relationships_spec.rb

@@ -13,9 +13,11 @@ describe ActiveFedora::Relationships do
         include ActiveFedora::SemanticNode
         
         attr_accessor :pid
-        def initialize (params={}) 
-          self.pid = params[:pid]
+        def init_with(inner_obj)
+          self.pid = inner_obj.pid
+          self
         end
+
         def internal_uri
           'info:fedora/' + pid.to_s
         end

data/spec/unit/service_definitions_spec.rb

@@ -25,11 +25,11 @@ describe ActiveFedora::ServiceDefinitions do
   end
   describe "method creation" do
     it "should create the system sdef methods" do
-      obj = Test.new(:pid=>"monkey:99")
+      obj = Test.new()
       (obj.respond_to? :object_profile).should == true
     end
     it "should create the declared sdef methods" do
-      obj = Test.new(:pid=>"monkey:99")
+      obj = Test.new()
       (obj.respond_to? :document_style_1).should == true
     end
   end
@@ -37,12 +37,14 @@ describe ActiveFedora::ServiceDefinitions do
     it "should call the appropriate rubydora rest api method" do
       Rubydora::Repository.any_instance.expects(:dissemination).with({:pid=>'monkey:99',:sdef=>'test:12', :method=>'getDocumentStyle1'})
       #@mock_client.stubs(:[]).with('objects/monkey%3A99/methods/test%3A12/getDocumentStyle1')
-      obj = Test.new(:pid=>"monkey:99")
+      obj = Test.new()
+      obj.stubs(:pid).returns('monkey:99')
       obj.document_style_1
     end
     it "should call the appropriate rubydora rest api method with parameters" do
       Rubydora::Repository.any_instance.expects(:dissemination).with({:pid=>'monkey:99',:sdef=>'test:12', :method=>'getDocumentStyle1', :format=>'xml'})
-      obj = Test.new(:pid=>"monkey:99")
+      obj = Test.new()
+      obj.stubs(:pid).returns('monkey:99')
       obj.document_style_1({:format=>'xml'})
     end
     it "should call the appropriate rubydora rest api method with a block" do

data/spec/unit/solr_config_options_spec.rb

@@ -9,7 +9,7 @@ describe ActiveFedora do
     module SolrSpecModel
       class Basic
         include ActiveFedora::Model
-        def initialize(opts)
+        def init_with(inner_obj)
         end
       end
     end

data/spec/unit/solr_service_spec.rb

@@ -49,8 +49,9 @@ describe ActiveFedora::SolrService do
     before(:each) do
       class AudioRecord
         attr_accessor :pid
-        def initialize (params={}) 
-          self.pid = params[:pid]
+        def init_with(inner_obj)
+          self.pid = inner_obj.pid
+          self
         end
       end
       @sample_solr_hits = [{"id"=>"my:_PID1_", "has_model_s"=>["info:fedora/afmodel:AudioRecord"]},

data/spec/unit/validations_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe ActiveFedora::Base do
+  before :all do
+    class ValidationStub < ActiveFedora::Base
+      has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"someData" do |m|
+        m.field "fubar", :string
+        m.field "swank", :text
+      end
+      delegate :fubar, :to=>'someData'
+      delegate :swank, :to=>'someData'
+
+      validates_presence_of :fubar
+      validates_length_of :swank, :minimum=>5
+      
+    end
+  end
+  after :all do
+    Object.send(:remove_const, :ValidationStub)
+  end
+
+  describe "a valid object" do
+    before do
+      @obj = ValidationStub.new(:fubar=>'here', :swank=>'long enough')
+    end
+    
+    it "should be valid" do
+      @obj.should_not be_valid
+    end
+  end
+  describe "an invalid object" do
+    before do
+      @obj = ValidationStub.new(:swank=>'smal')
+    end
+    
+    it "should be invalid" do
+      @obj.should_not be_valid
+      @obj.errors[:fubar].should == ["can't be blank"]
+      @obj.errors[:swank].should == ["is too short (minimum is 5 characters)"]
+    end
+  end
+
+end

metadata

@@ -1,24 +1,25 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 1923832047
+  hash: 1923832033
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - pre
-  - 3
-  version: 3.2.0.pre3
+  - 4
+  version: 3.2.0.pre4
 platform: ruby
 authors: 
 - Matt Zumwalt
 - McClain Looney
+- Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-12-30 00:00:00 -06:00
+date: 2012-01-01 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -562,6 +563,7 @@ files:
 - lib/active_fedora/associations/has_many_association.rb
 - lib/active_fedora/attribute_methods.rb
 - lib/active_fedora/base.rb
+- lib/active_fedora/callbacks.rb
 - lib/active_fedora/content_model.rb
 - lib/active_fedora/datastream.rb
 - lib/active_fedora/datastream_collections.rb
@@ -577,6 +579,7 @@ files:
 - lib/active_fedora/named_relationships.rb
 - lib/active_fedora/nested_attributes.rb
 - lib/active_fedora/nokogiri_datastream.rb
+- lib/active_fedora/persistence.rb
 - lib/active_fedora/predicates.rb
 - lib/active_fedora/property.rb
 - lib/active_fedora/qualified_dublin_core_datastream.rb
@@ -595,8 +598,10 @@ files:
 - lib/active_fedora/samples/special_thing.rb
 - lib/active_fedora/semantic_node.rb
 - lib/active_fedora/service_definitions.rb
+- lib/active_fedora/solr_digital_object.rb
 - lib/active_fedora/solr_service.rb
 - lib/active_fedora/unsaved_digital_object.rb
+- lib/active_fedora/validations.rb
 - lib/active_fedora/version.rb
 - lib/ruby-fedora.rb
 - lib/tasks/active_fedora.rake
@@ -693,6 +698,7 @@ files:
 - spec/unit/base_extra_spec.rb
 - spec/unit/base_file_management_spec.rb
 - spec/unit/base_spec.rb
+- spec/unit/callback_spec.rb
 - spec/unit/content_model_spec.rb
 - spec/unit/datastream_collections_spec.rb
 - spec/unit/datastream_concurrency_spec.rb
@@ -715,6 +721,7 @@ files:
 - spec/unit/service_definitions_spec.rb
 - spec/unit/solr_config_options_spec.rb
 - spec/unit/solr_service_spec.rb
+- spec/unit/validations_spec.rb
 has_rdoc: true
 homepage: http://yourmediashelf.com/activefedora
 licenses: []
@@ -836,6 +843,7 @@ test_files:
 - spec/unit/base_extra_spec.rb
 - spec/unit/base_file_management_spec.rb
 - spec/unit/base_spec.rb
+- spec/unit/callback_spec.rb
 - spec/unit/content_model_spec.rb
 - spec/unit/datastream_collections_spec.rb
 - spec/unit/datastream_concurrency_spec.rb
@@ -858,3 +866,4 @@ test_files:
 - spec/unit/service_definitions_spec.rb
 - spec/unit/solr_config_options_spec.rb
 - spec/unit/solr_service_spec.rb
+- spec/unit/validations_spec.rb