polyrex_calendarbase 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87af5913bdf544a500b425d47caaa71ed7771dbc
-  data.tar.gz: 9bd96cb1d3b37da781da2d50a9aa0248d784580d
+  metadata.gz: 8a3f46fd422720f70d48e087ffcd9e21d3179dde
+  data.tar.gz: 281a6be1808fae67b275a49e576014a69793de71
 SHA512:
-  metadata.gz: 466d480495e1c31625932b611b537450c787a8626920e14bbade357be6275f58a219d17a927e6658d44579c15f11266a6881f5923f5d2a743a9f6f8ee0993b89
-  data.tar.gz: acefe190651c6c1f7a7f8c2b453f4d510ee6effa5639d811400fe57aef870e1c277812a692880f0a628192a3c837cec6ad5670e02f965f519ac553cc0e4df910
+  metadata.gz: d8537b77ee09ca9c1613dfa09ca256304bbf73e2fad367d6d4d1fabec269851dd0b98ce03b2ccadaf3e5d39896c14a4ec6775705b7c4f9d74424d0500b30065f
+  data.tar.gz: 0e2a933fc618e5cbc39f3f318f3b9d891ceede7960f85745ee9e9a64ba46b9055c638df01816c60d3763e840fd0b42557e59f7656cd79968c8b7a2679bb8e98f

data/lib/polyrex_calendarbase.rb

@@ -30,7 +30,6 @@ module LIBRARY
 
     lib = File.dirname(__FILE__)
     File.read filename      
-
   end
 
   def generate_webpage(xml, xsl)
@@ -73,53 +72,56 @@ class Calendar < Polyrex
   end           
 end
 
-class CalendarObjects
+class PolyrexObjects
   
-  class Month
-    include LIBRARY
+    class Month
+      include LIBRARY
 
-    attr_accessor :xslt, :css_layout, :css_style
+      attr_accessor :xslt, :css_layout, :css_style
 
-    def inspect()
-      "#<CalendarObjects::Month:%s" % __id__
+      def inspect()
+        "#<CalendarObjects::Month:%s" % __id__
+      end            
+      
+      def d(n)
+        self.records[n-1]
+      end
+    
     end
     
-    def wk(n)
-      self.records[n-1]        
-    end      
-  end
-  
-  class Week
-    include LIBRARY
+    class Week
+      include LIBRARY
 
-    def inspect()
-      "#<CalendarObjects::Week:%s" % __id__
-    end
+      def inspect()
+        "#<CalendarObjects::Week:%s" % __id__
+      end
+      
+    end  
     
-  end  
-  
-  class Day
+    class Day
+          
+      def date()
+        Date.parse(self.sdate)
+      end
 
-    def date()
-      Date.parse(self.sdate)
-    end
+      def wday()
+        self.date.wday
+      end   
 
-    def wday()
-      self.date.wday
+      def day()
+        self.date.day
+      end
+      
     end
 
-    def day()
-      self.date.day
-    end
-    
-  end
-    
 end
 
 
+
 class PolyrexCalendarBase
   include LIBRARY
 
+
   attr_accessor :xsl, :css, :calendar, :month_xsl, :month_css
   attr_reader :day
   
@@ -167,7 +169,12 @@ class PolyrexCalendarBase
     CalendarObjects.new(visual_schema)
        
   end
-
+  
+  def find(s)
+    dt = Chronic.parse s, now: Time.local(@year,1,1)
+    self.month(dt.month).d(dt.day)
+  end
+  
   def to_xml()
     @calendar.to_xml pretty: true
   end
@@ -181,7 +188,12 @@ class PolyrexCalendarBase
   alias import! import_events
 
   def inspect()
-     %Q(=> #<PolyrexCalendar:#{self.object_id} @id="#{@id}", @year="#{@year}">)
+     %Q(=> #<PolyrexCalendarBase:#{self.object_id} @id="#{@id}", @year="#{@year}">)
+  end
+  
+  def month(n=nil)
+    r = @calendar.records
+    n ? r[n-1] : r
   end
   
   def parse_events(list)    
@@ -201,16 +213,16 @@ class PolyrexCalendarBase
   end
 
   def save(filename='calendar.xml')
-    @calendar.save filename
+    @calendar.save filename, pretty: true
   end
   
   def this_week()
 
     dt = DateTime.now
-    days = @calendar.records[dt.month-1].day
+    days = @calendar.month(dt.month).day
 
     r = days.find {|day| day.date.cweek == dt.cweek }    
-    pxweek = CalendarObjects::Week.new
+    pxweek = PolyrexObjects::Week.new
     pxweek.mon = Date::MONTHNAMES[dt.month]
     pxweek.no = dt.cweek.to_s
     pxweek.label = ''
@@ -239,7 +251,7 @@ class PolyrexCalendarBase
       m, d = dt.month, dt.day
       record = {title: title, time_start: time_start}
 
-      @calendar.records[m-1].day[d-1].create.entry record
+      @calendar.month(m).d(d).create.entry record
     end
   end
 
@@ -259,7 +271,7 @@ class PolyrexCalendarBase
 
       dt = DateTime.parse(event[:date])
       m, d = dt.month, dt.day
-      @calendar.records[m-1].day[d-1].method(event_type).call event[:time]
+      @calendar.month(m).d(d).method(event_type).call event[:time]
     end
   end
   
@@ -290,7 +302,7 @@ class PolyrexCalendarBase
                 time_end: Time.parse(end_time).strftime("%H:%M%p")
               }
 
-              @calendar.records[m-1].day[d-1].create.entry record
+              @calendar.month(m).d(d).create.entry record
             else
 
               dt = DateTime.parse(event[:date] + ' ' + event[:time])
@@ -299,19 +311,19 @@ class PolyrexCalendarBase
                                 event[:desc]].compact.join(': ')
               event_label = "%s at %s" % [title, dt.strftime("%H:%M%p")]
 
-              @calendar.records[m-1].day[d-1].method(daytype).call event_label
+              @calendar.month(m).d(d).method(daytype).call event_label
             end
 
           else
 
             event_label = "%s at %s" % [event[:title], dt.strftime("%H:%M%p")]
-            @calendar.records[m-1].day[d-1].method(daytype).call event_label
+            @calendar.month(m).d(d).method(daytype).call event_label
           end
 
         else
 
           event_label = "%s" % event[:title]
-          @calendar.records[m-1].day[d-1].method(daytype).call event_label
+          @calendar.month(m).d(d).method(daytype).call event_label
       end
 
     end
@@ -325,7 +337,7 @@ class PolyrexCalendarBase
 
       sd = dt.strftime("%Y-%b-%d ")
       m, i = dt.month, dt.day
-      cal_day = @calendar.records[m - 1].day[i-1]
+      cal_day = @calendar.month(m).d(i)
 
       cal_day.event = day.title
 
@@ -406,4 +418,3 @@ class PolyrexCalendarBase
   end
   
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyrex_calendarbase
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   eGxjKaL2sbouS4fyw4A39SBdlnl+EEAc05wbVgSI3V3Qx6T/opctD22MCO7rCLKx
   cODimpf9WykDmA==
   -----END CERTIFICATE-----
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex