enju_question 0.1.0.pre12 → 0.1.0.pre13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9bfa05a0add606a0ac41ce620c5c8d90aeb16db
-  data.tar.gz: c06de63d0fe30b4e3c3dbba3fa07c2f2c0793b42
+  metadata.gz: e6ecc1065776585a67c92f3f44b8b16ab961eb0f
+  data.tar.gz: d70e615307eaeb402b0f6d02f80ccf45a55de491
 SHA512:
-  metadata.gz: c85ceeb84b0750bd5378471143e6120a38145e50d46c4dcb101929ac25568263b591c22f2690cb22096e89232930ccfc7b542c4d3b12d1d005718e0f62a16089
-  data.tar.gz: 34229ed11ecaa06ee192bee85ec2ba8f57df80d4b2c50282edd137c032a36366f190c73330bae3cf6e735cef6f6dfbaf2e3ea6ae764691f9b819149ee2574814
+  metadata.gz: 2fcef2da47cd00ea941882ec3a383726af4e93cd12f6722896b632436e01d0faef6911c2d7179e0527b13a42cde138d4a4722142be15ae870ab27dcfa4ba0c4c
+  data.tar.gz: d160eb04967edc55516b8735ed7bd64d2a7f02b6564126575a7ddb207c45987ad5aacc1a7b8e2be0b1ae09a4daa9e57d08106256bb4741717d297f3fb1481c5e

data/app/models/answer.rb

@@ -1,7 +1,7 @@
 # -*- 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

data/app/models/question.rb

@@ -1,11 +1,11 @@
 # -*- encoding: utf-8 -*-
 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)
-  scope :solved, where(:solved => true)
-  scope :unsolved, where(:solved => false)
+  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
 

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

@@ -1,14 +1,14 @@
 <div id="crd">
 <%- if @crd_results -%>
-  <h4><%= link_to t('question.crd'), "http://crd.ndl.go.jp/" -%></h4>
-  <p><%= t('question.number_of_search_results', :count => @crd_results.total_count) -%><br />
+  <h4><%= link_to t('question.crd'), "https://crd.ndl.go.jp/" -%></h4>
+  <p><%= t('question.number_of_search_results', count: @crd_results.total_count) -%><br />
   <ul>
     <%- @crd_results.each do |result| -%>
       <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>
+  <p><%= link_to t('question.you_can_search_crd'), "https://crd.ndl.go.jp/" -%></p>
 <%- end -%>
 </div>

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

@@ -10,6 +10,6 @@
     </li>
   <%- end -%>
   <%- if @solved -%>
-    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(:solved => nil, page: nil, view: nil, only_path: true)) -%></li>
+    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(solved: nil, page: nil, view: nil, only_path: true)) -%></li>
   <%- end -%>
 </ul>

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

@@ -4,8 +4,8 @@ xml.rss('version' => "2.0",
   'xmlns:atom' => "http://www.w3.org/2005/Atom"){
   xml.channel{
     if @user
-      xml.title t('question.user_question', :login_name => @user.username)
-      xml.link user_questions_url(@user)
+      xml.title t('question.user_question', login_name: @user.username)
+      xml.link questions_url(user_id: @user.username)
     else
       xml.title t('question.library_group_question', library_group_name: @library_group.display_name.localize)
       xml.link questions_url
@@ -14,13 +14,13 @@ xml.rss('version' => "2.0",
     xml.language @locale.to_s
     xml.ttl "60"
     if @user
-      xml.tag! "atom:link", rel: 'self', href: user_questions_url(@user, format: :rss)
-      xml.tag! "atom:link", rel: 'alternate', href: user_questions_url(@user)
+      xml.tag! "atom:link", rel: 'self', href: questions_url(user_id: @user.username, format: :rss)
+      xml.tag! "atom:link", rel: 'alternate', href: questions_url(user_id: @user.username)
     else
       xml.tag! "atom:link", rel: 'self', href: questions_url(format: :rss)
       xml.tag! "atom:link", rel: 'alternate', href: questions_url
     end
-    #xml.tag! "atom:link", rel: 'search', :type => 'application/opensearchdescription+xml', href: "http://#{request.host_with_port}/page/opensearch"
+    #xml.tag! "atom:link", rel: 'search', :type => 'application/opensearchdescription+xml', href: page_opensearch_url(format: :xml)
     unless params[:query].blank?
       xml.tag! "opensearch:totalResults", @count[:query_result]
       xml.tag! "opensearch:startIndex", @questions.offset + 1

data/lib/enju_question/version.rb

@@ -1,3 +1,3 @@
 module EnjuQuestion
-  VERSION = "0.1.0.pre12"
+  VERSION = "0.1.0.pre13"
 end