fanforce 0.5.5 → 0.5.6

data/lib/fanforce/version.rb

@@ -1,3 +1,3 @@
 class Fanforce
-  VERSION = '0.5.5'
+  VERSION = '0.5.6'
 end

data/lib/ff_globals.rb

@@ -1,14 +1,15 @@
 if !ENV['RACK_ENV'] or ENV['RACK_ENV'] == 'development'
-  $BASE_DOMAIN    = ENV['FANFORCE_GEM_BASE_DOMAIN'] || 'fanforce.gg'
-  $APP_DOMAIN     = ENV['FANFORCE_GEM_APP_DOMAIN']  || 'app.' + $BASE_DOMAIN
-  $API_DOMAIN     = ENV['FANFORCE_GEM_API_DOMAIN']  || 'api.' + $BASE_DOMAIN
-  $I_DOMAIN       = ENV['FANFORCE_GEM_I_DOMAIN']    || 'i.' + $BASE_DOMAIN
+  top_level_domain = ENV['FANFORCE_GEM_TOP_LEVEL_DOMAIN'] || 'gg'
+  $BASE_DOMAIN    = 'fanforce.' + top_level_domain
+  $APP_DOMAIN     = $BASE_DOMAIN
+  $API_DOMAIN     = $BASE_DOMAIN
+  $I_DOMAIN       = $BASE_DOMAIN
   $WEBSITE_DOMAIN = $BASE_DOMAIN
 
-  $SMARTURL_DOMAIN  = 'fanforc.gg'
-  $FF_PLUGIN_DOMAIN = 'ffplugin.gg'
-  $FF_APP_DOMAIN    = 'ffapp.gg'
-  $FF_WIDGET_DOMAIN = 'ffwidget.gg'
+  $SMARTURL_DOMAIN  = 'fanforc.'  + top_level_domain
+  $FF_PLUGIN_DOMAIN = 'ffplugin.' + top_level_domain
+  $FF_APP_DOMAIN    = 'ffapp.'    + top_level_domain
+  $FF_WIDGET_DOMAIN = 'ffwidget.' + top_level_domain
 
   $DEVS_DOMAIN = 'technical%40mobilizationlabs.com:zE27fdevelopers@developers-fanforce.dotcloud.com' # or localhost:3000'
 
@@ -17,10 +18,10 @@ if !ENV['RACK_ENV'] or ENV['RACK_ENV'] == 'development'
   $PUSHER_SECRET = '3169163d2e27de9a2291'
 
 elsif ENV['RACK_ENV'] == 'test'
-  $BASE_DOMAIN    = ENV['FANFORCE_GEM_BASE_DOMAIN'] || 'fanforce.gg'
-  $APP_DOMAIN     = ENV['FANFORCE_GEM_APP_DOMAIN']  || 'app.' + $BASE_DOMAIN
-  $API_DOMAIN     = ENV['FANFORCE_GEM_API_DOMAIN']  || 'api.' + $BASE_DOMAIN
-  $I_DOMAIN       = ENV['FANFORCE_GEM_I_DOMAIN']    || 'i.' + $BASE_DOMAIN
+  $BASE_DOMAIN    = 'fanforce.gg'
+  $APP_DOMAIN     = 'app.' + $BASE_DOMAIN
+  $API_DOMAIN     = 'api.' + $BASE_DOMAIN
+  $I_DOMAIN       = 'i.'   + $BASE_DOMAIN
   $WEBSITE_DOMAIN = $BASE_DOMAIN
 
   $SMARTURL_DOMAIN  = 'fanforc.gg'
@@ -35,10 +36,10 @@ elsif ENV['RACK_ENV'] == 'test'
   $PUSHER_SECRET = '61c760c05430e68d7e8d'
 
 elsif ENV['RACK_ENV'] == 'qa'
-  $BASE_DOMAIN    = ENV['FANFORCE_GEM_BASE_DOMAIN'] || 'fanforce-qa.com'
-  $APP_DOMAIN     = ENV['FANFORCE_GEM_APP_DOMAIN']  || 'app.' + $BASE_DOMAIN
-  $API_DOMAIN     = ENV['FANFORCE_GEM_API_DOMAIN']  || 'api.' + $BASE_DOMAIN
-  $I_DOMAIN       = ENV['FANFORCE_GEM_I_DOMAIN']    || 'i.' + $BASE_DOMAIN
+  $BASE_DOMAIN    = 'fanforce-qa.com'
+  $APP_DOMAIN     = 'app.' + $BASE_DOMAIN
+  $API_DOMAIN     = 'api.' + $BASE_DOMAIN
+  $I_DOMAIN       = 'i.'   + $BASE_DOMAIN
   $WEBSITE_DOMAIN = $BASE_DOMAIN
 
   $SMARTURL_DOMAIN  = 'fanforc.us'
@@ -53,10 +54,10 @@ elsif ENV['RACK_ENV'] == 'qa'
   $PUSHER_SECRET = '7bfba2003df078ca64e9'
 
 elsif ENV['RACK_ENV'] == 'production'
-  $BASE_DOMAIN    = ENV['FANFORCE_GEM_BASE_DOMAIN'] || 'fanforce.com'
-  $APP_DOMAIN     = ENV['FANFORCE_GEM_APP_DOMAIN']  || 'app.' + $BASE_DOMAIN
-  $API_DOMAIN     = ENV['FANFORCE_GEM_API_DOMAIN']  || 'api.' + $BASE_DOMAIN
-  $I_DOMAIN       = ENV['FANFORCE_GEM_I_DOMAIN']    || 'i.' + $BASE_DOMAIN
+  $BASE_DOMAIN    = 'fanforce.com'
+  $APP_DOMAIN     = 'app.' + $BASE_DOMAIN
+  $API_DOMAIN     = 'api.' + $BASE_DOMAIN
+  $I_DOMAIN       = 'i.'   + $BASE_DOMAIN
   $WEBSITE_DOMAIN = $BASE_DOMAIN
 
   $SMARTURL_DOMAIN  = 'fanforce.io'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors: