enju_biblio 0.1.0.pre59 → 0.1.0.pre60

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', model: t('activerecord.models.agent_merge')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -16,7 +16,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.add', model: t('activerecord.models.agent')), @agent_merge.agent_merge_list -%></li>
     <li><%= link_to t('page.edit'), edit_agent_merge_path(@agent_merge) -%></li>

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

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

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

@@ -10,16 +10,16 @@
   <div class="field">
     <span id="name_person">
       <%- if Setting.family_name_first == true -%>
-        <%= render 'agents/form_family_name_first', :f => f -%>
+        <%= render 'agents/form_family_name_first', f: f -%>
       <%- else -%>
-        <%= render 'agents/form_family_name_last', :f => f -%>
+        <%= render 'agents/form_family_name_last', f: f -%>
       <%- end -%>
     </span>
     <%= f.label :full_name -%><br />
     <%= f.text_field :full_name, class: 'resource_title' -%><br />
     <%= f.label :full_name_transcription -%><br />
     <%= f.text_field :full_name_transcription, class: 'resource_title' -%><br />
-    <%= link_to_function t('activerecord.attributes.agent.full_name_alternative'), "$('#full_name_alternative').toggle()" -%>
+    <%= link_to "#", { onclick: "$('#full_name_alternative').toggle(); return false;"} do t('activerecord.attributes.agent.full_name_alternative') end %>)
     <span id="full_name_alternative" style="display: none">
       <br />
       <%= f.text_area :full_name_alternative, class: 'resource_textarea' -%>

data/app/views/agents/_index_expression.html.erb

@@ -35,7 +35,7 @@
       <td>
         <%- if can? :delete, agent -%>
           <%- if params[:mode] == 'add' -%>
-            <%= link_to t('page.add'), new_expression_realize_path(expression, :agent_id => agent.id) unless expression.contributors.include?(agent) -%>
+            <%= link_to t('page.add'), new_expression_realize_path(expression, agent_id: agent.id) unless expression.contributors.include?(agent) -%>
           <%- else -%>
             <%= link_to t('page.destroy'), expression_realize_path(expression, expression.realized(agent)), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
           <%- end -%>

data/app/views/agents/_index_work.html.erb

@@ -39,7 +39,7 @@
       <td>
         <%- if can? :delete, agent -%>
           <%- if params[:mode] == 'add' -%>
-            <%= link_to t('page.add'), new_work_create_path(work, :agent_id => agent.id) unless work.creators.include?(agent) -%>
+            <%= link_to t('page.add'), new_work_create_path(work, agent_id: agent.id) unless work.creators.include?(agent) -%>
           <%- else -%>
             <% if work.created(agent) %>
               <%= link_to t('page.edit'), edit_create_path(work.created(agent)) -%>

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

@@ -5,7 +5,7 @@
 <%- when @manifestation -%>
   <%= render 'index_manifestation', manifestation: @manifestation -%>
 <%- when @agent -%>
-  <%= render 'index_agent', :agent => @agent -%>
+  <%= render 'index_agent', agent: @agent -%>
 <%- when @agent_merge_list -%>
   <%= render 'index_agent_merge_list', :agent_merge_list => @agent_merge_list -%>
 <%- else -%>

data/app/views/creates/_index_agent.html.erb

@@ -18,8 +18,8 @@
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
       <%- if can? :delete, create -%>
-        <%= create.first? ? image_tag('icons/stop.png', size: '16x16') : link_to(image_tag('icons/arrow_up.png', size: '16x16', alt: t('page.asc')), {action: 'update', move: 'higher', id: create.id, :agent_id => agent.id}, method: :put) -%>
-        <%= create.last? ? image_tag('icons/stop.png', size: '16x16') : link_to(image_tag('icons/arrow_down.png', size: '16x16', alt: t('page.desc')), {action: 'update', move: 'lower', id: create.id, :agent_id => agent.id}, method: :put) -%>
+        <%= create.first? ? image_tag('icons/stop.png', size: '16x16') : link_to(image_tag('icons/arrow_up.png', size: '16x16', alt: t('page.asc')), {action: 'update', move: 'higher', id: create.id, agent_id: agent.id}, method: :put) -%>
+        <%= create.last? ? image_tag('icons/stop.png', size: '16x16') : link_to(image_tag('icons/arrow_down.png', size: '16x16', alt: t('page.desc')), {action: 'update', move: 'lower', id: create.id, agent_id: agent.id}, method: :put) -%>
       <%- end -%>
     </td>
     <td><%= link_to create.work.try(:original_title), create.work -%></td>

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

@@ -1,7 +1,7 @@
 <% if @agent %>
-  <%= render 'index_agent', :agent => @agent %>
+  <%= render 'index_agent', agent: @agent %>
 <% elsif @work %>
-  <%= render 'index_work', :work => @work %>
+  <%= render 'index_work', work: @work %>
 <% else %>
   <%= render 'index' %>
 <% end %>

data/app/views/items/_shelf_picture.html.erb

@@ -1,8 +1,8 @@
 <%- item.shelf.picture_files.each do |picture_file| -%>
-  <%= link_to image_tag('icons/picture.png', size: '16x16', alt: t('page.picture')), picture_file_path(picture_file, format: :download), rel: "item_#{item.id}_manifestation_#{item.manifestation.id}" -%>
+  <%= link_to image_tag('icons/picture.png', size: '16x16', alt: t('page.picture')), picture_file_path(picture_file, format: :download), rel: "item_#{item.id}_manifestation_#{item.manifestation_id}" -%>
 <%- end -%>
 <script type="text/javascript">
   $(document).ready(function(){
-      $("a[rel='item_<%= item.id -%>_manifestation_<%= item.manifestation.id -%>']").colorbox({transition:"none", photo:true});
+      $("a[rel='item_<%= item.id -%>_manifestation_<%= item.manifestation_id -%>']").colorbox({transition:"none", photo:true});
   })
 </script>

data/app/views/items/_shelf_picture.mobile.erb

@@ -1,8 +1,8 @@
 <%- item.shelf.picture_files.each do |picture_file| -%>
-  <%= link_to image_tag('icons/picture.png', size: '16x16', alt: t('page.picture')), picture_file_path(picture_file, format: :download), rel: "item_#{item.id}_manifestation_#{item.manifestation.id}" -%>
+  <%= link_to image_tag('icons/picture.png', size: '16x16', alt: t('page.picture')), picture_file_path(picture_file, format: :download), rel: "item_#{item.id}_manifestation_#{item.manifestation_id}" -%>
 <%- end -%>
 <script type="text/javascript">
   $(document).ready(function(){
-      $("a[rel='item_<%= item.id -%>_manifestation_<%= item.manifestation.id -%>']").colorbox({transition:"none", photo:true});
+      $("a[rel='item_<%= item.id -%>_manifestation_<%= item.manifestation_id -%>']").colorbox({transition:"none", photo:true});
   })
 </script>

data/app/views/manifestations/_show.mods.builder

@@ -6,7 +6,7 @@
     }
     manifestation.creators.readable_by(current_user).each do |creator|
       case creator.agent_type.name
-      when "Person"
+      when "person"
         xml.name('type' => 'personal'){
           xml.namePart creator.full_name
           xml.namePart creator.date if creator.date
@@ -14,14 +14,14 @@
             xml.roleTerm "creator", 'type' => 'text', 'authority' => 'marcrelator'
           end
         }
-      when "CorporateBody"
+      when "corporate_body"
         xml.name('type' => 'corporate'){
           xml.namePart creator.full_name
           xml.role do
             xml.roleTerm "creator", 'type' => 'text', 'authority' => 'marcrelator'
           end
         }
-      when "Conference"
+      when "conference"
         xml.name('type' => 'conference'){
           xml.namePart creator.full_name
           xml.role do
@@ -32,16 +32,16 @@
     end
     manifestation.contributors.readable_by(current_user).each do |contributor|
       case contributor.agent_type.name
-      when "Person"
+      when "person"
         xml.name('type' => 'personal'){
           xml.namePart contributor.full_name
           xml.namePart contributor.date if contributor.date
         }
-      when "CorporateBody"
+      when "corporate_body"
         xml.name('type' => 'corporate'){
           xml.namePart contributor.full_name
         }
-      when "Conference"
+      when "conference"
         xml.name('type' => 'conference'){
           xml.namePart contributor.full_name
         }

data/app/views/manifestations/_show.rdf.builder

@@ -6,7 +6,7 @@
     }
     manifestation.creators.readable_by(current_user).each do |creator|
       case creator.agent_type.name
-      when "Person"
+      when "person"
         xml.name('type' => 'personal'){
           xml.namePart creator.full_name
           xml.namePart creator.date if creator.date
@@ -14,14 +14,14 @@
             xml.roleTerm "creator", 'type' => 'text', 'authority' => 'marcrelator'
           end
         }
-      when "CorporateBody"
+      when "corporate_body"
         xml.name('type' => 'corporate'){
           xml.namePart creator.full_name
           xml.role do
             xml.roleTerm "creator", 'type' => 'text', 'authority' => 'marcrelator'
           end
         }
-      when "Conference"
+      when "conference"
         xml.name('type' => 'conference'){
           xml.namePart creator.full_name
           xml.role do
@@ -32,16 +32,16 @@
     end
     manifestation.contributors.readable_by(current_user).each do |contributor|
       case contributor.agent_type.name
-      when "Person"
+      when "person"
         xml.name('type' => 'personal'){
           xml.namePart contributor.full_name
           xml.namePart contributor.date if contributor.date
         }
-      when "CorporateBody"
+      when "corporate_body"
         xml.name('type' => 'corporate'){
           xml.namePart contributor.full_name
         }
-      when "Conference"
+      when "conference"
         xml.name('type' => 'conference'){
           xml.namePart contributor.full_name
         }

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

@@ -3,7 +3,7 @@
 <%- when 'Manifestation' -%>
   <%= render 'index_manifestation', manifestation: @attachable -%>
 <%- when 'Agent' -%>
-  <%= render 'index_agent', :agent => @attachable -%>
+  <%= render 'index_agent', agent: @attachable -%>
 <%- when 'Event' -%>
   <%= render 'index_event', :event => @attachable -%>
 <%- else -%>

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

@@ -1,5 +1,5 @@
 <%- if @agent -%>
-  <%= render 'index_agent', :agent => @agent -%>
+  <%= render 'index_agent', agent: @agent -%>
 <%- elsif @manifestation -%>
   <%= render 'index_manifestation', manifestation: @manifestation -%>
 <%- else -%>

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

@@ -1,7 +1,7 @@
 <%- if @agent -%>
-  <%= render 'index_agent', :agent => @agent -%>
+  <%= render 'index_agent', agent: @agent -%>
 <%- elsif @expression -%>
-  <%= render 'index_expression', :expression => @expression -%>
+  <%= render 'index_expression', expression: @expression -%>
 <%- else -%>
   <%= render 'index' -%>
 <%- end -%>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.editing', model: t('activerecord.models.series_statement_merge_list')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), @series_statement_merge_list -%></li>
     <li><%= link_to t('page.back'), series_statement_merge_lists_path -%></li>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.series_statement_merge_list')) -%></h1>
 <div id="content_list">
 
@@ -26,7 +26,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.new', model: t('activerecord.models.series_statement_merge_list')), new_series_statement_merge_list_path -%></li>
   </ul>

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

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

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', model: t('activerecord.models.series_statement_merge_list')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -22,7 +22,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.listing', model: t('activerecord.models.series_statement')), series_statement_merge_list_series_statements_path(@series_statement_merge_list) -%></li>
     <li><%= link_to t('page.edit'), edit_series_statement_merge_list_path(@series_statement_merge_list) -%></li>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.editing', model: t('activerecord.models.series_statement_merge')) -%></h1>
 <div id="content_list">
 
@@ -23,7 +23,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), @series_statement_merge -%></li>
     <li><%= link_to t('page.back'), series_statement_merges_path -%></li>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.series_statement_merge')) -%></h1>
 <div id="content_list">
 
@@ -23,7 +23,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if @series_statement_merge_list -%>
       <li><%= link_to t('page.add', model: t('activerecord.models.series_statement')), series_statement_merge_list_series_statements_path(@series_statement_merge_list) -%></li>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.new', model: t('activerecord.models.series_statement_merge')) -%></h1>
 <div id="content_list">
 
@@ -32,7 +32,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.back'), series_statement_merges_path -%></li>
   </ul>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', model: t('activerecord.models.series_statement_merge')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -16,7 +16,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.add', model: t('activerecord.models.series_statement')), series_statement_merge_list_series_statements_path(@series_statement_merge.series_statement_merge_list) -%></li>
     <li><%= link_to t('page.edit'), edit_series_statement_merge_path(@series_statement_merge) -%></li>

data/config/locales/translation_en.yml

@@ -38,8 +38,8 @@ en:
       identifier_type: Identifier type
       resource_export_file: Resource export
       agent_export_file: Agent export
-      patron_merge_list: Patron merge list
-      patron_merge: Patrom merge
+      agent_merge_list: Patron merge list
+      agent_merge: Patrom merge
       series_statement_merge: Series statement merge
       series_statement_merge_list: Series statement merge list
 
@@ -319,9 +319,9 @@ en:
         resource_export_file_name: Filename
         resource_export_file_size: Size
         state: State
-      patron_merge_list:
+      agent_merge_list:
         title: Title
-      patron_merge:
+      agent_merge:
       series_statement_merge_list:
         title: Title
       series_statement_merge:

data/config/locales/translation_ja.yml

@@ -38,8 +38,8 @@ ja:
       identifier_type: 識別子の種類
       resource_export_file: 書誌と所蔵のエクスポート
       agent_export_file: 人物・団体情報のエクスポート
-      patron_merge_list: 人物・団体の統合リスト
-      patron_merge: 人物・団体の統合
+      agent_merge_list: 人物・団体の統合リスト
+      agent_merge: 人物・団体の統合
       series_statement_merge_list: シリーズ情報統合リスト
       series_statement_merge: シリーズ情報の統合
 
@@ -323,9 +323,9 @@ ja:
         agent_export_file_name: ファイル名
         agent_export_file_size: ファイルサイズ
         state: 状態
-      patron_merge_list:
+      agent_merge_list:
         title: タイトル
-      patron_merge:
+      agent_merge:
       series_statement_merge_list:
         title: タイトル
       series_statement_merge:

data/config/routes.rb

@@ -9,7 +9,6 @@ Rails.application.routes.draw do
     resources :agents
     resources :produces
     resources :series_statements
-    resources :items
     resources :picture_files
     resources :manifestations
     resources :manifestation_relationships

data/lib/enju_biblio/engine.rb

@@ -9,11 +9,13 @@ require 'resque_mailer'
 require 'library_stdnums'
 require 'lisbn'
 require 'statesman'
+require 'faraday'
 require 'nkf'
 begin
   require 'charlock_holmes/string'
 rescue LoadError
 end
+require "protected_attributes" if Rails::VERSION::MAJOR == 4
 
 module EnjuBiblio
   class Engine < ::Rails::Engine

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.0.pre59"
+  VERSION = "0.1.0.pre60"
 end