lib/exvo_helpers/helpers.rb in exvo_helpers-0.5.3 vs lib/exvo_helpers/helpers.rb in exvo_helpers-0.6.0
- old
+ new
@@ -3,29 +3,24 @@
module Helpers
# Dynamically define class methods
class << self
- %w(auth budget cdn cfs desktop themes blog contacts inbox music pics preview store).each do |service|
+ %w(auth budget cdn cfs desktop themes blog contacts inbox music pics preview).each do |service|
# def self.cdn_uri
# protocol = 'http://'
- # protocol = 'https://' if (service == "auth" && auth_require_ssl) || (service == "budget" && budget_require_ssl)
- # protocol = '//' if ["cdn", "cfs", "themes"].include?(service) && env.to_sym == :production
+ # protocol = 'https://' if %w(auth budget cdn cfs themes).include?(service) && env.to_sym == :production
# suffix = '/blog' if service == "blog"
# protocol + cdn_host + suffix.to_s
# end
define_method "#{service}_uri" do
protocol = 'http://'
- # explicit https for auth & budget
- protocol = 'https://' if (service == "auth" && send(:auth_require_ssl)) || (service == "budget" && send(:budget_require_ssl))
+ # explicit https
+ protocol = 'https://' if %w(auth budget cdn cfs themes).include?(service) && env.to_sym == :production
- # special link starting with '//' in production so that the webserver can choose between HTTP and HTTPS
- # but only for those apps/services that have proper SSL support (i.e. valid certificates)
- protocol = '//' if ["cdn", "cfs", "themes"].include?(service) && env.to_sym == :production
-
# blog now lives at http://www.exvo.com/blog, so adding '/blog' suffix is required
suffix = '/blog' if service == "blog"
protocol + send("#{service}_host") + suffix.to_s
end
@@ -58,11 +53,11 @@
# AUTH
# Dynamically define class methods
class << self
- %w(debug require_ssl).each do |option|
+ %w(debug).each do |option|
# def self.auth_debug
# return @@auth_debug if defined?(@@auth_debug) && !@@auth_debug.nil?
# value = true if ENV["AUTH_DEBUG"] =~ /true/i
# value = false if ENV["AUTH_DEBUG"] =~ /false/i
@@ -167,47 +162,10 @@
end
end
- # BUDGET
-
- # Dynamically define class methods
- class << self
-
- %w(require_ssl).each do |option|
-
- # def self.budget_require_ssl
- # return @@budget_require_ssl if defined?(@@budget_require_ssl) && !@@budget_require_ssl.nil?
- # value = true if ENV["BUDGET_REQUIRE_SSL"] =~ /true/i
- # value = false if ENV["BUDGET_REQUIRE_SSL"] =~ /false/i
- # value = default_opts[env.to_sym]["budget_require_ssl".to_sym] if value.nil?
- # @@budget_require_ssl = value
- # end
- define_method "budget_#{option}" do
- if class_variable_defined?("@@budget_#{option}") and !class_variable_get("@@budget_#{option}").nil?
- class_variable_get("@@budget_#{option}")
- else
- value = true if ENV["BUDGET_#{option.upcase}"] =~ /true/i
- value = false if ENV["BUDGET_#{option.upcase}"] =~ /false/i
- value = default_opts[env.to_sym]["budget_#{option}".to_sym] if value.nil?
- class_variable_set("@@budget_#{option}", value)
- end
- end
-
- # def self.budget_require_ssl=(debug)
- # @@budget_require_ssl = debug
- # end
- define_method "budget_#{option}=" do |value|
- class_variable_set("@@budget_#{option}", value)
- end
-
- end
-
- end
-
-
# ENV
# by default fall back to production; this way the omniauth-exvo's gem specs can pass
# (they depend on this gem and on env, but nor Rails nor Merb is defined there)
def self.env
@@ -227,81 +185,69 @@
def self.default_opts
{
:production => {
:auth_debug => false,
:auth_host => 'auth.exvo.com',
- :auth_require_ssl => true,
:sso_cookie_domain => 'exvo.com',
:budget_host => 'budget.exvo.com',
- :budget_require_ssl => true,
:cdn_host => 'd33gjlr95u9pgf.cloudfront.net', # cloudfront.net so we can use https (cdn.exvo.com via https does not work properly)
:cfs_host => 'cfs.exvo.com',
:desktop_host => 'home.exvo.com',
:themes_host => 'themes.exvo.com',
:blog_host => 'www.exvo.com',
:contacts_host => 'contacts.exvo.com',
:inbox_host => 'inbox.exvo.com',
:music_host => 'music.exvo.com',
:pics_host => 'pics.exvo.com',
- :preview_host => 'preview.exvo.com',
- :store_host => 'store.exvo.com'
+ :preview_host => 'preview.exvo.com'
},
:staging => {
:auth_debug => false,
:auth_host => 'auth.exvo.co',
- :auth_require_ssl => false,
:sso_cookie_domain => 'exvo.co',
:budget_host => 'budget.exvo.co',
- :budget_require_ssl => false,
:cdn_host => 'd1by559a994699.cloudfront.net',
:cfs_host => 'cfs.exvo.co',
:desktop_host => 'home.exvo.co',
:themes_host => 'themes.exvo.co',
:blog_host => 'www.exvo.co',
:contacts_host => 'contacts.exvo.co',
:inbox_host => 'inbox.exvo.co',
:music_host => 'music.exvo.co',
:pics_host => 'pics.exvo.co',
- :preview_host => 'preview.exvo.co',
- :store_host => 'store.exvo.co'
+ :preview_host => 'preview.exvo.co'
},
:development => {
:auth_debug => false,
:auth_host => 'auth.exvo.local',
- :auth_require_ssl => false,
:sso_cookie_domain => 'exvo.local',
:budget_host => 'budget.exvo.local',
- :budget_require_ssl => false,
:cdn_host => 'home.exvo.local',
:cfs_host => 'cfs.exvo.local',
:desktop_host => 'home.exvo.local',
:themes_host => 'themes.exvo.local',
:blog_host => 'www.exvo.local',
:contacts_host => 'contacts.exvo.local',
:inbox_host => 'inbox.exvo.local',
:music_host => 'music.exvo.local',
:pics_host => 'pics.exvo.local',
- :preview_host => 'preview.exvo.local',
- :store_host => 'store.exvo.local'
+ :preview_host => 'preview.exvo.local'
},
:test => {
:auth_debug => false,
:auth_host => 'auth.exvo.local',
- :auth_require_ssl => false,
:sso_cookie_domain => 'exvo.local',
:budget_host => 'budget.exvo.local',
- :budget_require_ssl => false,
:cdn_host => 'home.exvo.local',
:cfs_host => 'cfs.exvo.local',
:desktop_host => 'home.exvo.local',
:themes_host => 'themes.exvo.local',
:blog_host => 'www.exvo.local',
:contacts_host => 'contacts.exvo.local',
:inbox_host => 'inbox.exvo.local',
:music_host => 'music.exvo.local',
:pics_host => 'pics.exvo.local',
- :preview_host => 'preview.exvo.local',
- :store_host => 'store.exvo.local'
+ :preview_host => 'preview.exvo.local'
}
}
end
end