listview 1.2.1 → 2.0.0

data/lib/listview.rb

@@ -1,5 +1,6 @@
 require 'date'
 
+#this is included in rails, but unfortunately not in the general ruby date library
 class DateTime
   def to_i
     seconds_since_unix_epoch.to_i
@@ -15,99 +16,73 @@ end
 class ListView
 
   class << self
-    #example use:
-    #
-    #class ObjectThatRespondsToDate
-    #  attr_accessor :date
-    #end
-    #
-    #obj1 = ObjectThatRespondsToDate.new
-    #obj1.date = DateTime.now
-    #
-    #
-    #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])[:events_that_havent_happened_yet]
-    end
-
-    #example use:
-    #
-    #get_events(events: [obj1], events_per_page: 5, page: 0, date_format: "%B, %d")
-    #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"
-      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
-        if only_date(date) == only_date(DateTime.now)
-          "Today"
-        else
-          date.strftime(date_format)
-        end
-      end
-      organized_events.each_with_index do |event, index|
-        if only_date(event.date) != only_date(current_day)
-          current_day = event.date
-          events_organized_by_day += [date: event_date(event.date, vars[:date_format]), events: [event]]
-        elsif index == 0
-          events_organized_by_day += [date: event_date(event.date, vars[:date_format]), events: [event]]
-        else
-          events_organized_by_day[-1][:events] += [event]
-        end
-      end
+    #parameters: vars[:events], vars[:date], vars[:page], vars[:events_per_page], vars[:date_format]
+    def get_events_and_page_info vars
+      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)
+      events = get_events(events: vars[:events],
+                          date: vars[:date],
+                          page: vars[:page],
+                          events_per_page: vars[:events_per_page])
+      rightmost_page = rightmost_page(events: vars[:events].length, next_event: next_event, events_per_page: vars[:events_per_page])
+      leftmost_page = leftmost_page(next_event: next_event, events_per_page: vars[:events_per_page])
       return {
-        events: events_organized_by_day,
+        events: events,
         rightmost_page: rightmost_page,
         leftmost_page: leftmost_page,
       }
     end
 
-    private
-
-      def only_date date_time
-        date_time.strftime("%d/%m/%Y")
-      end
-
-      def get_events_that_havent_happened_yet events, number_of_events_per_page, offset=0
-        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_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_var[:events_that_havent_happened_yet] = events_that_havent_happened_yet[start_event_index, number_of_events_per_page]
-        return return_var
+    #parameters: vars[:events], vars[:date], vars[:page], vars[:events_per_page]
+    def get_events vars 
+      vars[:date] ||= DateTime.now
+      events_closed_to_today = get_event_closed_to_today(vars[:events], vars[:date])
+      sorted_events = vars[:events].sort{ |x,y| x.date <=> y.date }
+      left_most_index = events_closed_to_today + (vars[:page].to_i * vars[:events_per_page].to_i)
+      if left_most_index < 0
+        return sorted_events[0, vars[:events_per_page].to_i + left_most_index] || []
       end
+      sorted_events[left_most_index, vars[:events_per_page].to_i] || []
+    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
-            if closest_to_today == nil
+    def get_event_closed_to_today events, the_date=nil
+      the_date ||= DateTime.now
+      closest_to_today = nil
+      sorted_events = events.sort{ |x,y| x.date <=> y.date }
+      sorted_events.each_with_index do |event, index|
+        if event.date.to_i > the_date.to_i
+          if closest_to_today == nil
+            closest_to_today = index
+          else
+            if event.date.to_i - the_date.to_i < sorted_events[closest_to_today].date.to_i - the_date.to_i
               closest_to_today = index
-            else
-              if event.date.to_i - today.to_i < events[closest_to_today].date.to_i - today.to_i
-                closest_to_today = index
-              end
             end
           end
         end
-        return closest_to_today
       end
-  end
+      return closest_to_today
+    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
+        return 0
+      end
+      -(((vars[:next_event].to_i) / vars[:events_per_page].to_f).ceil)
+    end
+
+    #parameters:
+    #vars[:events],
+    #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
+    end
+
+  end
 end

metadata

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