add a non-required ref_id to the subject model

edsu · Dec 11, 2012 · 9e2588f · 9e2588f
1 parent 689a371
commit 9e2588f
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 2 deletions.
diff --git a/backend/app/model/migrations/001_create_base_schema.rb b/backend/app/model/migrations/001_create_base_schema.rb
@@ -375,6 +375,7 @@
       Integer :vocab_id, :null => false
 
       String :terms_sha1, :unique => true
+      String :ref_id, :unique => true
 
       DateTime :create_time, :null => false
       DateTime :last_modified, :null => false

diff --git a/backend/app/model/subject.rb b/backend/app/model/subject.rb
@@ -68,6 +68,7 @@ def self.sequel_to_jsonmodel(obj, type, opts = {})
   def validate
     super
     validates_unique([:vocab_id, :terms_sha1], :message => "Subject must be unique")
+    validates_unique([:vocab_id, :ref_id], :message => "Subject heading identifier must be unique")
     map_validation_to_json_property([:vocab_id, :terms_sha1], :terms)
   end
 

diff --git a/backend/spec/factories.rb b/backend/spec/factories.rb
@@ -258,8 +258,9 @@
   end
 
   factory :json_subject, class: JSONModel(:subject) do
-    terms { [build(:json_term)] }
+    terms { [build(:json_term).to_hash] }
     vocabulary { create(:json_vocab).uri }
+    ref_id { generate(:url) }
   end
 
   factory :json_term, class: JSONModel(:term) do

diff --git a/backend/spec/model_subject_spec.rb b/backend/spec/model_subject_spec.rb
@@ -85,5 +85,24 @@ def createTerm
                                                      }))
      }.to raise_error(Sequel::ValidationFailed)
   end
+
+  it "ensures subject heading identifiers are unique within a vocab" do
+    vocab = create(:json_vocab)
+
+    heading_id = 1 == rand(2) ? "http://example.com/example" : "12aBCD12"
+
+    subject_a = create(:json_subject, {:vocabulary => vocab.uri, :ref_id => heading_id})
+
+   expect {
+      create(:json_subject, {:vocabulary => vocab.uri})
+    }.to_not raise_error(JSONModel::ValidationException)
+
+    expect {
+      create(:json_subject, {:vocabulary => vocab.uri, :ref_id => heading_id})
+    }.to raise_error(JSONModel::ValidationException)
+
+
+  end    
+
 
 end
diff --git a/common/schemas/subject.rb b/common/schemas/subject.rb
@@ -9,6 +9,7 @@
       "terms" => {"type" => "array", "items" => {"type" => "JSONModel(:term) uri_or_object"}, "ifmissing" => "error", "minItems" => 1},
 
       "vocabulary" => {"type" => "JSONModel(:vocabulary) uri", "ifmissing" => "error"},
+      "ref_id" => {"type" => "string", "pattern" => "^[\\S]*$"},
 
       "external_documents" => {"type" => "array", "items" => {"type" => "JSONModel(:external_document) object"}},
     },

diff --git a/frontend/app/views/subjects/_form.html.erb b/frontend/app/views/subjects/_form.html.erb
@@ -29,6 +29,11 @@
 <fieldset>
    <%= form.hidden_input "vocabulary", current_vocabulary['uri'] %>
 
+   <section id="identifier">
+     <h3>Identifier</h3>
+     <%= form.label_and_textfield "ref_id" %>
+   </section>
+
    <section id="terms">
      <h3>Terms</h3>
      <div class="row-fluid">

diff --git a/frontend/app/views/subjects/_sidebar.html.erb b/frontend/app/views/subjects/_sidebar.html.erb
@@ -1,5 +1,6 @@
 <div id="archivesSpaceSidebar">
   <ul class="nav nav-list as-nav-list">
+    <li><a href="#basic_information">Basic Information <span class="icon-chevron-right"></span></a></li>
     <li><a href="#terms">Terms <span class="icon-chevron-right"></span></a></li>
 
     <% if not controller.action_name === "show" or @subject.external_documents.length > 0 %>

diff --git a/frontend/app/views/subjects/show.html.erb b/frontend/app/views/subjects/show.html.erb
@@ -5,8 +5,14 @@
       <%= render :partial => "sidebar" %>
    </div>
    <div class="span9 record-pane">
+     <%= readonly_context :subject, @subject.to_hash do |readonly| %>
       <h2><%= @subject.display_string %>  <span class="label label-info">Subject</span></h2>
+      <section id="basic_information">
+        <h3>Basic Information</h3>
 
+        <%= readonly.label_and_textfield "ref_id" %>
+      </section>
+
       <section id="terms">
         <h3>Terms</h3>
         <div class="row-fluid">
@@ -24,6 +30,6 @@
       <% if @subject.external_documents.length > 0 %>
         <%= render :partial => "external_documents/show", :locals => { :external_documents => @subject.external_documents } %>
       <% end %>
-
+    <% end %>
    </div>
 </div>
diff --git a/frontend/config/locales/en.yml b/frontend/config/locales/en.yml
@@ -1093,6 +1093,7 @@ en:
     term_type: Type
   subject:
     terms: Terms
+    ref_id: Subject Heading Identifier
     _terms:
       <<: *term_attributes
     _external_documents: