listview 1.1.0 → 1.2.0

data/lib/listview.rb

@@ -27,7 +27,7 @@ class ListView
     #
     #get_events(events: [obj1], events_per_page: 5, page: 0)
     def get_events vars
-      get_events_that_havent_happened_yet(vars[:events], vars[:events_per_page], (vars[:page].to_i)*vars[:events_per_page])
+      get_events_that_havent_happened_yet(vars[:events], vars[:events_per_page], (vars[:page].to_i)*vars[:events_per_page])[:events_that_havent_happened_yet]
     end
 
     #example use:
@@ -36,7 +36,12 @@ class ListView
     #date_format help: http://ruby-doc.org/stdlib-1.9.3/libdoc/date/rdoc/DateTime.html#method-i-to_date
     def organization_events_by_day vars
       vars[:date_format] ||= "%B, %d"
-      organized_events = get_events_that_havent_happened_yet(vars[:events], vars[:events_per_page], (vars[:page].to_i)*vars[:events_per_page])
+      events_dict = get_events_that_havent_happened_yet(vars[:events], vars[:events_per_page], (vars[:page].to_i)*vars[:events_per_page])
+
+      organized_events = events_dict[:events_that_havent_happened_yet]
+      rightmost_page = events_dict[:rightmost_page]
+      leftmost_page = events_dict[:leftmost_page]
+
       events_organized_by_day = []
       current_day = DateTime.now
       def event_date date, date_format
@@ -56,7 +61,11 @@ class ListView
           events_organized_by_day[-1][:events] += [event]
         end
       end
-      return events_organized_by_day
+      return {
+        events: events_organized_by_day,
+        rightmost_page: rightmost_page,
+        leftmost_page: leftmost_page,
+      }
     end
 
     private
@@ -69,17 +78,25 @@ class ListView
         events_that_havent_happened_yet = events
         events_that_havent_happened_yet.sort_by! {|event| event.date}
         closest_to_today = get_event_closed_to_today(events_that_havent_happened_yet)
-        return [] if closest_to_today.nil?
-  
+
+        return_var = {}
+        return_var[:events_that_havent_happened_yet] = []
+        event_index = closest_to_today + offset
+        return_var[:leftmost_page] = -((event_index / number_of_events_per_page).to_i)
+        return_var[:rightmost_page] = (((events_that_havent_happened_yet.length - 1) - (event_index)) / number_of_events_per_page).to_i
+
+        return return_var if closest_to_today.nil?
+
         start_event_index = [closest_to_today + offset, 0].max
-        return events_that_havent_happened_yet[start_event_index, number_of_events_per_page]
+        return_var[:events_that_havent_happened_yet] = events_that_havent_happened_yet[start_event_index, number_of_events_per_page]
+        return return_var
       end
 
       def get_event_closed_to_today events
         today = DateTime.now
         closest_to_today = nil
         events.each_with_index do |event, index|
-          if event.date.to_i - today.to_i > 0
+          if event.date.to_i > today.to_i
             if closest_to_today == nil
               closest_to_today = index
             else

metadata

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