enju_subject 0.1.0.pre25 → 0.1.0.pre26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58fa31fc46e6086be90f44cd2c0bdfc8879e1c86
-  data.tar.gz: fd2aae3d6bf163b0ad4e955aba991ef1c215a3c5
+  metadata.gz: eb377ab73e1f078b5899f949f29b6bca3805a0b2
+  data.tar.gz: 219048b79e584acf30c2cf9112b804bb6f7368be
 SHA512:
-  metadata.gz: a6be2c158c82d531e1a8606155d86cd79483ca5b0055c3f809f978af10b7ed90c8ce2ae21c19c754389992d6287c895b99047b649b453b4f1f9a1ac627d7e34b
-  data.tar.gz: 898e1dcd59613aa9cc8aa211c2222cff7d99ebf07671a6b5d2dfbb73e4e113eb67f6abb73c5b4f1e1968311a36f58f18ecc74387925ad3b4c8523aa12b72459b
+  metadata.gz: 99de1b3f98bd62786fa6df67b0436aa55065de8211a05a3d393fa1b9bd4e34b7ee9b76b1018d6961d9d46c13613cea90779c0ed4fc29f6e43b8bd472b45d0e00
+  data.tar.gz: ccd8eca7c18f65ad8783564d309ebfe464eaca5964f919c11125791aed8675502c7fa6c65dca62ec0ad6a977c4adc6e84ac51fe72f73f677053108bfce727305

data/app/controllers/classifications_controller.rb

@@ -2,8 +2,7 @@
 class ClassificationsController < ApplicationController
   load_and_authorize_resource
   before_filter :get_subject, :get_classification_type
-  after_filter :solr_commit, :only => [:create, :update, :destroy]
-  cache_sweeper :subject_sweeper, :only => [:create, :update, :destroy]
+  after_filter :solr_commit, only: [:create, :update, :destroy]
 
   # GET /classifications
   # GET /classifications.json
@@ -34,7 +33,7 @@ class ClassificationsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @classifications }
+      format.json { render json: @classifications }
     end
   end
 
@@ -43,7 +42,7 @@ class ClassificationsController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @classification }
+      format.json { render json: @classification }
     end
   end
 
@@ -56,7 +55,7 @@ class ClassificationsController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @classification }
+      format.json { render json: @classification }
     end
   end
 
@@ -72,12 +71,12 @@ class ClassificationsController < ApplicationController
 
     respond_to do |format|
       if @classification.save
-        format.html { redirect_to @classification, :notice => t('controller.successfully_created', :model => t('activerecord.models.classification')) }
-        format.json { render :json => @classification, :status => :created, :location => @classification }
+        format.html { redirect_to @classification, notice: t('controller.successfully_created', model: t('activerecord.models.classification')) }
+        format.json { render json: @classification, status: :created, location: @classification }
       else
         @classification_types = ClassificationType.all
-        format.html { render :action => "new" }
-        format.json { render :json => @classification.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @classification.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -87,12 +86,12 @@ class ClassificationsController < ApplicationController
   def update
     respond_to do |format|
       if @classification.update_attributes(params[:classification])
-        format.html { redirect_to @classification, :notice => t('controller.successfully_updated', :model => t('activerecord.models.classification')) }
+        format.html { redirect_to @classification, notice: t('controller.successfully_updated', model: t('activerecord.models.classification')) }
         format.json { head :no_content }
       else
         @classification_types = ClassificationType.all
-        format.html { render :action => "edit" }
-        format.json { render :json => @classification.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @classification.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/controllers/subjects_controller.rb

@@ -1,15 +1,14 @@
 # -*- encoding: utf-8 -*-
 class SubjectsController < ApplicationController
-  load_and_authorize_resource :except => :index
-  authorize_resource :only => :index
-  before_filter :prepare_options, :only => [:new, :edit]
-  after_filter :solr_commit, :only => [:create, :update, :destroy]
-  cache_sweeper :subject_sweeper, :only => [:create, :update, :destroy]
+  load_and_authorize_resource except: :index
+  authorize_resource only: :index
+  before_filter :prepare_options, only: [:new, :edit]
+  after_filter :solr_commit, only: [:create, :update, :destroy]
 
   # GET /subjects
   # GET /subjects.json
   def index
-    sort = {:sort_by => 'created_at', :order => 'desc'}
+    sort = {sort_by: 'created_at', order: 'desc'}
     case params[:sort_by]
     when 'name'
       sort[:sort_by] = 'term'
@@ -41,11 +40,11 @@ class SubjectsController < ApplicationController
     session[:params] = {} unless session[:params]
     session[:params][:subject] = params
 
-    flash[:page_info] = {:page => page, :query => query}
+    flash[:page_info] = {page: page, query: query}
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @subjects }
+      format.json { render json: @subjects }
       format.rss
       format.atom
     end
@@ -55,7 +54,7 @@ class SubjectsController < ApplicationController
   # GET /subjects/1.json
   def show
     if params[:term]
-      subject = Subject.where(:term => params[:term]).first
+      subject = Subject.where(term: params[:term]).first
       redirected_to subject
       return
     end
@@ -70,7 +69,7 @@ class SubjectsController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @subject }
+      format.json { render json: @subject }
     end
   end
 
