enju_question 0.0.15 → 0.0.16

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2011 YOURNAME
+Copyright 2012 Kosuke Tanabe
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -23,6 +23,12 @@ end
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
 
 Bundler::GemHelper.install_tasks
 
@@ -33,4 +39,7 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
     spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
+require 'rake/testtask'
+
+
 task :default => :spec

data/app/controllers/answers_controller.rb

@@ -92,7 +92,8 @@ class AnswersController < ApplicationController
   # POST /answers
   # POST /answers.json
   def create
-    @answer = current_user.answers.new(params[:answer])
+    @answer = Answer.new(params[:answer])
+    @answer.user = current_user
     unless @answer.question
       redirect_to questions_url
       return

data/app/controllers/questions_controller.rb

@@ -129,7 +129,8 @@ class QuestionsController < ApplicationController
   # POST /questions
   # POST /questions.json
   def create
-    @question = current_user.questions.new(params[:question])
+    @question = Question.new(params[:question])
+    @question.user = current_user
 
     respond_to do |format|
       if @question.save

data/app/models/answer.rb

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 class Answer < ActiveRecord::Base
-  default_scope :order => 'id ASC'
+  attr_accessible :question_id, :body, :item_identifier_list, :url_list
+  default_scope :order => 'answers.id ASC'
   #scope :public_answers, where(:shared => true)
   #scope :private_answers, where(:shared => false)
   belongs_to :user, :validate => true

data/app/models/answer_has_item.rb

@@ -1,4 +1,5 @@
 class AnswerHasItem < ActiveRecord::Base
+  attr_accessible :answer_id, :item_id
   belongs_to :answer
   belongs_to :item
 

data/app/models/question.rb

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 require 'timeout'
 class Question < ActiveRecord::Base
+  attr_accessible :body, :shared, :solved, :note
   default_scope :order => 'id DESC'
   scope :public_questions, where(:shared => true)
   scope :private_questions, where(:shared => false)

data/lib/enju_question/engine.rb

@@ -9,6 +9,6 @@ require 'enju_ndl'
 require 'acts_as_list'
 
 module EnjuQuestion
-  class Engine < Rails::Engine
+  class Engine < ::Rails::Engine
   end
 end

data/lib/enju_question/version.rb

@@ -1,3 +1,3 @@
 module EnjuQuestion
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 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/controllers/answers_controller_spec.rb

@@ -325,7 +325,7 @@ describe AnswersController do
       describe "with valid params" do
         it "assigns a newly created answer as @answer" do
           post :create, :answer => @attrs
-          assigns(:answer).should be_valid
+          assigns(:answer).should_not be_valid
         end
 
         it "redirects to the created answer" do

data/spec/controllers/questions_controller_spec.rb

@@ -337,7 +337,7 @@ describe QuestionsController do
       describe "with valid params" do
         it "assigns a newly created question as @question" do
           post :create, :question => @attrs
-          assigns(:question).should be_valid
+          assigns(:question).should_not be_valid
         end
 
         it "should be forbidden" do

data/spec/dummy/config/environments/development.rb

@@ -2,7 +2,7 @@ Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # In the development environment your application's code is reloaded on
-  # every request.  This slows down response time but is perfect for development
+  # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
@@ -22,6 +22,13 @@ Dummy::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
+
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  config.active_record.auto_explain_threshold_in_seconds = 0.5
+
   # Do not compress assets
   config.assets.compress = false
 

data/spec/dummy/config/environments/production.rb

@@ -33,8 +33,11 @@ Dummy::Application.configure do
   # See everything in the log (default is :info)
   # config.log_level = :debug
 
+  # Prepend all log lines with the following tags
+  # config.log_tags = [ :subdomain, :uuid ]
+
   # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
   # Use a different cache store in production
   # config.cache_store = :mem_cache_store
@@ -57,4 +60,8 @@ Dummy::Application.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
+
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  # config.active_record.auto_explain_threshold_in_seconds = 0.5
 end

data/spec/dummy/config/environments/test.rb

@@ -2,9 +2,9 @@ Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # The test environment is used exclusively to run your application's
-  # test suite.  You never need to work with it otherwise.  Remember that
+  # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
+  # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
@@ -29,10 +29,8 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
+  # Raise exception on mass assignment protection for Active Record models
+  #config.active_record.mass_assignment_sanitizer = :strict
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr

data/spec/dummy/solr/data/test/index/_0.fnm

@@ -0,0 +1,3 @@
+����idtype
+class_name
+username_screated_at_dupdated_at_dshared_bsolved_banswers_count_i	body_text
answer_body_text

data/spec/dummy/solr/data/test/index/_0.frq

@@ -0,0 +1 @@
+





	
	



	
	

data/spec/dummy/solr/data/test/index/_0.nrm

@@ -0,0 +1 @@
+NRM�||||||||����

data/spec/dummy/solr/data/test/index/_1.fnm

@@ -0,0 +1,3 @@
+����idtype
+class_name
+username_screated_at_dupdated_at_dshared_bsolved_banswers_count_i	body_text
answer_body_text

data/spec/dummy/solr/data/test/index/_1.frq

@@ -0,0 +1 @@
+





	
	



	
	

data/spec/dummy/solr/data/test/index/_1.nrm

@@ -0,0 +1 @@
+NRM�||||||||����

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_question
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-25 00:00:00.000000000 Z
+date: 2012-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -387,6 +387,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
@@ -398,8 +399,6 @@ files:
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/lib/expire_editable_fragment.rb
-- spec/dummy/log/sunspot-solr-test.log
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -416,8 +415,25 @@ files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
+- spec/dummy/solr/data/test/index/_0.fdt
+- spec/dummy/solr/data/test/index/_0.fdx
+- spec/dummy/solr/data/test/index/_0.fnm
+- spec/dummy/solr/data/test/index/_0.frq
+- spec/dummy/solr/data/test/index/_0.nrm
+- spec/dummy/solr/data/test/index/_0.prx
+- spec/dummy/solr/data/test/index/_0.tii
+- spec/dummy/solr/data/test/index/_0.tis
+- spec/dummy/solr/data/test/index/_0_1.del
+- spec/dummy/solr/data/test/index/_1.fdt
+- spec/dummy/solr/data/test/index/_1.fdx
+- spec/dummy/solr/data/test/index/_1.fnm
+- spec/dummy/solr/data/test/index/_1.frq
+- spec/dummy/solr/data/test/index/_1.nrm
+- spec/dummy/solr/data/test/index/_1.prx
+- spec/dummy/solr/data/test/index/_1.tii
+- spec/dummy/solr/data/test/index/_1.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_1
+- spec/dummy/solr/data/test/index/segments_3
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/answer.rb
@@ -499,6 +515,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
@@ -510,8 +527,6 @@ test_files:
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/lib/expire_editable_fragment.rb
-- spec/dummy/log/sunspot-solr-test.log
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -528,8 +543,25 @@ test_files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
+- spec/dummy/solr/data/test/index/_0.fdt
+- spec/dummy/solr/data/test/index/_0.fdx
+- spec/dummy/solr/data/test/index/_0.fnm
+- spec/dummy/solr/data/test/index/_0.frq
+- spec/dummy/solr/data/test/index/_0.nrm
+- spec/dummy/solr/data/test/index/_0.prx
+- spec/dummy/solr/data/test/index/_0.tii
+- spec/dummy/solr/data/test/index/_0.tis
+- spec/dummy/solr/data/test/index/_0_1.del
+- spec/dummy/solr/data/test/index/_1.fdt
+- spec/dummy/solr/data/test/index/_1.fdx
+- spec/dummy/solr/data/test/index/_1.fnm
+- spec/dummy/solr/data/test/index/_1.frq
+- spec/dummy/solr/data/test/index/_1.nrm
+- spec/dummy/solr/data/test/index/_1.prx
+- spec/dummy/solr/data/test/index/_1.tii
+- spec/dummy/solr/data/test/index/_1.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_1
+- spec/dummy/solr/data/test/index/segments_3
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/answer.rb