polyrex-calendar 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68fe9cd5ead06826d1f5444367043efb6414b943
-  data.tar.gz: 7b9d400c21a3ba3c4d28fc1b80b4cbdaa01ebd2f
+  metadata.gz: bb941b9ce09a7826d6ef965a8c1b5bee0e4cfc4f
+  data.tar.gz: 351f4020b16f485cdb8b9968fe9440f2f3aa16ce
 SHA512:
-  metadata.gz: 1e84c62de61139e3d0d9b55c65c3570a8395a53ef62613cfbf55ba80387929ba42fa3b02597451a83993edaff2fbc195b56e437d6eaf506413eaab02a1dcd46e
-  data.tar.gz: 01252e2e6934a6d5114a86a4ed2f25f2e917660fbe51afbe0842ba3459c58e3600259850d1bf2c6645f23a6b21540f36dd95830daaa2463f9623128652ff27d9
+  metadata.gz: c53727432e3f781dd3444aa60027154c1494678b8f1ec8abff78aa7c817a21bd2ffda5a0c974f97ba9cf01862625f5c79e72171420f2603ac98c620f894a801d
+  data.tar.gz: 6adc0c1d066f3dafe2573749fce04dd0a01da1dd272e6f2f45b82ae1248d6567bd7b5ed9af44739b3edb4d3ebb205381732a22f7dc1326a98998e1ac98e03d56

data.tar.gz.sig

@@ -1,2 +1 @@
-˃�5�)6f�t50�ۦXʞ�m��������B��kN
-�Iw���I���&��6fAQ�1���l���-��c�8iG4˵��RMtd�H�6<�Dˎ�e�ֿ���䶎鵆<'B���!�h��H��s��$t5�W!5����=����e��I��eaF�=,߮m�@�.�o\��N�C)���1ȄF�P��O %oY�|�=��Y6hWl��h�,/���+�u��qN����ƛ���a��L�|��U<
+�{ؠ�,��DJe�Q~;c���Q�n��?m��]�E�aA���z�Yࡵ��EO��6���t�8%D�O��D���&��\�9�tr6��e�`��;����Dᰶ��𶏳9@6;n�"�XgQ�;	��B+ļ�B0s�`�x�� n��/�Ȣ�^p��(slۄcB'u�K������UFd�lְ)����@I����{�P��j�m�c�1�O�֒���NLWI

data/lib/polyrex-calendar.rb

@@ -7,6 +7,12 @@ require 'date'
 require 'nokogiri'
 require 'chronic_duration'
 
+MINUTE = 60
+HOUR = MINUTE * 60
+DAY = HOUR * 24
+WEEK = DAY * 7
+MONTH = DAY * 30
+
 class Numeric
   def ordinal
     ( (10...20).include?(self) ? 'th' : %w{ th st nd rd th th th th th th }[self % 10] )
@@ -20,12 +26,13 @@ class PolyrexCalendar
   def initialize(year=nil, options={})
 
     @id = '1'
-    
+
+    lib = File.dirname(__FILE__)
     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.read lib + '/calendar.xsl'
     @css = File.read lib + '/layout.css'
@@ -41,7 +48,11 @@ class PolyrexCalendar
 
         month_xsl = File.read lib + '/month_calendar.xsl'
         month_css = File.read lib + '/month_layout.css'
-        
+
+        File.open('self.xml','w'){|f| f.write self.to_xml pretty: true}
+        File.open('month.xsl','w'){|f| f.write month_xsl }
+        #html = Rexslt.new(month_xsl, self.to_xml).to_xml
+
         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}
@@ -60,12 +71,17 @@ class PolyrexCalendar
       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'
-
+        
+        File.open('self.xml','w'){|f| f.write self.to_xml pretty: true}
+        File.open('week.xsl','w'){|f| f.write week_xsl }        
+        #html = Rexslt.new(week_xsl, self.to_xml).to_xml
+        #html = xsltproc 'week_calendar.xsl', self.to_xml
         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, \
@@ -85,8 +101,9 @@ class PolyrexCalendar
   end
 
   def to_webpage()
