enju_question 0.1.0.pre11 → 0.1.0.pre12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ae5ecf6b5d7c744216cc19d1f8a08922e125dc7
-  data.tar.gz: 736fbeaa3c33d0209916045ba95e8d286cc7242a
+  metadata.gz: e9bfa05a0add606a0ac41ce620c5c8d90aeb16db
+  data.tar.gz: c06de63d0fe30b4e3c3dbba3fa07c2f2c0793b42
 SHA512:
-  metadata.gz: 918e131260467456addb99f840bad845eb770c5924ee93f58acb9c16bc330fb108693e5d7b6099ed51589e9f65423000654c06f7eb6a9beea4b94cec02309572
-  data.tar.gz: fc493900650fb08c4f68587d3108198b4e078ce77def5771741a6e83b59bacf81d3ebf0cc89e1301c3c5168fc355431f253d01591e8a13541a0b0740cac8b449
+  metadata.gz: c85ceeb84b0750bd5378471143e6120a38145e50d46c4dcb101929ac25568263b591c22f2690cb22096e89232930ccfc7b542c4d3b12d1d005718e0f62a16089
+  data.tar.gz: 34229ed11ecaa06ee192bee85ec2ba8f57df80d4b2c50282edd137c032a36366f190c73330bae3cf6e735cef6f6dfbaf2e3ea6ae764691f9b819149ee2574814

data/app/controllers/answers_controller.rb

@@ -1,11 +1,10 @@
 # -*- encoding: utf-8 -*-
 class AnswersController < ApplicationController
-  load_and_authorize_resource :except => :index
-  authorize_resource :only => :index
-  before_filter :store_location, :only => [:index, :show, :new, :edit]
-  before_filter :get_user, :except => [:edit]
+  load_and_authorize_resource except: :index
+  authorize_resource only: :index
+  before_filter :store_location, only: [:index, :show, :new, :edit]
+  before_filter :get_user, except: [:edit]
   before_filter :get_question
-  cache_sweeper :question_sweeper, :only => [:create, :update, :destroy]
 
   # GET /answers
   # GET /answers.json
@@ -59,8 +58,8 @@ class AnswersController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @answers.to_json }
-      format.rss  { render :layout => false }
+      format.json { render json: @answers.to_json }
+      format.rss  { render layout: false }
       format.atom
     end
   end
@@ -70,7 +69,7 @@ class AnswersController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @answer.to_json }
+      format.json { render json: @answer.to_json }
     end
   end
 
@@ -101,14 +100,14 @@ class AnswersController < ApplicationController
 
     respond_to do |format|
       if @answer.save
-        flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.answer'))
+        flash[:notice] = t('controller.successfully_created', model: t('activerecord.models.answer'))
         format.html { redirect_to @answer }
-        format.json { render :json => @answer, :status => :created, :location => answer_url(@answer) }
+        format.json { render json: @answer, status: :created, location: answer_url(@answer) }
         format.mobile { redirect_to question_url(@answer.question) }
       else
-        format.html { render :action => "new" }
-        format.json { render :json => @answer.errors, :status => :unprocessable_entity }
-        format.mobile { render :action => "new" }
+        format.html { render action: "new" }
+        format.json { render json: @answer.errors, status: :unprocessable_entity }
+        format.mobile { render action: "new" }
       end
     end
   end
@@ -118,12 +117,12 @@ class AnswersController < ApplicationController
   def update
     respond_to do |format|
       if @answer.update_attributes(params[:answer])
-        flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.answer'))
+        flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.answer'))
         format.html { redirect_to @answer }
         format.json { head :no_content }
       else
-        format.html { render :action => "edit" }
-        format.json { render :json => @answer.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @answer.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/controllers/questions_controller.rb

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
 class QuestionsController < ApplicationController
-  before_filter :store_location, :only => [:index, :show, :new, :edit]
+  before_filter :store_location, only: [:index, :show, :new, :edit]
   load_and_authorize_resource
-  before_filter :get_user, :except => [:edit]
-  after_filter :solr_commit, :only => [:create, :update, :destroy]
+  before_filter :get_user, except: [:edit]
+  after_filter :solr_commit, only: [:create, :update, :destroy]
 
   # GET /questions
   # GET /questions.json
@@ -85,16 +85,16 @@ class QuestionsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @questions }
+      format.json { render json: @questions }
       format.xml {
         if params[:mode] == 'crd'
-          render :template => 'questions/index_crd'
+          render template: 'questions/index_crd'
           convert_charset
         else
           render :xml => @questions
         end
       }
