enju_biblio 0.1.3 → 0.2.0.beta.1

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

@@ -24,7 +24,7 @@
       <%= render 'manifestations/show_index', manifestation: own.item.manifestation -%>
     </td>
     <td>
-      <%- if can? :delete, own -%>
+      <%- if policy(own).destroy? -%>
         <%= link_to t('page.show'), own -%>
         <%= link_to t('page.destroy'), own, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
@@ -39,7 +39,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, Own -%>
+    <%- if policy(Own).create? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.own')), new_own_path -%></li>
     <%- end -%>
   </ul>

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

@@ -24,10 +24,10 @@
       <td><%= link_to h(picture_file.picture_file_name), picture_file_path(picture_file, format: :download, size: 'original') -%></td>
       <td>
         <%= link_to t('page.show'), picture_file -%>
-        <%- if can? :update, picture_file -%>
+        <%- if policy(picture_file).update? -%>
           <%= link_to t('page.edit'), edit_picture_file_path(picture_file) -%>
         <% end %>
-        <%- if can? :delete, picture_file -%>
+        <%- if policy(picture_file).destroy? -%>
           <%= link_to t('page.destroy'), picture_file, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         <%- end -%>
       </td>
@@ -40,7 +40,7 @@
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
-  <%- if can? :create, PictureFile -%>
+  <%- if policy(PictureFile).create? -%>
     <ul>
       <li><%= link_to t('page.listing', model: t('activerecord.models.manifestation')), manifestations_path -%></li>
       <li><%= link_to t('page.listing', model: t('activerecord.models.shelf')), shelves_path -%></li>

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

@@ -19,7 +19,7 @@
   <%- @picture_files.each do |picture_file| -%>
     <tr class="line<%= cycle("0", "1") -%>">
       <td>
-        <%- if can? :update, picture_file -%>
+        <%- if policy(picture_file).update? -%>
           <%= move_position(picture_file) -%>
         <%- end -%>
       </td>
@@ -31,10 +31,10 @@
       <td><%= link_to picture_file.picture_file_name, picture_file_path(picture_file, format: :download, size: 'original') -%></td>
       <td>
         <%= link_to t('page.show'), picture_file -%>
-        <%- if can? :update, picture_file -%>
+        <%- if policy(picture_file).update? -%>
           <%= link_to t('page.edit'), edit_picture_file_path(picture_file) -%>
         <% end %>
-        <%- if can? :delete, picture_file -%>
+        <%- if policy(picture_file).destroy? -%>
           <%= link_to t('page.destroy'), picture_file_path(picture_file, agent_id: agent.id), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         <%- end -%>
       </td>
@@ -47,7 +47,7 @@
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
-  <%- if can? :create, PictureFile -%>
+  <%- if policy(PictureFile).create? -%>
     <ul>
       <li><%= link_to t('page.new', model: t('activerecord.models.picture_file')), new_picture_file_path(agent_id: agent.id) -%></li>
       <li><%= link_to t('picture_file.all_picture'), picture_files_path -%></li>

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

@@ -19,7 +19,7 @@
   <%- @picture_files.each do |picture_file| -%>
     <tr class="line<%= cycle("0", "1") -%>">
       <td>
-        <%- if can? :update, picture_file -%>
+        <%- if policy(picture_file).update? -%>
           <%= move_position(picture_file) -%>
         <%- end -%>
       </td>
@@ -31,10 +31,10 @@
       <td><%= link_to picture_file.picture_file_name, picture_file_path(picture_file, format: :download, size: 'original') -%></td>
       <td>
         <%= link_to t('page.show'), picture_file -%>
-        <%- if can? :update, picture_file -%>
+        <%- if policy(picture_file).update? -%>
           <%= link_to t('page.edit'), edit_picture_file_path(picture_file) -%>
         <% end %>
-        <%- if can? :delete, picture_file -%>
+        <%- if policy(picture_file).destroy? -%>
           <%= link_to t('page.destroy'), picture_file, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         <%- end -%>
       </td>
@@ -47,7 +47,7 @@
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
-  <%- if can? :create, PictureFile -%>
+  <%- if policy(PictureFile).create? -%>
     <ul>
       <li><%= link_to t('page.new', model: t('activerecord.models.picture_file')), new_picture_file_path(manifestation_id: manifestation) -%></li>
       <li><%= link_to t('picture_file.all_picture'), picture_files_path -%></li>

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

@@ -18,7 +18,7 @@
 <%- @produce_types.each do |produce_type| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :update, produce_type -%>
+      <%- if policy(produce_type).update? -%>
         <%= move_position(produce_type) -%>
       <%- end -%>
     </td>
@@ -29,10 +29,10 @@
       <%= produce_type.note %>
     </td>
     <td>
-      <%- if can? :update, produce_type -%>
+      <%- if policy(produce_type).update? -%>
         <%= link_to t('page.edit'), edit_produce_type_path(produce_type) -%>
       <% end %>
-      <%- if can? :delete, produce_type -%>
+      <%- if policy(produce_type).destroy? -%>
         <%= link_to t('page.destroy'), produce_type_path(produce_type), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
@@ -45,7 +45,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, ProduceType -%>
+    <%- if policy(ProduceType).create? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.produce_type')), new_produce_type_path -%></li>
     <%- end -%>
   </ul>

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

@@ -14,7 +14,7 @@
     <td><%= link_to produce.agent.full_name, produce.agent -%></td>
     <td><%= link_to produce.manifestation_original_title, produce.manifestation -%></td>
     <td>
-      <%- if can? :delete, produce -%>
+      <%- if policy(produce).destroy? -%>
         <%= link_to t('page.show'), produce -%>
         <%= link_to t('page.destroy'), produce, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
@@ -28,7 +28,7 @@
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
-  <%- if can? :create, Produce -%>
+  <%- if policy(Produce).create? -%>
     <ul>
       <li><%= link_to t('page.new', model: t('activerecord.models.produce')), new_produce_path -%></li>
     </ul>

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

@@ -18,7 +18,7 @@
     <td><%= l(produce.created_at) -%></td>
     <td><%= l(produce.updated_at) -%></td>
     <td>
-      <%- if can? :delete, produce -%>
+      <%- if policy(produce).destroy? -%>
         <%= link_to t('page.destroy'), produce_path(produce, agent_id: agent.id), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
@@ -33,7 +33,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, Produce -%>
+    <%- if policy(Produce).create? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.produce')), new_produce_path(agent_id: agent.id) -%></li>
     <%- end -%>
   </ul>

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

@@ -16,7 +16,7 @@
 <%- @produces.each do |produce| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :delete, produce -%>
+      <%- if policy(produce).update? -%>
         <%= produce.first? ? image_tag('icons/stop.png', size: '16x16') : link_to(image_tag('icons/arrow_up.png', size: '16x16', alt: t('page.asc')), manifestation_produce_path(produce.manifestation, produce, move: 'higher'), method: :put) -%>
         <%= produce.last? ? image_tag('icons/stop.png', size: '16x16') : link_to(image_tag('icons/arrow_down.png', size: '16x16', alt: t('page.desc')), manifestation_produce_path(produce.manifestation, produce, move: 'lower'), method: :put) -%>
       <%- end -%>
@@ -36,7 +36,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.listing', model: t('activerecord.models.agent')), agents_path(manifestation_id: manifestation.id) -%></li>
-    <%- if can? :create, Produce -%>
+    <%- if policy(Produce).create? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.produce')), new_produce_path(manifestation_id: manifestation.id) -%></li>
     <%- end -%>
   </ul>

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

@@ -18,7 +18,7 @@
 <%- @realize_types.each do |realize_type| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :update, realize_type -%>
+      <%- if policy(realize_type).update? -%>
         <%= move_position(realize_type) -%>
       <%- end -%>
     </td>
@@ -29,10 +29,10 @@
       <%= realize_type.note %>
     </td>
     <td>
-      <%- if can? :update, realize_type -%>
+      <%- if policy(realize_type).update? -%>
         <%= link_to t('page.edit'), edit_realize_type_path(realize_type) -%>
       <% end %>
-      <%- if can? :delete, realize_type -%>
+      <%- if policy(realize_type).destroy? -%>
         <%= link_to t('page.destroy'), realize_type_path(realize_type), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
@@ -45,7 +45,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, RealizeType -%>
+    <%- if policy(RealizeType).create? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.realize_type')), new_realize_type_path -%></li>
     <%- end -%>
   </ul>

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

@@ -14,7 +14,7 @@
     <td><%= link_to realize.agent.full_name, realize.agent -%></td>
     <td><%= link_to realize.expression.original_title, realize.expression -%></td>
     <td>
-      <%- if can? :delete, realize -%>
+      <%- if policy(realize).destroy? -%>
         <%= link_to t('page.show'), realize -%>
         <%= link_to t('page.destroy'), realize, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
@@ -28,7 +28,7 @@
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
-  <%- if can? :create, Realize -%>
+  <%- if policy(Realize).create? -%>
     <ul>
       <li><%= link_to t('page.new', model: t('activerecord.models.realize')), new_realize_path -%></li>
     </ul>

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

@@ -18,7 +18,7 @@
     <td><%= l(realize.created_at) -%></td>
     <td><%= l(realize.updated_at) -%></td>
     <td>
-      <%- if can? :delete, realize -%>
+      <%- if policy(realize).destroy? -%>
         <%= link_to t('page.destroy'), realize_path(realize, agent_id: agent.id), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
@@ -33,7 +33,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, Realize -%>
+    <%- if policy(Realize).create? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.realize')), new_realize_path(agent_id: agent.id) -%></li>
     <%- end -%>
   </ul>

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

@@ -16,7 +16,7 @@
 <%- @realizes.each do |realize| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :delete, realize -%>
+      <%- if policy(realize).destroy? -%>
         <%= realize.first? ? image_tag('icons/stop.png', size: '16x16') : link_to(image_tag('icons/arrow_up.png', size: '16x16', alt: t('page.asc')), expression_realize_path(realize.expression, realize, move: 'higher'), method: :put) -%>
         <%= realize.last? ? image_tag('icons/stop.png', size: '16x16') : link_to(image_tag('icons/arrow_down.png', size: '16x16', alt: t('page.desc')), expression_realize_path(realize.expression, realize, move: 'lower'), method: :put) -%>
       <%- end -%>
@@ -36,7 +36,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.listing', model: t('activerecord.models.agent')), agents_path(expression_id: expression.id) -%></li>
-    <%- if can? :create, Realize -%>
+    <%- if policy(Realize).create? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.realize')), new_realize_path(expression_id: expression.id) -%></li>
     <%- end -%>
   </ul>

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

@@ -20,8 +20,6 @@
   <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>
-    <!--
     <li><%= back_to_index(flash[:page_info]) -%></li>
-    -->
   </ul>
 </div>

data/app/views/series_statements/_index.html.erb

@@ -23,7 +23,7 @@
 <% @series_statements.each do |series_statement| %>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if @query.present? and can? :update, series_statement -%>
+      <%- if @query.present? and policy(series_statement).update? -%>
         <%= move_position(series_statement) -%>
       <%- end -%>
     </td>
@@ -31,8 +31,8 @@
       <strong><%= link_to series_statement.original_title, series_statement %></strong>
     </td>
     <td>
-      <%= link_to t('page.edit'), edit_series_statement_path(series_statement) if can? :update, series_statement -%>
-      <%= link_to t('page.destroy'), series_statement, data: {confirm: t('page.are_you_sure')}, method: :delete if can? :delete, series_statement -%>
+      <%= link_to t('page.edit'), edit_series_statement_path(series_statement) if policy(series_statement).update? -%>
+      <%= link_to t('page.destroy'), series_statement, data: {confirm: t('page.are_you_sure')}, method: :delete if policy(series_statement).destroy? -%>
     </td>
   </tr>
 <% end %>
@@ -45,7 +45,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <% if can? :create, SeriesStatement %>
+    <% if policy(SeriesStatement).create? %>
       <li><%= link_to t('page.new', model: t('activerecord.models.series_statement')), new_series_statement_path -%></li>
     <% end %>
   </ul>

data/app/views/series_statements/_index_series_statement_merge_list.html.erb

@@ -7,7 +7,7 @@
 <%= form_for :series_statements, url: series_statement_merge_list_series_statements_path(@series_statement_merge_list), html: {method: 'get'} do -%>
   <p>
     <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {id: 'search_form_top', class: 'search_form', placeholder: t('page.search_term')} -%>
-    <%- if can? :update, @series_statement_merge_list -%>
+    <%- if policy(@series_statement_merge_list).update? -%>
       <%= render 'page/add' %>
     <%- end -%>
     <%= submit_tag t('page.search') -%>
@@ -28,7 +28,7 @@
     <td><%= link_to series_statement.original_title, series_statement_merge_list_series_statement_path(@series_statement_merge_list, series_statement) -%></td>
     <td><%= series_statement.series_statement_identifier -%></td>
     <td>
-      <%- if can? :delete, series_statement -%>
+      <%- if policy(series_statement).destroy? -%>
         <%- if params[:mode] == 'add' -%>
           <%= link_to t('page.add'), new_series_statement_merge_list_series_statement_merge_path(@series_statement_merge_list, series_statement_id: series_statement.id) unless @series_statement_merge_list.series_statements.include?(series_statement) -%>
         <%- else -%>

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

@@ -33,7 +33,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <% if can? :update, @series_statement %>
+    <% if policy(@series_statement).update? %>
       <li><%= link_to t('page.edit'), edit_series_statement_path(@series_statement) %></li>
     <% end %>
     <li><%= back_to_index(flash[:page_info]) %></li>

data/config/locales/translation_en.yml

@@ -42,6 +42,7 @@ en:
       agent_merge: Patron merge
       series_statement_merge: Series statement merge
       series_statement_merge_list: Series statement merge list
+      periodical: Periodical
 
     attributes:
       manifestation:
@@ -376,6 +377,7 @@ en:
     invalid_isbn: "Invalid ISBN."
     already_imported: "This manifestation is already imported."
     record_not_found: "Record not found."
+    record_not_added: "Record not added."
     add: "Add a manifestation"
     specify_expression: "Specify the expression."
     pickup: "Pick up"
@@ -415,6 +417,17 @@ en:
     merge: "Merge!"
     merge_resource: "Merge %{model}"
     new_acquisition: Acquisition
+    per_page: "%{num} records per page"
+    new_item: New item
+    sort_criteria:
+      created_at: "Created at"
+      date_asc: Oldest
+      date_desc: Newest
+      score_asc: Score Asc
+      score_desc: Score Desc
+      title_asc: A-Z
+      title_desc: Z-A
+    score: Score
 
   merge_list:
     successfully_merged: "%{model} were merged successfully."

data/config/locales/translation_ja.yml

@@ -42,6 +42,7 @@ ja:
       agent_merge: 人物・団体の統合
       series_statement_merge_list: シリーズ情報統合リスト
       series_statement_merge: シリーズ情報の統合
+      periodical: 逐次刊行物
 
     attributes:
       manifestation:
@@ -380,6 +381,7 @@ ja:
     invalid_isbn: "無効なISBNです。"
     already_imported: "すでにインポートされています。"
     record_not_found: "資料が見つかりませんでした。"
+    record_not_added: "資料がまだ登録されていません。"
     add: "資料を追加する"
     specify_expression: "協力した資料を指定してください。"
     pickup: "ピックアップ"
@@ -419,6 +421,17 @@ ja:
     merge: "統合する（取り消しはできません）"
     merge_resource: "%{model}を統合する"
     new_acquisition: 新規受入
+    per_page: "%{num}件ずつ表示"
+    new_item: 所蔵作成
+    sort_criteria:
+      created_at: 書誌作成日
+      date_asc: 古い順
+      date_desc: 新しい順
+      score_asc: 適合度逆順
+      score_desc: 適合度順
+      title_asc: 50音順
+      title_desc: 50音逆順
+    score: スコア
 
   merge_list:
     successfully_merged: "%{model}は正常に統合されました。"

data/config/routes.rb

@@ -5,51 +5,11 @@ Rails.application.routes.draw do
 
   get "/manifestations/:manifestation_id/items" => redirect("/items?manifestation_id=%{manifestation_id}")
 
-  resources :manifestations do
-    resources :agents
-    resources :produces
-    resources :series_statements
-    resources :picture_files
-    resources :manifestations
-    resources :manifestation_relationships
-  end
-
-  resources :items do
-    resources :agents
-    resources :owns
-    resources :manifestations, :only => [:index]
-  end
-
-  resources :agents do
-    resources :works, :controller => 'manifestations'
-    resources :expressions, :controller => 'manifestations'
-    resources :manifestations
-    resources :items
-    resources :agents
-    resources :agent_relationships
-  end
+  resources :manifestations
 
-  resources :works, :controller => 'manifestations', :except => [:index, :new, :create] do
-    resources :agents
-    resources :creates
-  end
-
-  resources :expressions, :controller => 'manifestations', :except => [:index, :new, :create] do
-    resources :agents
-    resources :realizes
-  end
+  resources :items
 
-  resources :creators, :controller => 'agents', :except => [:index, :new, :create] do
-    resources :manifestations
-  end
-
-  resources :contributors, :controller => 'agents', :except => [:index, :new, :create] do
-    resources :manifestations
-  end
-
-  resources :publishers, :controller => 'agents', :except => [:index, :new, :create] do
-    resources :manifestations
-  end
+  resources :agents
 
   resources :creates
   resources :create_types

