common_repository_model 0.0.1 → 0.0.2

data/common_repository_model.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "minitest"
   gem.add_runtime_dependency "minitest-matchers"
   gem.add_runtime_dependency "active-fedora"
+  gem.add_runtime_dependency "factory_girl"
 end

data/lib/common_repository_model/area.rb

@@ -10,9 +10,14 @@ module CommonRepositoryModel
     )
 
     has_metadata(name: "properties",type: ActiveFedora::SimpleDatastream) do |m|
-      m.field 'area_name', :string
+      m.field 'name', :string
     end
 
-    delegate_to 'properties', [:area_name], unique: true
+    validates :name, presence: true
+
+    delegate_to 'properties', [:name], unique: true
+
+    # We shouldn't be calling these
+    protected :save, :save!
   end
 end

data/lib/common_repository_model/collection.rb

@@ -3,6 +3,20 @@ require_relative './area'
 require_relative './data'
 require 'set'
 
+class PersistedValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    is_valid = true
+    is_valid = false if value.nil?
+    begin
+      is_valid = false unless value.persisted?
+    rescue NoMethodError
+      is_valid = false
+    end
+
+    record.errors.add(attribute, 'must be persisted') unless is_valid
+    is_valid
+  end
+end
 module CommonRepositoryModel
   class MembershipRegistry
     def initialize
@@ -68,6 +82,8 @@ module CommonRepositoryModel
       property: :is_member_of_area
     )
 
+    validates :area, presence: true, persisted: true
+
     has_many(
       :child_collections,
       class_name: 'CommonRepositoryModel::Collection',

data/lib/common_repository_model/version.rb

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

data/spec/common_respository_model/area_spec.rb

@@ -3,29 +3,46 @@ 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
+    }
+  end
 
-  subject { CommonRepositoryModel::Area.new(area_name: area_name) }
-  let(:area_name) { 'My Area Name'}
+  describe 'without persisting' do
+    subject { FactoryGirl.build(:area, name: name) }
+    let(:name) { 'My Area Name'}
 
-  it 'should have #area_name' do
-    subject.area_name.must_equal area_name
-  end
+    it 'should find or create by #name' do
+      lambda { subject.save }.must_raise(NoMethodError)
+      lambda { subject.save! }.must_raise(NoMethodError)
+    end
+
+    it 'should require a #name' do
+      subject.name = nil
+      subject.valid?.must_equal false
+      subject.name = name
+      subject.valid?.must_equal true
+    end
+
+    it 'should have #name' do
+      subject.name.must_equal name
+    end
 
-  describe 'has_many #collections' do
     it 'should build #collections' do
       subject.collections.build.
         must_be_kind_of(CommonRepositoryModel::Collection)
     end
   end
 
-  describe 'integration' do
-    let(:collection) { CommonRepositoryModel::Collection.new }
+  describe 'integration (with persistence)' do
+    subject { FactoryGirl.create(:area) }
+    let(:collection) { FactoryGirl.build(:collection) }
     it 'should save' do
       # Before we can add a collection, the containing object
       # must be saved
-      subject.save.must_equal true
       subject.collections << collection
-      subject.save.must_equal true
+      subject.send(:save).must_equal true
       new_subject = subject.class.find(subject.pid)
 
       new_subject.collections.size.must_equal 1

data/spec/common_respository_model/collection_spec.rb

@@ -3,7 +3,14 @@ require 'common_repository_model/collection'
 
 describe CommonRepositoryModel::Collection do
 
-  subject { CommonRepositoryModel::Collection.new }
+  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)
@@ -46,7 +53,7 @@ describe CommonRepositoryModel::Collection do
 
 
   describe 'integration' do
-    let(:child_collection) { CommonRepositoryModel::Collection.new }
+    let(:child_collection) { FactoryGirl.build(:collection) }
     it 'should handle parent/child collection' do
       # Before we can add a collection, the containing object
       # must be saved

data/spec/common_respository_model/data_spec.rb

@@ -3,15 +3,10 @@ require 'common_repository_model/data'
 
 describe CommonRepositoryModel::Data do
 
-  subject {
-    CommonRepositoryModel::Data.new(
-      slot_name: '1234',
-      md5_checksum: 'abcdefg'
-    )
-  }
+  subject { FactoryGirl.build(:data) }
 
   describe 'integration' do
-    let(:collection) { CommonRepositoryModel::Collection.new }
+    let(:collection) { FactoryGirl.build(:collection) }
     let(:file_1) { File.new(__FILE__) }
     let(:file_2) {
       File.new(File.join(File.dirname(__FILE__), '../spec_helper.rb'))

data/spec/common_respository_model/integration_spec.rb

@@ -53,15 +53,15 @@ class Person < CommonRepositoryModel::Collection
 end
 
 describe CommonRepositoryModel::Collection do
-
-  let(:family) { Family.new }
-  let(:lawyer) { Job.new }
-  let(:doctor) { Job.new }
-  let(:heathcliff) { Person.new }
-  let(:claire) { Person.new }
-  let(:theo) { Person.new }
-  let(:vanessa) { Person.new }
-  let(:rudy) { Person.new }
+  let(:area) { FactoryGirl.create(:area) }
+  let(:family) { Family.new(area: area) }
+  let(:lawyer) { Job.new(area: area) }
+  let(:doctor) { Job.new(area: area) }
+  let(:heathcliff) { Person.new(area: area) }
+  let(:claire) { Person.new(area: area) }
+  let(:theo) { Person.new(area: area) }
+  let(:vanessa) { Person.new(area: area) }
+  let(:rudy) { Person.new(area: area) }
   let(:dress) { Clothing.new(slot_name: 'outerwear') }
 
   before(:all) do
@@ -107,14 +107,14 @@ describe CommonRepositoryModel::Collection do
   end
 
   it 'verifies complicated relationships' do
-    # verify_initial_relations_for_family
-    # verify_initial_relations_for_theo
-    # verify_initial_relations_for_claire
-    # verify_initial_relations_for_dress
+    verify_initial_relations_for_family
+    verify_initial_relations_for_theo
+    verify_initial_relations_for_claire
+    verify_initial_relations_for_dress
 
-    # verify_claire_adding_a_child
+    verify_claire_adding_a_child
 
-    # verify_claire_losing_a_child
+    verify_claire_losing_a_child
 
     verify_rudy_losing_a_parent
   end
@@ -182,7 +182,7 @@ describe CommonRepositoryModel::Collection do
   end
 
   def verify_claire_adding_a_child
-    sandra = Person.new
+    sandra = Person.new(area: area)
     sandra.save
     @claire.children << sandra
     @claire.save

data/spec/factories/common_repository_model_factories.rb

@@ -0,0 +1,17 @@
+require 'common_repository_model/area'
+require 'common_repository_model/collection'
+require 'common_repository_model/data'
+
+FactoryGirl.define do
+  factory :area, class: CommonRepositoryModel::Area do
+    sequence(:name) { |n| "Area #{n}" }
+    to_create { |instance| instance.send(:save!) }
+  end
+  factory :collection, class: CommonRepositoryModel::Collection do
+    area { CommonRepositoryModel::Area.all.first }
+  end
+  factory :data, class: CommonRepositoryModel::Data do
+    sequence(:slot_name) { |n| "Slot Name #{n}" }
+    sequence(:md5_checksum) { |n| "#{n}abc"}
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 $:.unshift File.expand_path('../../lib', __FILE__)
 require 'minitest/autorun'
 require 'active_fedora'
+require 'factory_girl'
+FactoryGirl.find_definitions
 ActiveFedora.init(
   fedora_config_path: File.join(File.dirname(__FILE__),"config/fedora.yml"),
   solr_config_path: File.join(File.dirname(__FILE__),"config/solr.yml"),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: common_repository_model
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Notre Dame's Common Fedora Repository Model
 email:
 - jeremy.n.friesen@gmail.com
@@ -141,6 +157,7 @@ files:
 - spec/config/fedora.yml
 - spec/config/predicate_mappings.yml
 - spec/config/solr.yml
+- spec/factories/common_repository_model_factories.rb
 - spec/spec_helper.rb
 homepage: https://github.com/ndlib/common_repository_model
 licenses: []
@@ -176,4 +193,5 @@ test_files:
 - spec/config/fedora.yml
 - spec/config/predicate_mappings.yml
 - spec/config/solr.yml
+- spec/factories/common_repository_model_factories.rb
 - spec/spec_helper.rb