rubbish_collection 0.0.1 → 0.0.2

data/README.md

@@ -20,7 +20,8 @@ Or install it yourself as:
 
 ## Usage
 
-    collection_times = RubbishCollection.times_at_postcode 'SE1 1EY'
+    address = OpenStruct.new :street_name => "Redcross Way", :postcode => "SE1 1EY"
+    collection_times = RubbishCollection.times_at_address address
     collection_times.each do |t|
       puts t.to_s
     end
@@ -36,9 +37,17 @@ You can get the ID to register your local authority adapter against by looking
 at the [local authority database][0] in my [local\_authority gem][1]. It's the
 last column of the CSV row.
 
+Note that the API of the address object used in this gem hasn't yet been settled
+on. Different local authorities need different parts or formats of the address
+to determine collection times eg Southwark and Redbridge are pretty good with
+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.
+
 [0]: https://raw.github.com/craigw/local_authority/master/db/local_authorities.csv
 [1]: https://github.com/craigw/local_authority
 
+
 ## Contributing
 
 1. Fork it

data/lib/rubbish_collection/redbridge.rb

@@ -9,10 +9,10 @@ module RubbishCollection
     def initialize local_authority
     end
 
-    def collection_times_at postcode
+    def collection_times_at address
       Net::HTTP.start "www.redbridge.gov.uk", 80 do |http|
         req = Net::HTTP::Get.new '/RecycleRefuse'
-        req['Cookie'] = "RedbridgeIV3LivePref=postcode=#{postcode}"
+        req['Cookie'] = "RedbridgeIV3LivePref=postcode=#{address.postcode}"
         response = http.request req
         doc = Nokogiri::HTML response.body
         info = doc.xpath "//*[@id='RegularCollectionDay']"

data/lib/rubbish_collection/southwark.rb

@@ -9,9 +9,9 @@ module RubbishCollection
     def initialize local_authority
     end
 
-    def collection_times_at postcode
+    def collection_times_at address
       Net::HTTP.start "wasteservices.southwark.gov.uk", 80 do |http|
-        req = Net::HTTP::Get.new "/findAddress.asp?pc=#{postcode.gsub(/\s+/, '')}"
+        req = Net::HTTP::Get.new "/findAddress.asp?pc=#{address.postcode.gsub(/\s+/, '')}"
         response = http.request req
         addresses = Nokogiri::HTML.fragment response.body
         first_address = addresses.xpath(".//option").detect { |o| o['value'].to_s.strip != '' }

data/lib/rubbish_collection/version.rb

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

data/lib/rubbish_collection.rb

@@ -70,12 +70,13 @@ module RubbishCollection
     end
   end
 
-  def self.times_at_postcode postcode
+  def self.times_at_address address
+    pc = address.postcode
+    local_authority = LocalAuthority::LocalAuthority.find_by_postcode pc
     times = CollectionTimes.new
-    local_authority = LocalAuthority::LocalAuthority.find_by_postcode postcode
     return times if local_authority.nil?
     adaptor = adapter_for local_authority
-    adaptor.collection_times_at(postcode).each do |t|
+    adaptor.collection_times_at(address).each do |t|
       times << t
     end
     times

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubbish_collection
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: