listview 2.0.0 → 2.1.0

data/lib/listview.rb

@@ -19,6 +19,13 @@ class ListView
 
     #parameters: vars[:events], vars[:date], vars[:page], vars[:events_per_page], vars[:date_format]
     def get_events_and_page_info vars
+      if vars[:events] == []
+        return {
+          events: [],
+          rightmost_page: 0,
+          leftmost_page: 0,
+        }
+      end
       vars[:date] ||= DateTime.now
       event_closed_to_today = get_event_closed_to_today(vars[:events], vars[:date])
       next_event = event_closed_to_today + (vars[:page].to_i * vars[:events_per_page].to_i)
@@ -62,17 +69,16 @@ class ListView
           end
         end
       end
-      return closest_to_today
+      return closest_to_today || events.length
     end
 
     #parameters: vars[:events_per_page], vars[:next_event]
     def leftmost_page vars
-      if vars[:events_per_page] > vars[:next_event]
-        return -1
-      elsif vars[:events_per_page] == 0
+      if vars[:next_event] <= 0 || vars[:events_per_page] == 0
         return 0
+      else
+        -(vars[:next_event] / vars[:events_per_page].to_f).ceil
       end
-      -(((vars[:next_event].to_i) / vars[:events_per_page].to_f).ceil)
     end
 
     #parameters:
@@ -80,8 +86,11 @@ class ListView
     #vars[:next_event]
     #vars[:events_per_page]
     def rightmost_page vars
-      events_after_today_minus_page_zero = (vars[:events] - (vars[:next_event] + vars[:events_per_page]))
-      (events_after_today_minus_page_zero / vars[:events_per_page].to_f).ceil
+      if vars[:events] <= vars[:next_event]
+        return 0
+      else
+        ((vars[:events] - vars[:next_event]) / vars[:events_per_page].to_f).ceil - 1
+      end
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: listview
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors: