lib/exvo_helpers/helpers.rb in exvo_helpers-0.6.1 vs lib/exvo_helpers/helpers.rb in exvo_helpers-0.6.2

- old
+ new

@@ -3,28 +3,24 @@ module Helpers # Dynamically define class methods class << self - %w(auth budget cdn cfs desktop themes blog contacts inbox music pics preview).each do |service| + %w(auth budget cdn cfs desktop themes contacts inbox music pics preview).each do |service| # def self.cdn_uri # protocol = 'http://' # 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 + # protocol + cdn_host # end define_method "#{service}_uri" do protocol = 'http://' # explicit https protocol = 'https://' if %w(auth budget 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 + protocol + send("#{service}_host") end # def self.cdn_host # @@cdn_host ||= ENV['CDN_HOST'] || default_opts[env.to_sym][:cdn_host] # end @@ -186,63 +182,59 @@ { :production => { :auth_debug => false, :auth_host => 'auth.exvo.com', :sso_cookie_domain => 'exvo.com', - :budget_host => 'budget.exvo.com', + :budget_host => 'www.exvo.com', :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' }, :staging => { :auth_debug => false, :auth_host => 'auth.exvo.co', :sso_cookie_domain => 'exvo.co', - :budget_host => 'budget.exvo.co', + :budget_host => 'www.exvo.co', :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' }, :development => { :auth_debug => false, :auth_host => 'auth.exvo.local', :sso_cookie_domain => 'exvo.local', - :budget_host => 'budget.exvo.local', + :budget_host => 'www.exvo.local', :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' }, :test => { :auth_debug => false, :auth_host => 'auth.exvo.local', :sso_cookie_domain => 'exvo.local', - :budget_host => 'budget.exvo.local', + :budget_host => 'www.exvo.local', :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'