enju_subject 0.1.0.pre13 → 0.1.0.pre14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a89e5f25c1f9c4b71c86a465ba2444e76df5a2d
-  data.tar.gz: c5057ad5dd20114fb5efb76e4334b7e8b5ca756e
+  metadata.gz: f53eb252d1fbc6832322d735d57b15b11aa63269
+  data.tar.gz: 9736eb6d6466b072718346f43e7e27f5827a4f67
 SHA512:
-  metadata.gz: 07634d10d3e400ae41d3ffb3c170da6f6647e69e63d54e26e35126e36b2403d310039a578fd52b62ec07131c5d89be80c54906dc47a054c52955f6e5d2e98bb8
-  data.tar.gz: c39aaf878922caeea0dfc026763c7d5b88616edfe0d7d4ee8266cc8e54888a6e03e180ee796f549b8476ddac5a38e3bfa71dcfad49d7508eb675481cfa34a68e
+  metadata.gz: 6ff7f21843d3ea51a961d03d9fb4b54087caa3e66e69f05c174fbe62e4af4e106564d83ebad9df4605f742149032eb99bc725def840f8ba04ddc709bf11707a5
+  data.tar.gz: 4d0cee45a22718db76db002c067303aad88fbfc71fc4f416de65dadae46720e5bbad64ec99778e2665a5504312216dd811413243afd3d8f5b0603e81b11b07eb

data/app/controllers/subjects_controller.rb

@@ -2,7 +2,6 @@
 class SubjectsController < ApplicationController
   load_and_authorize_resource :except => :index
   authorize_resource :only => :index
-  before_filter :get_work, :get_subject_heading_type
   before_filter :prepare_options, :only => :new
   after_filter :solr_commit, :only => [:create, :update, :destroy]
   cache_sweeper :subject_sweeper, :only => [:create, :update, :destroy]
@@ -17,7 +16,7 @@ class SubjectsController < ApplicationController
     end
     sort[:order] = 'asc' if params[:order] == 'asc'
 
-    search = Subject.search(:include => [:manifestation])
+    search = Subject.search
     query = params[:query].to_s.strip
     unless query.blank?
       @query = query.dup
@@ -31,15 +30,6 @@ class SubjectsController < ApplicationController
       order_by sort[:sort_by], sort[:order]
     end
 
-    unless params[:mode] == 'add'
-      work = @work
-      subject_heading_type = @subject_heading_type
-      search.build do
-        with(:work_id).equal_to work.id if work
-        with(:subject_heading_type_ids).equal_to subject_heading_type.id if subject_heading_type
-      end
-    end
-
     role = current_user.try(:role) || Role.default_role
     search.build do
       with(:required_role_id).less_than_or_equal_to role.id
@@ -70,11 +60,6 @@ class SubjectsController < ApplicationController
       return
     end
 
-    if @work
-      @subject = @work.subjects.find(params[:id])
-    #else
-    #  @subject = Subject.find(params[:id])
-    end
     search = Sunspot.new_search(Manifestation)
     subject = @subject
     search.build do
@@ -82,19 +67,16 @@ class SubjectsController < ApplicationController
     end
     page = params[:work_page] || 1
     search.query.paginate(page.to_i, Manifestation.default_per_page)
-    @works = search.execute!.results
 
     respond_to do |format|
       format.html # show.html.erb
       format.json { render :json => @subject }
-      format.js
     end
   end
 
   # GET /subjects/new
   def new
     @subject = Subject.new
-    @subject.subject_heading_type_id = @subject_heading_type.id if @subject_heading_type
 
     respond_to do |format|
       format.html # new.html.erb
@@ -104,31 +86,18 @@ class SubjectsController < ApplicationController
 
   # GET /subjects/1/edit
   def edit
-    if @work
-      @subject = @work.subjects.find(params[:id])
-    #else
-    #  @subject = Subject.find(params[:id])
-    end
-    @subject_types = SubjectType.all
   end
 
   # POST /subjects
   # POST /subjects.json
   def create
-    if @work
-      @subject = @work.subjects.new(params[:subject])
-    else
-      @subject = Subject.new(params[:subject])
-    end
-    subject_heading_type = SubjectHeadingType.find(@subject.subject_heading_type_id) if @subject.subject_heading_type_id.present?
+    @subject = Subject.new(params[:subject])
 
     respond_to do |format|
       if @subject.save