@@ -80,7 +79,7 @@ class SubjectsController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @subject }
+      format.json { render json: @subject }
     end
   end
 
@@ -95,12 +94,12 @@ class SubjectsController < ApplicationController
 
     respond_to do |format|
       if @subject.save
-        format.html { redirect_to @subject, :notice => t('controller.successfully_created', :model => t('activerecord.models.subject')) }
-        format.json { render :json => @subject, :status => :created, :location => @subject }
+        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
         prepare_options
-        format.html { render :action => "new" }
-        format.json { render :json => @subject.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @subject.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -110,12 +109,12 @@ class SubjectsController < ApplicationController
   def update
     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')) }
+        format.html { redirect_to @subject, notice: t('controller.successfully_updated', model: t('activerecord.models.subject')) }
         format.json { head :no_content }
       else
         prepare_options
-        format.html { render :action => "edit" }
-        format.json { render :json => @subject.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @subject.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/models/classification_type.rb

@@ -1,7 +1,7 @@
 class ClassificationType < ActiveRecord::Base
   attr_accessible :name, :display_name, :note
   include MasterModel
-  default_scope :order => 'position'
+  default_scope order: 'classification_types.position'
   has_many :classifications
   validates :name, :format => {:with => /\A[0-9a-z][0-9a-z_\-]*[0-9a-z]\Z/}
 end

data/app/models/subject.rb

@@ -5,7 +5,7 @@ class Subject < ActiveRecord::Base
   belongs_to :manifestation
   belongs_to :subject_type
   belongs_to :subject_heading_type
-  belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id'
+  belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id'
 
   validates_associated :subject_type, :subject_heading_type
   validates_presence_of :term, :subject_type_id, :subject_heading_type_id

data/app/models/subject_heading_type.rb

@@ -2,7 +2,7 @@ class SubjectHeadingType < ActiveRecord::Base
   attr_accessible :name, :display_name, :note
   include MasterModel
   has_many :subjects
-  validates :name, :format => {:with => /\A[0-9a-z][0-9a-z_\-]*[0-9a-z]\Z/}
+  validates :name, format: {with: /\A[0-9a-z][0-9a-z_\-]*[0-9a-z]\Z/}
 end
 
 # == Schema Information

data/app/models/subject_type.rb

@@ -1,9 +1,9 @@
 class SubjectType < ActiveRecord::Base
   attr_accessible :name, :display_name, :note
   include MasterModel
-  default_scope :order => "position"
+  default_scope order: "position"
   has_many :subjects
-  validates :name, :format => {:with => /\A[0-9A-Za-z][0-9a-z_\-]*[0-9a-z]\Z/}
+  validates :name, format: {with: /\A[0-9A-Za-z][0-9a-z_\-]*[0-9a-z]\Z/}
 end
 
 # == Schema Information

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

@@ -3,15 +3,15 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name, :class => 'short_name' %>
+    <%= f.text_field :name, class: 'short_name' %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />
-    <%= f.text_area :display_name, :class => 'resource_textarea' %>
+    <%= f.text_area :display_name, class: 'resource_textarea' %>
   </div>
   <div class="field">
     <%= f.label :note %><br />
-    <%= f.text_area :note, :class => 'resource_textarea' %>
+    <%= f.text_area :note, class: 'resource_textarea' %>
   </div>
   <div class="actions">
     <%= f.submit %>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.classification_type')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.classification_type')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.classification_type')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.classification_type')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -26,7 +26,7 @@
         <%= 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, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
