enju_biblio 0.1.0.pre62 → 0.1.0.pre63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dd53a7049e42dc24361a89c58aaf3336ee0cf4d
-  data.tar.gz: d33fad0a3c37f0ddd23724a8e0b55b600c5e44db
+  metadata.gz: 12c3398286d119f0c1da75ab93a49e47b05d3332
+  data.tar.gz: ca673d38b8c33ebb9b91e836af956ae45209970a
 SHA512:
-  metadata.gz: 289d1cfe963f9d7011de48ba78beb508dc663057891a36406f365398130c8a3aad7b1c39a0cff0ba9ccdc91419940d4af1a3e7f65838b6621690296b2c4f5cfd
-  data.tar.gz: e5cbe3e846579a64a1632ae10463c4fa319201d1f3a82717214e71d9fc24f138477944e995140bb54b937bc6f0310fcdfb40c358ba6945342b61f743ddb6f306
+  metadata.gz: 92c2e3f791d543aaa1060db69a01bc9ec4253875bb1ec865d890d1e2b3dec6e731218670a9d036c1c0fee62bc56a17f7fe962b96174ebd893f77a31a668cc2dd
+  data.tar.gz: 0402d031655a3fb8212b763ff37b305f179cb5a836b7a2f63cc6840a035693f903fb15c4ba0b24387e197bbabe0bd9554cdf5cf6736d090f78fc44e448070777

data/README.rdoc

@@ -1,3 +1,10 @@
-= EnjuBiblio {<img src="https://secure.travis-ci.org/next-l/enju_biblio.png?branch=master" alt="Build Status" />}[http://travis-ci.org/next-l/enju_biblio]
+= EnjuBiblio
+{<img src="https://secure.travis-ci.org/next-l/enju_biblio.png?branch=1.1" alt="Build Status" />}[http://travis-ci.org/next-l/enju_biblio]
+{<img src="https://coveralls.io/repos/next-l/enju_biblio/badge.png?branch=1.1" alt="Coverage Status" />}[https://coveralls.io/r/next-l/enju_biblio?branch=1.1]
+{<img src="https://hakiri.io/github/next-l/enju_biblio/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_biblio/1.1]
 
 This project rocks and uses MIT-LICENSE.
+
+== 製作者・貢献者 (Authors and contributors)
+* {TANABE, Kosuke}[https://github.com/nabeta] ({@nabeta}[https://twitter.com/nabeta])
+* {Project Next-L}[http://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])

data/app/controllers/series_statements_controller.rb

@@ -18,7 +18,7 @@ class SeriesStatementsController < ApplicationController
     end
     search.build do
       fulltext query if query.present?
-      paginate :page => page.to_i, :per_page => SeriesStatement.default_per_page
+      paginate page: page.to_i, per_page: SeriesStatement.default_per_page
       order_by :position, :asc
     end
     #work = @work

data/app/helpers/agents_helper.rb

@@ -4,10 +4,10 @@ module AgentsHelper
     link = ''
     agent.picture_files.each_with_index do |picture_file, i|
       if i == 0
-        link += link_to(show_image(picture_file, :size => :thumb), picture_file_path(picture_file, :format => :download), :rel => "agent_#{agent.id}")
+        link += link_to(show_image(picture_file, size: :thumb), picture_file_path(picture_file, format: :download), rel: "agent_#{agent.id}")
       else
-        link += content_tag :span, :style => "display: none" do
-          link_to(show_image(picture_file, :size => :thumb), picture_file_path(picture_file, :format => :download), :rel => "agent_#{agent.id}")
+        link += content_tag :span, style: "display: none" do
+          link_to(show_image(picture_file, size: :thumb), picture_file_path(picture_file, format: :download), rel: "agent_#{agent.id}")
         end
       end
     end

data/app/helpers/series_statements_helper.rb

@@ -3,7 +3,7 @@ module SeriesStatementsHelper
 
   def series_pagination_link
     if flash[:manifestation_id]
-      render 'manifestations/paginate_id_link', :manifestation => Manifestation.find(flash[:manifestation_id])
+      render 'manifestations/paginate_id_link', manifestation: Manifestation.find(flash[:manifestation_id])
     end
   end
 end

data/app/models/agent.rb

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
 class Agent < ActiveRecord::Base
-  enju_export if defined?(EnjuExport)
   attr_accessible :last_name, :middle_name, :first_name,
     :last_name_transcription, :middle_name_transcription,
     :first_name_transcription, :corporate_name, :corporate_name_transcription,
@@ -271,8 +270,8 @@ end
 #  full_name                           :string(255)
 #  full_name_transcription             :text
 #  full_name_alternative               :text
-#  created_at                          :datetime         not null
-#  updated_at                          :datetime         not null
+#  created_at                          :datetime
+#  updated_at                          :datetime
 #  deleted_at                          :datetime
 #  zip_code_1                          :string(255)
 #  zip_code_2                          :string(255)

data/app/models/agent_import_file.rb

@@ -233,8 +233,8 @@ end
 #  agent_import_content_type :string(255)
 #  agent_import_file_size    :integer
 #  agent_import_updated_at   :datetime
-#  created_at                :datetime         not null
-#  updated_at                :datetime         not null
+#  created_at                :datetime
+#  updated_at                :datetime
 #  agent_import_fingerprint  :string(255)
 #  error_message             :text
 #  edit_mode                 :string(255)

data/app/models/agent_import_file_transition.rb

@@ -15,6 +15,6 @@ end
 #  metadata             :text             default("{}")
 #  sort_key             :integer
 #  agent_import_file_id :integer
-#  created_at           :datetime         not null
-#  updated_at           :datetime         not null
+#  created_at           :datetime
+#  updated_at           :datetime
 #

data/app/models/agent_import_result.rb

@@ -1,7 +1,7 @@
 class AgentImportResult < ActiveRecord::Base
   attr_accessible :agent_import_file_id, :agent_id, :body
   default_scope { order('agent_import_results.id') }
-  scope :file_id, proc{|file_id| where(:agent_import_file_id => file_id)}
+  scope :file_id, proc{|file_id| where(agent_import_file_id: file_id)}
   scope :failed, -> { where(agent_id: nil) }
 
   belongs_to :agent_import_file
@@ -18,6 +18,6 @@ end
 #  agent_import_file_id :integer
 #  agent_id             :integer
 #  body                 :text
-#  created_at           :datetime         not null
-#  updated_at           :datetime         not null
+#  created_at           :datetime
+#  updated_at           :datetime
 #

data/app/models/agent_merge.rb

@@ -15,7 +15,6 @@ end
 #  id                  :integer          not null, primary key
 #  agent_id            :integer          not null
 #  agent_merge_list_id :integer          not null
-#  created_at          :datetime         not null
-#  updated_at          :datetime         not null
+#  created_at          :datetime
+#  updated_at          :datetime
 #
-

data/app/models/agent_merge_list.rb

@@ -23,7 +23,6 @@ end
 #
 #  id         :integer          not null, primary key
 #  title      :string(255)
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  created_at :datetime
+#  updated_at :datetime
 #
-

data/app/models/agent_relationship.rb

@@ -20,8 +20,7 @@ end
 #  parent_id                  :integer
 #  child_id                   :integer
 #  agent_relationship_type_id :integer
-#  created_at                 :datetime         not null
-#  updated_at                 :datetime         not null
+#  created_at                 :datetime
+#  updated_at                 :datetime
 #  position                   :integer
 #
-

data/app/models/agent_relationship_type.rb

@@ -14,7 +14,6 @@ end
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #
-

data/app/models/agent_type.rb

@@ -14,7 +14,6 @@ end
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #
-

data/app/models/carrier_type.rb

@@ -30,7 +30,6 @@ end
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #
-

data/app/models/content_type.rb

@@ -14,7 +14,6 @@ end
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #
-

data/app/models/create.rb

@@ -26,8 +26,7 @@ end
 #  agent_id       :integer          not null
 #  work_id        :integer          not null
 #  position       :integer
-#  created_at     :datetime         not null
-#  updated_at     :datetime         not null
+#  created_at     :datetime
+#  updated_at     :datetime
 #  create_type_id :integer
 #
-

data/app/models/create_type.rb

@@ -13,7 +13,6 @@ end
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #
-

data/app/models/donate.rb

@@ -13,7 +13,6 @@ end
 #  id         :integer          not null, primary key
 #  agent_id   :integer          not null
 #  item_id    :integer          not null
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  created_at :datetime
+#  updated_at :datetime
 #
-

data/app/models/exemplify.rb

@@ -26,7 +26,6 @@ end
 #  manifestation_id :integer          not null
 #  item_id          :integer          not null
 #  position         :integer
-#  created_at       :datetime         not null
-#  updated_at       :datetime         not null
+#  created_at       :datetime
+#  updated_at       :datetime
 #
-

data/app/models/form_of_work.rb

@@ -14,7 +14,6 @@ end
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #
-

data/app/models/frequency.rb

@@ -14,7 +14,6 @@ end
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #
-

data/app/models/identifier.rb

@@ -76,7 +76,6 @@ end
 #  manifestation_id   :integer
 #  primary            :boolean
 #  position           :integer
-#  created_at         :datetime         not null
-#  updated_at         :datetime         not null
+#  created_at         :datetime
+#  updated_at         :datetime
 #
-

data/app/models/identifier_type.rb

@@ -15,7 +15,6 @@ end
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #
-

data/app/models/import_request.rb

@@ -7,7 +7,7 @@ class ImportRequest < ActiveRecord::Base
   validates_presence_of :isbn
   validate :check_isbn
   #validate :check_imported, on: :create
-  #validates_uniqueness_of :isbn, :if => Proc.new{|request| ImportRequest.where("created_at > ?", 1.day.ago).collect(&:isbn).include?(request.isbn)}
+  #validates_uniqueness_of :isbn, if: Proc.new{|request| ImportRequest.where("created_at > ?", 1.day.ago).collect(&:isbn).include?(request.isbn)}
   enju_ndl_ndl_search if defined?(EnjuNdl)
   enju_nii_cinii_books if defined?(EnjuNii)
 
@@ -74,6 +74,6 @@ end
 #  isbn             :string(255)
 #  manifestation_id :integer
 #  user_id          :integer
-#  created_at       :datetime         not null
-#  updated_at       :datetime         not null
+#  created_at       :datetime
+#  updated_at       :datetime
 #

data/app/models/import_request_transition.rb

@@ -15,6 +15,6 @@ end
 #  metadata          :text             default("{}")
 #  sort_key          :integer
 #  import_request_id :integer
-#  created_at        :datetime         not null
-#  updated_at        :datetime         not null
+#  created_at        :datetime
+#  updated_at        :datetime
 #

data/app/models/item.rb

@@ -104,8 +104,8 @@ end
 #  id                      :integer          not null, primary key
 #  call_number             :string(255)
 #  item_identifier         :string(255)
-#  created_at              :datetime         not null
-#  updated_at              :datetime         not null
+#  created_at              :datetime
+#  updated_at              :datetime
 #  deleted_at              :datetime
 #  shelf_id                :integer          default(1), not null
 #  include_supplements     :boolean          default(FALSE), not null

data/app/models/license.rb

@@ -13,7 +13,6 @@ end
 #  display_name :string(255)
 #  note         :text
 #  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #
-

data/app/models/manifestation.rb

@@ -48,7 +48,6 @@ class Manifestation < ActiveRecord::Base
   belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id', validate: true
   has_one :resource_import_result
   has_many :identifiers, dependent: :destroy
-  belongs_to :nii_type if defined?(EnjuNii)
   accepts_nested_attributes_for :creators, allow_destroy: true, reject_if: :all_blank
   accepts_nested_attributes_for :contributors, allow_destroy: true, reject_if: :all_blank
   accepts_nested_attributes_for :publishers, allow_destroy: true, reject_if: :all_blank
@@ -231,6 +230,7 @@ class Manifestation < ActiveRecord::Base
     has_attached_file :attachment,
       path: ":rails_root/private/system/:class/:attachment/:id_partition/:style/:filename"
   end
+  do_not_validate_attachment_file_type :attachment
 
   validates_presence_of :original_title, :carrier_type, :language
   validates_associated :carrier_type, :language
@@ -369,8 +369,8 @@ class Manifestation < ActiveRecord::Base
   def extract_text
     return nil unless attachment.path
     # TODO: S3 support
-    response = `curl "#{Sunspot.config.solr.url}/update/extract?&extractOnly=true&wt=ruby" --data-binary @#{attachment.path} -H "Content-type:text/html"`
-    self.fulltext = eval(response)[""]
+    response = `curl "#{Sunspot.config.solr.url}/update/extract?&extractOnly=true&wt=json" --data-binary @#{attachment.path} -H "Content-type:text/html"`
+    self.fulltext = JSON.parse(response)["responseHeader"][""]
     save(validate: false)
   end
 
@@ -578,8 +578,8 @@ end
 #  manifestation_identifier        :string(255)
 #  date_of_publication             :datetime
 #  date_copyrighted                :datetime
-#  created_at                      :datetime         not null
-#  updated_at                      :datetime         not null
+#  created_at                      :datetime
+#  updated_at                      :datetime
 #  deleted_at                      :datetime
 #  access_address                  :string(255)
 #  language_id                     :integer          default(1), not null

data/app/models/manifestation_relationship.rb

@@ -23,8 +23,7 @@ end
 #  parent_id                          :integer
 #  child_id                           :integer
 #  manifestation_relationship_type_id :integer
-#  created_at                         :datetime         not null
-#  updated_at                         :datetime         not null
+#  created_at                         :datetime
+#  updated_at                         :datetime
 #  position                           :integer
 #
-

data/app/models/manifestation_relationship_type.rb

@@ -14,7 +14,6 @@ end
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #
-

data/app/models/medium_of_performance.rb

@@ -14,7 +14,6 @@ end
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #
-

data/app/models/own.rb

@@ -27,7 +27,6 @@ end
 #  agent_id   :integer          not null
 #  item_id    :integer          not null
 #  position   :integer
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  created_at :datetime
+#  updated_at :datetime
 #
-

data/app/models/picture_file.rb

@@ -36,8 +36,8 @@ end
 #  title                   :text
 #  thumbnail               :string(255)
 #  position                :integer
-#  created_at              :datetime         not null
-#  updated_at              :datetime         not null
+#  created_at              :datetime
+#  updated_at              :datetime
 #  picture_file_name       :string(255)
 #  picture_content_type    :string(255)
 #  picture_file_size       :integer
@@ -45,4 +45,3 @@ end
 #  picture_meta            :text
 #  picture_fingerprint     :string(255)
 #
-

data/app/models/produce.rb

@@ -27,8 +27,7 @@ end
 #  agent_id         :integer          not null
 #  manifestation_id :integer          not null
 #  position         :integer
-#  created_at       :datetime         not null
-#  updated_at       :datetime         not null
+#  created_at       :datetime
+#  updated_at       :datetime
 #  produce_type_id  :integer
 #
-

data/app/models/produce_type.rb

@@ -13,7 +13,6 @@ end
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #
-

data/app/models/realize.rb

@@ -26,8 +26,7 @@ end
 #  agent_id        :integer          not null
 #  expression_id   :integer          not null
 #  position        :integer
-#  created_at      :datetime         not null
-#  updated_at      :datetime         not null
+#  created_at      :datetime
+#  updated_at      :datetime
 #  realize_type_id :integer
 #
-

data/app/models/realize_type.rb

@@ -13,7 +13,6 @@ end
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #
-

data/app/models/resource_export_file.rb

@@ -4,7 +4,7 @@ class ResourceExportFile < ActiveRecord::Base
   include ExportFile
   enju_export_file_model
   has_attached_file :resource_export
-  validates_attachment_content_type :resource_export, :content_type => /\Atext\/plain\Z/
+  validates_attachment_content_type :resource_export, content_type: /\Atext\/plain\Z/
 
   has_many :resource_export_file_transitions
 
@@ -48,6 +48,6 @@ end
 #  resource_export_file_size    :integer
 #  resource_export_updated_at   :datetime
 #  executed_at                  :datetime
-#  created_at                   :datetime         not null
-#  updated_at                   :datetime         not null
+#  created_at                   :datetime
+#  updated_at                   :datetime
 #

data/app/models/resource_export_file_transition.rb

@@ -15,6 +15,6 @@ end
 #  metadata                :text             default("{}")
 #  sort_key                :integer
 #  resource_export_file_id :integer
-#  created_at              :datetime         not null
-#  updated_at              :datetime         not null
+#  created_at              :datetime
+#  updated_at              :datetime
 #

data/app/models/resource_import_file.rb

@@ -746,8 +746,8 @@ end
 #  resource_import_content_type :string(255)
 #  resource_import_file_size    :integer
 #  resource_import_updated_at   :datetime
-#  created_at                   :datetime         not null
-#  updated_at                   :datetime         not null
+#  created_at                   :datetime
+#  updated_at                   :datetime
 #  edit_mode                    :string(255)
 #  resource_import_fingerprint  :string(255)
 #  error_message                :text

data/app/models/resource_import_file_transition.rb

@@ -15,6 +15,6 @@ end
 #  metadata                :text             default("{}")
 #  sort_key                :integer
 #  resource_import_file_id :integer
-#  created_at              :datetime         not null
-#  updated_at              :datetime         not null
+#  created_at              :datetime
+#  updated_at              :datetime
 #

data/app/models/resource_import_result.rb

@@ -21,7 +21,7 @@ end
 #  manifestation_id        :integer
 #  item_id                 :integer
 #  body                    :text
-#  created_at              :datetime         not null
-#  updated_at              :datetime         not null
+#  created_at              :datetime
+#  updated_at              :datetime
 #  error_message           :text
 #

data/app/models/series_statement.rb

@@ -55,8 +55,8 @@ end
 #  title_subseries                    :text
 #  numbering_subseries                :text
 #  position                           :integer
-#  created_at                         :datetime         not null
-#  updated_at                         :datetime         not null
+#  created_at                         :datetime
+#  updated_at                         :datetime
 #  title_transcription                :text
 #  title_alternative                  :text
 #  series_statement_identifier        :string(255)
@@ -69,4 +69,3 @@ end
 #  series_master                      :boolean
 #  root_manifestation_id              :integer
 #
-

data/app/models/series_statement_merge.rb

@@ -15,7 +15,6 @@ end
 #  id                             :integer          not null, primary key
 #  series_statement_id            :integer          not null
 #  series_statement_merge_list_id :integer          not null
-#  created_at                     :datetime         not null
-#  updated_at                     :datetime         not null
+#  created_at                     :datetime
+#  updated_at                     :datetime
 #
-

data/app/models/series_statement_merge_list.rb

@@ -13,7 +13,6 @@ end
 #
 #  id         :integer          not null, primary key
 #  title      :string(255)
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  created_at :datetime
+#  updated_at :datetime
 #
-

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

@@ -2,7 +2,7 @@
   <ul>
     <%- @agent.versions.reverse.each_with_index do |version, i| -%>
       <li>
-        <%= link_to l(version.created_at), agent_path(@agent, :version_id => version.id) -%>
+        <%= link_to l(version.created_at), agent_path(@agent, version_id: version.id) -%>
         <%- if i == 0 -%>
           (<%= t('page.current_version') -%>)
         <%- end -%>

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

@@ -1,13 +1,13 @@
 <%- case when @work -%>
-  <%= render 'index_work', :work => @work -%>
+  <%= render 'index_work', work: @work -%>
 <%- when @expression -%>
-  <%= render 'index_expression', :expression => @expression -%>
+  <%= render 'index_expression', expression: @expression -%>
 <%- when @manifestation -%>
   <%= render 'index_manifestation', manifestation: @manifestation -%>
 <%- when @agent -%>
   <%= render 'index_agent', agent: @agent -%>
 <%- when @agent_merge_list -%>
-  <%= render 'index_agent_merge_list', :agent_merge_list => @agent_merge_list -%>
+  <%= render 'index_agent_merge_list', agent_merge_list: @agent_merge_list -%>
 <%- else -%>
   <%= render 'index' -%>
 <%- end -%>

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

@@ -1,4 +1,4 @@
-xml.instruct! :xml, :version=>"1.0"
+xml.instruct! :xml, version: "1.0"
 xml.rss('version' => "2.0",
         'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/",
         'xmlns:atom' => "http://www.w3.org/2005/Atom"){

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

@@ -10,7 +10,7 @@
     <%= f.text_area :display_name %>
   </div>
   <% if defined?(EnjuCirculation) and !@carrier_type.new_record? %>
-    <%= render 'carrier_types/checkout_form', :f => f %>
+    <%= render 'carrier_types/checkout_form', f: f %>
   <% end %>
   <div class="field">
     <%= f.label :note %><br />