fanforce-app-factory 0.16.1 → 0.17.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWIxYmI1ZGI0YTg0MTQ2YzY0MzAyY2NmZjVlZDQ3ZGIzY2YyNTM2MQ==
+    YjQyNjQxMmRhYTg1MGY3YzQ3ZjEwNzMwM2Y4MjBjM2QzZDEzYjBlNg==
   data.tar.gz: !binary |-
-    NDcyN2ZiZGM1M2Q0YjZhYzc1YWNkMWUzMTlkZDA5MmY1MTg3YjQ3Nw==
+    MWM4MmExNGM5MmIzMDdhZWIyOWMxYzM5NzMzMWZmZWI2NTdkYjJkYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjJiMTJjODc0Y2FjNGJmMjRiNTYyZjc2NTQzOTQzOTJlMGJjYWEyMjViNDZm
-    ZTIyOTU2N2JjM2Y5MmY3MWIzMDY0ZDg1ZjZiNjFiZjEyMDRjMjk5ZGRiNDlk
-    NTc4YTE0OTZmMDg4ZTJkMWRhYzQ1MDRiNmMyZWZiZTRlYjA4MDI=
+    M2I4MTUzOTUyMzczYzUwNTc2ZDJiNDMwNGJjYmVlNjdmMzRiM2I0OWFlZTRh
+    ZWQxZGU3YzQ1YjNkNDQ5NWFkNzU5NDhhYjI5ZTQ3MTAzYTZjNzNkZGI4NjZl
+    NmFiZWJlNmQ5ZmRhZjlhY2VjNDEzOGU1YjkwYTRhYzNmNGQyNzk=
   data.tar.gz: !binary |-
-    MDYyMzQ3NWYzMjRlNTg0NTViNmZiODMwNzllYjY1YTE0MjVlMGVhNjY2MTkw
-    ZjMwMDYzMDliYzg0NDFiZjhkNzZjNTk1Mjk0ZTlkMGUwMDAzOGU5YzY3MDNk
-    ZjVkNGYwODQ5NWUxZjRmNDcwNDBkM2VhNTdlZWVhMjQ3YTllMjM=
+    YmEzZWM2ZjM0ZGM3ZDA0Yjc5Njk5NzZlMjVmNzFiOTA4ZWM5ZDdlOGE2MjRj
+    YjJhNWVkZjZlY2JiMDhjMjcyMjg2MDlkOWQ2M2JmOWZkZTBiMjYyNmZmMWYy
+    MDcxM2RkYjc2Y2RmZGNiZWYwYTZkYmQ1MGFiNTdiZmJmNTI4YTM=

data/fanforce-app-factory.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'bugsnag', '~> 1.3'
   gem.add_runtime_dependency 'rack-jsonr', '~> 0.2'
 
-  gem.add_runtime_dependency 'fanforce-api', '~> 0.11'
+  gem.add_runtime_dependency 'fanforce-api', '~> 0.12'
   gem.add_runtime_dependency 'fanforce-errors', '~> 0.3'
-  gem.add_runtime_dependency 'fanforce-workers', '~> 0.7'
+  gem.add_runtime_dependency 'fanforce-workers', '~> 0.8'
 end

data/lib/fanforce/app_factory.rb

@@ -56,7 +56,7 @@ module FanforceApp
     FanforceApp::Sinatra.new.call(env)
   end
 
+  require 'fanforce/domains'
   require_relative 'app_factory/config/core_config'
-  require_relative 'app_factory/initializers/ff_globals'
 end
 

data/lib/fanforce/app_factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   module AppFactory
-    VERSION = '0.16.1'
+    VERSION = '0.17.0'
   end
 end

data/lib/fanforce/domains.rb