-        @subject.subject_heading_types << subject_heading_type if subject_heading_type
         format.html { redirect_to @subject, :notice => t('controller.successfully_created', :model => t('activerecord.models.subject')) }
         format.json { render :json => @subject, :status => :created, :location => @subject }
       else
-        @subject_heading_type = subject_heading_type
         prepare_options
         format.html { render :action => "new" }
         format.json { render :json => @subject.errors, :status => :unprocessable_entity }
@@ -139,12 +108,6 @@ class SubjectsController < ApplicationController
   # PUT /subjects/1
   # PUT /subjects/1.json
   def update
-    if @work
-      @subject = @work.subjects.find(params[:id])
-    #else
-    #  @subject = Subject.find(params[:id])
-    end
-
     respond_to do |format|
       if @subject.update_attributes(params[:subject])
         format.html { redirect_to @subject, :notice => t('controller.successfully_updated', :model => t('activerecord.models.subject')) }
@@ -160,11 +123,6 @@ class SubjectsController < ApplicationController
   # DELETE /subjects/1
   # DELETE /subjects/1.json
   def destroy
-    if @work
-      @subject = @work.subjects.find(params[:id])
-    #else
-    #  @subject = Subject.find(params[:id])
-    end
     @subject.destroy
 
     respond_to do |format|
@@ -175,6 +133,6 @@ class SubjectsController < ApplicationController
 
   private
   def prepare_options
-    @subject_types = SubjectType.all
+    @subject_heading_types = SubjectHeadingType.select([:id, :display_name, :position])
   end
 end

data/app/models/enju_subject/ability.rb

@@ -7,10 +7,8 @@ module EnjuSubject
       when 'Administrator'
         can :manage, [
           Classification,
-          Subject,
-          SubjectHeadingTypeHasSubject
+          Subject
         ]
-        can :manage, WorkHasSubject
         if LibraryGroup.site_config.network_access_allowed?(ip_address)
           can [:read, :create, :update], ClassificationType
           can [:destroy, :delete], ClassificationType do |classification_type|
@@ -30,32 +28,26 @@ module EnjuSubject
           ]
         end
       when 'Librarian'
-        can :manage, [
-          WorkHasSubject
-        ]
         can :read, [
           Classification,
           ClassificationType,
           Subject,
           SubjectType,
-          SubjectHeadingType,
-          SubjectHeadingTypeHasSubject
+          SubjectHeadingType
         ]
       when 'User'
         can :read, [
           Classification,
           ClassificationType,
           Subject,
-          SubjectHeadingType,
-          WorkHasSubject
+          SubjectHeadingType
         ]
       else
         can :read, [
           Classification,
           ClassificationType,
           Subject,
-          SubjectHeadingType,
-          WorkHasSubject
+          SubjectHeadingType
         ]
       end
     end

data/app/models/subject.rb

@@ -1,25 +1,19 @@
 class Subject < ActiveRecord::Base
   attr_accessible :parent_id, :use_term_id, :term, :term_transcription,
-    :subject_type_id, :note, :required_role_id
+    :subject_type_id, :note, :required_role_id, :subject_heading_type_id
 
   belongs_to :manifestation
   belongs_to :subject_type
-  has_many :subject_heading_type_has_subjects
-  has_many :subject_heading_types, :through => :subject_heading_type_has_subjects
+  belongs_to :subject_heading_type
   belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id'
 
-  validates_associated :subject_type
-  validates_presence_of :term, :subject_type
-
-  attr_accessor :subject_heading_type_id
+  validates_associated :subject_type, :subject_heading_type
+  validates_presence_of :term, :subject_type_id #, :subject_heading_type_id
 
   searchable do
     text :term
     time :created_at
     integer :required_role_id
-    integer :work_id do
-      manifestation_id
-    end
   end
 
   normalize_attributes :term

data/app/models/subject_heading_type.rb

@@ -1,9 +1,7 @@
 class SubjectHeadingType < ActiveRecord::Base
   attr_accessible :name, :display_name, :note
   include MasterModel
-  #has_many_polymorphs :subjects, :from => [:concepts, :places], :through => :subject_heading_type_has_subjects
-  has_many :subject_heading_type_has_subjects
-  has_many :subjects, :through => :subject_heading_type_has_subjects
+  has_many :subjects
 end
 
 # == Schema Information

data/app/models/subject_sweeper.rb

@@ -1,6 +1,5 @@
 class SubjectSweeper < ActionController::Caching::Sweeper
-  observe Subject, Classification,  SubjectHeadingTypeHasSubject,
-    SubjectHeadingType
+  observe Subject, Classification
   include ExpireEditableFragment
 
   def after_save(record)
@@ -12,8 +11,6 @@ class SubjectSweeper < ActionController::Caching::Sweeper
       end
     when :Classification
       expire_editable_fragment(record)
-    when :SubjectHeadingTypeHasSubject
-      expire_editable_fragment(record.subject)
     end
   end
 

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

@@ -5,7 +5,7 @@
       <ul>
         <%- manifestation.subjects.each do |subject| -%>
           <li>
-            <%= link_to subject.term, manifestations_path(:query => "subject_sm:#{subject.term}") -%>
+            <%= link_to "#{subject.subject_heading_type.display_name.localize}: #{subject.term}", manifestations_path(:query => "subject_sm:#{subject.term}") -%>
           </li>
         <%- end -%>
       </ul>

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

@@ -17,20 +17,10 @@
     <%= f.label :note -%><br />
     <%= f.text_area :note -%>
   </div>
-  <%- if @classification -%>
-    <div class="field">
-      <%= f.label t('activerecord.models.classification') -%>
-      <%= link_to @classification.category, @classification -%>
-      <%= f.hidden_field :classification_id -%>
-    </div>
-  <%- end -%>
-  <%- if @subject_heading_type -%>
-    <div class="field">
-      <%= f.label t('activerecord.models.subject_heading_type') -%>
-      <%= link_to @subject_heading_type.display_name.localize, @subject_heading_type -%>
-      <%= f.hidden_field :subject_heading_type_id -%>
-    </div>
-  <%- end -%>
+  <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,5 +1,44 @@
-<%- if @work -%>
-  <%= render 'subjects/index_work', :subjects => @subjects -%>
-<%- else -%>
-  <%= render 'subjects/index', :subjects => @subjects -%>
-<%- end -%>
+<div id="content_detail" class="ui-corner-all">
+<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.subject')) -%></h1>
+<div id="content_list">
+  
+<div class="search_form">
+  <%= form_for :subjects, :url => subjects_path, :html => {:method => 'get'} do -%>
+    <p>
+      <%= t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
+      <%= submit_tag t('page.search') -%>
+    </p>
+  <%- end -%>
+</div>
+
+<table class="table table-striped index">
+  <tr>
+    <th><%= t('activerecord.attributes.subject.term') -%></th>
+    <th></th>
+  </tr>
+  <%- @subjects.each do |subject| -%>
+    <tr class="line<%= cycle("0", "1") -%>">
+      <td><%= link_to subject.term, subject -%></td>
+      <td>
+        <%- if can? :update, subject -%>
+          <%= link_to t('page.edit'), edit_subject_path(subject) -%>
+        <%- end -%>
+        <%- if can? :delete, subject -%>
+          <%= link_to t('page.destroy'), subject, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%- end -%>
+      </td>
+    </tr>
+  <%- end -%>
+</table>
+
+<%= paginate(@subjects) -%>
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all">
+  <ul>
+    <%- if can? :create, Subject -%>
+      <li><%= link_to t('page.new', :model => t('activerecord.models.subject')), new_subject_path -%></li>
+    <%- end -%>
+  </ul>
+</div>

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

@@ -7,14 +7,10 @@
   [S]
   <%= @subject.term -%>
 </h2>
-  <p>
-    (<%= link_to_wikipedia(@subject.term) -%>)
-  </p>
 
   <p>
-    <%- @subject.subject_heading_types.uniq.each do |subject_heading_type| -%>
-      <%= link_to subject_heading_type.display_name.localize, subject_heading_type -%>
-    <%- end -%>
+    <strong><%= t('activerecord.models.subject_heading_type') -%>:</strong>
+    <%= link_to @subject.subject_heading_type.display_name.localize, @subject.subject_heading_type -%>
   </p>
 
   <p>
@@ -22,35 +18,10 @@
     <%= @subject.term_transcription -%>
   </p>
 
-  <div id="tabs">
-    <ul>
-      <li title="active" class="selected"><a href="#work"><em><%= t('activerecord.models.work') -%></em></a></li>
-      <li><a href="#classification"><em><%= t('activerecord.models.classification') -%></em></a></li>
-    </ul>
-    <%= render 'subjects/show_work_list' -%>
-    <%- cache(:controller => :subjects, :action => :show, :id => @subject.id, :page => 'detail', :role => current_user_role_name, :locale => @locale, :subject_id => nil) do -%>
-    <div id="classification">
-      <table class="table table-striped index">
-        <tr>
-          <th><%= t('activerecord.attributes.classification.category') -%></th>
-          <th><%= t('activerecord.models.classification_type') -%></th>
-        </tr>
-        <%- @subject.classifications.each do |classification| -%>
-          <tr class="line<%= cycle("0", "1") -%>">
-            <td><%= link_to classification.category, classification -%></td>
-            <td><%= link_to classification.classification_type.name, classification.classification_type -%></td>
-          </tr>
-        <%- end -%>
-      </table>
-
-      <p>
-        <strong><%= t('activerecord.attributes.subject.note') -%>:</strong>
-        <%= @subject.note -%>
-      </p>
-    </div>
-    <%- end -%>
-    </div>
-  </div>
+  <p>
+    <strong><%= t('activerecord.attributes.subject.note') -%>:</strong>
+    <%= @subject.note -%>
+  </p>
 </div>
 
 <div id="submenu" class="ui-corner-all">
@@ -58,6 +29,5 @@
     <li><%= back_to_index(flash[:page_info]) -%></li>
     <li><%= link_to t('page.edit'), edit_subject_path(@subject) -%></li>
     <li><%= link_to t('page.destroy'), subject_path(@subject), :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></li>
-    <li><%= link_to t('page.listing', :model => t('activerecord.models.subject_heading_type')), subject_subject_heading_types_path(@subject) -%></li>
   </ul>
 </div>

data/config/locales/translation_en.yml

@@ -2,14 +2,10 @@ en:
   activerecord:
     models:
       subject: Subject
-      work_has_subject: Resource has subject
       subject_type: Subject type
       subject_heading_type: Subject heading type
-      subject_heading_type_has_subject: Subject heading type to subject relationship
       classification: Classification
       classification_type: Classification type
-      subject_has_classification: Subject has classification
-      work: Work
 
     attributes:
       subject:
@@ -18,10 +14,6 @@ en:
         scope_note: Scope note
         note: Note
         lock_version: Lock version
-      work_has_subject:
-        work: Work
-        subject: Subject
-        subjectable_type: Subjectable type
       subject_type:
         name: Name
         display_name: Display name
@@ -32,7 +24,6 @@ en:
         display_name: Display name
         note: Note
         position: Position
-      subject_heading_type_has_subject:
       classification:
         category: Category
         name: Name
@@ -42,10 +33,3 @@ en:
         display_name: Display name
         note: Note
         position: Position
-      subject_has_classification:
-
-  work_has_subject:
-    add_work: "Add a work"
-    add_subject: "Add a subject"
-    subjectable: "Subjectable"
-

data/config/locales/translation_ja.yml

@@ -2,14 +2,10 @@ ja:
   activerecord:
     models:
       subject: 件名
-      work_has_subject: 資料と件名の関係
       subject_type: 件名の種類
       subject_heading_type: 件名標目の種類
-      subject_heading_type_has_subject: 件名標目と件名の関係
       classification: 分類
-      classification_type: 分類型
-      subject_has_classification: 件名と分類の関係
-      work: 著作
+      classification_type: 分類の種類
 
     attributes:
       subject:
@@ -18,10 +14,6 @@ ja:
         scope_note: スコープ注記
         note: 注記
         lock_version: ロックバージョン
-      work_has_subject:
-        work: 書いた資料
-        subject: 件名
-        subjectable_type: 件名付与対象の種類
       subject_type:
         name: 名前
         display_name: 表示名
@@ -32,7 +24,6 @@ ja:
         display_name: 表示名
         note: 注記
         position: 位置
-      subject_heading_type_has_subject:
       classification:
         category: カテゴリー
         name: 名前
@@ -42,10 +33,3 @@ ja:
         display_name: 表示名
         note: 注記
         position: 位置
-      subject_has_classification:
-
-  work_has_subject:
-    add_work: "書いた資料を追加する"
-    add_subject: "件名を追加する"
-    subjectable: "件名付与対象"
-

data/config/routes.rb

@@ -1,34 +1,7 @@
 Rails.application.routes.draw do
-  resources :subject_has_classifications
-  resources :subject_heading_types do
-    resources :subjects
-  end
-  resources :subject_heading_type_has_subjects
-  resources :classifications do
-    resources :subject_has_classifications
-  end
-  resources :classification_types do
-    resources :classifications
-  end
+  resources :subject_heading_types
+  resources :classification_types
+  resources :classifications
   resources :subject_types
