rubbish_collection 0.0.2 → 0.0.3

data/README.md

@@ -20,7 +20,8 @@ Or install it yourself as:
 
 ## Usage
 
-    address = OpenStruct.new :street_name => "Redcross Way", :postcode => "SE1 1EY"
+    address = OpenStruct.new :house_number => "2",
+      :street_name => "Beech Road", :postcode => "GU14 8EU"
     collection_times = RubbishCollection.times_at_address address
     collection_times.each do |t|
       puts t.to_s
@@ -44,8 +45,19 @@ just the postcode but Westminster need a street name. At some point we should
 either find a gem that already caters to addresses and provides a nice API and
 tools for comparison, or we should define or own.
 
+Not all local authorities perform all collections on a weekly basis -
+[fuzzmonkey][2] points out that Rushmoor only pick up recycling once a
+fortnight. This project can't handle schedules like that yet. Perhaps we
+should consider pulling in a more advanced temporal event library?
+
+  * [Recurring Event][3]
+  * [RUNT][4]
+
 [0]: https://raw.github.com/craigw/local_authority/master/db/local_authorities.csv
 [1]: https://github.com/craigw/local_authority
+[2]: https://github.com/fuzzmonkey
+[3]: https://github.com/nickstenning/recurring_event
+[4]: https://github.com/texel/runt
 
 
 ## Contributing

data/lib/rubbish_collection.rb

@@ -34,7 +34,6 @@ module RubbishCollection
   end
 
   class CollectionTime
-    DAYS = %w( Sunday Monday Tuesday Wednesday Thursday Friday Saturday ).map(&:freeze).freeze
 
     attr_accessor :day
     private :day=, :day
@@ -52,7 +51,7 @@ module RubbishCollection
     end
 
     def human_day
-      DAYS[day]
+      Date::DAYNAMES[day]
     end
 
     def human_time
@@ -99,3 +98,4 @@ end
 
 require 'rubbish_collection/redbridge'
 require 'rubbish_collection/southwark'
+require 'rubbish_collection/rushmoor'

data/lib/rubbish_collection/rushmoor.rb

@@ -0,0 +1,45 @@
+module RubbishCollection
+
+  class RushmoorAdapter
+
+    def self.load
+      require 'nokogiri'
+      require 'date'
+    end
+
+    def initialize local_authority
+    end
+
+    def collection_times_at address
+      Net::HTTP.start "www.rushmoor.gov.uk", 80 do |http|
+        postcode = address.postcode.gsub("\s","") # Rushmoor don't like post codes with spaces
+        req = Net::HTTP::Get.new "/article/1589/Address-search?housenumber=#{address.house_number}&addressdetail=#{postcode}"
+        response = http.request req
+        if response.code == "302"
+          response = Net::HTTP.get_response(URI.parse(response.header['location']))
+        end
+        doc = Nokogiri::HTML response.body
+        info = doc.xpath("//*[@id='inmyarea']")
+        container = info.xpath("//*[@class='ima_block']").first
+        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
+          end
+          day_index = Date::DAYNAMES.index(lines[2].strip.split(" ")[0])
+          times << CollectionTime.new(day_index, :unknown, collection_type)
+        end
+        times
+      end
+    end
+  end
+end
+
+RubbishCollection.register_adapter 'http://mapit.mysociety.org/area/2337', RubbishCollection::RushmoorAdapter

data/lib/rubbish_collection/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubbish_collection
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -57,6 +57,7 @@ files:
 - Rakefile
 - lib/rubbish_collection.rb
 - lib/rubbish_collection/redbridge.rb
+- lib/rubbish_collection/rushmoor.rb
 - lib/rubbish_collection/southwark.rb
 - lib/rubbish_collection/version.rb
 - rubbish_collection.gemspec