enju_biblio 0.1.0.pre33 → 0.1.0.pre34

data/spec/controllers/import_requests_controller_spec.rb

@@ -164,45 +164,43 @@ describe ImportRequestsController do
       @attrs = {:isbn => '9784873114422'}
       @invalid_attrs = {:isbn => 'invalid'}
     end
-    VCR.use_cassette "enju_ndl/ndl_search", :record => :new_episodes do
 
-      describe "When logged in as Administrator" do
-        login_admin
+    describe "When logged in as Administrator" do
+      login_admin
 
-        describe "with valid params" do
-          it "assigns a newly created import_request as @import_request" do
-            post :create, :import_request => @attrs
-            assigns(:import_request).should be_valid
-          end
+      describe "with valid params", :vcr => true do
+        it "assigns a newly created import_request as @import_request" do
+          post :create, :import_request => @attrs
+          assigns(:import_request).should be_valid
+        end
 
-          it "redirects to the created import_request" do
-            post :create, :import_request => @attrs
-            response.should redirect_to manifestation_items_url(assigns(:import_request).manifestation)
-          end
+        it "redirects to the created import_request" do
+          post :create, :import_request => @attrs
+          response.should redirect_to manifestation_items_url(assigns(:import_request).manifestation)
         end
+      end
 
-        describe "with invalid params" do
-          it "assigns a newly created but unsaved import_request as @import_request" do
-            post :create, :import_request => @invalid_attrs
-            assigns(:import_request).should_not be_valid
-          end
+      describe "with invalid params" do
+        it "assigns a newly created but unsaved import_request as @import_request" do
+          post :create, :import_request => @invalid_attrs
+          assigns(:import_request).should_not be_valid
+        end
 
-          it "re-renders the 'new' template" do
-            post :create, :import_request => @invalid_attrs
-            response.should render_template("new")
-          end
+        it "re-renders the 'new' template" do
+          post :create, :import_request => @invalid_attrs
+          response.should render_template("new")
         end
+      end
 
-        describe "with isbn which is already imported" do
-          it "assigns a newly created import_request as @import_request" do
-            post :create, :import_request => {:isbn => manifestations(:manifestation_00001).isbn}
-            assigns(:import_request).should be_valid
-          end
+      describe "with isbn which is already imported" do
+        it "assigns a newly created import_request as @import_request" do
+          post :create, :import_request => {:isbn => manifestations(:manifestation_00001).isbn}
+          assigns(:import_request).should be_valid
+        end
 
-          it "redirects to the created import_request" do
-            post :create, :import_request => @attrs
-            response.should redirect_to manifestation_items_url(assigns(:import_request).manifestation)
-          end
+        it "redirects to the created import_request", :vcr => true do
+          post :create, :import_request => @attrs
+          response.should redirect_to manifestation_items_url(assigns(:import_request).manifestation)
         end
       end
     end
@@ -210,7 +208,7 @@ describe ImportRequestsController do
     describe "When logged in as Librarian" do
       login_librarian
 
-      describe "with valid params" do
+      describe "with valid params", :vcr => true do
         it "assigns a newly created import_request as @import_request" do
           post :create, :import_request => @attrs
           assigns(:import_request).should be_valid

data/spec/controllers/manifestations_controller_spec.rb

@@ -111,38 +111,6 @@ describe ManifestationsController do
         response.should render_template("manifestations/index")
       end
 
-      it "assigns all manifestations as @manifestations in oai format without verb" do
-        get :index, :format => 'oai'
-        assigns(:manifestations).should_not be_nil
-        response.should render_template("manifestations/index")
-      end
-
-      it "assigns all manifestations as @manifestations in oai format with ListRecords" do
-        get :index, :format => 'oai', :verb => 'ListRecords'
-        assigns(:manifestations).should_not be_nil
-        response.should render_template("manifestations/list_records")
-      end
-
-      it "assigns all manifestations as @manifestations in oai format with ListIdentifiers" do
-        get :index, :format => 'oai', :verb => 'ListIdentifiers'
-        assigns(:manifestations).should_not be_nil
-        response.should render_template("manifestations/list_identifiers")
-      end
-
-      it "assigns all manifestations as @manifestations in oai format with GetRecord without identifier" do
-        get :index, :format => 'oai', :verb => 'GetRecord'
-        assigns(:manifestations).should be_nil
-        assigns(:manifestation).should be_nil
-        response.should render_template('manifestations/index')
-      end
-
-      it "assigns all manifestations as @manifestations in oai format with GetRecord with identifier" do
-        get :index, :format => 'oai', :verb => 'GetRecord', :identifier => 'oai:localhost:manifestations-1'
-        assigns(:manifestations).should be_nil
-        assigns(:manifestation).should_not be_nil
-        response.should render_template('manifestations/show')
-      end
-
       it "should get index with manifestation_id" do
         get :index, :manifestation_id => 1
         response.should be_success
@@ -417,9 +385,9 @@ describe ManifestationsController do
         end
 
         it "assigns a series_statement" do
-          post :create, :manifestation => @attrs.merge(:series_has_manifestation_attributes => {:series_statement_id => 1})
+          post :create, :manifestation => @attrs.merge(:series_statements_attributes => {[0] => {:original_title => SeriesStatement.find(1).original_title}})
           assigns(:manifestation).reload
-          assigns(:manifestation).series_statement.should eq SeriesStatement.find(1)
+          assigns(:manifestation).series_statements.pluck(:original_title).include?(series_statements(:one).original_title).should be_true
         end
 
         it "redirects to the created manifestation" do
@@ -527,7 +495,7 @@ describe ManifestationsController do
   describe "PUT update" do
     before(:each) do
       @manifestation = FactoryGirl.create(:manifestation)
-      @manifestation.series_statement = SeriesStatement.find(1)
+      @manifestation.series_statements = [SeriesStatement.find(1)]
       @attrs = valid_attributes
       @invalid_attrs = {:original_title => ''}
     end
@@ -541,9 +509,9 @@ describe ManifestationsController do
         end
 
         it "assigns a series_statement" do
-          put :update, :id => @manifestation.id, :manifestation => @attrs.merge(:series_has_manifestation_attributes => {:series_statement_id => 2})
+          put :update, :id => @manifestation.id, :manifestation => @attrs.merge(:series_statements_attributes => {[0] => {:original_title => series_statements(:two).original_title, "_destroy"=>"false"}})
           assigns(:manifestation).reload
-          assigns(:manifestation).series_statement.should eq SeriesStatement.find(2)
+          assigns(:manifestation).series_statements.pluck(:original_title).include?(series_statements(:two).original_title).should be_true
         end
 
         it "assigns the requested manifestation as @manifestation" do

data/spec/dummy/app/models/ability.rb

@@ -15,7 +15,7 @@
         end
         can [:read, :create, :update], Manifestation
         can [:destroy, :delete], Manifestation do |manifestation|
-          manifestation.items.empty? and !manifestation.periodical_master?
+          manifestation.items.empty? and !manifestation.series_master?
         end
         can :manage, [
           Create,
@@ -74,7 +74,7 @@
         can :index, Manifestation
         can [:show, :create, :update], Manifestation
         can [:destroy, :delete], Manifestation do |manifestation|
-          manifestation.items.empty? and !manifestation.periodical_master?
+          manifestation.items.empty? and !manifestation.series_master?
         end
         can [:index, :create], Patron
         can :show, Patron do |patron|

data/spec/dummy/config/application.rb

@@ -61,7 +61,6 @@ require 'enju_bookmark'
 require 'enju_event'
 require 'enju_manifestation_viewer'
 require 'enju_export'
-require 'enju_oai'
 require 'enju_ndl'
 require 'mobylette'
 require 'plugins'

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130416054135) do
+ActiveRecord::Schema.define(:version => 20130421164124) do
 
   create_table "baskets", :force => true do |t|
     t.integer  "user_id"
@@ -636,6 +636,7 @@ ActiveRecord::Schema.define(:version => 20130416054135) do
     t.integer  "month_of_publication"
     t.boolean  "fulltext_content"
     t.string   "doi"
+    t.boolean  "periodical"
   end
 
   add_index "manifestations", ["access_address"], :name => "index_manifestations_on_access_address"
@@ -1070,19 +1071,21 @@ ActiveRecord::Schema.define(:version => 20130416054135) do
     t.text     "title_subseries"
     t.text     "numbering_subseries"
     t.integer  "position"
-    t.datetime "created_at",                                       :null => false
-    t.datetime "updated_at",                                       :null => false
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
     t.text     "title_transcription"
     t.text     "title_alternative"
     t.string   "series_statement_identifier"
-    t.string   "issn"
-    t.boolean  "periodical",                    :default => false, :null => false
-    t.integer  "root_manifestation_id"
+    t.integer  "manifestation_id"
     t.text     "note"
     t.text     "title_subseries_transcription"
+    t.text     "creator_string"
+    t.text     "volume_number_string"
+    t.text     "volume_number_transcription_string"
+    t.boolean  "series_master"
   end
 
