app/view_objects/carnival/paginator.rb in carnival-0.1.5 vs app/view_objects/carnival/paginator.rb in carnival-0.1.6

@@ -1,58 +1,56 @@
 module Carnival
   class Paginator
 
-    def initialize(actual_page, last_page, max_fast_pages = 5)
-      @actual_page = actual_page
+    def initialize(current_page, last_page, max_fast_pages = 5)
+      @current_page = current_page
       @last_page = last_page >= 1 ? last_page : 1
       @max_fast_pages = max_fast_pages
     end
 
     def fast_pages_links_indexes
       fast_page_links = []
       first_index = -(@max_fast_pages/2)
       while fast_page_links.size < @max_fast_pages do
-        fast_page = @actual_page + first_index
+        fast_page = @current_page + first_index
         break if fast_page > @last_page
         fast_page_links << fast_page if fast_page > 0
         first_index = first_index + 1
       end
       fast_page_links
     end
 
     def fast_pages_links_html
-      htmls = []
-      fast_pages_links_indexes.each do |page|
-        htmls << {:label => page, :css_class => get_css_class(page), :js_function => get_js_function(page)}
+      fast_pages_links_indexes.map do |page|
+        {:label => page, :css_class => get_css_class(page), :js_function => get_js_function(page)}
       end
-      htmls
     end
 
     def get_js_function page
       "javascript:Carnival.goToPage(#{page})"
     end
 
     def get_css_class page
-      if page == @actual_page
+      if page == @current_page
         'carnival-selected-page-button'
       else
         'carnival-page-button'
       end
     end
 
     def previous_page
-      if @actual_page - 1 < 1
-        @actual_page
+      if @current_page - 1 < 1
+        @current_page
       else
-        @actual_page - 1
+        @current_page - 1
       end
     end
 
     def next_page
-      if @actual_page + 1 > @last_page
-        @actual_page
+      if @current_page + 1 > @last_page
+        @current_page
       else
-        @actual_page + 1
+        @current_page + 1
       end
     end
 
     def pages
       htmls = []