common_repository_model 0.0.2 → 0.0.3

data/lib/common_repository_model/area.rb

@@ -17,6 +17,10 @@ module CommonRepositoryModel
 
     delegate_to 'properties', [:name], unique: true
 
+    def self.find_by_name(name)
+      find({name_s: name}).first
+    end
+
     # We shouldn't be calling these
     protected :save, :save!
   end

data/lib/common_repository_model/collection.rb

@@ -59,7 +59,10 @@ module CommonRepositoryModel
       has_and_belongs_to_many(method_name, options)
     end
 
-    def save
+    before_save :register_parent_and_collections
+    def register_parent_and_collections
+      self.__area = CommonRepositoryModel::Area.find(area.pid) if area
+
       collected_has_members = membership_registry.has_members.
       collect do |association_name|
         public_send(association_name)
@@ -73,11 +76,36 @@ module CommonRepositoryModel
 
       self.parent_collections = collected_is_member_of
 
-      super
+      true
+    end
+    protected :register_parent_and_collections
+
+    def is_root?
+      parent_collections.size == 0
+    end
+
+    def parent_areas
+      parent_collections.collect(&:__area).uniq
+    end
+
+    def area=(an_area)
+      if is_root?
+        self.__area = an_area
+      else
+        self.__area = parent_areas.first
+      end
+    end
+
+    def area
+      if is_root?
+        __area
+      else
+        parent_areas.first
+      end
     end
 
     belongs_to(
-      :area,
+      :__area,
       class_name:'CommonRepositoryModel::Area',
       property: :is_member_of_area
     )

data/lib/common_repository_model/version.rb

@@ -1,3 +1,3 @@
 module CommonRepositoryModel
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/common_respository_model/area_spec.rb

@@ -3,10 +3,8 @@ require 'common_repository_model/area'
 require 'common_repository_model/collection'
 
 describe CommonRepositoryModel::Area do
-  describe 'meta test' do
-    it {
-      FactoryGirl.create(:area).persisted?.must_equal true
-    }
+  after(:each) do
+    subject.delete if subject.persisted?
   end
 
   describe 'without persisting' do
@@ -37,7 +35,12 @@ describe CommonRepositoryModel::Area do
 
   describe 'integration (with persistence)' do
     subject { FactoryGirl.create(:area) }
-    let(:collection) { FactoryGirl.build(:collection) }
+    let(:collection) { FactoryGirl.build(:collection, area: nil) }
+    it 'should find by name' do
+      CommonRepositoryModel::Area.find_by_name(subject.name).must_equal subject
+      CommonRepositoryModel::Area.
+        find_by_name("#{subject.name}-tmp").must_equal nil
+    end
     it 'should save' do
       # Before we can add a collection, the containing object
       # must be saved

data/spec/common_respository_model/collection_spec.rb

@@ -2,21 +2,15 @@ require_relative '../spec_helper'
 require 'common_repository_model/collection'
 
 describe CommonRepositoryModel::Collection do
-
   subject { FactoryGirl.build(:collection) }
-
   it 'should require an area' do
-    subject.area.must_be_kind_of(CommonRepositoryModel::Area)
-    subject.valid?.must_equal true
-    subject.area = nil
-    subject.valid?.must_equal false
-  end
-
-  it 'should belong_to #area' do
-    subject.must_respond_to(:area)
-    subject.must_respond_to(:area=)
-    subject.must_respond_to(:area_id)
-    subject.must_respond_to(:area_id=)
+    with_persisted_area do |area|
+      subject.area = area
+      subject.area.must_be_kind_of(CommonRepositoryModel::Area)
+      subject.valid?.must_equal true
+      subject.area = nil
+      subject.valid?.must_equal false
+    end
   end
 
   describe '#find_or_build_data_for_given_slot_names' do
@@ -53,26 +47,51 @@ describe CommonRepositoryModel::Collection do
 
 
   describe 'integration' do
