enju_question 0.0.10 → 0.0.11

data/lib/enju_question/version.rb

@@ -1,3 +1,3 @@
 module EnjuQuestion
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/cassette_library/enju_ndl/crd.yml

@@ -15,7 +15,7 @@ http_interactions:
       message: OK
     headers:
       date:
-      - Wed, 28 Dec 2011 21:49:09 GMT
+      - Thu, 15 Dec 2011 08:18:24 GMT
       content-type:
       - application/xml;charset=UTF-8
       connection:
@@ -24,103 +24,16 @@ http_interactions:
 
       <result_set xmlns="http://crd.ndl.go.jp/refapi/servlet/refapi.RSearchAPI">
 
-      <hit_num>5</hit_num>
+      <hit_num>4</hit_num>
 
       <results_get_position>1</results_get_position>
 
-      <results_num>5</results_num>
+      <results_num>4</results_num>
 
       <results_cd>0001</results_cd>
 
       <result>
 
-      <QUESTION>グリーグ「詩人の心」のＣＤを借りたい。
-
-      yahooで検索し「自作の歌曲による12のピアノ曲集」（全音楽譜出版社）の曲だということがわかりました。『クラシック音楽作品名辞典』（三省堂）で「自作～」を引くと、「自作～」はop41とop52があり、曲の順番からいって「詩人の心」はop52の3曲目と思われますが、3曲目は「海の永遠の動きをあなたは知らない」となっています。
-
-      op52の入っているＣＤは1枚所蔵があったのですが、その3番目の曲は「君知らず、彼の永遠の動きを」です（「グリーグ：ピアノ全曲集⑧」）。この曲と「詩人の心」は同一の曲でしょうか。
-
-
-      （関係ないかもしれませんが、前出の「クラシック～」によると、「4つのデンマーク語の歌『心の歌』」op5の2曲目にも「海の永遠の動きをあなたは知らない」という曲があります。）
-
-
-      貴館でお持ちの「新・外国楽曲の呼び方」（日本放送出版協会）資料No1511395137と「洋楽索引：作曲者と原題と訳題を引き出すための上、下」（民音音楽資料館）資料No1510796988,1510796996を確認してください。
-
-
-      「クラシック音楽作品名辞典第3版」（三省堂）および「作曲家別名曲解説ライブラリー18北欧の巨匠」（音楽の友社）は調査済みです。</QUESTION>
-
-      <REG-ID>OSPR11070035</REG-ID>
-
-      <ANSWER>「海の永遠の動きをあなたは知らない」（「君知らず、彼の永遠の動きを」）と「詩人の心」は同じものでした。
-
-
-      ①《自作の歌曲によるピアノ曲》Op.52は題名のとおり、グリーグの作曲した歌曲をピアノ曲に編曲したもので、「海の永遠の動きをあなたは知らない」Du fatter
-      ej Bolgernes evige Gangは《4つのデンマーク語の歌「心の歌」》Op.5の第2曲に当たります。これは『グリーグ：生涯と作品』（菅野浩和/著　音楽之友社　1984.11）付録28頁に記載されています。
-
-
-      ②「海の永遠の動きをあなたは知らない」は『クラシック音楽作品名辞典：改訂版』（井上和男/編　三省堂　1996.12）174頁にあるようにアンデルセンの詩に曲をつけたものです（事前調査された第3版にも記載されていると思います）。
-
-
-      ③〈NAXOS MUSIC LIBRARY〉のサイトでは、
-
-      「 Du fatter ej Boigemes evige Gang (The Poet''s Heart), Op. 5, No. 2」と表記されています。
-
-
-      http://ml.naxos.jp/album/8.553400
-
-
-
-      ※『ピアノ作曲家作品事典』（中村菊子/著　大竹紀子/著　ヤマハミュージックメディア　2003.11）は「詩人の心」The Poet''s Heartと表記されています（79頁）。これは全音楽譜出版社の《自作の歌曲による12のピアノ曲》の楽譜に依っています。
-
-
-      なお、以下の資料には「詩人の心」「海の永遠の動きをあなたは知らない」は記載されていませんでした。
-
-      『新・外国楽曲の呼び方』（日本放送協会　1962.9）
-
-      『洋楽索引：作曲者と原題と訳題を引き出すための　下巻』（民音音楽資料館　1981.2）
-
-      『洋楽索引：作曲者と原題と訳題を引き出すための　上巻』（民音音楽資料館　1975.11）
-
-      </ANSWER>
-
-      <CRT-DATE>2011/07/25</CRT-DATE>
-
-      <KEYWORD>Du fatter ej Boigemes evige Gang 　The Poet''s Heart</KEYWORD>
-
-      <NDC>763</NDC>
-
-      <NDC-NOTE>楽器．器楽(763：8版)</NDC-NOTE>
-
-      <RES-TYPE>事実調査</RES-TYPE>
-
-      <BIBL>『グリーグ：生涯と作品』（菅野浩和/著　音楽之友社　1984.11）（ページ：28）</BIBL>
-
-      <BIBL>『クラシック音楽作品名辞典：改訂版』（井上和男/編　三省堂　1996.12）（ページ：174）</BIBL>
-
-      <BIBL>『ピアノ作曲家作品事典：152人の作曲家たちとピアノ曲のすべて』（中村菊子/著　大竹紀子/著　ヤマハミュージックメディア　2003.11）（ページ：79）</BIBL>
-
-      <BIBL>NAXOS MUSIC LIBRARY（2010/7/27現在）(ホームページ：http://ml.naxos.jp/album/8.553400)</BIBL>
-
-      <REG-DATE>201112160205</REG-DATE>
-
-      <LST-DATE>201112161258</LST-DATE>
-
-      <SYS-ID>1000098395</SYS-ID>
-
-      <LIB-ID>2120005</LIB-ID>
-
-      <LIB-NAME>大阪府立中央図書館</LIB-NAME>
-
-      <URL>http://crd.ndl.go.jp/GENERAL/servlet/detail.reference?id=1000098395</URL>
-
-      <IMAGE>無</IMAGE>
-
-      <position>0</position>
-
-      </result>
-
-      <result>
-
       <QUESTION>「極冷酒」の読み方を知りたい。尾瀬あきら著『さらに極める日本酒味わい入門』の紹介文に「熱燗、燗冷まし、割り水燗、にごり酒、日本酒カクテル、極冷酒・・・。日本酒のオツな楽しみ方が満載」とあり、原本には「極冷酒のファンタジー」の項目がありました。日本酒の辞典類には用語はなく、yahoo検索では極冷酒はありましたが読みはなし。</QUESTION>
 
       <REG-ID>5077</REG-ID>
@@ -258,7 +171,7 @@ http_interactions:
 
       <IMAGE>無</IMAGE>
 
-      <position>1</position>
+      <position>0</position>
 
       </result>
 
@@ -300,7 +213,7 @@ http_interactions:
 
       <IMAGE>無</IMAGE>
 
-      <position>2</position>
+      <position>1</position>
 
       </result>
 
@@ -388,7 +301,7 @@ http_interactions:
 
       <IMAGE>無</IMAGE>
 
-      <position>3</position>
+      <position>2</position>
 
       </result>
 
@@ -515,7 +428,7 @@ http_interactions:
 
       <IMAGE>無</IMAGE>
 
-      <position>4</position>
+      <position>3</position>
 
       </result>
 
@@ -523,5 +436,5 @@ http_interactions:
 
 '
     http_version: '1.0'
-  recorded_at: Wed, 28 Dec 2011 21:49:10 GMT
+  recorded_at: Thu, 15 Dec 2011 08:18:26 GMT
 recorded_with: VCR 2.0.0.rc1

data/spec/support/controller_macros.rb

@@ -2,14 +2,14 @@ module ControllerMacros
   def login_admin
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:admin]
-      sign_in Factory.create(:admin)
+      sign_in FactoryGirl.create(:admin)
     end
   end
 
   def login_librarian
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:user]
-      user = Factory.create(:librarian)
+      user = FactoryGirl.create(:librarian)
       sign_in user
     end
   end
@@ -17,7 +17,7 @@ module ControllerMacros
   def login_user
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:user]
-      user = Factory.create(:user)
+      user = FactoryGirl.create(:user)
       sign_in user
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_question
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-18 00:00:00.000000000 Z
+date: 2012-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70341206584240 !ruby/object:Gem::Requirement
+  requirement: &70303220760800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70341206584240
+  version_requirements: *70303220760800
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &70341206583820 !ruby/object:Gem::Requirement
+  requirement: &70303220776680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70341206583820
+  version_requirements: *70303220776680
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
-  requirement: &70341206583100 !ruby/object:Gem::Requirement
+  requirement: &70303220776040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70341206583100
+  version_requirements: *70303220776040
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
-  requirement: &70341206582160 !ruby/object:Gem::Requirement
+  requirement: &70303220775160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70341206582160
+  version_requirements: *70303220775160
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70341206581240 !ruby/object:Gem::Requirement
+  requirement: &70303220773880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70341206581240
+  version_requirements: *70303220773880
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70341206580300 !ruby/object:Gem::Requirement
+  requirement: &70303220772640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70341206580300
+  version_requirements: *70303220772640
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &70341206579340 !ruby/object:Gem::Requirement
+  requirement: &70303220771520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70341206579340
+  version_requirements: *70303220771520
 - !ruby/object:Gem::Dependency
   name: friendly_id
-  requirement: &70341206578140 !ruby/object:Gem::Requirement
+  requirement: &70303220770880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '4.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70341206578140
+  version_requirements: *70303220770880
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70341206577180 !ruby/object:Gem::Requirement
+  requirement: &70303220770260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70341206577180
+  version_requirements: *70303220770260
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70341206575900 !ruby/object:Gem::Requirement
+  requirement: &70303220768840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70341206575900
+  version_requirements: *70303220768840
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70341206574700 !ruby/object:Gem::Requirement
+  requirement: &70303220783480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,21 +131,21 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70341206574700
+  version_requirements: *70303220783480
 - !ruby/object:Gem::Dependency
   name: enju_ndl
-  requirement: &70341206574020 !ruby/object:Gem::Requirement
+  requirement: &70303220782480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.19
   type: :runtime
   prerelease: false
-  version_requirements: *70341206574020
+  version_requirements: *70303220782480
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70341206573080 !ruby/object:Gem::Requirement
+  requirement: &70303220781920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70341206573080
+  version_requirements: *70303220781920
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70341206621360 !ruby/object:Gem::Requirement
+  requirement: &70303220781440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70341206621360
+  version_requirements: *70303220781440
 - !ruby/object:Gem::Dependency
   name: sunspot-rails-tester
-  requirement: &70341206620800 !ruby/object:Gem::Requirement
+  requirement: &70303220780920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,32 +175,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70341206620800
+  version_requirements: *70303220780920
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70341206620040 !ruby/object:Gem::Requirement
+  requirement: &70303220779940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70341206620040
+  version_requirements: *70303220779940
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70341206618960 !ruby/object:Gem::Requirement
+  requirement: &70303220779180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc2
+        version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70341206618960
+  version_requirements: *70303220779180
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70341206618420 !ruby/object:Gem::Requirement
+  requirement: &70303220778340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,7 +208,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70341206618420
+  version_requirements: *70303220778340
 description: Question and answer management for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp
@@ -296,6 +296,7 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/006_create_items.rb
 - spec/dummy/db/migrate/20100525171356_acts_as_taggable_on_migration.rb
 - spec/dummy/db/migrate/20111201121636_create_languages.rb
@@ -406,6 +407,7 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/006_create_items.rb
 - spec/dummy/db/migrate/20100525171356_acts_as_taggable_on_migration.rb
 - spec/dummy/db/migrate/20111201121636_create_languages.rb
@@ -454,4 +456,3 @@ test_files:
 - spec/support/controller_macros.rb
 - spec/support/devise.rb
 - spec/support/vcr.rb
-has_rdoc: