@@ -14,3 +14,4 @@ data/register_of_interests/representatives/*.pdf .*.sw? .DS_Store features/tmp +configuration-local.yml .gitignore @@ -38,3 +38,8 @@ Scenario: downloading a list of people Then I should see the "small" images for the list of people And I should see the "big" images for the list of people +@focus +Scenario: attempting to download a person not found in parlinfo + Given a list of people "John Armitage" + And not-found parlinfo pages for "John Lindsay Armitage, John Armitage" + When I download the list of people features/people_downloader.feature @@ -7,6 +7,9 @@ Given /^not-found parlinfo pages for "([^\"]*)"$/ do |name_list| @app.parlinfo.prepare_not_found_page_for!(name) end end +Given /^a not\-found parlinfo page for "([^\"]*)"$/ do |name| + @app.parlinfo.prepare_not_found_page_for!(name) +end Given /^a parlinfo person page for "([^\"]*)" \(stubbed\)$/ do |name| @app.parlinfo.prepare_stub_page_for!(name) features/step_definitions/parlinfo_steps.rb @@ -150,8 +150,7 @@ Content-Length: #{text.size} require 'person' class Person < Namespace - # NOTE basically fixtures... move them outta here! - def make!(name) + def make(name) person_params = case name when "Bob Loblaw" { @@ -159,8 +158,19 @@ Content-Length: #{text.size} :name => Name.new(:first => 'Bob', :middle => 'Francis', :last => 'Loblaw'), :alternate_names => [Name.new(:first => 'Robert', :middle => 'Francis', :last => 'Loblaw')] } + when "John Armitage" + { + :count => 2, + :name => Name.new(:first => 'John', :middle => 'Lindsay', :last => 'Armitage') + } + else + raise "Person fixture not found for #{name}" end - @person = ::Person.new(person_params) + ::Person.new(person_params) + end + + def make!(name) + @person = make(name) self end @@ -200,6 +210,10 @@ Content-Length: #{text.size} self end + def download! + download.download_page(page, person, fixture.tmp_dir("small"), fixture.tmp_dir("big")) + end + def iterate_bio_pages_of!(people) @pages = [] downloader.each_person_bio_page(people) {|page| @pages << page} features/support/oa_app.rb @@ -7,9 +7,24 @@ class Configuration @@conf = nil + # Load the configuration def self.global_conf - @@conf ||= YAML.load_file( "#{File.dirname(__FILE__)}/../configuration.yml" ) || {} + unless @@conf + here = File.dirname(__FILE__) + @@conf = YAML.load_file( "#{here}/../configuration.yml" ) || {} + + local_config = "#{here}/../configuration-local.yml" + if File.exist?(local_config) + @@conf.merge!( YAML.load_file( local_config ) ) + end + + @@conf.keys.each do |key| + #@@conf + end + end + + @@conf end def global_conf; self.class.global_conf end lib/configuration.rb @@ -53,7 +53,7 @@ class PeopleImageDownloader image.resize("%dx%d" % [@@SMALL_THUMBNAIL_WIDTH * 2, @@SMALL_THUMBNAIL_HEIGHT * 2]).write(large_img) small_img = File.join( small_image_dir, "#{person.id_count}.jpg") - image.resize("%dx%d" % [@@SMALL_THUMBNAIL_WIDTH, @@SMALL_THUMBNAIL_HEIGHT] ).write(small_img) + image.resize("%dx%d" % [@@SMALL_THUMBNAIL_WIDTH , @@SMALL_THUMBNAIL_HEIGHT] ).write(small_img) else puts "WARNING: Skipping photo for #{name.full_name} because they don't exist in the list of people" end @@ -85,6 +85,8 @@ class PeopleImageDownloader return page end end + + nil end def each_person_bio_page(people) lib/people_image_downloader.rb @@ -9,4 +9,5 @@ conf = Configuration.new people = PeopleCSVReader.read_members puts "Downloading person images..." -people.download_images("#{conf.file_image_path}/mps", "#{conf.file_image_path}/mpsL") +#people.download_images("#{conf.file_image_path}/mps", "#{conf.file_image_path}/mpsL") +people.download_images("/tmp/mps", "/tmp/mpsL") member-images.rb 7b253eb3074231f08a2c43e1de6209b04e702769 lachie lachiec@gmail.com http://github.com/lachie/openaustralia-parser/commit/392a3cb5ccc9f570197193c33ebcd52287e413dc 392a3cb5ccc9f570197193c33ebcd52287e413dc 2009-06-14T17:18:15-07:00 2009-06-14T17:18:15-07:00 tested and fixed not-found biopage bug 7c92d47bbe991e84d83828ee07b8055925aee62b lachie lachiec@gmail.com