app/models/invalid_location.rb public/cached_reports.html @@ -204,7 +204,8 @@ class ReportsController < ApplicationController reporter = IphoneReporter.update_or_create(info[:reporter]) polling_place = PollingPlace.match_or_create(info[:polling_place][:name], reporter.location) report = reporter.reports.create(info[:report].merge(:polling_place => polling_place, :latlon => info[:reporter][:latlon])) - report.reload + report.save + p report.uniqueid if audiofile = params[:uploaded] fn = "#{AUDIO_UPLOAD_PATH}/#{report.uniqueid}.caf" File.open(fn, 'w') { |f| f.write audiofile.read } app/controllers/reports_controller.rb @@ -18,6 +18,7 @@ Signal.trap("TERM") do end while($running) do - `#{CURL} #{URL} > #{PATH_TO_CACHED_FILE}` + `#{CURL} #{URL} > #{PATH_TO_CACHED_FILE}.tmp` + File.rename("#{PATH_TO_CACHED_FILE}.tmp", PATH_TO_CACHED_FILE) sleep 30 end lib/daemons/cache_reports.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require File.dirname(__FILE__) + '/../test_helper' class ReportsControllerTest < ActionController::TestCase def test_paginated_index_loads @@ -7,22 +7,30 @@ class ReportsControllerTest < ActionController::TestCase assert !@response.body.include?("hdn_reports_container") end - def test_live_autoupdate_index_loads - get(:index, :live => "1", :format => 'html') - assert_response :success - assert @response.body.include?("hdn_reports_container") - end + # def test_live_autoupdate_index_loads + # get(:index, :live => "1", :format => 'html') + # assert_response :success + # assert @response.body.include?("hdn_reports_container") + # end - def test_reload_loads - get(:reload) - assert_response :success - exp_size = [50, Report.count].min - assert_equal exp_size, assigns(:reports).size - end + # def test_reload_loads + # get(:reload) + # assert_response :success + # exp_size = [50, Report.count].min + # assert_equal exp_size, assigns(:reports).size + # end def test_reload_reads_count_param get(:reload, :per_page => 2) assert_response :success assert_equal 2, assigns(:reports).size end + + def test_create_iphone_report + post(:create, "reporter"=>{"profile_location"=>"Secaucus, NJ, United States", "name"=>"Oscarlpelaez@gmail.com", "latlon"=>"40.803,-74.057:1368", "uniqueid"=>"79103044a2ecc86761b01bd7f94686d6427d510c"}, + "format"=>"iphone", "polling_place"=>{"name"=>"Secaucus"}, + "report"=>{"rating"=>"100", "tag_string"=>"", "wait_time"=>"Less Than 5 Minutes", "text"=>""}) + assert_response :success + assert_equal "OK", @response.body + end end test/functional/reports_controller_test.rb @@ -17,12 +17,14 @@ class ReporterTest < ActiveSupport::TestCase assert_match /Arnold/, reporter.profile_location assert_nil reporter.followers_count assert_equal "VoteReport iPhone App", reporter.source_name - report = reporter.reports.create(:uniqueid => '829388202.292', :text => 'all is well in l:New York', :rating => '62', :tag_string => '#machine #registration', :latlon => '39.024,-76.511:2192') + report = reporter.reports.create(:text => 'all is well in l:New York', :rating => '62', :tag_string => '#machine #registration', :latlon => '39.024,-76.511:2192', + :polling_place => PollingPlace.create(:name => 'Elem School') ) assert_equal 1, reporter.reports.size assert_equal "New York, NY, USA", report.location.address assert_equal 62, report.rating assert_equal 2, report.tags.size assert_equal 2192, report.location_accuracy.to_i + assert report.uniqueid.ends_with?(report.id) end def test_android_reporter_creation @@ -35,7 +37,7 @@ class ReporterTest < ActiveSupport::TestCase assert_equal "Birmingham, AL, USA", report.location.address assert_equal 78, report.rating assert_equal 0, report.tags.size - assert report.uniqueid + assert report.uniqueid.ends_with?(report.id) # assert_equal 1400, report.location_accuracy end test/unit/reporter_test.rb e2459e5a734db62b774f85fab91d391edb19902e David Troy dave@popvox.com http://github.com/davetroy/votereport/commit/3d012bb2a7308117b68fad277bd4d2c3ddd41a49 3d012bb2a7308117b68fad277bd4d2c3ddd41a49 2008-11-04T05:38:54-08:00 2008-11-04T05:38:54-08:00 Fixing cache script 5e5c76bfdd0f51f55fe63994b55c6b7058a22b6e David Troy dave@popvox.com