Permalink
Browse files

CLC-823 Timeshift the up-next feed; fix JSON exception in fake proxy …

…when response is empty
  • Loading branch information...
1 parent 5ccea50 commit b493a80530cfc62dee204a03f99d7c8ad74c18c1 Chris Tweney committed Dec 19, 2012
Showing with 117 additions and 471 deletions.
  1. +8 −0 config/initializers/timeshift.rb
  2. +108 −470 fixtures/pretty_vcr_recordings/Google.json
  3. +1 −1 lib/proxies/fakeable_proxy.rb
@@ -10,10 +10,18 @@
":::TWENTY_SEVEN_DAYS_AGO:::" => today.advance(:days => -27).rfc3339,
":::TWO_DAYS_AGO_MIDNIGHT_PST:::" => today.advance(:days => -1, :minutes => -1).rfc3339,
":::TODAY_MIDNIGHT_PST:::" => today.rfc3339,
+ ":::TODAY_MIDNIGHT_GMT:::" => Date.today.to_datetime.rfc3339,
+ ":::TOMORROW_MIDNIGHT_GMT:::" => Date.today.to_datetime.advance(:days => 1).rfc3339,
":::TODAY_AT_TEA_TIME:::" => today.advance(:hours => 15, :minutes => 47, :seconds => 13).rfc3339,
":::TWO_DAYS_HENCE:::" => today.advance(:days => 2).rfc3339,
":::THREE_DAYS_HENCE:::" => today.advance(:days => 3).rfc3339,
":::SIX_DAYS_HENCE:::" => today.advance(:days => 6).rfc3339,
+ ":::TODAY_NINE:::" => today.advance(:hours => 9, :minutes => 00, :seconds => 00).rfc3339,
+ ":::TODAY_TEN:::" => today.advance(:hours => 10, :minutes => 00, :seconds => 00).rfc3339,
+ ":::TODAY_LUNCHTIME:::" => today.advance(:hours => 12, :minutes => 30, :seconds => 00).rfc3339,
+ ":::TODAY_AFTER_LUNCH:::" => today.advance(:hours => 14, :minutes => 00, :seconds => 00).rfc3339,
+ ":::TODAY_THREE_THIRTY:::" => today.advance(:hours => 15, :minutes => 30, :seconds => 00).rfc3339,
+ ":::TODAY_FOUR_THIRTY:::" => today.advance(:hours => 16, :minutes => 30, :seconds => 00).rfc3339,
}
Rails.logger.info "Timeshifter: Today = #{today}; epoch = #{today.to_i}"
Oops, something went wrong.

0 comments on commit b493a80

Please sign in to comment.