-      format.rss  { render :layout => false }
+      format.rss  { render layout: false }
       format.atom
       format.js
     end
@@ -105,10 +105,10 @@ class QuestionsController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @question }
+      format.json { render json: @question }
       format.xml {
         if params[:mode] == 'crd'
-          render :template => 'questions/show_crd'
+          render template: 'questions/show_crd'
           convert_charset
         else
           render :xml => @question
@@ -134,12 +134,12 @@ class QuestionsController < ApplicationController
 
     respond_to do |format|
       if @question.save
-        flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.question'))
+        flash[:notice] = t('controller.successfully_created', model: t('activerecord.models.question'))
         format.html { redirect_to @question }
-        format.json { render :json => @question, :status => :created, :location => @question }
+        format.json { render json: @question, status: :created, location: @question }
       else
-        format.html { render :action => "new" }
-        format.json { render :json => @question.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @question.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -149,12 +149,12 @@ class QuestionsController < ApplicationController
   def update
     respond_to do |format|
       if @question.update_attributes(params[:question])
-        flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.question'))
+        flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.question'))
         format.html { redirect_to @question }
         format.json { head :no_content }
       else
-        format.html { render :action => "edit" }
-        format.json { render :json => @question.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @question.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/models/answer.rb

@@ -1,13 +1,13 @@
 # -*- encoding: utf-8 -*-
 class Answer < ActiveRecord::Base
   attr_accessible :question_id, :body, :item_identifier_list, :url_list
-  default_scope :order => 'answers.id ASC'
+  default_scope order: 'answers.id ASC'
   #scope :public_answers, where(:shared => true)
   #scope :private_answers, where(:shared => false)
-  belongs_to :user, :validate => true
-  belongs_to :question, :validate => true
-  has_many :answer_has_items, :dependent => :destroy
-  has_many :items, :through => :answer_has_items
+  belongs_to :user, validate: true
+  belongs_to :question, validate: true
+  has_many :answer_has_items, dependent: :destroy
+  has_many :items, through: :answer_has_items
 
   after_save :save_questions
   before_save :add_items
@@ -19,11 +19,11 @@ class Answer < ActiveRecord::Base
   paginates_per 10
 
   def save_questions
-    self.question.save
+    question.save
   end
 
   def add_items
-    item_list = item_identifier_list.to_s.strip.split.map{|i| Item.where(:item_identifier => i).first}.compact.uniq
+    item_list = item_identifier_list.to_s.strip.split.map{|i| Item.where(item_identifier: i).first}.compact.uniq
     url_list = add_urls
     self.items = item_list + url_list
   end

data/app/models/answer_has_item.rb

@@ -3,8 +3,8 @@ class AnswerHasItem < ActiveRecord::Base
   belongs_to :answer
   belongs_to :item
 
-  validates_uniqueness_of :item_id, :scope => :answer_id
-  acts_as_list :scope => :answer_id
+  validates_uniqueness_of :item_id, scope: :answer_id
+  acts_as_list scope: :answer_id
 end
 
 # == Schema Information

data/app/models/question.rb

@@ -1,13 +1,13 @@
 # -*- encoding: utf-8 -*-
 class Question < ActiveRecord::Base
   attr_accessible :body, :shared, :solved, :note
-  default_scope :order => 'id DESC'
+  default_scope order: 'id DESC'
   scope :public_questions, where(:shared => true)
   scope :private_questions, where(:shared => false)
   scope :solved, where(:solved => true)
   scope :unsolved, where(:solved => false)
-  belongs_to :user, :validate => true
-  has_many :answers, :dependent => :destroy
+  belongs_to :user, validate: true
+  has_many :answers, dependent: :destroy
 
   validates_associated :user
   validates_presence_of :user, :body
@@ -22,7 +22,7 @@ class Question < ActiveRecord::Base
     boolean :shared
     boolean :solved
     integer :answers_count
-    integer :manifestation_id, :multiple => true do
+    integer :manifestation_id, multiple: true do
       answers.collect(&:items).flatten.collect{|i| i.manifestation.id}
     end
   end

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

@@ -1,10 +1,10 @@
-<%= simple_form_for(@answer, :validate => true) do |f| %>
+<%= simple_form_for(@answer, validate: true) do |f| %>
   <%= f.error_notification %>
   <%= f.hidden_field :question_id %>
 
   <div class="field">
     <%= f.label t('activerecord.models.user') %><br />
-    <%= link_to @answer.user.username, @answer.user %>
+    <%= link_to @answer.user.username, @answer.user.profile if @answer.user.try(:profile) %>
   </div>
 
   <div class="field">
@@ -14,17 +14,17 @@
 
   <div class="field">
     <%= f.label :body %><br />
-    <%= f.text_area :body, :class => 'resource_textarea' %>
+    <%= f.text_area :body, class: 'resource_textarea' %>
   </div>
 
   <div class="field">
     <%= f.label :item_identifier_list %><br />
-    <%= f.text_area :item_identifier_list, :class => 'resource_textarea' %>
+    <%= f.text_area :item_identifier_list, class: 'resource_textarea' %>
   </div>
 
   <div class="field">
     <%= f.label :url_list %><br />
-    <%= f.text_area :url_list, :class => 'resource_textarea' %>
+    <%= f.text_area :url_list, class: 'resource_textarea' %>
   </div>
 
   <div class="actions">

data/app/views/answers/edit.html.erb

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.answer')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.answer')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), @answer -%></li>
     <li><%= link_to t('page.back'), question_answers_path(@answer.question) -%></li>

data/app/views/answers/index.atom.builder

@@ -1,8 +1,8 @@
-atom_feed(:url => answers_url(:format => :atom)) do |feed|
+atom_feed(url: answers_url(format: :atom)) do |feed|
   if @user
     feed.title t('answer.user_answer', :login_name => @user.username)
   else
-    feed.title t('answer.library_group_answer', :library_group_name => @library_group.display_name.localize)
+    feed.title t('answer.library_group_answer', library_group_name: @library_group.display_name.localize)
   end
   feed.updated(@answers.first ? @answers.first.created_at : Time.zone.now)
 

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

@@ -1,5 +1,5 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.answer')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.answer')) -%></h1>
 <div id="content_list">
 
 <%- if @question -%>
@@ -17,14 +17,14 @@
 
 <%- @answers.each_with_index do |answer, i| -%>
   <tr class="line<%= cycle("0", "1") -%>">
-    <td><%= link_to answer.user.username, answer.user -%></td>
-    <td><%= link_to truncate(answer.body, :length => 20), answer -%></td>
+    <td><%= link_to answer.user.username, answer.user.profile if answer.user.try(:profile) -%></td>
+    <td><%= link_to truncate(answer.body, length: 20), answer -%></td>
     <td><%= l(answer.created_at) -%></td>
     <td><%= l(answer.updated_at) -%></td>
     <td>
       <%- if can? :delete, answer -%>
         <%= link_to t('page.edit'), edit_answer_path(answer) -%>
-        <%= link_to t('page.destroy'), answer, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), answer, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
@@ -35,10 +35,10 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <%- if @question -%>
     <ul>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.answer')), new_question_answer_path(@question) -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.answer')), new_question_answer_path(@question) -%></li>
     </ul>
   <%- end -%>
 </div>

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

@@ -8,9 +8,9 @@ xml.rss('version' => "2.0",
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
     xml.language @locale.to_s
     xml.ttl "60"
-    xml.tag! "atom:link", :rel => 'self', :href => "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(:format => :rss, :only_path => true))}"
-    xml.tag! "atom:link", :rel => 'alternate', :href => "#{request.protocol}#{request.host_with_port}"
-    #xml.tag! "atom:link", :rel => 'search', :type => 'application/opensearchdescription+xml', :href => "http://#{request.host_with_port}/page/opensearch"
+    xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(format: :rss, only_path: true))}"
+    xml.tag! "atom:link", rel: 'alternate', href: "#{request.protocol}#{request.host_with_port}"
+    #xml.tag! "atom:link", rel: 'search', :type => 'application/opensearchdescription+xml', href: "http://#{request.host_with_port}/page/opensearch"
     unless params[:query].blank?
       xml.tag! "opensearch:totalResults", @count[:query_result]
       xml.tag! "opensearch:startIndex", @answers.offset_value + 1

data/app/views/answers/new.html.erb

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.answer')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.answer')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if @answer.question -%>
       <li><%= link_to t('page.back'), question_answers_path(@answer.question) -%></li>

data/app/views/answers/new.mobile.erb

@@ -1,30 +1,30 @@
 <div data-role="header">
-  <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.answer')) -%></h1>
+  <h1 class="title"><%= t('page.showing', model: t('activerecord.models.answer')) -%></h1>
 </div>
 <div data-role="content">
   <div id="detail">
 
-<%= form_for(@answer, :url => question_answers_path(@answer.question)) do |f| -%>
+<%= form_for(@answer, url: question_answers_path(@answer.question)) do |f| -%>
   <%= f.error_messages -%>
   <div class="field">
     <%= f.label t('activerecord.models.question') -%><br />
     <%= @answer.question.body -%>
-    <%= f.hidden_field :question_id, :value => @answer.question.id -%>
+    <%= f.hidden_field :question_id, value: @answer.question.id -%>
   </div>
 
   <div class="field">
     <%= f.label :body -%><br />
-    <%= f.text_area :body, :class => 'resource_textarea' -%>
+    <%= f.text_area :body, class: 'resource_textarea' -%>
   </div>
 
   <div class="field">
     <%= f.label :item_identifier_list -%><br />
-    <%= f.text_area :item_identifier_list, :class => 'resource_textarea' -%>
+    <%= f.text_area :item_identifier_list, class: 'resource_textarea' -%>
   </div>
 
   <div class="field">
     <%= f.label :url_list -%><br />
-    <%= f.text_area :url_list, :class => 'resource_textarea' -%>
+    <%= f.text_area :url_list, class: 'resource_textarea' -%>
   </div>
 
   <div class="actions">

data/app/views/answers/show.html.erb

@@ -1,16 +1,17 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.answer')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.answer')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
 <p>
   <strong><%= t('activerecord.models.user') -%>:</strong>
-  <%= link_to @answer.user.username, @answer.user -%>
+  <%= link_to @answer.user.username, @answer.user.profile if @answer.user.try(:profile) -%>
 </p>
 
 <p>
   <strong><%= t('activerecord.models.question') -%>:</strong>
-  <%= link_to @answer.question.user.username, @answer.question.user -%>: <%= link_to @answer.question.body, @answer.question -%>
+  <%= link_to @answer.question.user.username, @answer.question.user.profile if @answer.question.user.try(:profile) -%>:
+  <%= link_to @answer.question.body, @answer.question -%>
 </p>
 
 <p>
@@ -44,7 +45,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if can? :update, @answer -%>
       <li><%= link_to t('page.edit'), edit_answer_path(@answer) -%></li>

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

@@ -0,0 +1,13 @@
+<div id="question">
+  <div id="question_list">
+    <ul>
+      <% @questions.each do |question| %>
+        <li>
+          <%= link_to question.body, question %>
+          (<%= t('page.last_updated') %>: <%=l question.updated_at %>)
+        </li>
+      <% end %>
+    </ul>
+    <%= paginate(@questions, param_name: :question_page, remote: true) -%>
+  </div>
+</div>

data/app/views/questions/_crd.html.erb

@@ -7,7 +7,7 @@
       <li><%= link_to h(truncate(result[:question])), result[:url] -%></li>
     <%- end -%>
   </ul>
-  <%= paginate(@crd_results, :param_name => :crd_page, :remote => true, :window => 1) -%>
+  <%= paginate(@crd_results, param_name: :crd_page, remote: true, :window => 1) -%>
 <%- else -%>
   <p><%= link_to t('question.you_can_search_crd'), "http://crd.ndl.go.jp/" -%></p>
 <%- end -%>