@@ -39,7 +39,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if can? :create, ClassificationType -%>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.classification_type')), new_classification_type_path -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.classification_type')), new_classification_type_path -%></li>
     <%- end -%>
   </ul>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.classification_type')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.classification_type')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.classification_type')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.classification_type')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 

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

@@ -8,7 +8,7 @@
 
   <div class="field">
     <%= f.label :note -%><br />
-    <%= f.text_area :note, :class => 'resource_textarea' -%>
+    <%= f.text_area :note, class: 'resource_textarea' -%>
   </div>
 
   <div class="field">

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.classification')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.classification')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

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

@@ -1,11 +1,11 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.classification')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.classification')) -%></h1>
 <div id="content_list">
 
 <div class="search_form">
-  <%= form_for :classifications, :url => classifications_path, :html => {:method => 'get'} do -%>
+  <%= form_for :classifications, url: classifications_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')} -%>
+      <%= 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 -%>
@@ -27,7 +27,7 @@
     <td>
       <%- if can? :delete, classification -%>
         <%= link_to t('page.edit'), edit_classification_path(classification) -%>
-        <%= link_to t('page.destroy'), classification, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), classification, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
@@ -43,9 +43,9 @@
   <ul>
     <%- if can? :create, Classification -%>
       <%- if @classification_type -%>
-        <li><%= link_to t('page.new', :model => t('activerecord.models.classification')), new_classification_type_classification_path(@classification_type) -%></li>
+        <li><%= link_to t('page.new', model: t('activerecord.models.classification')), new_classification_type_classification_path(@classification_type) -%></li>
       <%- else -%>
-        <li><%= link_to t('page.new', :model => t('activerecord.models.classification')), new_classification_path -%></li>
+        <li><%= link_to t('page.new', model: t('activerecord.models.classification')), new_classification_path -%></li>
       <%- end -%>
     <%- end -%>
   </ul>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%=  t('page.new', :model => t('activerecord.models.classification')) -%></h1>
+<h1 class="title"><%=  t('page.new', model: t('activerecord.models.classification')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.classification')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.classification')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 

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.category}") -%>
           </li>
         <%- end -%>
       </ul>

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

@@ -5,7 +5,7 @@
       <ul>
         <%- manifestation.subjects.each do |subject| -%>
           <li>
-            <%= link_to "#{subject.subject_heading_type.display_name.localize}: #{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/manifestations/_subject_facet.html.erb

@@ -2,15 +2,15 @@
 <%- unless @subject_facet.blank? -%>
 <ul>
   <%- @subject_facet[0..19].each do |facet| -%>
-    <%- subject = Subject.where(:id => facet.value).first -%>
+    <%- subject = Subject.where(id: facet.value).first -%>
     <%- if subject -%>
       <li>
-        <%= link_to "#{subject.term} (#{facet.count})", url_for(params.merge(:page => nil, :subject => "\"#{subject.term}\"", :view => nil, :only_path => true)) -%>
+        <%= link_to "#{subject.term} (#{facet.count})", url_for(params.merge(page: nil, subject: "\"#{subject.term}\"", view: nil, only_path: true)) -%>
       </li>
     <%- end -%>
   <%- end -%>
   <%- if @subject_by_term -%>
-    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(:subject => nil, :page => nil, :view => nil, :only_path => true)) -%></li>
+    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(subject: nil, page: nil, view: nil, only_path: true)) -%></li>
   <%- end -%>
 </ul>
 <%- else -%>

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

@@ -4,7 +4,7 @@
       <%= subject_form.select(:subject_heading_type_id, @subject_heading_types.collect{|s| [s.display_name.localize, s.id]}) %>
       <%= subject_form.text_field :term %>
       <%= subject_form.select(:subject_type_id, @subject_types.collect{|s| [s.display_name.localize, s.id]}) %>
