polyrex-calendar 0.3.11 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a12d35568f6415a47e583e6991deadda6ad821aa
-  data.tar.gz: 492af65848a1efa54b982bd933aae06b3d5b1c68
+  metadata.gz: bce4882cc2ad150e9fb2edd2d6a786896b5ebeb9
+  data.tar.gz: 3451f7a0e86515f3186875b6c3026f42cd94fcbb
 SHA512:
-  metadata.gz: e146ccf872111f38f8f0b7512baac6d776755409fb288f178564abb1ee8f590c9369c09a7c007d56d6e3116158119c073683665ea4804d26de699da19e113448
-  data.tar.gz: e5020e116c468e67bea52bf40ea4155f3d8c20ba582b8b91ed4893b86e2f08ec6d4d90c13c1a70b77decd27626853bfcc7d8a43e5f366af772e2d75fd0f4f6d7
+  metadata.gz: b6f54c2840a6833dc3720cb8c331558b3baca82250606969ea3bea904a2773281ea8463318c184c4192a873b2ac29e50263c9fd535a7bc277e0fff7beb630a8a
+  data.tar.gz: 45b084ec740fdd9163163e22aff6a32ed13a0b83f6ec7fc7d05b9f2316eb69c7120bef21fabe59ec9e0cabf2f3cccdeb405ad8532ad61c75b986685e2d6a2bc4

checksums.yaml.gz.sig

@@ -1,2 +1 @@
-K������خ'+[�652GQ����9�*��
-������E;r�CAEE���/�޾ΧI�	�Jf���A�$Ԕ����0�Ζ��*
��r�e�M���ˮ{��p�r>h�r&���p��������r'����T���e5k�����ɂ����r��J7�%�/��+��yHj�n��W�W�/�io_�@E8�`ݜ��'ɷ�4m�ݑ��T�_��U�QwB��,����I$��#�)+�������E
+F�Ȭ2泚8���wb$�9r�_%HX��O��)��@i׵i=�IɊ�疓	@������k�P�.G�~q[�pgM�n~��X:����o�	E�e�x� VH����r��j��̱Ak���P�ž����W��U�����{+�0J��L��\��oqS#�h��΃]�޻B��:��J;��\mbe#x�t�������-+�����G�!�[`�=#�	(U��~��1�5�wGQ���
���^I�A7AlĈw!,l

data/lib/polyrex-calendar.rb

@@ -2,230 +2,65 @@
 
 # file: polyrex-calendar.rb
 
-require 'polyrex'
-require 'date'
-require 'nokogiri'
-require 'chronic_duration'
-require 'chronic_cron'
-require 'rxfhelper'
+require 'px-calendarbase'
 
 
-MONTH = DAY * 30
-
-
-h = {
-  calendar: 'calendar[year]',
-     month: 'month[n, title]',
-      week: 'week[n, mon, no, label]',
-       day: 'day[sdate, xday, event, bankholiday, title, sunrise, sunset]',
-     entry: 'entry[time_start, time_end, duration, title]'
-}
-visual_schema = h.values.join '/'
-PolyrexObjects.new(visual_schema)
-
-module LIBRARY
-
-  def fetch_file(filename)
-
-    lib = File.dirname(__FILE__)
-    File.read filename      
-
-  end
-
-  def generate_webpage(xml, xsl)
-    
-    # transform the xml to html
-    doc = Nokogiri::XML(xml)
-    xslt  = Nokogiri::XSLT(xsl)
-    xslt.transform(doc).to_s   
-  end
-
-  def read(s)
-    RXFHelper.read(s).first
-  end
-end 
-
-class Polyrex
-  include LIBRARY
-
-  attr_accessor :xslt, :css_layout, :css_style, :filename
-
-  def inspect()
-    "#<Polyrex:%s" % __id__
-  end
-
-  def to_webpage()
-
-    year_xsl        = self.xslt ? read(self.xslt) : fetch_file(self.xslt)
-    year_layout_css = fetch_file self.css_layout
-    year_css        = fetch_file self.css_style
-    File.open('self.xml','w'){|f| f.write (self.to_xml pretty: true)}
-    File.open(self.xslt,'w'){|f| f.write year_xsl }
-    #html = Rexslt.new(month_xsl, self.to_xml).to_xml
-
-    html = generate_webpage self.to_xml, year_xsl
-    {self.filename => html, 
-      self.css_layout => year_layout_css, self.css_style => year_css}
-
-  end           
-end
-
-class PolyrexObjects::Month
-  include LIBRARY
-
-  attr_accessor :xslt, :css_layout, :css_style
-
-  def inspect()
-    "#<PolyrexObjects::Month:%s" % __id__
-  end
-
-  def to_webpage()
-
-    month_xsl        = fetch_file self.xslt
-    month_layout_css = fetch_file self.css_layout
-    month_css        = fetch_file self.css_style
-
-    # add a css selector for the current day
-    date = Time.now.strftime("%Y-%b-%d")
-
-    e = self.element("records/week/records/day/summary[sdate='#{date}']")
-    e.attributes[:class] = 'selected' if e
-
-    File.write 'self.xml', self.to_xml(pretty: true)
-    File.write 'month.xsl', month_xsl 
-
-
-    html = generate_webpage self.to_xml, month_xsl
-    {self.title.downcase[0..2] + '_calendar.html' => html, 
-      self.css_layout => month_layout_css, self.css_style => month_css}
-  end      
+class PolyrexObjects
   
-  def wk(n)
-    self.records[n-1]        
-  end      
-end
-
-class PolyrexObjects::Week
-  include LIBRARY
-
-  def inspect()
-    "#<PolyrexObjects::Week:%s" % __id__
+  class Month
+    
+    def wk(n)
+      self.records[n-1]        
+    end      
   end
-  
-  def to_webpage()
-
-    week_xsl        = fetch_file 'week_calendar.xsl'
-    week_layout_css = fetch_file 'week_layout.css'
-    week_css        = fetch_file 'week.css'
 
-    File.write 'self.xml', self.to_xml(pretty: true)
-    File.write 'week.xsl', week_xsl
+  class Week
+    
+    def to_webpage()
 
-    # add a css selector for the current day
-    date = Time.now.strftime("%Y-%b-%d")
+      week_xsl        = fetch_file 'week_calendar.xsl'
+      week_layout_css = fetch_file 'week_layout.css'
+      week_css        = fetch_file 'week.css'
 
-    e = self.element("records/day/summary[sdate='#{date}']")
-    e.attributes[:class] = 'selected' if e
+      File.write 'self.xml', self.to_xml(pretty: true)
+      File.write 'week.xsl', week_xsl
+      #html = Rexslt.new(week_xsl, self.to_xml).to_xml
+      #html = xsltproc 'week_calendar.xsl', self.to_xml
 
+      # add a css selector for the current day
+      date = Time.now.strftime("%Y-%b-%d")
 
-    html = generate_webpage self.to_xml, week_xsl
-    {'week' + self.no + '_planner.html' => html, 'week_layout.css' => week_layout_css, \
-     'week.css' => week_css}
-  end  
-end
+      e = self.element("records/day/summary[sdate='#{date}']")
+      e.attributes[:class] = 'selected' if e
 
-class PolyrexObjects::Day
 
-  def date()
-    Date.parse(self.sdate)
+      html = generate_webpage self.to_xml, week_xsl
+      {'week' + self.no + '_planner.html' => html, 'week_layout.css' => week_layout_css, \
+      'week.css' => week_css}
+    end  
   end
 
-  def wday()
-    self.date.wday
-  end
 
-  def day()
-    self.date.day
-  end
 end
 
-class PolyrexCalendar
-  include LIBRARY
-
-  attr_accessor :xsl, :css, :polyrex, :month_xsl, :month_css
-  attr_reader :day
+class PolyrexCalendar < PolyrexCalendarBase
   
   def initialize(calendar_file=nil, options={})
 
-    opts = {year: Time.now.year.to_s}.merge(options)
-    @year = opts[:year]
-
-    h = {
-      calendar: 'calendar[year]',
-         month: 'month[n, title]',
-          week: 'week[n]',
-           day: 'day[sdate, xday, event, bankholiday, title, sunrise, sunset]',
-         entry: 'entry[time_start, time_end, duration, title]'
-    }
-    @schema = %i(calendar month day entry).map{|x| h[x]}.join '/'
-    @visual_schema = h.values.join '/'
-
-
-    if calendar_file then
-      @polyrex = Polyrex.new calendar_file
-      @id = @polyrex.id_counter
-
-    else
-      @id = '1'
-      # generate the calendar
-
-      a = (Date.parse(@year + '-01-01')...Date.parse(@year.succ + '-01-01')).to_a
-
-      @polyrex = Polyrex.new(@schema, id_counter: @id)
-      @polyrex.summary.year = @year
-
-      a.group_by(&:month).each do |month, days| 
-
-        @polyrex.create.month no: month.to_s, title: Date::MONTHNAMES[month]  do |create|
-          days.each do |x|
-            create.day sdate: x.strftime("%Y-%b-%d"), xday: x.day.to_s, title: Date::DAYNAMES[x.wday]
-          end
-        end
-      end
-
-    end
-
-    visual_schema = h.values.join '/'
-    PolyrexObjects.new(visual_schema)
+    super(calendar_file, options)
 
     @xsl = fetch_file 'calendar.xsl'
     @css = fetch_file 'layout.css'
        
   end
 
-  def to_a()
-    @a
-  end
-
-  def to_xml()
-    @polyrex.to_xml pretty: true
-  end
-
-  def import_events(objx)
-    @id = @polyrex.id_counter
-    method('import_'.+(objx.class.to_s.downcase).to_sym).call(objx)
-    self
-  end
-  
-  alias import! import_events
-
   def inspect()
      %Q(=> #<PolyrexCalendar:#{self.object_id} @id="#{@id}", @year="#{@year}">)
   end
 
   def kitchen_planner()
 
-    px = @polyrex
+    px = @calendar
 
     # add a css selector for the current day
     date = DateTime.now.strftime("%Y-%b-%d")
@@ -285,7 +120,6 @@ class PolyrexCalendar
 
         r
 
-
       end
 
       pxmonth.xslt = 'monthday_calendar.xsl'
@@ -320,37 +154,11 @@ class PolyrexCalendar
     end
 
   end
-  def month_day()
-  end
-
-  def months
-    @polyrex.records
-  end
-  
-  def parse_events(list)    
     
-    polyrex = Polyrex.new('events/dayx[date, title]/entryx[start_time, end_time,' + \
-      ' duration, title]')
-
-    polyrex.format_masks[1] = '([!start_time] \([!duration]\) [!title]|' +  \
-      '[!start_time]-[!end_time] [!title]|' + \
-      '[!start_time] [!title])'
-
-    polyrex.parse(list)
-
-    self.import_events polyrex
-    # for testing only
-    #polyrex
-  end
-
-  def save(filename='polyrex.xml')
-    @polyrex.save filename
-  end
-  
   def this_week()
 
     dt = DateTime.now
-    days = @polyrex.records[dt.month-1].day
+    days = @calendar.month(dt.month).day
 
     r = days.find {|day| day.date.cweek == dt.cweek }    
     pxweek = PolyrexObjects::Week.new
@@ -365,165 +173,13 @@ class PolyrexCalendar
   def this_month()
     self.month(DateTime.now.month)
   end
-
-  def import_bankholidays(dynarex)
-    import_dynarex(dynarex, :bankholiday=)
-  end
-
-  def import_recurring_events(dynarex)
-
-    title = dynarex.summary[:event_title]
-    cc = ChronicCron.new dynarex.summary[:description].split(/,/,2).first
-    time_start= "%s:%02d" % cc.to_time.to_a.values_at(2,1)
-
-    dynarex.flat_records.each do |event|
-
-      dt = DateTime.parse(event[:date])
-      m, d = dt.month, dt.day
-      record = {title: title, time_start: time_start}
-
-      @polyrex.records[m-1].day[d-1].create.entry record
-    end
-  end
-
-  def import_sunrise_times(dynarex)
-    import_suntimes dynarex, :sunrise=
-  end
-
-  def import_sunset_times(dynarex)
-    import_suntimes dynarex, :sunset=
-  end
   
   private
 
-  def import_suntimes(dynarex, event_type=:sunrise=)
-
-    dynarex.flat_records.each do |event|
-
-      dt = DateTime.parse(event[:date])
-      m, d = dt.month, dt.day
-      @polyrex.records[m-1].day[d-1].method(event_type).call event[:time]
-    end
-  end
-  
-  def import_dynarex(dynarex, daytype=:event=)
-
-    dynarex.flat_records.each do |event|
-
-      dt = DateTime.parse(event[:date])
-      m, d = dt.month, dt.day
-
-      case daytype
-        when :event=
-          if dynarex.fields.include?(:time) then
-
-            match = event[:time].match(/(\S+)\s*(?:to|-)\s*(\S+)/) 
-
-            if match then
-
-              start_time, end_time = match.captures
-              # add an event entry
-              title = [event[:title], dynarex.summary[:label], 
-                                event[:desc]].compact.join(': ')
-              record = {
-                title: title, 
-                time_start: Time.parse(start_time).strftime("%H:%M%p"), 
-                time_end: Time.parse(end_time).strftime("%H:%M%p")
-              }
-
-              @polyrex.records[m-1].day[d-1].create.entry record
-            else
-
-              dt = DateTime.parse(event[:date] + ' ' + event[:time])
-              # add the event
-              title = [event[:title], dynarex.summary[:label], 
-                                event[:desc]].compact.join(': ')
-              event_label = "%s at %s" % [title, dt.strftime("%H:%M%p")]
-
-              @polyrex.records[m-1].day[d-1].method(daytype).call event_label
-            end
-
-          else
-
-            event_label = "%s at %s" % [event[:title], dt.strftime("%H:%M%p")]
-            @polyrex.records[m-1].day[d-1].method(daytype).call event_label
-          end
-
-        else
-
-          event_label = "%s" % event[:title]
-          @polyrex.records[m-1].day[d-1].method(daytype).call event_label
-      end
-
-    end
-  end
-
-  def import_polyrex(polyrex)
-
-    polyrex.records.each do |day|
-
-      dt = day.date
-
-      sd = dt.strftime("%Y-%b-%d ")
-      m, i = dt.month, dt.day
-      cal_day = @polyrex.records[m - 1].day[i-1]
-
-      cal_day.event = day.title
-
-      if day.records.length > 0 then
-
-        raw_entries = day.records
-
-        entries = raw_entries.inject({}) do |r,entry|
-
-          start_time = entry.start_time  
-
-          if entry.end_time.length > 0 then
-
-            end_time = entry.end_time
-            duration = ChronicDuration.output(Time.parse(sd + end_time) \
-              - Time.parse(sd + start_time))
-          else
-
-            if entry.duration.length > 0 then
-              duration = entry.duration
-            else
-              duration = '10 mins'
-            end
-
-            end_time = (Time.parse(sd + start_time) + ChronicDuration.parse(duration))\
-              .strftime("%H:%M")
-          end
-
-          r.merge!(start_time => {time_start: start_time, time_end: end_time, \
-            duration: duration, title: entry.title})
-
-        end
-
-        seconds = entries.keys.map{|x| Time.parse(x) - Time.parse('08:00')}
-
-        unless dt.saturday? or dt.sunday? then
-          rows = slotted_sort(seconds).map do |x| 
-            (Time.parse('08:00') + x.to_i).strftime("%H:%M") if x
-          end
-        else
-          rows = entries.keys
-        end
-
-        rows.each do |row|
-          create = cal_day.create
-          create.id = @id
-          create.entry entries[row] || {}
-        end        
-
-      end  
-    end 
-    
-  end
 
   def make_month(m)
 
-    cal_month = @polyrex.records[m-1]
+    cal_month = @calendar.month(m)
     days_in_month = cal_month.records
     pxmonth = cal_month.clone
     pxmonth.records.each(&:delete)
@@ -578,29 +234,4 @@ class PolyrexCalendar
       'th' : %w{ th st nd rd th th th th th th }[val % 10] 
   end
 
-  def slotted_sort(a)
-
-    upper = 36000 # upper slot value
-    slot_width = 9000 # 2.5 hours
-    max_slots = 3  
-
-    b = a.reverse.inject([]) do |r,x|
-
-      upper ||= 10;  i ||= 0
-      diff = upper - x
-
-      if diff >= slot_width and (i + a.length) < max_slots then
-        r << nil
-        i += 1
-        upper -= slot_width
-        redo
-      else
-        upper -= slot_width if x <= upper
-        r << x
-      end
-    end
-
-    a = b.+([nil] * max_slots).take(max_slots).reverse
-  end
-  
 end

data/lib/polyrex-calendar.rb~

@@ -2,228 +2,65 @@
 
 # file: polyrex-calendar.rb
 
-require 'polyrex'
-require 'date'
-require 'nokogiri'
-require 'chronic_duration'
-require 'chronic_cron'
+require 'px-calendarbase'
 
 
-MONTH = DAY * 30
-
-
-h = {
-  calendar: 'calendar[year]',
-     month: 'month[n, title]',
-      week: 'week[n, mon, no, label]',
-       day: 'day[sdate, xday, event, bankholiday, title, sunrise, sunset]',
-     entry: 'entry[time_start, time_end, duration, title]'
-}
-visual_schema = h.values.join '/'
-PolyrexObjects.new(visual_schema)
-
-module LIBRARY
-
-  def fetch_file(filename)
-
-    lib = File.dirname(__FILE__)
-    File.read File.join(lib, filename )
-  end
-
-  def generate_webpage(xml, xsl)
-    
-    # transform the xml to html
-    doc = Nokogiri::XML(xml)
-    xslt  = Nokogiri::XSLT(xsl)
-    xslt.transform(doc).to_s   
-  end
-end 
-
-class Polyrex
-  include LIBRARY
-
-  attr_accessor :xslt, :css_layout, :css_style, :filename
-
-  def inspect()
-    "#<Polyrex:%s" % __id__
-  end
-
-  def to_webpage()
-
-    year_xsl        = fetch_file self.xslt
-    year_layout_css = fetch_file self.css_layout
-    year_css        = fetch_file self.css_style
-    File.open('self.xml','w'){|f| f.write (self.to_xml pretty: true)}
-    File.open(self.xslt,'w'){|f| f.write year_xsl }
-    #html = Rexslt.new(month_xsl, self.to_xml).to_xml
-
-    html = generate_webpage self.to_xml, year_xsl
-    {self.filename => html, 
-      self.css_layout => year_layout_css, self.css_style => year_css}
-
-  end           
-end
-
-class PolyrexObjects::Month
-  include LIBRARY
-
-  attr_accessor :xslt, :css_layout, :css_style
-
-  def inspect()
-    "#<PolyrexObjects::Month:%s" % __id__
-  end
-
-  def to_webpage()
-
-    month_xsl        = fetch_file self.xslt
-    month_layout_css = fetch_file self.css_layout
-    month_css        = fetch_file self.css_style
-
-    #html = Rexslt.new(month_xsl, self.to_xml).to_xml
-
-    # add a css selector for the current day
-    date = Time.now.strftime("%Y-%b-%d")
-
-    e = self.element("records/week/records/day/summary[sdate='#{date}']")
-    e.attributes[:class] = 'selected' if e
-
-    File.write 'self.xml', self.to_xml(pretty: true)
-    File.write 'month.xsl', month_xsl 
-
-
-    html = generate_webpage self.to_xml, month_xsl
-    {self.title.downcase[0..2] + '_calendar.html' => html, 
-      self.css_layout => month_layout_css, self.css_style => month_css}
-  end      
+class PolyrexObjects
   
-  def wk(n)
-    self.records[n-1]        
-  end      
-end
-
-class PolyrexObjects::Week
-  include LIBRARY
-
-  def inspect()
-    "#<PolyrexObjects::Week:%s" % __id__
+  class Month
+    
+    def wk(n)
+      self.records[n-1]        
+    end      
   end
-  
-  def to_webpage()
-
-    week_xsl        = fetch_file 'week_calendar.xsl'
-    week_layout_css = fetch_file 'week_layout.css'
-    week_css        = fetch_file 'week.css'
 
-    File.write 'self.xml', self.to_xml(pretty: true)
-    File.write 'week.xsl', week_xsl
-    #html = Rexslt.new(week_xsl, self.to_xml).to_xml
-    #html = xsltproc 'week_calendar.xsl', self.to_xml
+  class Week
+    
+    def to_webpage()
 
-    # add a css selector for the current day
-    date = Time.now.strftime("%Y-%b-%d")
+      week_xsl        = fetch_file 'week_calendar.xsl'
+      week_layout_css = fetch_file 'week_layout.css'
+      week_css        = fetch_file 'week.css'
 
-    e = self.element("records/day/summary[sdate='#{date}']")
-    e.attributes[:class] = 'selected' if e
+      File.write 'self.xml', self.to_xml(pretty: true)
+      File.write 'week.xsl', week_xsl
+      #html = Rexslt.new(week_xsl, self.to_xml).to_xml
+      #html = xsltproc 'week_calendar.xsl', self.to_xml
 
+      # add a css selector for the current day
+      date = Time.now.strftime("%Y-%b-%d")
 
-    html = generate_webpage self.to_xml, week_xsl
-    {'week' + self.no + '_planner.html' => html, 'week_layout.css' => week_layout_css, \
-     'week.css' => week_css}
-  end  
-end
+      e = self.element("records/day/summary[sdate='#{date}']")
+      e.attributes[:class] = 'selected' if e
 
-class PolyrexObjects::Day
 
-  def date()
-    Date.parse(self.sdate)
+      html = generate_webpage self.to_xml, week_xsl
+      {'week' + self.no + '_planner.html' => html, 'week_layout.css' => week_layout_css, \
+      'week.css' => week_css}
+    end  
   end
 
-  def wday()
-    self.date.wday
-  end
 
-  def day()
-    self.date.day
-  end
 end
 
-class PolyrexCalendar
-  include LIBRARY
-
-  attr_accessor :xsl, :css, :polyrex, :month_xsl, :month_css
-  attr_reader :day
+class PolyrexCalendar < PolyrexCalendarBase
   
   def initialize(calendar_file=nil, options={})
 
-    opts = {year: Time.now.year.to_s}.merge(options)
-    @year = opts[:year]
-
-    h = {
-      calendar: 'calendar[year]',
-         month: 'month[n, title]',
-          week: 'week[n]',
-           day: 'day[sdate, xday, event, bankholiday, title, sunrise, sunset]',
-         entry: 'entry[time_start, time_end, duration, title]'
-    }
-    @schema = %i(calendar month day entry).map{|x| h[x]}.join '/'
-    @visual_schema = h.values.join '/'
-
-
-    if calendar_file then
-      @polyrex = Polyrex.new calendar_file
-      @id = @polyrex.id_counter
-
-    else
-      @id = '1'
-      # generate the calendar
-
-      a = (Date.parse(@year + '-01-01')...Date.parse(@year.succ + '-01-01')).to_a
-
-      @polyrex = Polyrex.new(@schema, id_counter: @id)
-      @polyrex.summary.year = @year
-
-      a.group_by(&:month).each do |month, days| 
-
-        @polyrex.create.month no: month.to_s, title: Date::MONTHNAMES[month]  do |create|
-          days.each do |x|
-            create.day sdate: x.strftime("%Y-%b-%d"), xday: x.day.to_s, title: Date::DAYNAMES[x.wday]
-          end
-        end
-      end
-
-    end
-
-    visual_schema = h.values.join '/'
-    PolyrexObjects.new(visual_schema)
+    super(calendar_file, options)
 
     @xsl = fetch_file 'calendar.xsl'
     @css = fetch_file 'layout.css'
        
   end
 
-  def to_a()
-    @a
-  end
-
-  def to_xml()
-    @polyrex.to_xml pretty: true
-  end
-
-  def import_events(objx)
-    @id = @polyrex.id_counter
-    method('import_'.+(objx.class.to_s.downcase).to_sym).call(objx)
-    self
-  end
-  
-  alias import! import_events
-
   def inspect()
      %Q(=> #<PolyrexCalendar:#{self.object_id} @id="#{@id}", @year="#{@year}">)
   end
 
   def kitchen_planner()
 
-    px = @polyrex
+    px = @calendar
 
     # add a css selector for the current day
     date = DateTime.now.strftime("%Y-%b-%d")
@@ -252,8 +89,6 @@ class PolyrexCalendar
                                               + "summary[sdate='#{date}']")
     e.attributes[:class] = 'selected' if e
 
-
-    px.xslt = 'calendar.xsl'
     px.css_layout = 'layout.css'
     px.css_style = 'year.css'
     px.filename = px.summary.year.to_s + '-planner.html'
@@ -285,7 +120,6 @@ class PolyrexCalendar
 
         r
 
-
       end
 
       pxmonth.xslt = 'monthday_calendar.xsl'
@@ -320,37 +154,11 @@ class PolyrexCalendar
     end
 
   end
-  def month_day()
-  end
-
-  def months
-    @polyrex.records
-  end
-  
-  def parse_events(list)    
     
-    polyrex = Polyrex.new('events/dayx[date, title]/entryx[start_time, end_time,' + \
-      ' duration, title]')
-
-    polyrex.format_masks[1] = '([!start_time] \([!duration]\) [!title]|' +  \
-      '[!start_time]-[!end_time] [!title]|' + \
-      '[!start_time] [!title])'
-
-    polyrex.parse(list)
-
-    self.import_events polyrex
-    # for testing only
-    #polyrex
-  end
-
-  def save(filename='polyrex.xml')
-    @polyrex.save filename
-  end
-  
   def this_week()
 
     dt = DateTime.now
-    days = @polyrex.records[dt.month-1].day
+    days = @calendar.month(dt.month).day
 
     r = days.find {|day| day.date.cweek == dt.cweek }    
     pxweek = PolyrexObjects::Week.new
@@ -365,165 +173,13 @@ class PolyrexCalendar
   def this_month()
     self.month(DateTime.now.month)
   end
-
-  def import_bankholidays(dynarex)
-    import_dynarex(dynarex, :bankholiday=)
-  end
-
-  def import_recurring_events(dynarex)
-
-    title = dynarex.summary[:event_title]
-    cc = ChronicCron.new dynarex.summary[:description].split(/,/,2).first
-    time_start= "%s:%02d" % cc.to_time.to_a.values_at(2,1)
-
-    dynarex.flat_records.each do |event|
-
-      dt = DateTime.parse(event[:date])
-      m, d = dt.month, dt.day
-      record = {title: title, time_start: time_start}
-
-      @polyrex.records[m-1].day[d-1].create.entry record
-    end
-  end
-
-  def import_sunrise_times(dynarex)
-    import_suntimes dynarex, :sunrise=
-  end
-
-  def import_sunset_times(dynarex)
-    import_suntimes dynarex, :sunset=
-  end
   
   private
 
-  def import_suntimes(dynarex, event_type=:sunrise=)
-
-    dynarex.flat_records.each do |event|
-
-      dt = DateTime.parse(event[:date])
-      m, d = dt.month, dt.day
-      @polyrex.records[m-1].day[d-1].method(event_type).call event[:time]
-    end
-  end
-  
-  def import_dynarex(dynarex, daytype=:event=)
-
-    dynarex.flat_records.each do |event|
-
-      dt = DateTime.parse(event[:date])
-      m, d = dt.month, dt.day
-
-      case daytype
-        when :event=
-          if dynarex.fields.include?(:time) then
-
-            match = event[:time].match(/(\S+)\s*(?:to|-)\s*(\S+)/) 
-
-            if match then
-
-              start_time, end_time = match.captures
-              # add an event entry
-              title = [event[:title], dynarex.summary[:label], 
-                                event[:desc]].compact.join(': ')
-              record = {
-                title: title, 
-                time_start: Time.parse(start_time).strftime("%H:%M%p"), 
-                time_end: Time.parse(end_time).strftime("%H:%M%p")
-              }
-
-              @polyrex.records[m-1].day[d-1].create.entry record
-            else
-
-              dt = DateTime.parse(event[:date] + ' ' + event[:time])
-              # add the event
-              title = [event[:title], dynarex.summary[:label], 
-                                event[:desc]].compact.join(': ')
-              event_label = "%s at %s" % [title, dt.strftime("%H:%M%p")]
-
-              @polyrex.records[m-1].day[d-1].method(daytype).call event_label
-            end
-
-          else
-
-            event_label = "%s at %s" % [event[:title], dt.strftime("%H:%M%p")]
-            @polyrex.records[m-1].day[d-1].method(daytype).call event_label
-          end
-
-        else
-
-          event_label = "%s" % event[:title]
-          @polyrex.records[m-1].day[d-1].method(daytype).call event_label
-      end
-
-    end
-  end
-
-  def import_polyrex(polyrex)
-
-    polyrex.records.each do |day|
-
-      dt = day.date
-
-      sd = dt.strftime("%Y-%b-%d ")
-      m, i = dt.month, dt.day
-      cal_day = @polyrex.records[m - 1].day[i-1]
-
-      cal_day.event = day.title
-
-      if day.records.length > 0 then
-
-        raw_entries = day.records
-
-        entries = raw_entries.inject({}) do |r,entry|
-
-          start_time = entry.start_time  
-
-          if entry.end_time.length > 0 then
-
-            end_time = entry.end_time
-            duration = ChronicDuration.output(Time.parse(sd + end_time) \
-              - Time.parse(sd + start_time))
-          else
-
-            if entry.duration.length > 0 then
-              duration = entry.duration
-            else
-              duration = '10 mins'
-            end
-
-            end_time = (Time.parse(sd + start_time) + ChronicDuration.parse(duration))\
-              .strftime("%H:%M")
-          end
-
-          r.merge!(start_time => {time_start: start_time, time_end: end_time, \
-            duration: duration, title: entry.title})
-
-        end
-
-        seconds = entries.keys.map{|x| Time.parse(x) - Time.parse('08:00')}
-
-        unless dt.saturday? or dt.sunday? then
-          rows = slotted_sort(seconds).map do |x| 
-            (Time.parse('08:00') + x.to_i).strftime("%H:%M") if x
-          end
-        else
-          rows = entries.keys
-        end
-
-        rows.each do |row|
-          create = cal_day.create
-          create.id = @id
-          create.entry entries[row] || {}
-        end        
-
-      end  
-    end 
-    
-  end
 
   def make_month(m)
 
-    cal_month = @polyrex.records[m-1]
+    cal_month = @calendar.month(m)
     days_in_month = cal_month.records
     pxmonth = cal_month.clone
     pxmonth.records.each(&:delete)
@@ -578,30 +234,4 @@ class PolyrexCalendar
       'th' : %w{ th st nd rd th th th th th th }[val % 10] 
   end
 
-  def slotted_sort(a)
-
-    upper = 36000 # upper slot value
-    slot_width = 9000 # 2.5 hours
-    max_slots = 3  
-
-    b = a.reverse.inject([]) do |r,x|
-
-      upper ||= 10;  i ||= 0
-      diff = upper - x
-
-      if diff >= slot_width and (i + a.length) < max_slots then
-        r << nil
-        i += 1
-        upper -= slot_width
-        redo
-      else
-        upper -= slot_width if x <= upper
-        r << x
-      end
-    end
-
-    a = b.+([nil] * max_slots).take(max_slots).reverse
-  end
-  
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyrex-calendar
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,90 +31,10 @@ cert_chain:
   V2LbfuIuDVCUDR9ON1ozFySFLuTnZSmO6lR4UsFjHKwbtnnbapfQVvEJ1PLW/F13
   1r3+lzIVNJhpdQ==
   -----END CERTIFICATE-----
-date: 2014-07-06 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: polyrex
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.3
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.2.1
-- !ruby/object:Gem::Dependency
-  name: chronic_duration
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.4
-- !ruby/object:Gem::Dependency
-  name: chronic_cron
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.33
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.33
-- !ruby/object:Gem::Dependency
-  name: rxfhelper
+  name: polyrex_calendarbase
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -122,7 +42,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -132,7 +52,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.1.3
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -180,4 +100,3 @@ signing_key:
 specification_version: 4
 summary: Generates an HTML calendar from a Polyrex document
 test_files: []
-has_rdoc: