rubbish_collection 0.0.3 → 0.0.4

data/README.md

@@ -20,6 +20,15 @@ Or install it yourself as:
 
 ## Usage
 
+    require 'ostruct'
+
+    address = OpenStruct.new :house_number => "43",
+      :street_name => "Redcross Way", :postcode => "SE1 1EY"
+    collection_times = RubbishCollection.times_at_address address
+    collection_times.each do |t|
+      puts t.to_s
+    end
+
     address = OpenStruct.new :house_number => "2",
       :street_name => "Beech Road", :postcode => "GU14 8EU"
     collection_times = RubbishCollection.times_at_address address

data/lib/rubbish_collection.rb

@@ -1,7 +1,12 @@
 require "rubbish_collection/version"
 require 'local_authority'
+require 'runt'
 
 module RubbishCollection
+  DOMESTIC_RUBBISH = 'Domestic Rubbish'.freeze
+  DOMESTIC_RECYCLING = 'Domestic Recycling'.freeze
+  COMMUNAL_RECYCLING = 'Communal Recycling'.freeze
+
   class UnknownAdapter
     attr_accessor :local_authority
     private :local_authority=, :local_authority
@@ -15,64 +20,190 @@ module RubbishCollection
     end
   end
 
-  class CollectionTimes
-    attr_accessor :times
-    private :times=, :times
+  class Collections
+    attr_accessor :collections
+    private :collections=, :collections
 
     def initialize
-      self.times = []
+      self.collections = []
+    end
+
+    def << collection
+      collections << collection
     end
 
     def each
-      times.each { |t| yield t }
+      upto(Time.now + (86400 * 31)).each { |t| yield t }
     end
-    include Enumerable
+    include Comparable
 
-    def << time
-      times << time
+    def upto until_date
+      now = Time.now
+      collections.map { |c| c.realise now, until_date }.flatten.sort
     end
   end
 
-  class CollectionTime
+  class Resolution
+    attr_accessor :name
+    private :name=
+
+    attr_accessor :step
+    private :step=
+
+    def initialize name, step
+      self.name = name
+      self.step = step
+    end
+
+    def <=> other
+      other.step <=> step
+    end
+    include Comparable
+
+    def match_resolution time
+      args = [ time.year, time.month, time.day, time.hour, time.min, time.sec, time.usec ]
+      case step
+      when 1
+        Runt::PDate.sec *args
+      when 60
+        Runt::PDate.min *args
+      when 3600
+        Runt::PDate.hour *args
+      when 86400
+        Runt::PDate.day *args
+      else
+        raise "Don't know how to represent a time with resolution of #{step}"
+      end
+    end
+
+    SECOND = new "Second", 1
+    MINUTE = new "Minute", 60
+    HOUR = new "Hour", 3600
+    DAY = new "Day", 86400
+  end
+
+  class Schedule
+    attr_accessor :condition
+    private :condition=, :condition
+
+    attr_accessor :resolution
+    private :resolution=
+
+    def initialize resolution
+      self.resolution = resolution
+    end
+
+    def self.day_of_week day_name
+      normalised_name = day_name[0,1].upcase + day_name[1..-1].downcase
+      day_const = Runt.const_get normalised_name
+      Runt::DIWeek.new day_const
+    end
+
+    def self.hour hour
+      Runt::REDay.new hour, 0, hour, 59, true
+    end
+
+    def add_rule rule
+      if condition.nil?
+        self.condition = rule
+        return
+      end
+      self.condition = condition & rule
+    end
+
+    def include? time
+      time_with_resolution = resolution.match_resolution time
+      condition.include? time_with_resolution
+    end
 
-    attr_accessor :day
-    private :day=, :day
+    def to_s
+      condition.to_s
+    end
+  end
+
+  class Collection
+    attr_accessor :pickup_type
+    private :pickup_type=
+
+    attr_accessor :schedule
+    private :schedule=, :schedule
+
+    def initialize pickup_type, schedule
+      self.pickup_type = pickup_type
+      self.schedule = schedule
+    end
+
+    def realise from, to
+      times = []
+      now = from
+      resolution = schedule.resolution
+      rem = now.to_i % resolution.step
+      diff = resolution.step - rem
+      now += diff
+      while now < to
+        if schedule.include? now
+          time = CollectionTime.new pickup_type, now, resolution
+          times << time
+        end
+        now += resolution.step
+      end
+      times
+    end
+
+    def to_s
+      [ pickup_type, schedule.to_s ].join ' - '
+    end
+  end
 
+  class CollectionTime
     attr_accessor :time
     private :time=, :time
 
+    attr_accessor :resolution
+    private :resolution=, :resolution
+
     attr_accessor :pickup_type
     private :pickup_type=, :pickup_type
 
-    def initialize day, time = :unknown, pickup_type = :domestic_refuse
-      self.day = day
+    def initialize pickup_type, time, resolution
       self.time = time
+      self.resolution = resolution
       self.pickup_type = pickup_type
     end
 
-    def human_day
-      Date::DAYNAMES[day]
+    def human_time
+      return unless resolution > Resolution::DAY
+      start_time = time
+      end_time = time + resolution.step
+
+      [ start_time, end_time ].map { |t| t.strftime('%l.%M%P').strip }.join(' to ')
     end
 
-    def human_time
-      return if time == :unknown
-      t = time.to_s.rjust 4, '0'
-      t[0..1] + ':' + t[2..3]
+    def human_date
+      time.strftime '%A %d %B %Y'
     end
 
     def human_type
-      pickup_type.to_s.split(/_/).join(' ')
+      pickup_type
+    end
+
+    def <=> other
+      sort_key <=> other.sort_key
+    end
+
+    def sort_key
+      [ time, resolution, pickup_type ]
     end
 
     def to_s
-      [ human_day, human_time ].compact.join(' ') + " - #{human_type}"
+      [ human_date, human_time ].compact.join(' from ') + " - #{human_type}"
     end
   end
 
   def self.times_at_address address
     pc = address.postcode
     local_authority = LocalAuthority::LocalAuthority.find_by_postcode pc
-    times = CollectionTimes.new
+    times = Collections.new
     return times if local_authority.nil?
     adaptor = adapter_for local_authority
     adaptor.collection_times_at(address).each do |t|

data/lib/rubbish_collection/redbridge.rb

@@ -21,9 +21,11 @@ module RubbishCollection
         hour = hour.to_i
         hour += 12 if modifier == "pm"
         time = hour * 100
-        day = info.xpath ".//*[@class='day']/text()"
-        day_index = DAYS.index day.to_s.strip
-        [ CollectionTime.new(day_index, time) ]
+        day_name = info.xpath(".//*[@class='day']/text()").to_s
+        s = Schedule.new Resolution::HOUR
+        s.add_rule Schedule.day_of_week day_name
+        s.add_rule Schedule.hour hour
+        [ Collection.new(DOMESTIC_RUBBISH, s) ]
       end
     end
   end

data/lib/rubbish_collection/rushmoor.rb

@@ -24,17 +24,22 @@ module RubbishCollection
         times = []
         container.xpath("p").each do |rubbish_div|
           lines = rubbish_div.text.split("\n")
-          collection_type = case lines[1]
-            when /rubbish bin collection/
-              :domestic_refuse
-            # In Rushmoor, recycling comes every two weeks, CollectionTime doesn't really support this
-            # when /recycling collection/
-            #   :domestic_recycling
-            else
-              next
+          day_name = lines[2].to_s.strip.split(" ")[0]
+          s = Schedule.new Resolution::DAY
+          collection = case lines[1]
+          when /rubbish bin collection/
+            s.add_rule Schedule.day_of_week day_name
+            Collection.new DOMESTIC_RUBBISH, s
+          when /recycling collection/
+            nc = Time.parse lines[2]
+            start_date = Runt::PDate.day nc.year, nc.month, nc.day
+            s.add_rule Runt::EveryTE.new(start_date, 2, Runt::DPrecision::WEEK)
+            s.add_rule Schedule.day_of_week day_name
+            Collection.new DOMESTIC_RECYCLING, s
+          else
+            next
           end
-          day_index = Date::DAYNAMES.index(lines[2].strip.split(" ")[0])
-          times << CollectionTime.new(day_index, :unknown, collection_type)
+          times << collection
         end
         times
       end

data/lib/rubbish_collection/southwark.rb

@@ -25,20 +25,22 @@ module RubbishCollection
           link_text = link.inner_text.to_s.strip
           collection_type = case link_text
           when /refuse bin/
-            :domestic_refuse
+            DOMESTIC_RUBBISH
           when /communal recycling bins/
-            :communal_recycling
+            COMMUNAL_RECYCLING
           when /mixed recycling bag/
-            :mixed_recycling_bag
+            DOMESTIC_RECYCLING
           else
-            link_text.to_sym
+            next
           end
           DAYS.inject([]) { |a,e|
-            a << DAYS.index(e) if fragment =~ /#{e}/i
+            a << e if fragment =~ /#{e}/i
             a
           }.each do |d|
-            t = CollectionTime.new d, :unknown, collection_type
-            times << t
+            s = Schedule.new Resolution::DAY
+            s.add_rule Schedule.day_of_week(d)
+            c = Collection.new collection_type, s
+            times << c
           end
         end
         times

data/lib/rubbish_collection/version.rb

@@ -1,3 +1,3 @@
 module RubbishCollection
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/rubbish_collection.gemspec

@@ -17,4 +17,5 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'local_authority', '~> 0.0.5'
   gem.add_runtime_dependency 'nokogiri'
+  gem.add_runtime_dependency 'runt19', '~> 0.7.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubbish_collection
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-14 00:00:00.000000000 Z
+date: 2012-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: local_authority
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: runt19
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.7
 description: When is my rubbish collected?
 email:
 - craig@barkingiguana.com