enju_subject 0.1.0.pre26 → 0.1.0.pre27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb377ab73e1f078b5899f949f29b6bca3805a0b2
-  data.tar.gz: 219048b79e584acf30c2cf9112b804bb6f7368be
+  metadata.gz: f39a539208950c30df82cb40b7f4679ec04bd02d
+  data.tar.gz: 03750a9a61b0ad202afee9606d6efb8903a13d71
 SHA512:
-  metadata.gz: 99de1b3f98bd62786fa6df67b0436aa55065de8211a05a3d393fa1b9bd4e34b7ee9b76b1018d6961d9d46c13613cea90779c0ed4fc29f6e43b8bd472b45d0e00
-  data.tar.gz: ccd8eca7c18f65ad8783564d309ebfe464eaca5964f919c11125791aed8675502c7fa6c65dca62ec0ad6a977c4adc6e84ac51fe72f73f677053108bfce727305
+  metadata.gz: 9b4d3ae6aab37057222b13e7b45cdb65d465b43f2070bd3ad8c16a9e967d4f7d5c390abcd1018ce9f25c60b960f01dd9f3da6427f1d3ec13dae30f5ba70d8656
+  data.tar.gz: 156338c0e07072ddd799353638bad7cce20e8d1e59dd21d1272ae0299d06896c73ee18f35f132e23614b5b6970ba544d7ca36488c3e69c4f614770ec1bcda5bc

data/app/controllers/classification_types_controller.rb

@@ -1,13 +1,83 @@
-class ClassificationTypesController < InheritedResources::Base
-  respond_to :html, :json
+class ClassificationTypesController < ApplicationController
   load_and_authorize_resource
+  # GET /classification_types
+  # GET /classification_types.json
+  def index
+    @classification_types = ClassificationType.all
 
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @classification_types }
+    end
+  end
+
+  # GET /classification_types/1
+  # GET /classification_types/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @classification_type }
+    end
+  end
+
+  # GET /classification_types/new
+  # GET /classification_types/new.json
+  def new
+    @classification_type = ClassificationType.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @classification_type }
+    end
+  end
+
+  # GET /classification_types/1/edit
+  def edit
+  end
+
+  # POST /classification_types
+  # POST /classification_types.json
+  def create
+    @classification_type = ClassificationType.new(params[:classification_type])
+
+    respond_to do |format|
+      if @classification_type.save
+        format.html { redirect_to @classification_type, notice:  t('controller.successfully_created', model:  t('activerecord.models.classification_type')) }
+        format.json { render json: @classification_type, status: :created, location: @classification_type }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @classification_type.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /classification_types/1
+  # PUT /classification_types/1.json
   def update
-    @classification_type = ClassificationType.find(params[:id])
     if params[:move]
       move_position(@classification_type, params[:move])
       return
     end
-    update!
+
+    respond_to do |format|
+      if @classification_type.update_attributes(params[:classification_type])
+        format.html { redirect_to @classification_type, notice:  t('controller.successfully_updated', model:  t('activerecord.models.classification_type')) }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @classification_type.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /classification_types/1
+  # DELETE /classification_types/1.json
+  def destroy
+    @classification_type.destroy
+
+    respond_to do |format|
+      format.html { redirect_to classification_types_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.classification_type')) }
+      format.json { head :no_content }
+    end
   end
 end

data/app/controllers/classifications_controller.rb

@@ -103,7 +103,7 @@ class ClassificationsController < ApplicationController
     @classification.destroy
 
     respond_to do |format|
-      format.html { redirect_to classifications_url }
+      format.html { redirect_to classifications_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.classification')) }
       format.json { head :no_content }
     end
   end

data/app/controllers/subject_heading_types_controller.rb

@@ -1,13 +1,83 @@
-class SubjectHeadingTypesController < InheritedResources::Base
-  respond_to :html, :json
+class SubjectHeadingTypesController < ApplicationController
   load_and_authorize_resource
+  # GET /subject_heading_types
+  # GET /subject_heading_types.json
+  def index
+    @subject_heading_types = SubjectHeadingType.all
 
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @subject_heading_types }
+    end
+  end
+
+  # GET /subject_heading_types/1
+  # GET /subject_heading_types/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @subject_heading_type }
+    end
+  end
+
+  # GET /subject_heading_types/new
+  # GET /subject_heading_types/new.json
+  def new
+    @subject_heading_type = SubjectHeadingType.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @subject_heading_type }
+    end
+  end
+
+  # GET /subject_heading_types/1/edit
+  def edit
+  end
+
+  # POST /subject_heading_types
+  # POST /subject_heading_types.json
+  def create
+    @subject_heading_type = SubjectHeadingType.new(params[:subject_heading_type])
+
+    respond_to do |format|
+      if @subject_heading_type.save
+        format.html { redirect_to @subject_heading_type, notice:  t('controller.successfully_created', model:  t('activerecord.models.subject_heading_type')) }
+        format.json { render json: @subject_heading_type, status: :created, location: @subject_heading_type }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @subject_heading_type.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /subject_heading_types/1
+  # PUT /subject_heading_types/1.json
   def update
-    @subject_heading_type = SubjectHeadingType.find(params[:id])
     if params[:move]
       move_position(@subject_heading_type, params[:move])
       return
     end
-    update!
+
+    respond_to do |format|
+      if @subject_heading_type.update_attributes(params[:subject_heading_type])
+        format.html { redirect_to @subject_heading_type, notice:  t('controller.successfully_updated', model:  t('activerecord.models.subject_heading_type')) }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @subject_heading_type.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /subject_heading_types/1
+  # DELETE /subject_heading_types/1.json
+  def destroy
+    @subject_heading_type.destroy
+
+    respond_to do |format|
+      format.html { redirect_to subject_heading_types_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.subject_heading_type')) }
+      format.json { head :no_content }
+    end
   end
 end

data/app/controllers/subject_types_controller.rb

@@ -1,13 +1,83 @@
-class SubjectTypesController < InheritedResources::Base
-  respond_to :html, :json
+class SubjectTypesController < ApplicationController
   load_and_authorize_resource
+  # GET /subject_types
+  # GET /subject_types.json
+  def index
+    @subject_types = SubjectType.all
 
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @subject_types }
+    end
+  end
+
+  # GET /subject_types/1
+  # GET /subject_types/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @subject_type }
+    end
+  end
+
+  # GET /subject_types/new
+  # GET /subject_types/new.json
+  def new
+    @subject_type = SubjectType.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @subject_type }
+    end
+  end
+
+  # GET /subject_types/1/edit
+  def edit
+  end
+
+  # POST /subject_types
+  # POST /subject_types.json
+  def create
+    @subject_type = SubjectType.new(params[:subject_type])
+
+    respond_to do |format|
+      if @subject_type.save
+        format.html { redirect_to @subject_type, notice:  t('controller.successfully_created', model:  t('activerecord.models.subject_type')) }
+        format.json { render json: @subject_type, status: :created, location: @subject_type }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @subject_type.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /subject_types/1
+  # PUT /subject_types/1.json
   def update
-    @subject_type = SubjectType.find(params[:id])
     if params[:move]
       move_position(@subject_type, params[:move])
       return
     end
-    update!
+
+    respond_to do |format|
+      if @subject_type.update_attributes(params[:subject_type])
+        format.html { redirect_to @subject_type, notice:  t('controller.successfully_updated', model:  t('activerecord.models.subject_type')) }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @subject_type.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /subject_types/1
+  # DELETE /subject_types/1.json
+  def destroy
+    @subject_type.destroy
+
+    respond_to do |format|
+      format.html { redirect_to subject_types_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.subject_type')) }
+      format.json { head :no_content }
+    end
   end
 end

data/app/controllers/subjects_controller.rb

@@ -125,7 +125,7 @@ class SubjectsController < ApplicationController
     @subject.destroy
 
     respond_to do |format|
-      format.html { redirect_to subjects_url }
+      format.html { redirect_to subjects_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.subjects')) }
       format.json { head :no_content }
     end
   end

data/app/models/classification.rb

@@ -1,7 +1,7 @@
 class Classification < ActiveRecord::Base
   attr_accessible :parent_id, :category, :note, :classification_type_id
   belongs_to :classification_type
-  belongs_to :manifestation
+  belongs_to :manifestation, touch: true
 
   validates_associated :classification_type
   validates_presence_of :category, :classification_type

data/app/models/enju_subject/ability.rb

@@ -14,10 +14,13 @@ module EnjuSubject
           can [:destroy, :delete], ClassificationType do |classification_type|
             classification_type.classifications.empty?
           end
+          can [:read, :create, :update], SubjectHeadingType
+          can [:destroy, :delete], SubjectHeadingType do |subject_heading_type|
+            subject_heading_type.subjects.empty?
+          end
           can :manage, [
             Classification,
             Subject,
-            SubjectHeadingType,
             SubjectType
           ]
         else

data/app/models/subject.rb

@@ -2,7 +2,7 @@ class Subject < ActiveRecord::Base
   attr_accessible :parent_id, :use_term_id, :term, :term_transcription,
     :subject_type_id, :note, :required_role_id, :subject_heading_type_id
 
-  belongs_to :manifestation
+  belongs_to :manifestation, touch: true
   belongs_to :subject_type
   belongs_to :subject_heading_type
   belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id'

data/app/views/classification_types/index.html.erb

@@ -1,13 +1,17 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.classification_type')) -%></h1>
 <div id="content_list">
+<p id="notice"><%= notice %></p>
 
 <table class="table table-striped index">
   <tr>
     <th id="position"></th>
     <th><%= t('activerecord.attributes.classification_type.name') -%></th>
-    <th><%= t('activerecord.attributes.classification_type.display_name') -%></th>
-    <th><%= t('activerecord.attributes.classification_type.note') -%></th>
+    <th>
+      <%= t('activerecord.attributes.classification_type.display_name') -%>
+      /
+      <%= t('activerecord.attributes.classification_type.note') -%>
+    </th>
     <th></th>
   </tr>
 
@@ -18,15 +22,18 @@
         <%= move_position(classification_type) -%>
       <%- end -%>
     </td>
-    <td><%= link_to classification_type.name, classification_type -%></td>
-    <td><%= link_to classification_type.display_name.localize, classification_type -%></td>
-    <td><%= classification_type.note -%></td>
+    <td><%= classification_type.name -%></td>
+    <td>
+      <%= link_to classification_type.display_name.localize, classification_type -%>
+      <br />
+      <%= classification_type.note %>
+    </td>
     <td>
       <%- if can? :update, classification_type -%>
         <%= link_to t('page.edit'), edit_classification_type_path(classification_type) -%>
       <% end %>
       <%- if can? :delete, classification_type -%>
-        <%= link_to t('page.destroy'), classification_type, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
+        <%= link_to t('page.destroy'), classification_type_path(classification_type), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>

data/app/views/classifications/index.html.erb

@@ -1,6 +1,7 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.classification')) -%></h1>
 <div id="content_list">
+<p id="notice"><%= notice %></p>
 
 <div class="search_form">
   <%= form_for :classifications, url: classifications_path, html: {method: 'get'} do -%>

data/app/views/manifestations/_classification_detail.html.erb

@@ -5,7 +5,7 @@
       <ul>
         <%- manifestation.classifications.each do |classification| -%>
           <li>
-            <%= link_to "#{classification.classification_type.display_name.localize}: #{classification.category}", manifestations_path(query: "classification_sm:#{classification.category}") -%>
+            <%= link_to "#{classification.classification_type.display_name.localize}: #{classification.category}", manifestations_path(query: "classification_sm:#{classification.classification_type.name}_#{classification.category}") -%>
           </li>
         <%- end -%>
       </ul>

data/app/views/subject_heading_types/index.html.erb

@@ -1,13 +1,17 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.subject_heading_type')) -%></h1>
 <div id="content_list">
+<p id="notice"><%= notice %></p>
 
 <table class="table table-striped index">
   <tr>
     <th id="position"></th>
     <th><%= t('activerecord.attributes.subject_heading_type.name') -%></th>
-    <th><%= t('activerecord.attributes.subject_heading_type.display_name') -%></th>
-    <th><%= t('activerecord.attributes.subject_heading_type.note') -%></th>
+    <th>
+      <%= t('activerecord.attributes.subject_heading_type.display_name') -%>
+      /
+      <%= t('activerecord.attributes.subject_heading_type.note') -%>
+    </th>
     <th></th>
   </tr>
 
@@ -18,15 +22,18 @@
         <%= move_position(subject_heading_type) -%>
       <%- end -%>
     </td>
-    <td><%= link_to subject_heading_type.name, subject_heading_type -%></td>
-    <td><%= link_to subject_heading_type.display_name.localize, subject_heading_type -%></td>
-    <td><%= subject_heading_type.note -%></td>
+    <td><%= subject_heading_type.name -%></td>
+    <td>
+      <%= link_to subject_heading_type.display_name.localize, subject_heading_type -%>
+      <br />
+      <%= subject_heading_type.note %>
+    </td>
     <td>
       <%- if can? :update, subject_heading_type -%>
         <%= link_to t('page.edit'), edit_subject_heading_type_path(subject_heading_type) -%>
       <% end %>
       <%- if can? :delete, subject_heading_type -%>
-        <%= link_to t('page.destroy'), subject_heading_type, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
+        <%= link_to t('page.destroy'), subject_heading_type_path(subject_heading_type), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
@@ -38,6 +45,8 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.new', model: t('activerecord.models.subject_heading_type')), new_subject_heading_type_path -%></li>
+    <%- if can? :create, SubjectHeadingType -%>
+      <li><%= link_to t('page.new', model: t('activerecord.models.subject_heading_type')), new_subject_heading_type_path -%></li>
+    <%- end -%>
   </ul>
 </div>

data/app/views/subject_heading_types/show.html.erb

@@ -3,6 +3,11 @@
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
+<p>
+  <strong><%= t('activerecord.attributes.subject_heading_type.name') -%>:</strong>
+  <%= @subject_heading_type.name -%>
+</p>
+
 <p>
   <strong><%= t('activerecord.attributes.subject_heading_type.display_name') -%>:</strong>
   <%= @subject_heading_type.display_name.localize -%>

data/app/views/subject_types/index.html.erb

@@ -1,13 +1,17 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.subject_type')) -%></h1>
 <div id="content_list">
+<p id="notice"><%= notice %></p>
 
 <table class="table table-striped index">
   <tr>
     <th id="position"></th>
     <th><%= t('activerecord.attributes.subject_type.name') -%></th>
-    <th><%= t('activerecord.attributes.subject_type.display_name') -%></th>
-    <th><%= t('activerecord.attributes.subject_type.note') -%></th>
+    <th>
+      <%= t('activerecord.attributes.subject_type.display_name') -%>
+      /
+      <%= t('activerecord.attributes.subject_type.note') -%>
+    </th>
     <th></th>
   </tr>
 
@@ -18,15 +22,18 @@
         <%= move_position(subject_type) -%>
       <%- end -%>
     </td>
-    <td><%= link_to subject_type.name, subject_type -%></td>
-    <td><%= link_to subject_type.display_name.localize, subject_type -%></td>
-    <td><%= subject_type.note -%></td>
+    <td><%= subject_type.name -%></td>
+    <td>
+      <%= link_to subject_type.display_name.localize, subject_type -%>
+      <br />
+      <%= subject_type.note %>
+    </td>
     <td>
       <%- if can? :update, subject_type -%>
         <%= link_to t('page.edit'), edit_subject_type_path(subject_type) -%>
       <% end %>
       <%- if can? :delete, subject_type -%>
-        <%= link_to t('page.destroy'), subject_type, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
+        <%= link_to t('page.destroy'), subject_type_path(subject_type), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
@@ -38,8 +45,8 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <% if can? :create, SubjectType %>
+    <%- if can? :create, SubjectType -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.subject_type')), new_subject_type_path -%></li>
-    <% end %>
+    <%- end -%>
   </ul>
 </div>

data/app/views/subjects/_form.html.erb

@@ -1,5 +1,9 @@
 <%= form_for(@subject) do |f| -%>
   <%= f.error_messages -%>
+  <div class="field">
+    <%= f.label t('activerecord.models.subject_heading_type') -%>
+    <%= f.select(:subject_heading_type_id, @subject_heading_types.collect{|s| [s.display_name.localize, s.id]}) -%>
+  </div>
   <div class="field">
     <%= f.label t('activerecord.models.subject_type') -%>
     <%= f.select(:subject_type_id, @subject_types.collect{|s| [s.display_name.localize, s.id]}) -%>
@@ -17,10 +21,6 @@
     <%= f.label :note -%><br />
     <%= f.text_area :note -%>
   </div>
-  <div class="field">
-    <%= f.label t('activerecord.models.subject_heading_type') -%>
-    <%= f.select(:subject_heading_type_id, @subject_heading_types.collect{|s| [s.display_name.localize, s.id]}) -%>
-  </div>
   <div class="actions">
     <%= f.submit %>
   </div>

data/app/views/subjects/index.html.erb

@@ -1,6 +1,7 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.subject')) -%></h1>
 <div id="content_list">
+<p id="notice"><%= notice %></p>
   
 <div class="search_form">
   <%= form_for :subjects, url: subjects_path, html: {method: 'get'} do -%>

data/app/views/subjects/show.html.erb

@@ -13,6 +13,11 @@
     <%= link_to @subject.subject_heading_type.display_name.localize, @subject.subject_heading_type -%>
   </p>
 
+  <p>
+    <strong><%= t('activerecord.models.subject_type') -%>:</strong>
+    <%= link_to @subject.subject_type.display_name.localize, @subject.subject_type -%>
+  </p>
+
   <p>
     <strong><%= t('activerecord.attributes.subject.term_transcription') -%>:</strong>
     <%= @subject.term_transcription -%>

data/lib/enju_subject/engine.rb

@@ -1,5 +1,4 @@
 require 'enju_seed'
-require 'inherited_resources'
 require 'dynamic_form'
 
 module EnjuSubject

data/lib/enju_subject/manifestation.rb

@@ -12,6 +12,12 @@ module EnjuSubject
         has_many :classifications
         accepts_nested_attributes_for :subjects, :allow_destroy => true, :reject_if => :all_blank
         accepts_nested_attributes_for :classifications, :allow_destroy => true, :reject_if => :all_blank
+        after_save do
+          subject_index!
+        end
+        after_destroy do
+          subject_index!
+        end
 
         searchable do
           text :subject do
@@ -21,11 +27,19 @@ module EnjuSubject
             subjects.map{|s| [s.term, s.term_transcription]}.flatten.compact
           end
           string :classification, :multiple => true do
-            classifications.collect(&:category)
+            classifications.map{|c| "#{c.classification_type.name}_#{c.category}"}
           end
           integer :subject_ids, :multiple => true
         end
       end
+
+      module InstanceMethods
+        def subject_index!
+          subjects.map{|subject| subject.index}
+          classifications.map{|classification| classification.index}
+          Sunspot.commit
+        end
+      end
     end
   end
 end

data/lib/enju_subject/version.rb

@@ -1,3 +1,3 @@
 module EnjuSubject
-  VERSION = "0.1.0.pre26"
+  VERSION = "0.1.0.pre27"
 end

data/lib/tasks/enju_subject_tasks.rake

@@ -1,4 +1,7 @@
 require 'active_record/fixtures'
+require 'tasks/subject_type'
+require 'tasks/subject_heading_type'
+
 desc "create initial records for enju_subject"
 namespace :enju_subject do
   task :setup => :environment do
@@ -8,4 +11,13 @@ namespace :enju_subject do
 
     puts 'initial fixture files loaded.'
   end
+
+  desc "upgrade enju_subject"
+  task :upgrade => :environment do
+    SubjectType.transaction do
+      update_subject_type
+      update_subject_heading_type
+    end
+    puts 'enju_subject: The upgrade completed successfully.'
+  end
 end

data/lib/tasks/subject_heading_type.rb

@@ -0,0 +1,6 @@
+def update_subject_heading_type
+  unknown = SubjectHeadingType.where(name: 'unknown').first
+  unless unknown
+    SubjectHeadingType.create!(name: 'unknown')
+  end
+end

data/lib/tasks/subject_type.rb

@@ -0,0 +1,10 @@
+def update_subject_type
+  concept = SubjectType.where(name: 'Concept').first
+  concept.update_column(:name, 'concept') if concept
+  event = SubjectType.where(name: 'Event').first
+  event.update_column(:name, 'event') if event
+  object = SubjectType.where(name: 'Object').first
+  object.update_column(:name, 'object') if object
+  place = SubjectType.where(name: 'Place').first
+  place.update_column(:name, 'place') if place
+end