-
-  resources :work_has_subjects
-
-  resources :subjects do
-    resources :works, :controller => 'manifestations'
-    resources :subject_heading_types
-    resources :subject_has_classifications
-    resources :work_has_subjects
-    resources :classifications
-  end
-
-  resources :works, :controller => 'manifestations', :except => [:index, :new, :create] do
-    resources :subjects
-    resources :work_has_subjects
-  end
-
-  resources :manifestations do
-    resources :work_has_subjects
-    resources :subjects
-  end
+  resources :subjects
 end

data/db/migrate/20130504195916_add_subject_heading_type_id_to_subject.rb

@@ -0,0 +1,5 @@
+class AddSubjectHeadingTypeIdToSubject < ActiveRecord::Migration
+  def change
+    add_column :subjects, :subject_heading_type_id, :integer
+  end
+end

data/lib/enju_subject/version.rb

@@ -1,3 +1,3 @@
 module EnjuSubject
-  VERSION = "0.1.0.pre13"
+  VERSION = "0.1.0.pre14"
 end

data/lib/generators/enju_subject/setup/templates/db/fixtures/subject_heading_types.yml

@@ -0,0 +1,31 @@
+--- 
+subject_heading_type_00001: 
+  name: NDLSH
+  display_name: NDLSH
+  updated_at: 2008-03-03 00:44:49.850140 +09:00
+  id: 1
+  note: ""
+  created_at: 2008-03-03 00:44:34.260739 +09:00
+  position: 1
+subject_heading_type_00002: 
+  name: BSH
+  display_name: BSH
+  updated_at: 2008-03-03 00:44:58.685360 +09:00
+  id: 2
+  note: ""
+  created_at: 2008-03-03 00:44:58.685360 +09:00
+  position: 2
+
+# == Schema Information
+#
+# Table name: subject_heading_types
+#
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
+#  display_name :text
+#  note         :text
+#  position     :integer
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#
+

data/spec/controllers/subjects_controller_spec.rb

@@ -45,12 +45,6 @@ describe SubjectsController do
         response.should be_success
         assigns(:subjects).should_not be_nil
       end
-
-      it "assigns all subjects as @subjects with work_id" do
-        get :index, :work_id => 1
-        response.should be_success
-        assigns(:subjects).should_not be_nil
-      end
     end
   end
 
@@ -141,17 +135,6 @@ describe SubjectsController do
         get :edit, :id => subject.id
         assigns(:subject).should eq(subject)
       end
-
-      it "should get edit with work" do
-        get :edit, :id => subjects(:subject_00001).id, :work_id => 1
-        assigns(:subject).should eq subjects(:subject_00001)
-        response.should be_success
-      end
-
-      it "should not get edit with missing work" do
-        get :edit, :id => subjects(:subject_00001).id, :work_id => 'missing'
-        response.should be_missing
-      end
     end
 
     describe "When logged in as Librarian" do

data/spec/dummy/app/models/ability.rb

@@ -7,10 +7,8 @@
       when 'Administrator'
         can :manage, [
           Classification,
-          Subject,
-          SubjectHeadingTypeHasSubject
+          Subject
         ]
-        can :manage, WorkHasSubject
         if LibraryGroup.site_config.network_access_allowed?(ip_address)
           can [:read, :create, :update], ClassificationType
           can [:destroy, :delete], ClassificationType do |classification_type|
@@ -31,16 +29,12 @@
         end
         can :read, Manifestation
       when 'Librarian'
-        can :manage, [
-          WorkHasSubject
-        ]
         can :read, [
           Classification,
           ClassificationType,
           Subject,
           SubjectType,
-          SubjectHeadingType,
-          SubjectHeadingTypeHasSubject
+          SubjectHeadingType
         ]
         can :read, Manifestation
       when 'User'
@@ -48,8 +42,7 @@
           Classification,
           ClassificationType,
           Subject,
-          SubjectHeadingType,
-          WorkHasSubject
+          SubjectHeadingType
         ]
         can :read, Manifestation
       else
@@ -57,8 +50,7 @@
           Classification,
           ClassificationType,
           Subject,
-          SubjectHeadingType,
-          WorkHasSubject
+          SubjectHeadingType
         ]
         can :read, Manifestation
       end