enju_purchase_request 0.0.14 → 0.1.0.pre

data/app/controllers/purchase_requests_controller.rb

@@ -14,7 +14,7 @@ class PurchaseRequestsController < ApplicationController
     if params[:format] == 'csv'
       per_page = 65534
     else
-      per_page = PurchaseRequest.per_page
+      per_page = PurchaseRequest.default_per_page
     end
 
     query = params[:query].to_s.strip

data/app/models/order.rb

@@ -12,9 +12,7 @@ class Order < ActiveRecord::Base
 
   acts_as_list :scope => :order_list
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   def reindex
     purchase_request.try(:index)

data/app/models/order_list.rb

@@ -19,9 +19,7 @@ class OrderList < ActiveRecord::Base
     end
   end
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   def total_price
     self.purchase_requests.sum(:price)

data/app/models/purchase_request.rb

@@ -38,9 +38,7 @@ class PurchaseRequest < ActiveRecord::Base
     end
   end
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   def check_price
     errors.add(:price) unless self.price.nil? || self.price > 0

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

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

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

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

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

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

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

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

data/app/views/purchase_requests/_index_order_list.html.erb

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

data/lib/enju_purchase_request/version.rb

@@ -1,3 +1,3 @@
 module EnjuPurchaseRequest
-  VERSION = "0.0.14"
+  VERSION = "0.1.0.pre"
 end

data/lib/generators/enju_purchase_request/views_generator.rb

@@ -0,0 +1,19 @@
+module EnjuPurchaseRequest
+  module Generators
+    class ViewsGenerator < Rails::Generators::Base
+      source_root File.expand_path('../../../../app/views', __FILE__)
+
+      def copy_files
+        directories = %w(
+          order_lists
+          orders
+          purchase_requests
+        )
+
+        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_purchase_request
 version: !ruby/object:Gem::Version
-  version: 0.0.14
-  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
@@ -48,17 +48,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -170,6 +170,7 @@ files:
 - lib/enju_purchase_request/user.rb
 - lib/enju_purchase_request/version.rb
 - lib/enju_purchase_request.rb
+- lib/generators/enju_purchase_request/views_generator.rb
 - lib/tasks/enju_purchase_request_tasks.rake
 - MIT-LICENSE
 - Rakefile
@@ -281,9 +282,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