kaminari 0.10.4 → 0.11.0

data/app/views/kaminari/_paginator.html.erb

@@ -1,6 +1,6 @@
 <%# The container tag
   - available local variables
-    current_page:  the page number of currently displayed page
+    current_page:  a page object for the currently displayed page
     num_pages:     total number of pages
     per_page:      number of items to fetch per page
     remote:        data-remote
@@ -8,22 +8,16 @@
 -%>
 <%= paginator.render do -%>
   <nav class="pagination">
-    <%= current_page > 1 ? prev_link_tag : prev_span_tag %>
+    <%= first_page_tag unless current_page.first? %>
+    <%= prev_page_tag unless current_page.first? %>
     <% each_page do |page| -%>
-      <% if page.current? -%>
-        <%= current_page_tag %>
-      <% elsif page.left_outer? || page.right_outer? || page.inside_window? -%>
-        <% if page.first? -%>
-          <%= first_page_link_tag %>
-        <% elsif page.last? -%>
-          <%= last_page_link_tag %>
-        <% else -%>
-          <%= page_link_tag %>
-        <% end -%>
+      <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
+        <%= page_tag page %>
       <% elsif !page.was_truncated? -%>
-        <%= truncated_span_tag %>
+        <%= gap_tag %>
       <% end -%>
     <% end -%>
-    <%= num_pages > current_page ? next_link_tag : next_span_tag %>
+    <%= next_page_tag unless current_page.last? %>
+    <%= last_page_tag unless current_page.last? %>
   </nav>
 <% end -%>

data/app/views/kaminari/_paginator.html.haml

@@ -1,23 +1,18 @@
 -#  The container tag
   - available local variables
-    current_page:  the page number of currently displayed page
+    current_page:  a page object for the currently displayed page
     num_pages:     total number of pages
     per_page:      number of items to fetch per page
     remote:        data-remote
     paginator:     the paginator that renders the pagination tags inside
 = paginator.render do
   %nav.pagination
-    = current_page > 1 ? prev_link_tag : prev_span_tag
+    = first_page_tag unless current_page.first?
+    = prev_page_tag unless current_page.first?
     - each_page do |page|
-      - if page.current?
-        = current_page_tag
-      - elsif page.left_outer? || page.right_outer? || page.inside_window?
-        - if page.first?
-          = first_page_link_tag
-        - elsif page.last?
-          = last_page_link_tag
-        - else
-          = page_link_tag
+      - if page.left_outer? || page.right_outer? || page.inside_window?
+        = page_tag page
       - elsif !page.was_truncated?
-        = truncated_span_tag
-    = num_pages > current_page ? next_link_tag : next_span_tag
+        = gap_tag
+    = next_page_tag unless current_page.last?
+    = last_page_tag unless current_page.last?

data/app/views/kaminari/{_prev_link.html.erb → _prev_page.html.erb}

@@ -1,11 +1,11 @@
-<%# "Previous" with link
+<%# Link to the "Previous" page
   - available local variables
     url:           url to the previous page
-    current_page:  the page number of currently displayed page
+    current_page:  a page object for the currently displayed page
     num_pages:     total number of pages
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
 <span class="prev">
-  <%= link_to raw(t 'views.pagination.previous'), url, :class => 'prev', :rel => 'prev', :remote => remote %>
+  <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
 </span>

data/app/views/kaminari/_prev_page.html.haml

@@ -0,0 +1,9 @@
+-#  Link to the "Previous" page
+  - available local variables
+    url:           url to the previous page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+%span.prev
+  = link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote

data/config/locales/kaminari.yml

@@ -3,6 +3,8 @@
 en:
   views:
     pagination:
-      previous: "« Prev"
-      next: "Next »"
+      first: "« First"
+      last: "Last »"
+      previous: "‹ Prev"
+      next: "Next ›"
       truncate: "..."