-    let(:child_collection) { FactoryGirl.build(:collection) }
+    let(:child_collection) { FactoryGirl.build(:collection, area: nil) }
+    it 'should keep a child collection in the parent collection' do
+      with_persisted_area do |area_1|
+        with_persisted_area do |area_2|
+          area_1.wont_equal area_2
+
+          subject.area = area_1
+          subject.save!
+
+          child_collection.area = area_2
+
+          child_collection.parent_collections += [subject]
+
+          child_collection.area.must_equal subject.area
+
+          child_collection.save!
+
+          child_collection.area.must_equal subject.area
+        end
+      end
+    end
     it 'should handle parent/child collection' do
       # Before we can add a collection, the containing object
       # must be saved
-      subject.save.must_equal true
-      subject.child_collections << child_collection
-      subject.save.must_equal true
-      @collection = subject.class.find(subject.pid)
-      @child_collection = child_collection.class.find(child_collection.pid)
-
-      # We shouldn't store any child relations
-      assert_rels_ext(@collection, :has_members, [])
-      assert_active_fedora_has_many(
-        @collection, :child_collections, [@child_collection]
-      )
-
-      assert_rels_ext(@child_collection, :is_member_of, [@collection])
-      assert_active_fedora_has_many(
-        @child_collection, :parent_collections, [@collection]
-      )
+      with_persisted_area do |area|
+        subject.area = area
+        child_collection.area = area
+        subject.save!
+        subject.child_collections << child_collection
+        subject.save!
+
+        @collection = subject.class.find(subject.pid)
+        @child_collection = child_collection.class.find(child_collection.pid)
+
+        # We shouldn't store any child relations
+        assert_rels_ext(@collection, :has_members, [])
+        assert_active_fedora_has_many(
+          @collection, :child_collections, [@child_collection]
+        )
+
+        assert_rels_ext(@child_collection, :is_member_of, [@collection])
+        assert_active_fedora_has_many(
+          @child_collection, :parent_collections, [@collection]
+        )
+      end
     end
   end
 

data/spec/common_respository_model/data_spec.rb

@@ -2,7 +2,6 @@ require_relative '../spec_helper'
 require 'common_repository_model/data'
 
 describe CommonRepositoryModel::Data do
-
   subject { FactoryGirl.build(:data) }
 
   describe 'integration' do
@@ -15,12 +14,12 @@ describe CommonRepositoryModel::Data do
     it 'should have #slot_name' do
       subject.must_respond_to :slot_name
       subject.must_respond_to :slot_name=
-    end
+        end
 
     it 'should have #md5_checksum' do
       subject.must_respond_to :md5_checksum
       subject.must_respond_to :md5_checksum=
-    end
+        end
 
     it 'should have content versions' do
       subject.content = file_1
@@ -33,16 +32,20 @@ describe CommonRepositoryModel::Data do
     end
 
     it 'should save' do
-      # Before we can add a collection, the containing object
-      # must be saved
-      collection.save
-      subject.collection = collection
-      subject.save
+      with_persisted_area do |area|
+        collection.area = area
+        # Before we can add a collection, the containing object
+        # must be saved
+        collection.save!
+        subject.collection = collection
+        subject.save!
+
+        @subject = subject.class.find(subject.pid)
 
-      @subject = subject.class.find(subject.pid)
+        assert_rels_ext(@subject, :is_part_of, [collection])
+        assert_active_fedora_belongs_to(@subject, :collection, collection)
 
-      assert_rels_ext(@subject, :is_part_of, [collection])
-      assert_active_fedora_belongs_to(@subject, :collection, collection)
+      end
     end
   end
 end

data/spec/common_respository_model/integration_spec.rb

@@ -53,6 +53,9 @@ class Person < CommonRepositoryModel::Collection
 end
 
 describe CommonRepositoryModel::Collection do
+  after(:each) do
+    area.delete if area.persisted?
+  end
   let(:area) { FactoryGirl.create(:area) }
   let(:family) { Family.new(area: area) }
   let(:lawyer) { Job.new(area: area) }

data/spec/spec_helper.rb

@@ -11,6 +11,14 @@ ActiveFedora.init(
 
 
 class MiniTest::Unit::TestCase
+
+  def with_persisted_area
+    area = FactoryGirl.create(:area)
+    yield(area)
+  ensure
+    area.delete
+  end
+
   def assert_rels_ext(subject, predicate, objects = [])
     assert_equal objects.count, subject.relationships(predicate).count
     objects.each do |object|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: common_repository_model
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: