enju_biblio 0.1.0.pre37 → 0.1.0.pre38

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

@@ -77,8 +77,12 @@
     end
     xml.abstract manifestation.description
     xml.note manifestation.note
-    xml.identifier manifestation.isbn, :type => 'isbn'
-    xml.identifier manifestation.lccn, :type => 'lccn'
+    manifestation.identifier_content(:isbn).each do |i|
+      xml.identifier i, :type => 'isbn'
+    end
+    manifestation.identifier_content(:lccn).each do |l|
+      xml.identifier l, :type => 'lccn'
+    end
     xml.recordInfo{
       xml.recordCreationDate manifestation.created_at
       xml.recordChangeDate manifestation.updated_at

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

@@ -1,12 +1,13 @@
 xml.dcndl :BibResource do
   xml.rdf :Description, 'rdf:about' => manifestation_url(manifestation) do
-    if manifestation.nbn?
-      xml.dcterms :identifier, manifestation.nbn, 'rdf:datatype' => 'http://ndl.go.jp/dcndl/terms/JPNO'
-      xml.rdfs :seeAlso, 'rdf:resource' => "http://id.ndl.go.jp/jpno/#{manifestation.nbn}"
+    if manifestation.identifier_contents(:nbn).first
+      xml.dcterms :identifier, manifestation.identifier_contents(:nbn).first, 'rdf:datatype' => 'http://ndl.go.jp/dcndl/terms/JPNO'
+
+      xml.rdfs :seeAlso, 'rdf:resource' => "http://id.ndl.go.jp/jpno/#{manifestation.identifier_contents(:nbn).first}"
     end
-    if manifestation.isbn?
-      xml.dcterms :identifier, manifestation.isbn, 'rdf:datatype' => 'http://ndl.go.jp/dcndl/terms/ISBN'
-      xml.rdfs :seeAlso, 'rdf:resource' => "http://iss.ndl.go.jp/isbn/#{manifestation.isbn}"
+    manifestation.identifier_contents(:isbn).each do |i|
+      xml.dcterms :identifier, i, 'rdf:datatype' => 'http://ndl.go.jp/dcndl/terms/ISBN'
+      xml.rdfs :seeAlso, 'rdf:resource' => "http://iss.ndl.go.jp/isbn/#{i}"
     end
     xml.dcterms :title, manifestation.original_title
     xml.dc :title do

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

@@ -14,8 +14,8 @@
             <td style="width: 200px"><%= t('activerecord.models.series_statement') -%>:</td>
             <td style="width: 500px">
               <%= render 'show_series_detail', :manifestation => manifestation %>
-              <%- if manifestation.issn.present? -%>
-                (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.issn -%>)
+              <%- unless manifestation.identifier_contents(:issn).empty? -%>
+                (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.identifier_contents(:issn).join(" ") -%>)
               <%- end -%>
             </td>
           </tr>
@@ -56,19 +56,9 @@
           <tr>
             <td><%= t('page.identifier') -%>:</td>
             <td>
-              <%- if manifestation.isbn.present? -%>
-                ISBN: <span itemprop="isbn"><%= manifestation.isbn -%></span>
-                <%- if manifestation.isbn10.present? -%>
-                  ( <%= manifestation.isbn10 -%> )
-                <%- end -%>
-              <%- end -%>
-              <%- if manifestation.nbn.present? -%>
-                NBN: <%= manifestation.nbn -%>
-              <%- end -%>
-              <%- if manifestation.lccn.present? -%>
-                <br />
-                LCCN: <%= manifestation.lccn -%>
-              <%- end -%>
+              <% manifestation.identifiers.each do |identifier| %>
+                <%= "#{identifier.identifier_type.display_name.localize}: #{identifier.body}" %>
+              <% end %>
             </td>
           </tr>
         <%- end -%>

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

@@ -14,8 +14,8 @@
             <td style="width: 200px"><%= t('activerecord.models.series_statement') -%>:</td>
             <td style="width: 500px">
               <%= render 'show_series_detail', :manifestation => manifestation %>
-              <%- if manifestation.issn.present? -%>
-                (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.issn -%>)
+              <%- unless manifestation.identifier_contents(:issn).empty? -%>
+                (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.identifier_contents(:issn).join(" ") -%>)
               <%- end -%>
             </td>
           </tr>
@@ -58,19 +58,9 @@
           <tr>
             <td><%= t('page.identifier') -%>:</td>
             <td>
-              <%- if manifestation.isbn.present? -%>
-                ISBN: <span itemprop="isbn"><%= manifestation.isbn -%></span>
-                <%- if manifestation.isbn10.present? -%>
-                  ( <%= manifestation.isbn10 -%> )
-                <%- end -%>
-              <%- end -%>
-              <%- if manifestation.nbn.present? -%>
-                NBN: <%= manifestation.nbn -%>
-              <%- end -%>
-              <%- if manifestation.lccn.present? -%>
-                <br />
-                LCCN: <%= manifestation.lccn -%>
-              <%- end -%>
+              <% manifestation.identifiers.each do |identifier| %>
+                <%= "#{identifier.identifier_type.display_name.localize}: #{identifier.body}" %>
+              <% end %>
             </td>
           </tr>
         <%- end -%>

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

@@ -1,6 +1,6 @@
 <strong>
   <% if manifestation.root_series_statement %>
-    <%= link_to manifestation.root_series_statement.original_title, series_statement_manifestations_path(manifestation.root_series_statement, :query => @query) %>
+    <%= link_to manifestation.original_title, manifestations_path(:parent => manifestation.id, :query => @query) %>
   <% else %>
     <%= link_to title_with_volume_number(manifestation), manifestation -%>
   <% end %>

data/app/views/manifestations/index.csv.erb

@@ -1,4 +1,4 @@
 manifestation_identifier  original_title	creator	publisher	isbn	pub_date	note
 <%- @manifestations.each do |manifestation| -%>
-<%= manifestation.manifestation_identifier %> "<%=raw manifestation.original_title.gsub(/"/, '""') -%>"	<%=raw manifestation.creators.pluck(:full_name).join('; ') -%>	<%=raw manifestation.publishers.pluck(:full_name).join('; ') -%>	<%= manifestation.isbn -%>	<%= manifestation.pub_date -%>	<%= manifestation.note -%><%= "\n" -%>
+<%= manifestation.manifestation_identifier %> "<%=raw manifestation.original_title.gsub(/"/, '""') -%>"	<%=raw manifestation.creators.pluck(:full_name).join('; ') -%>	<%=raw manifestation.publishers.pluck(:full_name).join('; ') -%>	<%= manifestation.identifier_contents(:isbn) -%>	<%= manifestation.pub_date -%>	<%= manifestation.note -%><%= "\n" -%>
 <%- end -%>

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

@@ -30,7 +30,9 @@ xml.rss('version' => "2.0",
             xml.pubDate manifestation.date_of_publication.try(:utc).try(:rfc822)
             xml.link manifestation_url(manifestation)
             xml.guid manifestation_url(manifestation), :isPermaLink => "true"
-            xml.tag! "dc:identifier", manifestation.isbn
+            manifestation.identifier_contents(:isbn).each do |i|
+              xml.tag! "dc:identifier", i
+            end
           end
         end
     end

data/app/views/manifestations/show.mobile.erb

@@ -7,7 +7,7 @@
 <table class="table table-striped">
 <tr>
 <th>ISBN</th>
-<td><%= @manifestation.isbn %></td>
+<td><%= @manifestation.identifier_contents(:isbn).join(' ') %></td>
 </tr>
 <tr>
 <th><%= t('activerecord.attributes.manifestation.price') %></th>

data/config/locales/translation_en.yml

@@ -32,11 +32,11 @@ en:
       realize_type: Realize type
       resource_import_file: Resource import file
       resource_import_result: Resource Import Result
-      series_has_manifestation: Series statement to manifestation
       series_statement: Series statement
-      series_statement_relationship: Series statement relationship
       country: Country
       donate: Donate
+      identifier: Identifier
+      identifier_type: Identifier type
 
     attributes:
       manifestation:
@@ -84,6 +84,7 @@ en:
         series_master: Series master
         subject: Subject
         classification: Classification
+        identifier: Identifier
       item:
         call_number: Call number
         item_identifier: Item identifier
@@ -99,7 +100,7 @@ en:
       patron:
         last_name: Last name
         middle_name: Middle name
-        first_name: Name
+        first_name: First name
         last_name_transcription: Last name transcription
         middle_name_transcription: Middle name transcription
         first_name_transcription: First name transcription
@@ -130,9 +131,6 @@ en:
         language: Language
         email: Email
         url: URL
-      series_statement_relationship:
-        parent_id: Parent
-        child_id: Child
       patron_import_file:
         patron_import_file_name: Filename
         patron_import_content_type: Content type
@@ -173,10 +171,11 @@ en:
         work: Work
         series_statement_identifier: Series statement identifier
         issn: ISSN
-        periodical: Periodical
         title_transcription: Title transcription
         note: Note
         series_master: Maseter
+        volume_nunber_string: Volume number
+        creator_string: Creator
       country:
         name: Name
         display_name: Display name
@@ -290,6 +289,14 @@ en:
         name: Name
         display_name: Display name
         note: Note
+      identitifer_type:
+        name: Name
+        display_name: Display name
+        note: Note
+      identifier:
+        body: Body
+        manifestation_id: Manifestation
+        primary: Primary
 
   resource_import_file:
     update_relationship: Update relationship

data/config/locales/translation_ja.yml

@@ -8,7 +8,7 @@ ja:
       embody: 具体化
       exemplify: 書誌と所蔵の関係
       extent: 大きさ
-      form_of_work: 書いた資料の形態
+      form_of_work: 著作の形態
       frequency: 発行頻度
       item: 所蔵情報
       language: 言語
@@ -32,11 +32,11 @@ ja:
       realize_type: 表現の関係
       resource_import_file: 資料のインポート用ファイル
       resource_import_result: 資料インポートの結果
-      series_has_manifestation: シリーズ情報と資料の関係
       series_statement: シリーズ情報
-      series_statement_relationship: シリーズ情報の関係
       country: 国と地域
       donate: 寄贈
+      identifier: 識別子
+      identifier_type: 識別子の種類
 
     attributes:
       manifestation:
@@ -84,6 +84,7 @@ ja:
         series_master: シリーズ情報マスタ
         subject: 件名
         classification: 分類
+        identifier: 識別子
       item:
         call_number: 請求記号
         item_identifier: 所蔵情報ID
@@ -150,9 +151,6 @@ ja:
         iso_639_3: ISO 639-3
         note: 注記
         position: 位置
-      series_statement_relationship:
-        parent_id: 親
-        child_id: 子
       resource_import_file:
         resource_import_file_name: ファイル名
         resource_import_content_type: Content-Type
@@ -170,13 +168,14 @@ ja:
         title_subseries: 副シリーズ名
         title_subseries_transcription: 副シリーズ名よみ
         numbering_subseries: 副シリーズ番号
-        work: 書いた資料
+        work: 著作
         series_statement_identifier: シリーズ識別子
         issn: ISSN
-        periodical: 定期刊行物
         title_transcription: シリーズ名よみ
         note: 注記
         series_master: マスタ
+        volume_number_string: シリーズ巻号
+        creator_string: シリーズ著者
       country:
         name: 名前
         display_name: 表示名
@@ -290,6 +289,14 @@ ja:
         name: 名称
         display_name: 表示名
         note: 注記
+      identifier_type:
+        name: 名称
+        display_name: 表示名
+        note: 注記
+      identifier:
+        body: 内容
+        manifestation_id: 体現形
+        primary: 主に使用
 
   resource_import_file:
     update_relationship: 関連を更新

data/config/routes.rb

@@ -1,6 +1,8 @@
 Rails.application.routes.draw do
-  resources :people
 
+  resources :identifiers
+
+  resources :identifier_types
 
   resources :manifestations do
     resources :patrons
@@ -66,9 +68,7 @@ Rails.application.routes.draw do
 
   resources :donates
 
-  resources :series_statements do
-    resources :manifestations
-  end
+  resources :series_statements
 
   resources :countries
   resources :languages
@@ -99,8 +99,6 @@ Rails.application.routes.draw do
 
   resources :picture_files
 
-  resources :accepts
-
-  match '/isbn/:isbn' => 'manifestations#show'
-  match '/page/advanced_search' => 'page#advanced_search'
+  get '/isbn/:isbn' => 'manifestations#index'
+  get '/page/advanced_search' => 'page#advanced_search'
 end

data/db/migrate/005_create_manifestations.rb

@@ -19,13 +19,6 @@ class CreateManifestations < ActiveRecord::Migration
       t.integer :height
       t.integer :width
       t.integer :depth
-      t.string :isbn
-      t.string :isbn10
-      t.string :wrong_isbn
-      t.string :nbn
-      t.string :lccn
-      t.string :oclc_number
-      t.string :issn
       t.integer :price # TODO: 通貨単位
       t.text :fulltext
       t.string :volume_number_string
@@ -43,11 +36,6 @@ class CreateManifestations < ActiveRecord::Migration
     end
     #add_index :manifestations, :carrier_type_id
     #add_index :manifestations, :required_role_id
-    add_index :manifestations, :isbn
-    add_index :manifestations, :nbn
-    add_index :manifestations, :lccn
-    add_index :manifestations, :oclc_number
-    add_index :manifestations, :issn
     add_index :manifestations, :access_address
     #add_index :manifestations, :frequency_id
     add_index :manifestations, :manifestation_identifier

data/db/migrate/20130506175303_create_identifier_types.rb

@@ -0,0 +1,12 @@
+class CreateIdentifierTypes < ActiveRecord::Migration
+  def change
+    create_table :identifier_types do |t|
+      t.string :name
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20130506175834_create_identifiers.rb

@@ -0,0 +1,14 @@
+class CreateIdentifiers < ActiveRecord::Migration
+  def change
+    create_table :identifiers do |t|
+      t.string :body, :null => false
+      t.integer :identifier_type_id, :null => false
+      t.integer :manifestation_id
+      t.boolean :primary
+      t.integer :position
+
+      t.timestamps
+    end
+    add_index :identifiers, [:body, :identifier_type_id]
+  end
+end

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.0.pre37"
+  VERSION = "0.1.0.pre38"
 end

data/lib/generators/enju_biblio/setup/templates/db/fixtures/identifier_types.yml

@@ -0,0 +1,27 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+one:
+  name: isbn
+  display_name: ISBN
+  note: 
+  position: 1
+
+two:
+  name: issn
+  display_name: ISSN
+  note: 
+  position: 2
+
+# == Schema Information
+#
+# Table name: identifier_types
+#
+#  id           :integer          not null, primary key
+#  name         :string(255)
+#  display_name :text
+#  note         :text
+#  position     :integer
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#
+

data/spec/controllers/identifier_types_controller_spec.rb

@@ -0,0 +1,167 @@
+require 'spec_helper'
+
+# This spec was generated by rspec-rails when you ran the scaffold generator.
+# It demonstrates how one might use RSpec to specify the controller code that
+# was generated by Rails when you ran the scaffold generator.
+#
+# It assumes that the implementation code is generated by the rails scaffold
+# generator.  If you are using any extension libraries to generate different
+# controller code, this generated spec may or may not pass.
+#
+# It only uses APIs available in rails and/or rspec-rails.  There are a number
+# of tools you can use to make these specs even more expressive, but we're
+# sticking to rails and rspec-rails APIs to keep things simple and stable.
+#
+# Compared to earlier versions of this generator, there is very limited use of
+# stubs and message expectations in this spec.  Stubs are only used when there
+# is no simpler way to get a handle on the object needed for the example.
+# Message expectations are only used when there is no simpler way to specify
+# that an instance is receiving a specific message.
+
+describe IdentifierTypesController do
+  fixtures :all
+  login_admin
+
+  # This should return the minimal set of attributes required to create a valid
+  # IdentifierType. As you add validations to IdentifierType, be sure to
+  # update the return value of this method accordingly.
+  def valid_attributes
+    FactoryGirl.attributes_for(:identifier_type)
+  end
+
+  describe "GET index" do
+    it "assigns all identifier_types as @identifier_types" do
+      identifier_type = IdentifierType.create! valid_attributes
+      get :index
+      assigns(:identifier_types).should eq(IdentifierType.all)
+    end
+  end
+
+  describe "GET show" do
+    it "assigns the requested identifier_type as @identifier_type" do
+      identifier_type = IdentifierType.create! valid_attributes
+      get :show, :id => identifier_type.id
+      assigns(:identifier_type).should eq(identifier_type)
+    end
+  end
+
+  describe "GET new" do
+    it "assigns a new identifier_type as @identifier_type" do
+      get :new
+      assigns(:identifier_type).should be_a_new(IdentifierType)
+    end
+  end
+
+  describe "GET edit" do
+    it "assigns the requested identifier_type as @identifier_type" do
+      identifier_type = IdentifierType.create! valid_attributes
+      get :edit, :id => identifier_type.id
+      assigns(:identifier_type).should eq(identifier_type)
+    end
+  end
+
+  describe "POST create" do
+    describe "with valid params" do
+      it "creates a new IdentifierType" do
+        expect {
+          post :create, :identifier_type => valid_attributes
+        }.to change(IdentifierType, :count).by(1)
+      end
+
+      it "assigns a newly created identifier_type as @identifier_type" do
+        post :create, :identifier_type => valid_attributes
+        assigns(:identifier_type).should be_a(IdentifierType)
+        assigns(:identifier_type).should be_persisted
+      end
+
+      it "redirects to the created identifier_type" do
+        post :create, :identifier_type => valid_attributes
+        response.should redirect_to(IdentifierType.last)
+      end
+    end
+
+    describe "with invalid params" do
+      it "assigns a newly created but unsaved identifier_type as @identifier_type" do
+        # Trigger the behavior that occurs when invalid params are submitted
+        IdentifierType.any_instance.stub(:save).and_return(false)
+        post :create, :identifier_type => {}
+        assigns(:identifier_type).should be_a_new(IdentifierType)
+      end
+
+      it "re-renders the 'new' template" do
+        # Trigger the behavior that occurs when invalid params are submitted
+        IdentifierType.any_instance.stub(:save).and_return(false)
+        post :create, :identifier_type => {}
+        #response.should render_template("new")
+      end
+    end
+  end
+
+  describe "PUT update" do
+    describe "with valid params" do
+      it "updates the requested identifier_type" do
+        identifier_type = IdentifierType.create! valid_attributes
+        # Assuming there are no other identifier_types in the database, this
+        # specifies that the IdentifierType created on the previous line
+        # receives the :update_attributes message with whatever params are
+        # submitted in the request.
+        IdentifierType.any_instance.should_receive(:update_attributes).with({'these' => 'params'})
+        put :update, :id => identifier_type.id, :identifier_type => {'these' => 'params'}
+      end
+
+      it "assigns the requested identifier_type as @identifier_type" do
+        identifier_type = IdentifierType.create! valid_attributes
+        put :update, :id => identifier_type.id, :identifier_type => valid_attributes
+        assigns(:identifier_type).should eq(identifier_type)
+      end
+
+      it "redirects to the identifier_type" do
+        identifier_type = IdentifierType.create! valid_attributes
+        put :update, :id => identifier_type.id, :identifier_type => valid_attributes
+        response.should redirect_to(identifier_type)
+      end
+
+      it "moves its position when specified" do
+        identifier_type = IdentifierType.create! valid_attributes
+        position = identifier_type.position
+        put :update, :id => identifier_type.id, :move => 'higher'
+        response.should redirect_to identifier_types_url
+        assigns(:identifier_type).position.should eq position - 1
+      end
+    end
+
+    describe "with invalid params" do
+      it "assigns the identifier_type as @identifier_type" do
+        identifier_type = IdentifierType.create! valid_attributes
+        # Trigger the behavior that occurs when invalid params are submitted
+        IdentifierType.any_instance.stub(:save).and_return(false)
+        put :update, :id => identifier_type.id, :identifier_type => {}
+        assigns(:identifier_type).should eq(identifier_type)
+      end
+
+      it "re-renders the 'edit' template" do
+        identifier_type = IdentifierType.create! valid_attributes
+        # Trigger the behavior that occurs when invalid params are submitted
+        IdentifierType.any_instance.stub(:save).and_return(false)
+        put :update, :id => identifier_type.id, :identifier_type => {}
+        #response.should render_template("edit")
+      end
+    end
+  end
+
+  describe "DELETE destroy" do
+    it "destroys the requested identifier_type" do
+      identifier_type = IdentifierType.create! valid_attributes
+      expect {
+        delete :destroy, :id => identifier_type.id
+      }.to change(IdentifierType, :count).by(-1)
+    end
+
+    it "redirects to the identifier_types list" do
+      identifier_type = IdentifierType.create! valid_attributes
+      delete :destroy, :id => identifier_type.id
+      response.should redirect_to(identifier_types_url)
+    end
+  end
+
+end