@@ -0,0 +1,45 @@
+module Fanforce
+
+  if ENV['RACK_ENV'] == 'development'
+    TOP_LEVEL_DOMAIN  = ENV['FANFORCE_GEM_TOP_LEVEL_DOMAIN'] || 'gg'
+    BASE_DOMAIN       = ENV['FANFORCE_GEM_BASE_DOMAIN'] || 'fanforce.' + TOP_LEVEL_DOMAIN
+    SMARTURL_DOMAIN   = 'fanforc.gg'
+    FF_APP_DOMAIN     = 'ffapp.gg'
+    FF_PLUGIN_DOMAIN  = 'ffplugin.gg'
+    FF_WIDGET_DOMAIN  = 'ffwidget.gg'
+
+  elsif ENV['RACK_ENV'] == 'test'
+    BASE_DOMAIN       = 'fanforce.gg'
+    SMARTURL_DOMAIN   = 'fanforc.gg'
+    FF_APP_DOMAIN     = 'ffapp.gg'
+    FF_PLUGIN_DOMAIN  = 'ffplugin.gg'
+    FF_WIDGET_DOMAIN  = 'ffwidget.gg'
+
+  elsif ENV['RACK_ENV'] == 'staging'
+    BASE_DOMAIN       = 'fanforce-staging.com'
+    SMARTURL_DOMAIN   = 'fanforc.us'
+    FF_APP_DOMAIN     = 'ffapp.us'
+    FF_PLUGIN_DOMAIN  = 'ffplugin.us'
+    FF_WIDGET_DOMAIN  = 'ffwidget.us'
+
+  elsif ENV['RACK_ENV'] == 'production'
+    BASE_DOMAIN       = 'fanforce.com'
+    SMARTURL_DOMAIN   = 'fanforce.io'
+    FF_APP_DOMAIN     = 'ffapp.io'
+    FF_PLUGIN_DOMAIN  = 'ffplugin.io'
+    FF_WIDGET_DOMAIN  = 'ffwidget.io'
+  end
+
+  API_DOMAIN           = 'api.' + BASE_DOMAIN
+  I_DOMAIN             = 'i.' + BASE_DOMAIN
+  WEBSITE_DOMAIN       = BASE_DOMAIN
+  DEVELOPERS_DOMAIN    = 'developers.' + BASE_DOMAIN
+  CONTROLLER_DOMAIN    = 'controller.' + BASE_DOMAIN
+  ADDON_MANAGEMENT_URL = CONTROLLER_DOMAIN + '/db'
+
+  # these should be moved to edition
+  APP_DOMAIN           = 'app.' + BASE_DOMAIN
+  SIGNUP_DOMAIN        = 'signup.' + BASE_DOMAIN
+  MARKETPLACE_DOMAIN   = 'appstore.' + BASE_DOMAIN
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-app-factory
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.17.0
 platform: ruby
 authors:
 - Caleb Clark
@@ -282,14 +282,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: fanforce-errors
   requirement: !ruby/object:Gem::Requirement
@@ -310,14 +310,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 description: 
 email:
 - cclark@fanforce.com
@@ -380,7 +380,6 @@ files:
 - lib/fanforce/app_factory/config/helpers/assets.rb
 - lib/fanforce/app_factory/config/helpers/fanforce.rb
 - lib/fanforce/app_factory/config/helpers/json.rb
-- lib/fanforce/app_factory/initializers/ff_globals.rb
 - lib/fanforce/app_factory/layouts/dashboard.haml
 - lib/fanforce/app_factory/layouts/promotional.haml
 - lib/fanforce/app_factory/public/favicon.ico
@@ -391,6 +390,7 @@ files:
 - lib/fanforce/app_factory/views/dashboard.haml
 - lib/fanforce/app_factory/views/index.haml
 - lib/fanforce/app_factory_workers.rb
+- lib/fanforce/domains.rb
 homepage: http://github.com/mlabs/fanforce-app-factory
 licenses: []
 metadata: {}

data/lib/fanforce/app_factory/initializers/ff_globals.rb

@@ -1,33 +0,0 @@
-if ENV['RACK_ENV'] == 'development'
-  $BASE_DOMAIN  = 'fanforce.gg'
-  $SMARTURL_DOMAIN  = 'fanforc.gg'
-  $FF_PLUGIN_DOMAIN = 'ffplugin.gg'
-  $FF_APP_DOMAIN    = 'ffapp.gg'
-  $FF_WIDGET_DOMAIN = 'ffwidget.gg'
-
-elsif ENV['RACK_ENV'] == 'test'
-  $BASE_DOMAIN      = 'fanforce.gg'
-  $SMARTURL_DOMAIN  = 'fanforc.gg'
-  $FF_PLUGIN_DOMAIN = 'ffplugin.gg'
-  $FF_WIDGET_DOMAIN = 'ffwidget.gg'
-  $FF_APP_DOMAIN    = 'ffapp.gg'
-
-elsif ENV['RACK_ENV'] == 'staging'
-  $BASE_DOMAIN      = 'fanforce-staging.com'
-  $SMARTURL_DOMAIN  = 'fanforc.us'
-  $FF_PLUGIN_DOMAIN = 'ffplugin.us'
-  $FF_APP_DOMAIN    = 'ffapp.us'
-  $FF_WIDGET_DOMAIN = 'ffwidget.us'
-
-elsif ENV['RACK_ENV'] == 'production'
-  $BASE_DOMAIN      = 'fanforce.com'
-  $SMARTURL_DOMAIN  = 'fanforce.io'
-  $FF_PLUGIN_DOMAIN = 'ffplugin.io'
-  $FF_APP_DOMAIN    = 'ffapp.io'
-  $FF_WIDGET_DOMAIN = 'ffwidget.io'
-end
-
-$APP_DOMAIN     = 'app.' + $BASE_DOMAIN
-$API_DOMAIN     = 'api.' + $BASE_DOMAIN
-$I_DOMAIN       = 'i.' + $BASE_DOMAIN
-$WEBSITE_DOMAIN = $BASE_DOMAIN