-  add_index "series_statements", ["root_manifestation_id"], :name => "index_series_statements_on_manifestation_id"
+  add_index "series_statements", ["manifestation_id"], :name => "index_series_statements_on_manifestation_id"
   add_index "series_statements", ["series_statement_identifier"], :name => "index_series_statements_on_series_statement_identifier"
 
   create_table "shelves", :force => true do |t|

data/spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/resource_import_file_sample1.tsv

@@ -1,4 +1,4 @@
-manifestation_identifier	original_title	note	title_transcription	title_alternative	periodical	series_statement_identifier	series_title	series_title_transcription	creator	creator_transcription	publisher	publisher_transcription	pub_date	volume_number_string	edition	isbn	issn	manifestation_price	item_price	height	shelf	item_identifier	nbn	lccn	subject	budget_type	bookstore	dummy
+manifestation_identifier	original_title	note	title_transcription	title_alternative	periodical	series_statement_identifier	series_original_title	series_title_transcription	creator	creator_transcription	publisher	publisher_transcription	pub_date	volume_number_string	edition	isbn	issn	manifestation_price	item_price	height	shelf	item_identifier	nbn	lccn	subject	budget_type	bookstore	dummy
 資料ID	タイトル	注記	タイトルよみ	代替タイトル	定期刊行物フラグ	シリーズ番号	シリーズタイトル	シリーズタイトルよみ	著者	著者よみ	出版者	出版者よみ	出版日	巻	版	isbn	issn	販売価格	受入価格	高さ	書架名	個別資料ID	nbn	lccn	件名			インポート省略
 	test1	○ identifierなし、item_identifierなし							test	てすと	test2			invalid														
 	test2	○ identifierなし、item_identifierあり							test||author//test1||illustrator				2001									10101				Public fund	Example store	

data/spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/resource_import_file_sample2.tsv

@@ -1,4 +1,4 @@
-manifestation_identifier	original_title	note	title_transcription	title_alternative	periodical	series_statement_identifier	series_title	series_title_transcription	creator	creator_transcription	publisher	publisher_transcription	pub_date	volume_number_string	edition	isbn	issn	manifestation_price	item_price	height	shelf	item_identifier	nbn	lccn	subject	budget_type	bookstore	dummy
+manifestation_identifier	original_title	note	title_transcription	title_alternative	periodical	series_statement_identifier	series_original_title	series_title_transcription	creator	creator_transcription	publisher	publisher_transcription	pub_date	volume_number_string	edition	isbn	issn	manifestation_price	item_price	height	shelf	item_identifier	nbn	lccn	subject	budget_type	bookstore	dummy
 ����ID	�^�C�g��	���L	�^�C�g�����	��փ^�C�g��	������s���t���O	�V���[�Y�ԍ�	�V���[�Y�^�C�g��	�V���[�Y�^�C�g�����	����	���҂��	�o�Ŏ�	�o�Ŏ҂��	�o�œ�	��	��	isbn	issn	�̔����i	������i	����	���˖�	�•ʎ���ID	nbn	lccn	����			�C���|�[�g�ȗ�
 	test1	�� identifier�Ȃ��Aitem_identifier�Ȃ�							test	�Ă���	test2			invalid														
 	test2	�� identifier�Ȃ��Aitem_identifier����							test||author//test1||illustrator				2001									10101				Public fund	Example store	

data/spec/fixtures/items.yml

@@ -237,8 +237,6 @@ item_00023:
 #  id                    :integer          not null, primary key
 #  call_number           :string(255)
 #  item_identifier       :string(255)
-#  circulation_status_id :integer          default(5), not null
-#  checkout_type_id      :integer          default(1), not null
 #  created_at            :datetime         not null
 #  updated_at            :datetime         not null
 #  deleted_at            :datetime
@@ -254,6 +252,7 @@ item_00023:
 #  acquired_at           :datetime
 #  bookstore_id          :integer
 #  budget_type_id        :integer
-#  manifestation_id      :integer
+#  circulation_status_id :integer          default(5), not null
+#  checkout_type_id      :integer          default(1), not null
 #
 

data/spec/fixtures/manifestations.yml

@@ -1695,6 +1695,7 @@ manifestation_00201:
   created_at: 2007-11-19 17:55:41 UTC
   frequency_id: 3
   issn: 09130000
+  periodical: true
 manifestation_00202:
   carrier_type_id: 1
   language_id: 1
@@ -1715,6 +1716,7 @@ manifestation_00202:
   serial_number: 2
   volume_number: 1
   issue_number: 2
+  periodical: true
 manifestation_00203:
   carrier_type_id: 1
   language_id: 1
@@ -1942,81 +1944,79 @@ manifestation_00216:
   required_role_id: 1
   repository_content: false
 
-
-
-
-
-
-
-
 # == Schema Information
 #
 # Table name: manifestations
 #
-#  id                              :integer         not null, primary key
-#  original_title                  :text            not null
-#  title_alternative               :text
-#  title_transcription             :text
-#  classification_number           :string(255)
-#  manifestation_identifier        :string(255)
-#  date_of_publication             :datetime
-#  date_copyrighted                :datetime
-#  created_at                      :datetime        not null
-#  updated_at                      :datetime        not null
-#  deleted_at                      :datetime
-#  access_address                  :string(255)
-#  language_id                     :integer         default(1), not null
-#  carrier_type_id                 :integer         default(1), not null
-#  extent_id                       :integer         default(1), not null
-#  start_page                      :integer
-#  end_page                        :integer
-#  height                          :integer
-#  width                           :integer
-#  depth                           :integer
-#  isbn                            :string(255)
-#  isbn10                          :string(255)
-#  wrong_isbn                      :string(255)
-#  nbn                             :string(255)
-#  lccn                            :string(255)
-#  oclc_number                     :string(255)
-#  issn                            :string(255)
-#  price                           :integer
-#  fulltext                        :text
-#  volume_number_string            :string(255)
-#  issue_number_string             :string(255)
-#  serial_number_string            :string(255)
-#  edition                         :integer
-#  note                            :text
-#  repository_content              :boolean         default(FALSE), not null
-#  lock_version                    :integer         default(0), not null
-#  required_role_id                :integer         default(1), not null
-#  state                           :string(255)
-#  required_score                  :integer         default(0), not null
-#  frequency_id                    :integer         default(1), not null
-#  subscription_master             :boolean         default(FALSE), not null
-#  attachment_file_name            :string(255)
-#  attachment_content_type         :string(255)
-#  attachment_file_size            :integer
-#  attachment_updated_at           :datetime
-#  title_alternative_transcription :text
-#  description                     :text
-#  abstract                        :text
-#  available_at                    :datetime
-#  valid_until                     :datetime
-#  date_submitted                  :datetime
-#  date_accepted                   :datetime
-#  date_caputured                  :datetime
-#  ndl_bib_id                      :string(255)
-#  pub_date                        :string(255)
-#  edition_string                  :string(255)
-#  volume_number                   :integer
-#  issue_number                    :integer
-#  serial_number                   :integer
-#  ndc                             :string(255)
-#  content_type_id                 :integer         default(1)
-#  year_of_publication             :integer
-#  attachment_fingerprint          :string(255)
-#  attachment_meta                 :text
-#  month_of_publication            :integer
+#  id                                :integer          not null, primary key
+#  original_title                    :text             not null
+#  title_alternative                 :text
+#  title_transcription               :text
+#  classification_number             :string(255)
+#  manifestation_identifier          :string(255)
+#  date_of_publication               :datetime
+#  date_copyrighted                  :datetime
+#  created_at                        :datetime         not null
+#  updated_at                        :datetime         not null
+#  deleted_at                        :datetime
+#  access_address                    :string(255)
+#  language_id                       :integer          default(1), not null
+#  carrier_type_id                   :integer          default(1), not null
+#  extent_id                         :integer          default(1), not null
+#  start_page                        :integer
+#  end_page                          :integer
+#  height                            :integer
+#  width                             :integer
+#  depth                             :integer
+#  isbn                              :string(255)
+#  isbn10                            :string(255)
+#  wrong_isbn                        :string(255)
+#  nbn                               :string(255)
+#  lccn                              :string(255)
+#  oclc_number                       :string(255)
+#  issn                              :string(255)
+#  price                             :integer
+#  fulltext                          :text
+#  volume_number_string              :string(255)
+#  issue_number_string               :string(255)
+#  serial_number_string              :string(255)
+#  edition                           :integer
+#  note                              :text
+#  repository_content                :boolean          default(FALSE), not null
+#  lock_version                      :integer          default(0), not null
+#  required_role_id                  :integer          default(1), not null
+#  state                             :string(255)
+#  required_score                    :integer          default(0), not null
+#  frequency_id                      :integer          default(1), not null
+#  subscription_master               :boolean          default(FALSE), not null
+#  attachment_file_name              :string(255)
+#  attachment_content_type           :string(255)
+#  attachment_file_size              :integer
+#  attachment_updated_at             :datetime
+#  title_alternative_transcription   :text
+#  description                       :text
+#  abstract                          :text
+#  available_at                      :datetime
+#  valid_until                       :datetime
+#  date_submitted                    :datetime
+#  date_accepted                     :datetime
+#  date_caputured                    :datetime
+#  pub_date                          :string(255)
+#  edition_string                    :string(255)
+#  volume_number                     :integer
+#  issue_number                      :integer
+#  serial_number                     :integer
+#  ndc                               :string(255)
+#  content_type_id                   :integer          default(1)
+#  year_of_publication               :integer
+#  attachment_meta                   :text
+#  month_of_publication              :integer
+#  fulltext_content                  :boolean
+#  doi                               :string(255)
+#  periodical                        :boolean
+#  series_original_title             :text
+#  series_title_transcription        :text
+#  series_title_creator_string       :text
+#  series_title_volume_number_string :text
 #
 

data/spec/fixtures/series_statements.yml

@@ -1,45 +1,43 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
 one:
   id: 1
   original_title: title1
-  periodical: false
   position: 1
 
 two:
   id: 2
   original_title: title2
   title_transcription: テスト
-  periodical: true
-  issn: 09135707
   position: 2
+  manifestation_id: 202
+  series_master: true
 
 three:
   id: 3
   original_title: テスト雑誌
-  periodical: true
   position: 3
-  root_manifestation_id: 201
+  manifestation_id: 201
 
 # == Schema Information
 #
 # Table name: series_statements
 #
-#  id                            :integer          not null, primary key
-#  original_title                :text
-#  numbering                     :text
-#  title_subseries               :text
-#  numbering_subseries           :text
-#  position                      :integer
-#  created_at                    :datetime         not null
-#  updated_at                    :datetime         not null
-#  title_transcription           :text
-#  title_alternative             :text
-#  series_statement_identifier   :string(255)
-#  issn                          :string(255)
-#  periodical                    :boolean          default(FALSE), not null
-#  root_manifestation_id         :integer
-#  note                          :text
-#  title_subseries_transcription :text
+#  id                                 :integer          not null, primary key
+#  original_title                     :text
+#  numbering                          :text
+#  title_subseries                    :text
+#  numbering_subseries                :text
+#  position                           :integer
+#  created_at                         :datetime         not null
+#  updated_at                         :datetime         not null
+#  title_transcription                :text
+#  title_alternative                  :text
+#  series_statement_identifier        :string(255)
+#  manifestation_id                   :integer
+#  note                               :text
+#  title_subseries_transcription      :text
+#  creator_string                     :text
+#  volume_number_string               :text
+#  volume_number_transcription_string :text
+#  series_master                      :boolean
 #
 

data/spec/models/item_spec.rb

@@ -1,3 +1,29 @@
+# == Schema Information
+#
+# Table name: items
+#
+#  id                    :integer          not null, primary key
+#  call_number           :string(255)
+#  item_identifier       :string(255)
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  deleted_at            :datetime
+#  shelf_id              :integer          default(1), not null
+#  include_supplements   :boolean          default(FALSE), not null
+#  note                  :text
+#  url                   :string(255)
+#  price                 :integer
+#  lock_version          :integer          default(0), not null
+#  required_role_id      :integer          default(1), not null
+#  state                 :string(255)
+#  required_score        :integer          default(0), not null
+#  acquired_at           :datetime
+#  bookstore_id          :integer
+#  budget_type_id        :integer
+#  circulation_status_id :integer          default(5), not null
+#  checkout_type_id      :integer          default(1), not null
+#
+
 # -*- encoding: utf-8 -*-
 require 'spec_helper'
 
@@ -50,31 +76,3 @@ describe Item do
     item.lending_policies.where(:user_group_id => 1).first.loan_period.should eq 10
   end
 end
-
-# == Schema Information
-#
-# Table name: items
-#
-#  id                    :integer          not null, primary key
-#  call_number           :string(255)
-#  item_identifier       :string(255)
-#  circulation_status_id :integer          default(5), not null
-#  checkout_type_id      :integer          default(1), not null
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  deleted_at            :datetime
-#  shelf_id              :integer          default(1), not null
-#  include_supplements   :boolean          default(FALSE), not null
-#  note                  :text
-#  url                   :string(255)
-#  price                 :integer
-#  lock_version          :integer          default(0), not null
-#  required_role_id      :integer          default(1), not null
-#  state                 :string(255)
-#  required_score        :integer          default(0), not null
-#  acquired_at           :datetime
-#  bookstore_id          :integer
-#  budget_type_id        :integer
-#  manifestation_id      :integer
-#
-