enju_ndl 0.0.35 → 0.1.0.pre

data/app/controllers/ndl_books_controller.rb

@@ -10,8 +10,12 @@ class NdlBooksController < ApplicationController
     end
     @query = params[:query].to_s.strip
     books = NdlBook.search(params[:query], page)
-    @books = WillPaginate::Collection.create(page, NdlBook.per_page, books[:total_entries]) do |pager|
-      pager.replace books[:items]
+    @books = Kaminari.paginate_array(
+      books[:items], :total_count => books[:total_entries], :page => page
+    ).page(page).per(10)
+
+    respond_to do |format|
+      format.html
     end
   end
 

data/app/models/ndl_book.rb

@@ -1,5 +1,9 @@
 # -*- encoding: utf-8 -*-
 class NdlBook
+  def self.per_page
+    10
+  end
+
   def self.search(query, page = 1, per_page = self.per_page)
     if query
       cnt = self.per_page
@@ -15,10 +19,6 @@ class NdlBook
     end
   end
 
-  def self.per_page
-    10
-  end
-
   def self.import_from_sru_response(jpno)
     manifestation = Manifestation.where(:nbn => jpno).first
     return if manifestation

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

@@ -11,7 +11,7 @@
 <%- end -%>
 
 <% if @query.present? %>
-<p><%= @books.total_entries %> 件が見つかりました。</p>
+<p><%= @books.total_count %> 件が見つかりました。</p>
 
 <table class="table table-striped index">
   <tr>
@@ -37,7 +37,7 @@
 
 <br />
 
-<%= will_paginate(@books) %>
+<%= paginate(@books) %>
 <% else %>
   <%= javascript_tag("$('#search_form_top').focus()") -%>
 <% end %>

data/lib/enju_ndl/crd.rb

@@ -60,7 +60,7 @@ module EnjuNdl
         end
 
         resources = response[:results]
-        crd_results = WillPaginate::Collection.create(crd_page, Question.crd_per_page, crd_total_count) do |pager| pager.replace(resources) end
+        crd_results = Kaminari::paginate_array(resources, :total_count => crd_total_count, :page => crd_page).page(crd_page)
       end
     end
   end

data/lib/enju_ndl/version.rb

@@ -1,3 +1,3 @@
 module EnjuNdl
-  VERSION = "0.0.35"
+  VERSION = "0.1.0.pre"
 end

data/lib/generators/enju_ndl/views_generator.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: enju_ndl
 version: !ruby/object:Gem::Version
-  version: 0.0.35
-  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
@@ -144,33 +144,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_subject
   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_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
@@ -223,6 +223,7 @@ files:
 - lib/enju_ndl/ndl_search.rb
 - lib/enju_ndl/version.rb
 - lib/enju_ndl.rb
+- lib/generators/enju_ndl/views_generator.rb
 - lib/tasks/enju_ndl_tasks.rake
 - MIT-LICENSE
 - Rakefile
@@ -244,9 +245,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