data/lib/enju_biblio/engine.rb

@@ -4,7 +4,6 @@ require 'paperclip-meta'
 require 'validates_timeliness'
 require 'dynamic_form'
 require 'simple_form'
-require 'resque_mailer'
 require 'library_stdnums'
 require 'lisbn'
 require 'statesman'

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.3"
+  VERSION = "0.2.0.beta.1"
 end

data/lib/enju_biblio.rb

@@ -5,111 +5,4 @@ require "enju_biblio/sru"
 require "enju_biblio/biblio_helper"
 
 module EnjuBiblio
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
-
-  module ClassMethods
-    def enju_biblio
-      include EnjuBiblio::InstanceMethods
-    end
-  end
-
-  module InstanceMethods
-    private
-
-    def get_work
-      @work = Manifestation.find(params[:work_id]) if params[:work_id]
-      authorize! :show, @work if @work
-    end
-
-    def get_expression
-      @expression = Manifestation.find(params[:expression_id]) if params[:expression_id]
-      authorize! :show, @expression if @expression
-    end
-
-    def get_manifestation
-      @manifestation = Manifestation.find(params[:manifestation_id]) if params[:manifestation_id]
-      authorize! :show, @manifestation if @manifestation
-    end
-
-    def get_item
-      @item = Item.find(params[:item_id]) if params[:item_id]
-      authorize! :show, @item if @item
-    end
-
-    def get_carrier_type
-      @carrier_type = CarrierType.find(params[:carrier_type_id]) if params[:carrier_type_id]
-    end
-
-    def get_agent
-      @agent = Agent.find(params[:agent_id]) if params[:agent_id]
-      authorize! :show, @agent if @agent
-    end
-
-    def get_series_statement
-      @series_statement = SeriesStatement.find(params[:series_statement_id]) if params[:series_statement_id]
-    end
-
-    def get_basket
-      @basket = Basket.find(params[:basket_id]) if params[:basket_id]
-    end
-
-    def get_agent_merge_list
-      @agent_merge_list = AgentMergeList.find(params[:agent_merge_list_id]) if params[:agent_merge_list_id]
-    end
-
-    def get_series_statement_merge_list
-      @series_statement_merge_list = SeriesStatementMergeList.find(params[:series_statement_merge_list_id]) if params[:series_statement_merge_list_id]
-    end
-
-    def make_internal_query(search)
-      # 内部的なクエリ
-      set_role_query(current_user, search)
-
-      unless params[:mode] == "add"
-        expression = @expression
-        agent = @agent
-        manifestation = @manifestation
-        reservable = @reservable
-        carrier_type = params[:carrier_type]
-        library = params[:library]
-        language = params[:language]
-        if defined?(EnjuSubject)
-          subject = params[:subject]
-          subject_by_term = Subject.where(term: params[:subject]).first
-          @subject_by_term = subject_by_term
-        end
-
-        search.build do
-          with(:publisher_ids).equal_to agent.id if agent
-          with(:original_manifestation_ids).equal_to manifestation.id if manifestation
-          with(:reservable).equal_to reservable unless reservable.nil?
-          unless carrier_type.blank?
-            with(:carrier_type).equal_to carrier_type
-          end
-          unless library.blank?
-            library_list = library.split.uniq
-            library_list.each do |lib|
-              with(:library).equal_to lib
-            end
-          end
-          unless language.blank?
-            language_list = language.split.uniq
-            language_list.each do |language|
-              with(:language).equal_to language
-            end
-          end
-          if defined?(EnjuSubject)
-            unless subject.blank?
-              with(:subject).equal_to subject_by_term.term
-            end
-          end
-        end
-      end
-      return search
-    end
-  end
 end
-
-ActionController::Base.send(:include, EnjuBiblio)

data/lib/tasks/enju_biblio_tasks.rake

@@ -9,7 +9,7 @@ namespace :enju_biblio do
   desc "create initial records for enju_biblio"
   task :setup => :environment do
     Dir.glob(Rails.root.to_s + '/db/fixtures/enju_biblio/*.yml').each do |file|
-      ActiveRecord::Fixtures.create_fixtures('db/fixtures/enju_biblio', File.basename(file, '.*'))
+      ActiveRecord::FixtureSet.create_fixtures('db/fixtures/enju_biblio', File.basename(file, '.*'))
     end
   end