-      <%= subject_form.link_to_remove t('page.remove'), :confirm => t('page.are_you_sure')  %>
+      <%= subject_form.link_to_remove t('page.remove'), confirm: t('page.are_you_sure')  %>
     <% end %>
     <p><%= f.link_to_add t('page.add'), :subjects %></p>
   </div>
@@ -14,7 +14,7 @@
     <%= f.fields_for :classifications do |classification_form| %>
       <%= classification_form.select(:classification_type_id, @classification_types.collect{|c| [c.display_name.localize, c.id]}) %>
       <%= classification_form.text_field :category %>
-      <%= classification_form.link_to_remove t('page.remove'), :confirm => t('page.are_you_sure')  %>
+      <%= classification_form.link_to_remove t('page.remove'), confirm: t('page.are_you_sure')  %>
     <% end %>
     <p><%= f.link_to_add t('page.add'), :classifications %></p>
   </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.subject_heading_type')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.subject_heading_type')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

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

@@ -1,5 +1,5 @@
 <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>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.subject_heading_type')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -26,7 +26,7 @@
         <%= 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, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
@@ -38,6 +38,6 @@
 
 <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>
+    <li><%= link_to t('page.new', model: t('activerecord.models.subject_heading_type')), new_subject_heading_type_path -%></li>
   </ul>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.subject_heading_type')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.subject_heading_type')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.subject_heading_type')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.subject_heading_type')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.subject_type')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.subject_type')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.subject_type')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.subject_type')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -26,7 +26,7 @@
         <%= 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, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
@@ -39,7 +39,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <% if can? :create, SubjectType %>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.subject_type')), new_subject_type_path -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.subject_type')), new_subject_type_path -%></li>
     <% end %>
   </ul>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.subject_type')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.subject_type')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.subject_type')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.subject_type')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.subject')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.subject')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

data/app/views/subjects/index.atom.builder

@@ -1,5 +1,5 @@
-atom_feed(:url => subjects_url(:format => :atom)) do |feed|
-  feed.title t('page.listing', :model => t('activerecord.models.subject')) + " (#{@library_group.display_name.localize})"
+atom_feed(url: subjects_url(format: :atom)) do |feed|
+  feed.title t('page.listing', model: t('activerecord.models.subject')) + " (#{@library_group.display_name.localize})"
   feed.updated(@subjects.first ? @subjects.first.created_at : Time.zone.now)
 
   @subjects.each do |subject|

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

@@ -1,11 +1,11 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.subject')) -%></h1>
+<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 -%>
+  <%= 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')} -%>
+      <%= 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 -%>
@@ -24,7 +24,7 @@
           <%= 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 -%>
+          <%= link_to t('page.destroy'), subject, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         <%- end -%>
       </td>
     </tr>
@@ -38,7 +38,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if can? :create, Subject -%>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.subject')), new_subject_path -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.subject')), new_subject_path -%></li>
     <%- end -%>
   </ul>
 </div>

data/app/views/subjects/index.rss.builder

@@ -3,14 +3,14 @@ xml.rss('version' => "2.0",
         'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/",
         'xmlns:atom' => "http://www.w3.org/2005/Atom"){
   xml.channel{
-    xml.title t('page.listing', :model => t('activerecord.models.subject')) + " (#{@library_group.display_name.localize})"
-    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(:format => nil, :only_path => true))}"
+    xml.title t('page.listing', model: t('activerecord.models.subject')) + " (#{@library_group.display_name.localize})"
+    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(format: nil, only_path: true))}"
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
     xml.language @locale.to_s
     xml.ttl "60"
-    xml.tag! "atom:link", :rel => 'self', :href => "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(:format => :rss, :only_path => true))}"
-    xml.tag! "atom:link", :rel => 'alternate', :href => subjects_url
-    xml.tag! "atom:link", :rel => 'search', :type => 'application/opensearchdescription+xml', :href => page_opensearch_url
+    xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(format: :rss, only_path: true))}"
+    xml.tag! "atom:link", rel: 'alternate', href: subjects_url
+    xml.tag! "atom:link", rel: 'search', type: 'application/opensearchdescription+xml', href: page_opensearch_url
     unless params[:query].blank?
       xml.tag! "opensearch:totalResults", @count[:query_result]
       xml.tag! "opensearch:startIndex", @subjects.offset + 1

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.subject')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.subject')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>