-    #html = Rexslt.new(@xsl, @polyrex.to_xml).to_xml   
-    html = generate_webpage(@polyrex.to_xml, @xsl)    
+    # jr2441213 html = Rexslt.new(@xsl, @polyrex.to_xml).to_xml   
+    xslt  = Nokogiri::XSLT(@xsl)
+    html = xslt.transform(Nokogiri::XML(@polyrex.to_xml)).to_s
     {'calendar.html' => html, 'layout.css' => @css}
   end  
 
@@ -122,15 +139,36 @@ class PolyrexCalendar
     polyrex.parse(list)
 
     self.import_events polyrex
+    # for testing only
+    #polyrex
   end
   
   def this_week()
+
     m = DateTime.now.month
-    self.month(m).records.find do |week|
+    thisweek = self.month(m).records.find do |week|
       now = DateTime.now
-      week_no = now.cwday < 7 ? now.cweek - 1: now.cweek 
+      #week_no = now.cwday < 7 ? now.cweek - 1: now.cweek
+      week_no = now.cweek
       week.no == week_no.to_s
     end
+
+    day = (Time.now - DAY * (Time.now.wday - 1)).day
+
+    days_in_week = self.this_month.xpath('records/week/records/.')\
+      .select {|x| x.text('summary/xday').to_i >= day}\
+      .take 7
+
+    doc_week = Rexle.new thisweek.to_xml
+    records = doc_week.root.element 'records'
+    records.insert_before Rexle::Element.new('records')
+
+    records.delete
+
+    week = doc_week.root.element 'records'
+    days_in_week.each {|day| week.add day }
+    PolyrexObjects.new(@schema).to_h['Week'].new doc_week.root
+
   end
 
   def this_month()
@@ -166,13 +204,14 @@ class PolyrexCalendar
 
           start_time = entry.start_time  
 
-          if entry.end_time then
+          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 then
+            if entry.duration.length > 0 then
               duration = entry.duration
             else
               duration = '10 mins'
@@ -236,22 +275,23 @@ class PolyrexCalendar
     end
 
     @a = months
-    schema = 'calendar[year]/month[no,name,year]/week[no, rel_no, mon, label]/' + \
+    @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)
+    @polyrex = Polyrex.new(@schema, id_counter: @id)
     year_start = months[0][0][-1]
     @polyrex.summary.year = @year
     old_year_week = (year_start - 7).cweek
 
-    week_i = 0
+    week_i = 1
 
     months.each_with_index do |month,i| 
       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
+          # jr241213 week_s = (week_i == 0 ? old_year_week : week_i).to_s
+          week_s = week_i.to_s
           
           if week[0].nil? then
             label = Date::MONTHNAMES[(i > 0 ? i : 12)] + " - " + month_name
@@ -261,6 +301,7 @@ class PolyrexCalendar
             label = month_name + " - " + Date::MONTHNAMES[(i+2 <= 12 ? i+2 : 1)] 
           end          
           
+
           week_record = {
             rel_no: (j+1).to_s,
             no: week_s, 
@@ -329,6 +370,5 @@ class PolyrexCalendar
     html =  xslt.transform(doc).to_xml    
     html
 
-  end  
-  
+  end
 end

data/lib/week.xsl

@@ -34,12 +34,12 @@
 <xsl:template match='week/records'>
 <div id='col1'>
   <ul>
-    <xsl:apply-templates select="day[summary/wday &lt; '3']"/>
+    <xsl:apply-templates select="day[position() &lt; 5]"/>
   </ul>
 </div>
 <div id='col2'>
   <ul>
-    <xsl:apply-templates select="day[summary/wday &gt;= '3']"/>
+    <xsl:apply-templates select="day[position() &gt;= 5]"/>
   </ul>
 </div>
 </xsl:template>
@@ -98,4 +98,4 @@
 </xsl:template>
 
 
-</xsl:stylesheet>
+</xsl:stylesheet>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyrex-calendar
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   CIpMEIXEnQwmcmWL07xvpUquKTab0tCXtmcfjr74KP2KCm5guZyxeXaj9lD1OrnC
   Kgt/mRI2beG8K7QY81GGMsQjiG95Dcko
   -----END CERTIFICATE-----
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2013-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: polyrex-calendar