polyrex-calendar 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5986e6657ce73300d4e51abaf62eeb48ef0b5c40
-  data.tar.gz: 0487cf7bf36941a86872156073e11c89d8e33e35
+  metadata.gz: 43046cae49a8bb07a5549b4348acfb3ad8e662f3
+  data.tar.gz: c02d638727efa111ff15a4a0dc96eafa00b23880
 SHA512:
-  metadata.gz: a7a00229d4f8d9a32818c0a077b87323c4a831f6b94009590b847307c51939274902a7b6f05b60edc0415df3f83cc4a323382c286c98a337608419f8db208f69
-  data.tar.gz: b7072d188820f64339a2d063910b99728da466eb6dbcde92f42d2a51b56e274e5b033d6dfda37eb72328273b713841a738b244d2c52a8a3d84ca6406418d49c5
+  metadata.gz: 53d5cc3d4c823c2fa18b18c22d8a401e94def4db6fa55b1d9f2f1dac7e01e97f69c85f606941e865d190baaabff380c1ba6a2b3e89f2867e5e123c90de9a24a1
+  data.tar.gz: 26be0a97522f12ed84ec7e4284b7619c1baa1b1d5276bdb694256ef3ca95eafbe58077495e7d051ad009be8b867d411a78a8803456475206f82541e48c1f81d2

data/lib/polyrex-calendar.rb

@@ -5,31 +5,75 @@
 require 'polyrex'
 require 'date'
 require 'nokogiri'
+require 'chronic_duration'
+
+class Numeric
+  def ordinal
+    ( (10...20).include?(self) ? 'th' : %w{ th st nd rd th th th th th th }[self % 10] )
+  end
+end
 
 class PolyrexCalendar
 
   attr_accessor :xsl, :css, :polyrex, :month_xsl, :month_css
   
-  def initialize(year=nil)
+  def initialize(year=nil, options={})
+
+    @id = '1'
+    
+    opts = {calendar_xsl: lib + '/calendar.xsl'
+            }.merge(options)
     @year = year ? year.to_s : Time.now.year.to_s
     generate_calendar
     lib = File.dirname(__FILE__)
-    @xsl = File.open(lib + '/calendar.xsl','r').read
-    @css = File.open(lib + '/layout.css','r').read
-    @month_xsl = File.open(lib + '/month_calendar.xsl','r').read
-    @month_css = File.open(lib + '/month_layout.css','r').read
 
-    PolyrexObjects::Month.class_eval {
+    @xsl = File.read lib + '/calendar.xsl'
+    @css = File.read lib + '/layout.css'
+    
+    PolyrexObjects::Month.class_eval do
+
+      def inspect()
+        "#<PolyrexObjects::Month:%s" % __id__
+      end
+
       def to_webpage()
         lib = File.dirname(__FILE__)
-        month_xsl = File.open(lib + '/month_calendar.xsl','r').read
-        month_css = File.open(lib + '/month_layout.css','r').read
-        doc = Nokogiri::XML(self.to_xml);  xslt  = Nokogiri::XSLT(month_xsl)
-        html =  xslt.transform(doc).to_xml    
+
+        month_xsl = File.read lib + '/month_calendar.xsl'
+        month_css = File.read lib + '/month_layout.css'
+        
+        xslt  = Nokogiri::XSLT(month_xsl)
+        html = xslt.transform(Nokogiri::XML(self.to_xml)).to_s
         {self.name.downcase[0..2] + '_calendar.html' => html, 'month_layout.css' => month_css}
+
+      end      
+      
+      def wk(n)
+        self.records[n-1]        
+      end      
+    end
+    
+    PolyrexObjects::Week.class_eval do
+
+      def inspect()
+        "#<PolyrexObjects::Week:%s" % __id__
       end
-    }
+      
+      def to_webpage()
+        lib = File.dirname(__FILE__)
+
+        week_xsl = File.read lib + '/week_calendar.xsl'
+        week_layout_css = File.read lib + '/week_layout.css'
+        week_css = File.read lib + '/week.css'
 
+        xslt  = Nokogiri::XSLT(week_xsl)
+        html = xslt.transform(Nokogiri::XML(self.to_xml)).to_s
+        {'week' + self.no + '_planner.html' => html, 'week_layout.css' => week_layout_css, \
+         'week.css' => week_css}
+      end
+      
+    end
+    
   end
 
   def to_a()
@@ -40,18 +84,23 @@ class PolyrexCalendar
     @polyrex.to_xml pretty: true
   end
 
-  def to_webpage()    
+  def to_webpage()
+    #html = Rexslt.new(@xsl, @polyrex.to_xml).to_xml   
     html = generate_webpage(@polyrex.to_xml, @xsl)    
     {'calendar.html' => html, 'layout.css' => @css}
   end  
 
-  def import_events(dynarex)
-    dynarex.flat_records.each do |event|
-      m,w,i = @day[Date.parse(event[:date])]
-      @polyrex.records[m].week[w].day[i].event = event[:title]
-    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 month(m)
     @polyrex.records[m-1]
@@ -60,8 +109,105 @@ class PolyrexCalendar
   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
+  end
+  
+  def this_week()
+    m = DateTime.now.month
+    self.month(m).records.find do |week|
+      now = DateTime.now
+      week_no = now.cwday < 7 ? now.cweek - 1: now.cweek 
+      week.no == week_no.to_s
+    end
+  end
 
+  def this_month()
+    self.month(DateTime.now.month)
+  end
+  
   private
+  
+  def import_dynarex(dynarex)
+    dynarex.flat_records.each do |event|
+      m,w,i = @day[Date.parse(event[:date])]
+      @polyrex.records[m].week[w].day[i].event = event[:title]
+    end
+  end
+
+  def import_polyrex(polyrex)
+
+    polyrex.records.each do |day|
+
+      d1 = Date.parse(day.date)
+      sd = d1.strftime("%Y-%b-%d ")
+      m,w,i = @day[d1]
+
+      cal_day = @polyrex.records[m].week[w].day[i]
+    
+      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 then
+            end_time = entry.end_time
+            duration = ChronicDuration.output(Time.parse(sd + end_time) \
+              - Time.parse(sd + start_time))
+          else
+
+            if entry.duration 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 d1.saturday? or d1.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 generate_calendar()
 
@@ -90,8 +236,10 @@ class PolyrexCalendar
     end
 
     @a = months
-
-    @polyrex = Polyrex.new('calendar[year]/month[no,name,year]/week[no, rel_no]/day[wday, xday, name, event, date]')
+    schema = 'calendar[year]/month[no,name,year]/week[no, rel_no, mon, label]/' + \
+        'day[wday, xday, name, event, date, ordinal, overlap]/' + \
+        'entry[time_start, time_end, duration, title]'
+    @polyrex = Polyrex.new(schema, id_counter: @id)
     year_start = months[0][0][-1]
     @polyrex.summary.year = @year
     old_year_week = (year_start - 7).cweek
@@ -99,24 +247,46 @@ class PolyrexCalendar
     week_i = 0
 
     months.each_with_index do |month,i| 
-
-      @polyrex.create.month no: (i+1).to_s, name: Date::MONTHNAMES[i+1], year: @year do |create|
+      month_name = Date::MONTHNAMES[i+1]
+      @polyrex.create.month no: (i+1).to_s, name: month_name, year: @year do |create|
         month.each_with_index do |week,j|
 
           week_s = (week_i == 0 ? old_year_week : week_i).to_s
-          create.week rel_no: (j+1).to_s, no: week_s do |create|
-            week.each_with_index do |x,k|
-
-              if x then
+          
+          if week[0].nil? then
+            label = Date::MONTHNAMES[(i > 0 ? i : 12)] + " - " + month_name
+          end
+          
+          if week[-1].nil? then
+            label = month_name + " - " + Date::MONTHNAMES[(i+2 <= 12 ? i+2 : 1)] 
+          end          
+          
+          week_record = {
+            rel_no: (j+1).to_s,
+            no: week_s, 
+            mon: month_name, 
+            label: label
+          }
+          
+          create.week week_record do |create|
+            week.each_with_index do |day, k|
+                    
+              # if it's a day in the month then ...
+              if day then
+                x = day
                 week_i += 1 if x.wday == 6
-                h = {wday: x.wday.to_s, xday: x.day.to_s, name: Date::DAYNAMES[k], \
-                  date: x.strftime("%Y-%b-%d")}
+                h = {wday: x.wday.to_s, xday: x.day.to_s, \
+                  name: Date::DAYNAMES[k], date: x.strftime("%Y-%b-%d"), \
+                  ordinal: x.day.to_i.ordinal}
               else
                 #if blank find the nearest date in the week and calculate this date
                 # check right and if nothing then it's at the end of the month
                 x = week[-1] ? (week[-1] - (7-(k+1))) : week[0] + k
-                h = {wday: x.wday.to_s, xday: x.day.to_s, date: x.strftime("%Y-%b-%d")}
+                h = {wday: x.wday.to_s, xday: x.day.to_s, \
+                  name: Date::DAYNAMES[k], date: x.strftime("%Y-%b-%d"), \
+                  ordinal: x.day.to_i.ordinal, overlap: 'true'}
               end
+
               create.day(h)
             end
           end
@@ -125,7 +295,32 @@ class PolyrexCalendar
     end
 
   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
+  
   def generate_webpage(xml, xsl)
     
     # transform the xml to html
@@ -134,5 +329,6 @@ class PolyrexCalendar
     html =  xslt.transform(doc).to_xml    
     html
 
-  end
-end
+  end  
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyrex-calendar
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - James Robertson
@@ -29,34 +29,48 @@ cert_chain:
   CIpMEIXEnQwmcmWL07xvpUquKTab0tCXtmcfjr74KP2KCm5guZyxeXaj9lD1OrnC
   Kgt/mRI2beG8K7QY81GGMsQjiG95Dcko
   -----END CERTIFICATE-----
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: chronic_duration
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -82,12 +96,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []