doc/unused_css_selectors.csv public/files/pdfs/jobs/EOL_Marine_Species_Coordinator.pdf @@ -260,7 +260,7 @@ private # In order for AccountController to work with OpenID, we need to force it to use https when authenticating. def realm - return ENV['RAILS_ENV'] =~ /prod/ ? "https://#{request.host_with_port}" : "#{request.protocol + request.host_with_port}" + return $PRODUCTION_MODE ? "https://#{request.host_with_port}" : "#{request.protocol + request.host_with_port}" end end app/controllers/account_controller.rb @@ -245,18 +245,7 @@ end # expire a single non-species page fragment cache def expire_cache(page_name) - - pages=ContentPage.find_all_by_page_name(page_name) - - if pages.length > 0 - Language.find_active.each do |language| - pages.each do |page| - expire_fragment(:controller=>'/content',:part=>page.id.to_s + '_' + language.iso_639_1) - expire_fragment(:controller=>'/content',:part=>page.page_url + '_' + language.iso_639_1) - end - end - end - + expire_pages(ContentPage.find_all_by_page_name(page_name)) end # just clear all fragment caches quickly @@ -272,30 +261,14 @@ end # expire the header and footer caches def expire_menu_caches - - Language.find_active.each do |language| - expire_fragment(:controller=>'/content' ,:part => 'top_nav_'+language.iso_639_1) - expire_fragment(:controller=>'/content' ,:part => 'footer_'+language.iso_639_1) - expire_fragment(:controller=>'/content' ,:part => 'exemplars_'+language.iso_639_1) - end - + expire_pages(['top_nav', 'footer', 'exemplars']) end # expire the non-species page fragment caches def expire_caches - expire_menu_caches - pages=ContentPage.find_all_by_active(true) - - Language.find_active.each do |language| - pages.each do |page| - expire_fragment(:controller=>'/content',:part=>page.id.to_s + '_' + language.iso_639_1) - expire_fragment(:controller=>'/content',:part=>page.page_url + '_' + language.iso_639_1) - end - end - + expire_pages(ContentPage.find_all_by_active(true)) $CACHE_CLEARED_LAST=Time.now() - end # expire a list of taxa_ids specifed as an array app/controllers/application.rb @@ -119,7 +119,7 @@ class ContentController < ApplicationController # bit haywire since there are very few random taxa created by scenarios. num_tries = 0 while(num_tries < 30 and - ENV["RAILS_ENV"].downcase == 'production' and + $PRODUCTION_MODE and !explore_taxa.blank? and current_taxa.include?(explore_taxa.taxon_concept_id.to_s)) explore_taxa = RandomTaxon.random app/controllers/content_controller.rb @@ -4,6 +4,21 @@ require 'uri' # TODO - look these over. I'm not sure all of them are used, and those that are... perhaps not efficiently. module ApplicationHelper + def expire_pages(pages) + if pages.length > 0 + Language.find_active.each do |language| + pages.each do |page| + if page.class == ContentPage + expire_fragment(:controller => '/content', :part => "#{page.id.to_s }_#{language.iso_639_1}") + expire_fragment(:controller => '/content', :part => "#{page.page_url}_#{language.iso_639_1}") + else + expire_fragment(:controller => '/content', :part => "#{page}_#{language.iso_639_1}") + end + end + end + end + end + #this only applies to text attributions for now #author, source, copyright, and data supplier should be shown def has_hidden_attributions?(data_object) app/helpers/application_helper.rb @@ -4,9 +4,9 @@ class AgentContactRole < SpeciesSchemaModel has_many :agent_contacts def self.primary - YAML.load(Rails.cache.fetch('agent_contact_roles/primary') do - self.find_by_label('Primary Contact').to_yaml - end) + Rails.cache.fetch('agent_contact_roles/primary') do + self.find_by_label('Primary Contact') + end end end app/models/agent_contact_role.rb @@ -2,63 +2,63 @@ class ResourceStatus < SpeciesSchemaModel has_many :resources def self.uploading - YAML.load(Rails.cache.fetch('resource_statuses/uploading') do - self.find_by_label('Uploading').to_yaml - end) + Rails.cache.fetch('resource_statuses/uploading') do + self.find_by_label('Uploading') + end end def self.uploaded - YAML.load(Rails.cache.fetch('resource_statuses/uploaded') do - self.find_by_label('Uploaded').to_yaml - end) + Rails.cache.fetch('resource_statuses/uploaded') do + self.find_by_label('Uploaded') + end end def self.upload_failed - YAML.load(Rails.cache.fetch('resource_statuses/upload_failed') do - self.find_by_label('Upload Failed').to_yaml - end) + Rails.cache.fetch('resource_statuses/upload_failed') do + self.find_by_label('Upload Failed') + end end def self.moved_to_content_server - YAML.load(Rails.cache.fetch('resource_statuses/moved_to_content_server') do - self.find_by_label('Moved to Content Server').to_yaml - end) + Rails.cache.fetch('resource_statuses/moved_to_content_server') do + self.find_by_label('Moved to Content Server') + end end def self.validated - YAML.load(Rails.cache.fetch('resource_statuses/validated') do - self.find_by_label('Validated').to_yaml - end) + Rails.cache.fetch('resource_statuses/validated') do + self.find_by_label('Validated') + end end def self.validation_failed - YAML.load(Rails.cache.fetch('resource_statuses/validation_failed') do - self.find_by_label('Validation Failed').to_yaml - end) + Rails.cache.fetch('resource_statuses/validation_failed') do + self.find_by_label('Validation Failed') + end end def self.being_processed - YAML.load(Rails.cache.fetch('resource_statuses/being_processed') do - self.find_by_label('Being Processed').to_yaml - end) + Rails.cache.fetch('resource_statuses/being_processed') do + self.find_by_label('Being Processed') + end end def self.processed - YAML.load(Rails.cache.fetch('resource_statuses/processed') do - self.find_by_label('Processed').to_yaml - end) + Rails.cache.fetch('resource_statuses/processed') do + self.find_by_label('Processed') + end end def self.processing_failed - YAML.load(Rails.cache.fetch('resource_statuses/processing_failed') do - self.find_by_label('Processing Failed').to_yaml - end) + Rails.cache.fetch('resource_statuses/processing_failed') do + self.find_by_label('Processing Failed') + end end def self.published - YAML.load(Rails.cache.fetch('resource_statuses/published') do - self.find_by_label('Published').to_yaml - end) + Rails.cache.fetch('resource_statuses/published') do + self.find_by_label('Published') + end end end # == Schema Info app/models/resource_status.rb @@ -13,11 +13,7 @@ <div id="page-content" class="clearfix"> <!-- center page content --> <div id="full-page-content"> - <div id="open_id_instructions"> - Attention Flickr, Yahoo, SmugMug, Blogger, AOL users (and others) - <%= link_to 'you already have OpenID accounts', 'http://openid.net/get/',:target=>'_blank' %> and can now use - them to log into EOL directly! - </div> - + <div style="float: left; width: 550px;"> @@ -33,9 +29,31 @@ <%="or"[]%> <br /> <div id="openid"> + <a href="#" onclick="Element.toggle('open_id_instructions');return false;">You may already have an OpenID account</a> and, if so, can log into EOL immediately. <div id="open_id_instructions" style="display:none;"> + The following websites where you may already have an account act as OpenID providers. To use your existing account, find the website in the list below and then enter in the + sample OpenID login in the OpenID box below, replacing the <strong>bold</strong> text in the sample login with your specific username for that website. + <table class="results_table"> + <tr><th width="40%">Website</th><th>Sample OpenID login</th></tr> + <tr><td class="odd"><a href="http://www.aol.com"><img class="favicon" src="http://openid.net/wp-content/uploads/aol.png" alt="" /></a> AOL </td><td class="odd"> openid.aol.com/<strong>screenname</strong></td></tr> + <tr><td class="even"><a href="http://www.livejournal.com"><img class="favicon" src="http://www.myspace.com/favicon.ico" alt="" /></a> MySpace </td><td class="even"> myspace.com/<strong>username</strong></td></tr> + <tr><td class="odd"><a href="http://www.yahoo.com"><img class="favicon" src="http://www.yahoo.com/favicon.ico" alt="" /></a> Yahoo! </td><td class="odd"> me.yahoo.com/<strong>username</strong></td></tr> + <tr><td class="even"><a href="http://www.blogger.com"><img class="favicon" src="http://www.blogger.com/favicon.ico" alt="" /></a> Blogger </td><td class="even"> <strong>blogname</strong>.blogspot.com</td></tr> + <tr><td class="odd"><a href="http://www.flickr.com"><img class="favicon" src="http://www.flickr.com/favicon.ico" alt="" /></a> Flickr </td><td class="odd"> www.flickr.com/photos/<strong>username</strong></td></tr> + <tr><td class="even"><a href="http://www.livedoor.com"><img class="favicon" src="http://www.livedoor.com/favicon.ico" alt="" /></a> LiveDoor </td><td class="even"> profile.livedoor.com/<strong>username</strong></td></tr> + <tr><td class="odd"><a href="http://www.livejournal.com"><img class="favicon" src="http://www.livejournal.com/favicon.ico" alt="" /></a> LiveJournal </td><td class="odd"> <strong>username</strong>.livejournal.com</td></tr> + <tr><td class="even"><a class="favicon" href="http://www.smugmug.com"><img class="favicon" src="http://openid.net/wp-content/uploads/smugmug.png" alt="" /></a> SmugMug </td><td class="even"> <strong>username</strong>.smugmug.com</td></tr> + <tr><td class="odd"><a href="http://www.technorati.com"><img class="favicon" src="http://www.technorati.com/favicon.ico" alt="" /></a> Technorati </td><td class="odd"> technorati.com/people/technorati/<strong>username</strong></td></tr> + <tr><td class="even"><img src="http://openid.net/wp-content/uploads/vox.png" alt="" /></a> Vox </td><td class="even"> <strong>member</strong>.vox.com</td></tr> + <tr><td class="odd"><a href="http://www.wordpress.com"><img class="favicon" src="http://openid.net/wp-content/uploads/wordpress.png" alt="" /></a> WordPress.com </td><td class="odd"> <strong>username</strong>.wordpress.com</td></tr> + </table> + <br /> + <%= link_to 'Learn more about OpenID providers', 'http://openid.net/get/',:target=>'_blank' %> + <br /> <br /> + </div> + <label for="openid_url"><%= "OpenID"[] %></label> <%= text_field_tag 'openid_url', {},{:size=>100,:maxlength=>250,:class=>'openid'} %> - <%= link_to 'What is OpenID?', 'http://openid.net/',:target=>'_blank' %> | <%= link_to 'Do I already have an OpenID?', 'http://openid.net/get/',:target=>'_blank' %> + <%= link_to 'What is OpenID?', 'http://openid.net/',:target=>'_blank' %> | <a href="#" onclick="Element.toggle('open_id_instructions');return false;">How do I log in with OpenID?</a> </div> <br /> <table border="0" width="500" cellpadding="20"> app/views/account/login.html.erb @@ -75,6 +75,11 @@ Rails::Initializer.run do |config| # in the "environments" folder for the various environments (e.g. "production.rb") to see. # the following only generates assests1.eol.org or assets2.eol.org on up to any number specified below #config.action_controller.asset_host = "http://content0.eol.org" + + # We have a lot of production-like environments. To quickly test if we're in one, rather than parsing the ENV, + # you may check $PRODUCTION_MODE. + $PRODUCTION_MODE = true if ENV['RAILS_ENV'] and + ['production', 'staging', 'siproduction', 'failover', 'preview'].include?(ENV['RAILS_ENV'].downcase) # THIS IS WHERE ALL THE IMAGES/VIDEOS LIVE: $CONTENT_SERVERS = ['http://content1.eol.org/', 'http://content2.eol.org/', 'http://content3.eol.org/', 'http://content4.eol.org/', 'http://content5.eol.org/', @@ -207,5 +212,9 @@ begin rescue LoadError end +if ENV['BLEAK'] + require 'bleak_house' +end + # load the system configuration require File.dirname(__FILE__) + '/system' if File.file?(File.dirname(__FILE__) + '/system.rb') config/environment.rb @@ -32,8 +32,8 @@ end class ActiveRecord::Migration def self.not_okay_in_production # Perhaps not the right error class to throw, but I'm not aware of good alternatives: - raise ActiveRecord::IrreversibleMigration.new("It is not okay to run this migration on a production database.") if - ENV['RAILS_ENV'] =~ /prod/i + raise ActiveRecord::IrreversibleMigration.new("It is not okay to run this migration on a production database.") unless + $PRODUCTION_MODE end end lib/core_extensions.rb 2dccdd75155433e1bebb0c6849e6b88fb0d71b87 jrice jrice@78829999-583a-0410-bd01-8a9b849fd409 http://github.com/eol/eol/commit/46cdbb7dd57c464adf5629783a02436006b0ef65 46cdbb7dd57c464adf5629783a02436006b0ef65 2009-06-29T09:01:48-07:00 2009-06-29T09:01:48-07:00 Merge with 2.10 (.2), adding a pdf (I think), fixing a bug with RAILS_ENV checks, and refactoring some of the caching code (duplicated code). git-svn-id: file:///data/subversion/eol/trunk@791 78829999-583a-0410-bd01-8a9b849fd409 c5b561eaced32f2e3381f736cf577909878c5a9a jrice jrice@78829999-583a-0410-bd01-8a9b849fd409