enju_question 0.0.21 → 0.1.0.pre

data/app/controllers/questions_controller.rb

@@ -70,16 +70,16 @@ class QuestionsController < ApplicationController
     end
 
     page = params[:page] || 1
-    search.query.paginate(page.to_i, Question.per_page)
+    search.query.paginate(page.to_i, Question.default_per_page)
     result = search.execute!
     @questions = result.results
     @count[:query_result] = @questions.total_entries
 
     if query.present?
       begin
-        @crd_results = Question.search_crd(:query_01 => query, :page => params[:crd_page])
+        @crd_results = Question.search_crd(:query_01 => query, :page => params[:crd_page]).per(5)
       rescue Timeout::Error
-        @crd_results = WillPaginate::Collection.create(1,1,0) do end
+        @crd_results = Kaminari::paginate_array([]).page(1)
       end
     end
 

data/app/models/answer.rb

@@ -16,9 +16,7 @@ class Answer < ActiveRecord::Base
   validates_presence_of :user, :question, :body
   validate :check_url_list
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   def save_questions
     self.question.save

data/app/models/question.rb

@@ -31,9 +31,7 @@ class Question < ActiveRecord::Base
   acts_as_taggable_on :tags
   enju_ndl_crd
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   def self.crd_per_page
     5

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

@@ -31,7 +31,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@answers) -%>
+<%= paginate(@answers) -%>
 </div>
 </div>
 

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

@@ -13,8 +13,8 @@ xml.rss('version' => "2.0",
     #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 + 1
-      xml.tag! "opensearch:itemsPerPage", @answers.per_page
+      xml.tag! "opensearch:startIndex", @answers.offset_value + 1
+      xml.tag! "opensearch:itemsPerPage", @answers.limit_value
       #xml.tag! "opensearch:Query", :role => 'request', :searchTerms => params[:query], :startPage => (params[:page] || 1)
     end
     @answers.each do |answer|

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

@@ -1,25 +1,13 @@
 <div id="crd">
-<%- if user_signed_in? -%>
-  <ul>
-  <%- if current_user.has_role?('Librarian') -%>
-    <li><%= link_to t('question.all'), questions_path -%></li>
-  <%- end -%>
-  <%- if can? :create, Question -%>
-    <li><%= link_to t('question.my'), user_questions_path(current_user) -%></li>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.question')), new_question_path -%></li>
-  <%- end -%>
-  </ul>
-<%- end -%>
-
 <%- 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_entries) -%><br />
+  <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>
-  <%= will_paginate(@crd_results, :param_name => :crd_page, :class => 'sidebar_pagination') -%>
+  <%= 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 -%>

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

@@ -16,7 +16,10 @@
 <div id="submenu" class="ui-corner-all">
   <%= render 'solved_facet' -%>
   <ul>
-    <li><%= link_to t('question.all'), questions_path %></li>
+  <%- if can? :create, Question -%>
+    <li><%= link_to t('question.my'), user_questions_path(current_user) -%></li>
+    <li><%= link_to t('page.new', :model => t('activerecord.models.question')), new_question_path -%></li>
+  <%- end -%>
   </ul>
   <%= render 'crd' -%>
 </div>

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

@@ -14,5 +14,8 @@
 
 <div id="submenu" class="ui-corner-all">
   <%= render 'solved_facet' -%>
+  <ul>
+    <li><%= link_to t('question.all'), questions_path -%></li>
+  </ul>
   <%= render 'crd' -%>
 </div>

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

@@ -64,6 +64,6 @@
   <p><%= t('question.no_record_found') -%></p>
 <%- end -%>
 
-<%= will_paginate(@questions, :class => 'content_pagination digg_pagination') -%>
+<%= paginate(@questions, :remote => true) -%>
 
 </div>

data/app/views/questions/index.mobile.erb

@@ -18,4 +18,4 @@
 <% end %>
 </ul>
 
-<%= will_paginate(@questions, :renderer => WillPaginateJqueryMobileRenderer) %>
+<%= paginate(@questions) %>

data/lib/enju_question/version.rb

@@ -1,3 +1,3 @@
 module EnjuQuestion
-  VERSION = "0.0.21"
+  VERSION = "0.1.0.pre"
 end

data/lib/generators/enju_question/views_generator.rb

@@ -0,0 +1,18 @@
+module EnjuQuestion
+  module Generators
+    class ViewsGenerator < Rails::Generators::Base
+      source_root File.expand_path('../../../../app/views', __FILE__)
+
+      def copy_files
+        directories = %w(
+          answers
+          questions
+        )
+
+        directories.each do |dir|
+          directory dir, "app/views/#{dir}"
+        end
+      end
+    end
+  end
+end

data/spec/models/question_spec.rb

@@ -8,7 +8,7 @@ describe Question do
   it "test_should_get_crd_search" do
     result = Question.search_crd(:query_01 => 'Yahoo')
     result.should be_true
-    result.total_entries.should > 0
+    result.total_count.should > 0
   end
 
   it "should respond to last_updated_at" do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: enju_question
 version: !ruby/object:Gem::Version
-  version: 0.0.21
-  prerelease: 
+  version: 0.1.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-21 00:00:00.000000000 Z
+date: 2012-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,22 +59,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: enju_ndl
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.34
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.34
 - !ruby/object:Gem::Dependency
   name: enju_core
   requirement: !ruby/object:Gem::Requirement
@@ -176,17 +160,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre
+- !ruby/object:Gem::Dependency
+  name: enju_ndl
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0.pre
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0.pre
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
@@ -251,6 +251,7 @@ files:
 - lib/enju_question/user.rb
 - lib/enju_question/version.rb
 - lib/enju_question.rb
+- lib/generators/enju_question/views_generator.rb
 - lib/tasks/enju_question_tasks.rake
 - MIT-LICENSE
 - Rakefile
@@ -432,9 +433,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23