data/kaminari.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kaminari}
-  s.version = "0.10.4"
+  s.version = "0.11.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Akira Matsuda"]
-  s.date = %q{2011-02-24}
+  s.date = %q{2011-04-19}
   s.description = %q{Kaminari is a Scope & Engine based, clean, powerful, customizable and sophisticated paginator for Rails 3}
   s.email = %q{ronnie@dio.jp}
   s.extra_rdoc_files = [
@@ -27,33 +27,27 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "app/views/kaminari/_current_page.html.erb",
-    "app/views/kaminari/_current_page.html.haml",
-    "app/views/kaminari/_first_page_link.html.erb",
-    "app/views/kaminari/_first_page_link.html.haml",
-    "app/views/kaminari/_last_page_link.html.erb",
-    "app/views/kaminari/_last_page_link.html.haml",
-    "app/views/kaminari/_next_link.html.erb",
-    "app/views/kaminari/_next_link.html.haml",
-    "app/views/kaminari/_next_span.html.erb",
-    "app/views/kaminari/_next_span.html.haml",
-    "app/views/kaminari/_page_link.html.erb",
-    "app/views/kaminari/_page_link.html.haml",
+    "app/views/kaminari/_first_page.html.erb",
+    "app/views/kaminari/_first_page.html.haml",
+    "app/views/kaminari/_gap.html.erb",
+    "app/views/kaminari/_gap.html.haml",
+    "app/views/kaminari/_last_page.html.erb",
+    "app/views/kaminari/_last_page.html.haml",
+    "app/views/kaminari/_next_page.html.erb",
+    "app/views/kaminari/_next_page.html.haml",
+    "app/views/kaminari/_page.html.erb",
+    "app/views/kaminari/_page.html.haml",
     "app/views/kaminari/_paginator.html.erb",
     "app/views/kaminari/_paginator.html.haml",
-    "app/views/kaminari/_prev_link.html.erb",
-    "app/views/kaminari/_prev_link.html.haml",
-    "app/views/kaminari/_prev_span.html.erb",
-    "app/views/kaminari/_prev_span.html.haml",
-    "app/views/kaminari/_truncated_span.html.erb",
-    "app/views/kaminari/_truncated_span.html.haml",
+    "app/views/kaminari/_prev_page.html.erb",
+    "app/views/kaminari/_prev_page.html.haml",
     "config/locales/kaminari.yml",
     "kaminari.gemspec",
     "lib/generators/kaminari/views_generator.rb",
     "lib/kaminari.rb",
     "lib/kaminari/engine.rb",
     "lib/kaminari/helpers/action_view_extension.rb",
-    "lib/kaminari/helpers/helpers.rb",
+    "lib/kaminari/helpers/paginator.rb",
     "lib/kaminari/helpers/tags.rb",
     "lib/kaminari/models/active_record_extension.rb",
     "lib/kaminari/models/active_record_relation_methods.rb",
@@ -62,6 +56,7 @@ Gem::Specification.new do |s|
     "lib/kaminari/models/mongoid_extension.rb",
     "lib/kaminari/models/page_scope_methods.rb",
     "lib/kaminari/railtie.rb",
+    "lib/kaminari/version.rb",
     "spec/acceptance/acceptance_helper.rb",
     "spec/acceptance/support/helpers.rb",
     "spec/acceptance/support/paths.rb",
@@ -69,16 +64,18 @@ Gem::Specification.new do |s|
     "spec/fake_app.rb",
     "spec/helpers/helpers_spec.rb",
     "spec/helpers/tags_spec.rb",
+    "spec/models/active_record_relation_methods_spec.rb",
     "spec/models/default_per_page_spec.rb",
     "spec/models/mongoid_spec.rb",
     "spec/models/scopes_spec.rb",
     "spec/spec_helper.rb",
+    "spec/support/database_cleaner.rb",
     "spec/support/matchers.rb"
   ]
   s.homepage = %q{http://github.com/amatsuda/kaminari}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.7.2}
   s.summary = %q{A pagination engine plugin for Rails 3}
   s.test_files = [
     "spec/acceptance/acceptance_helper.rb",
@@ -88,10 +85,12 @@ Gem::Specification.new do |s|
     "spec/fake_app.rb",
     "spec/helpers/helpers_spec.rb",
     "spec/helpers/tags_spec.rb",
+    "spec/models/active_record_relation_methods_spec.rb",
     "spec/models/default_per_page_spec.rb",
     "spec/models/mongoid_spec.rb",
     "spec/models/scopes_spec.rb",
     "spec/spec_helper.rb",
+    "spec/support/database_cleaner.rb",
     "spec/support/matchers.rb"
   ]
 
@@ -99,54 +98,84 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 2.5.0"])
-      s.add_development_dependency(%q<rr>, [">= 1.0.2"])
-      s.add_development_dependency(%q<steak>, [">= 1.1.0"])
-      s.add_development_dependency(%q<capybara>, [">= 0.4.1.1"])
+      s.add_runtime_dependency(%q<kaminari>, [">= 0"])
+      s.add_development_dependency(%q<rails>, [">= 3.0.0"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<mongoid>, [">= 2"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<rspec-rails>, [">= 0"])
+      s.add_development_dependency(%q<rr>, [">= 0"])
+      s.add_development_dependency(%q<steak>, [">= 0"])
+      s.add_development_dependency(%q<capybara>, [">= 0"])
+      s.add_development_dependency(%q<database_cleaner>, [">= 0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<rails>, [">= 0"])
-      s.add_development_dependency(%q<rack>, [">= 0"])
-      s.add_development_dependency(%q<arel>, [">= 0"])
-      s.add_development_dependency(%q<rspec-rails>, [">= 2.5.0"])
-      s.add_development_dependency(%q<sqlite3>, [">= 1.3.3"])
-      s.add_development_dependency(%q<mongoid>, ["= 2.0.0.rc.7"])
-      s.add_development_dependency(%q<bson_ext>, ["~> 1.2"])
-      s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<mongoid>, [">= 2"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<rspec-rails>, [">= 0"])
+      s.add_development_dependency(%q<rr>, [">= 0"])
+      s.add_development_dependency(%q<steak>, [">= 0"])
+      s.add_development_dependency(%q<capybara>, [">= 0"])
+      s.add_development_dependency(%q<database_cleaner>, [">= 0"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<rspec>, [">= 2.5.0"])
-      s.add_dependency(%q<rr>, [">= 1.0.2"])
-      s.add_dependency(%q<steak>, [">= 1.1.0"])
-      s.add_dependency(%q<capybara>, [">= 0.4.1.1"])
+      s.add_dependency(%q<kaminari>, [">= 0"])
+      s.add_dependency(%q<rails>, [">= 3.0.0"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_dependency(%q<jeweler>, [">= 1.5.2"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<mongoid>, [">= 2"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<rspec-rails>, [">= 0"])
+      s.add_dependency(%q<rr>, [">= 0"])
+      s.add_dependency(%q<steak>, [">= 0"])
+      s.add_dependency(%q<capybara>, [">= 0"])
+      s.add_dependency(%q<database_cleaner>, [">= 0"])
       s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<rails>, [">= 0"])
-      s.add_dependency(%q<rack>, [">= 0"])
-      s.add_dependency(%q<arel>, [">= 0"])
-      s.add_dependency(%q<rspec-rails>, [">= 2.5.0"])
-      s.add_dependency(%q<sqlite3>, [">= 1.3.3"])
-      s.add_dependency(%q<mongoid>, ["= 2.0.0.rc.7"])
-      s.add_dependency(%q<bson_ext>, ["~> 1.2"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<mongoid>, [">= 2"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<rspec-rails>, [">= 0"])
+      s.add_dependency(%q<rr>, [">= 0"])
+      s.add_dependency(%q<steak>, [">= 0"])
+      s.add_dependency(%q<capybara>, [">= 0"])
+      s.add_dependency(%q<database_cleaner>, [">= 0"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 2.5.0"])
-    s.add_dependency(%q<rr>, [">= 1.0.2"])
-    s.add_dependency(%q<steak>, [">= 1.1.0"])
-    s.add_dependency(%q<capybara>, [">= 0.4.1.1"])
+    s.add_dependency(%q<kaminari>, [">= 0"])
+    s.add_dependency(%q<rails>, [">= 3.0.0"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
-    s.add_dependency(%q<jeweler>, [">= 1.5.2"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<mongoid>, [">= 2"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<rspec-rails>, [">= 0"])
+    s.add_dependency(%q<rr>, [">= 0"])
+    s.add_dependency(%q<steak>, [">= 0"])
+    s.add_dependency(%q<capybara>, [">= 0"])
+    s.add_dependency(%q<database_cleaner>, [">= 0"])
     s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<rails>, [">= 0"])
-    s.add_dependency(%q<rack>, [">= 0"])
-    s.add_dependency(%q<arel>, [">= 0"])
-    s.add_dependency(%q<rspec-rails>, [">= 2.5.0"])
-    s.add_dependency(%q<sqlite3>, [">= 1.3.3"])
-    s.add_dependency(%q<mongoid>, ["= 2.0.0.rc.7"])
-    s.add_dependency(%q<bson_ext>, ["~> 1.2"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rails>, [">= 3.0.0"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<mongoid>, [">= 2"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<rspec-rails>, [">= 0"])
+    s.add_dependency(%q<rr>, [">= 0"])
+    s.add_dependency(%q<steak>, [">= 0"])
+    s.add_dependency(%q<capybara>, [">= 0"])
+    s.add_dependency(%q<database_cleaner>, [">= 0"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
 

data/lib/generators/kaminari/views_generator.rb

@@ -38,7 +38,7 @@ BANNER
       def self.themes
         begin
           @themes ||= open ALL_API do |json|
-#         open File.join File.dirname(__FILE__), '../../../spec/generators/sample.json' do |json|
+#             @themes ||= open(File.join(File.dirname(__FILE__), '../../../spec/generators/sample.json')) do |json|
             files = ActiveSupport::JSON.decode(json)['blobs']
             hash = files.group_by {|fn, _| fn[0...(fn.index('/') || 0)]}.delete_if {|fn, _| fn.blank?}
             hash.map do |name, files|
@@ -53,7 +53,7 @@ BANNER
       def download_templates(theme)
         theme.templates_for(template_engine).each do |template|
           say "      downloading #{template.name} from kaminari_themes..."
-          get "#{SHOW_API}/#{template.sha}", "app/views/kaminari/#{template.basename}"
+          get "#{SHOW_API}/#{template.sha}", template.name
         end
       end
 
@@ -70,29 +70,33 @@ BANNER
     end
 
     Template = Struct.new(:name, :sha) do
-      def engine #:nodoc:
-        File.extname(name).sub /^\./, ''
+      def description?
+        name == 'DESCRIPTION'
+      end
+
+      def view?
+        name =~ /^app\/views\//
       end
 
-      def basename #:nodoc:
-        File.basename name
+      def engine #:nodoc:
+        File.extname(name).sub /^\./, ''
       end
     end
 
     class Theme
       attr_accessor :name
       def initialize(name, templates) #:nodoc:
-        @name, @templates = name, templates.map {|f| Template.new *f}
+        @name, @templates = name, templates.map {|fn, sha| Template.new fn.sub(/^#{name}\//, ''), sha}
       end
 
       def description #:nodoc:
-        file = @templates.detect {|t| t.name == "#{name}/DESCRIPTION"}
+        file = @templates.detect(&:description?)
         return "#{' ' * 12}#{name}" unless file
         open("#{SHOW_API}/#{file.sha}").read.chomp.gsub /^/, ' ' * 12
       end
 
       def templates_for(template_engine) #:nodoc:
-        @templates.select {|t| t.engine == template_engine}
+        @templates.select {|t| !t.description?}.select {|t| !t.view? || (t.engine == template_engine)}
       end
     end
   end

data/lib/kaminari.rb

@@ -1,2 +1,3 @@
+require File.join(File.dirname(__FILE__), 'kaminari/version')
 require File.join(File.dirname(__FILE__), 'kaminari/railtie')
 require File.join(File.dirname(__FILE__), 'kaminari/engine')

data/lib/kaminari/helpers/action_view_extension.rb

@@ -9,16 +9,16 @@ module Kaminari
       #   <%= paginate @articles %>
       #
       # ==== Options
-      # * <tt>:window</tt> - The "inner window" size (2 by default).
-      # * <tt>:outer_window</tt> - The "outer window" size (1 by default).
-      # * <tt>:left</tt> - The "left outer window" size (1 by default).
-      # * <tt>:right</tt> - The "right outer window" size (1 by default).
+      # * <tt>:window</tt> - The "inner window" size (4 by default).
+      # * <tt>:outer_window</tt> - The "outer window" size (0 by default).
+      # * <tt>:left</tt> - The "left outer window" size (0 by default).
+      # * <tt>:right</tt> - The "right outer window" size (0 by default).
       # * <tt>:params</tt> - url_for parameters for the links (:controller, :action, etc.)
       # * <tt>:param_name</tt> - parameter name for page number in the links (:page by default)
       # * <tt>:remote</tt> - Ajax? (false by default)
       # * <tt>:ANY_OTHER_VALUES</tt> - Any other hash key & values would be directly passed into each tag as :locals value.
       def paginate(scope, options = {}, &block)
-        Kaminari::Helpers::PaginationRenderer.new self, options.reverse_merge(:current_page => scope.current_page, :num_pages => scope.num_pages, :per_page => scope.limit_value, :param_name => :page, :remote => false)
+        Kaminari::Helpers::Paginator.new self, options.reverse_merge(:current_page => scope.current_page, :num_pages => scope.num_pages, :per_page => scope.limit_value, :param_name => :page, :remote => false)
       end
     end
   end

data/lib/kaminari/helpers/paginator.rb

@@ -0,0 +1,153 @@
+require File.join(File.dirname(__FILE__), 'tags')
+
+module Kaminari
+  module Helpers
+    # The main container tag
+    class Paginator < Tag
+      def initialize(template, options) #:nodoc:
+        @window_options = {}.tap do |h|
+          h[:window] = options.delete(:window) || options.delete(:inner_window) || 4
+          outer_window = options.delete(:outer_window)
+          h[:left] = options.delete(:left) || outer_window || 0
+          h[:right] = options.delete(:right) || outer_window || 0
+        end
+        @template, @options = template, options
+        @options[:current_page] = PageProxy.new @window_options.merge(@options), @options[:current_page], nil
+        # so that this instance can actually "render". Black magic?
+        @output_buffer = ActionView::OutputBuffer.new
+      end
+
+      # render given block as a view template
+      def render(&block)
+        instance_eval &block if @options[:num_pages] > 1
+        @output_buffer
+      end
+
+      # enumerate each page providing PageProxy object as the block parameter
+      def each_page
+        return to_enum(:each_page) unless block_given?
+
+        1.upto(@options[:num_pages]) do |i|
+          yield PageProxy.new(@window_options.merge(@options), i, @last)
+        end
+      end
+
+      def page_tag(page)
+        @last = Page.new @template, @options.merge(:page => page)
+      end
+
+      %w[first_page prev_page next_page last_page gap].each do |tag|
+        eval <<-DEF
+          def #{tag}_tag
+            @last = #{tag.classify}.new @template, @options
+          end
+        DEF
+      end
+
+      def to_s #:nodoc:
+        suppress_logging_render_partial do
+          super @window_options.merge(@options).merge :paginator => self
+        end
+      end
+
+      private
+      # dirty hack
+      def suppress_logging_render_partial(&blk)
+        if subscriber = ActionView::LogSubscriber.log_subscribers.detect {|ls| ls.is_a? ActionView::LogSubscriber}
+          class << subscriber
+            alias_method :render_partial_with_logging, :render_partial
+            # do nothing
+            def render_partial(event); end
+          end
+          ret = blk.call
+          class << subscriber
+            alias_method :render_partial, :render_partial_with_logging
+            undef :render_partial_with_logging
+          end
+          ret
+        else
+          blk.call
+        end
+      end
+
+      # Wraps a "page number" and provides some utility methods
+      class PageProxy
+        include Comparable
+
+        def initialize(options, page, last) #:nodoc:
+          @options, @page, @last = options, page, last
+        end
+
+        # the page number
+        def number
+          @page
+        end
+
+        # current page or not
+        def current?
+          @page == @options[:current_page]
+        end
+
+        # the first page or not
+        def first?
+          @page == 1
+        end
+
+        # the last page or not
+        def last?
+          @page == @options[:num_pages]
+        end
+
+        # the previous page or not
+        def prev?
+          @page == @options[:current_page] - 1
+        end
+
+        # the next page or not
+        def next?
+          @page == @options[:current_page] + 1
+        end
+
+        # within the left outer window or not
+        def left_outer?
+          @page <= @options[:left]
+        end
+
+        # within the right outer window or not
+        def right_outer?
+          @options[:num_pages] - @page < @options[:right]
+        end
+
+        # inside the inner window or not
+        def inside_window?
+          (@options[:current_page] - @page).abs <= @options[:window]
+        end
+
+        # The last rendered tag was "truncated" or not
+        def was_truncated?
+          @last.is_a? Gap
+        end
+
+        def to_i
+          number
+        end
+
+        def to_s
+          number.to_s
+        end
+
+        def +(other)
+          to_i + other.to_i
+        end
+
+        def -(other)
+          to_i - other.to_i
+        end
+
+        def <=>(other)
+          to_i <=> other.to_i
+        end
+      end
+    end
+  end
+end