fanforce 0.15.0 → 0.16.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTI2ZWIwNWRjZmQxZTcyZDkzN2EzZjFhYzQ4NjhkNDI0YjI2ZjFiMA==
+    NjM2Y2M3NDg1OTRkNWY1NGVjODcwZjE0NDFkMTg4YjdkNDEzYTE5OA==
   data.tar.gz: !binary |-
-    OTYxMzkwZmNhNTdhZTI5NjVlMWU5MjAyZjc3MzNmMzQxN2Q2YzJlOA==
+    ZDYzNzlkYWQwNGY1Y2RkNTg4NWI1OTNhZjUxNmMwZDU2NjZmMzU5Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODNkOWNiMzRmYTI0NzI3Y2RiOGQ4YTYxMmEyNGJmODQ0Mjg5MTE3ODgwYjE4
-    ZTQzMzg3YTdiOGJkNGRkNzgzODE5YzViMDJmZWNjZGU0ODE3NWI4ZDk3MDg1
-    ZmQ1NTY1N2Q2ZjJmZjlhMTIxM2RhYWE5MWZhYWQyNmJhYThkZDc=
+    YzVkMjIzNzQ5MjcwODU4MjhmNTc2ZjVjOTVjM2E4NzkzMmE1YjMyMjgzNWVi
+    ZTc0OWU5NmE2OTk2YTgzNzgwMzAyN2I1NjI5MDNkZDhhMmYwOWM3ODczMjA0
+    YWQ2M2M5NDYxMmU3MWFiNzVmN2UwM2VlZWYxZjU0MjFmZDQ3NmM=
   data.tar.gz: !binary |-
-    NjUwNDkyNGRjMmFhOTFiNzA5OWIwMTZlZGNjZjhmNWFmZmU1NGQ1MDk0MjQ4
-    OTVlM2UxODdkNDBmNDY3YWRhOTg0MmI5ODU5NjE3ZjIxZjk4MGM3YTY4YmQy
-    YmVmNjg1NzUwNTlkZWJjNDRmZDRkNjJiOTJkYTJmOTBmOWFkMmY=
+    MDZmYjI1YmE5OTg0MzdmYzI4MWU4MmRmM2Y4N2U2NTVhNGYxYWFjZDkyNjVi
+    NTM1ZWEwOTgyYTA3MTNlMzlhMDAzYmM0YjkxYTIxMmNiNzYxNWU4MTBlZjVh
+    NjQ3OWE1OGE5NDdlYzIxYzJlYzlmMWVkMTA3MGNkNjU0MTlmNzY=

data/lib/fanforce/_base.rb

@@ -3,63 +3,5 @@ require_relative 'utils'
 
 class Fanforce
   include Fanforce::Utils
-
-  def self.base_domain
-    Fanforce::Domains.method(ENV['RACK_ENV'] || 'development').call[:base]
-  end
-
-  def self.default_short_domain
-    Fanforce::Domains.method(ENV['RACK_ENV'] || 'development').call[:default_short_domain]
-  end
-
-  def self.apps_base_domain
-    Fanforce::Domains.method(ENV['RACK_ENV'] || 'development').call[:apps_base]
-  end
-
-  def self.plugins_base_domain
-    Fanforce::Domains.method(ENV['RACK_ENV'] || 'development').call[:plugins_base]
-  end
-
-  def self.widgets_base_domain
-    Fanforce::Domains.method(ENV['RACK_ENV'] || 'development').call[:widgets_base]
-  end
-
-  def self.api_domain
-    'api.' + base_domain
-  end
-
-  def self.eye_domain
-    'i.' + base_domain
-  end
-
-  def self.website_domain
-    'www.' + base_domain
-  end
-
-  def self.developers_domain
-    'developers.' + base_domain
-  end
-
-  def self.controller_domain
-    'controller.' + base_domain
-  end
-
-  def self.addon_management_url
-    controller_domain + '/db'
-  end
-
-  # these should be moved to edition
-
-  def self.app_domain
-    'app.' + base_domain
-  end
-
-  def self.signup_domain
-    'signup.' + base_domain
-  end
-
-  def self.marketplace_domain
-    'marketplace.' + base_domain
-  end
-
+  include Fanforce::Domains
 end

data/lib/fanforce/domain_environments.rb

@@ -0,0 +1,44 @@
+module Fanforce::DomainEnvironments
+
+  def self.development
+    base_domain = (ENV['FANFORCE_GEM_TOP_LEVEL_DOMAIN'] || 'gg')
+    {
+        :base                 => ENV['FANFORCE_GEM_BASE_DOMAIN'] || "fanforce.#{base_domain}",
+        :default_short_domain => ENV['FANFORCE_GEM_DEFAULT_SHORT_DOMAIN'] || "fanforc.#{base_domain}",
+        :apps_base            => ENV['FANFORCE_GEM_APPS_BASE_DOMAIN']     || "ffapp.#{base_domain}",
+        :plugins_base         => ENV['FANFORCE_GEM_PLUGINS_BASE_DOMAIN']  || "ffplugin.#{base_domain}",
+        :widgets_base         => ENV['FANFORCE_GEM_WIDGETS_BASE_DOMAIN']  || "ffwidget.#{base_domain}"
+    }
+  end
+
+  def self.test
+    {
+      :base                 => 'fanforce.gg',
+      :default_short_domain => 'fanforc.gg',
+      :apps_base            => 'ffapp.gg',
+      :plugins_base         => 'ffplugin.gg',
+      :widgets_base         => 'ffwidget.gg'
+    }
+  end
+
+  def self.staging
+    {
+        :base                 => 'fanforce-staging.com',
+        :default_short_domain => 'fanforc.us',
+        :apps_base            => 'ffapp.us',
+        :plugins_base         => 'ffplugin.us',
+        :widgets_base         => 'ffwidget.us'
+    }
+  end
+
+  def self.production
+    {
+        :base                 => 'fanforce.com',
+        :default_short_domain => 'fanforce.io',
+        :apps_base            => 'ffapp.io',
+        :plugins_base         => 'ffplugin.io',
+        :widgets_base         => 'ffwidget.io'
+    }
+  end
+
+end

data/lib/fanforce/domains.rb

@@ -1,44 +1,67 @@
-module Fanforce::Domains
-
-  def self.development
-    base_domain = (ENV['FANFORCE_GEM_TOP_LEVEL_DOMAIN'] || 'gg')
-    {
-        :base                 => ENV['FANFORCE_GEM_BASE_DOMAIN'] || "fanforce.#{base_domain}",
-        :default_short_domain => ENV['FANFORCE_GEM_DEFAULT_SHORT_DOMAIN'] || "fanforc.#{base_domain}",
-        :apps_base            => ENV['FANFORCE_GEM_APPS_BASE_DOMAIN']     || "ffapp.#{base_domain}",
-        :plugins_base         => ENV['FANFORCE_GEM_PLUGINS_BASE_DOMAIN']  || "ffplugin.#{base_domain}",
-        :widgets_base         => ENV['FANFORCE_GEM_WIDGETS_BASE_DOMAIN']  || "ffwidget.#{base_domain}"
-    }
-  end
-
-  def self.test
-    {
-      :base                 => 'fanforce.gg',
-      :default_short_domain => 'fanforc.gg',
-      :apps_base            => 'ffapp.gg',
-      :plugins_base         => 'ffplugin.gg',
-      :widgets_base         => 'ffwidget.gg'
-    }
-  end
-
-  def self.staging
-    {
-        :base                 => 'fanforce-staging.com',
-        :default_short_domain => 'fanforc.us',
-        :apps_base            => 'ffapp.us',
-        :plugins_base         => 'ffplugin.us',
-        :widgets_base         => 'ffwidget.us'
-    }
-  end
-
-  def self.production
-    {
-        :base                 => 'fanforce.com',
-        :default_short_domain => 'fanforce.io',
-        :apps_base            => 'ffapp.io',
-        :plugins_base         => 'ffplugin.io',
-        :widgets_base         => 'ffwidget.io'
-    }
-  end
-
-end
+require_relative 'domain_environments'
+
+class Fanforce::Domains
+
+  def self.base_domain
+    Fanforce::DomainEnvironments.method(ENV['RACK_ENV'] || 'development').call[:base]
+  end
+
+  def self.default_short_domain
+    Fanforce::DomainEnvironments.method(ENV['RACK_ENV'] || 'development').call[:default_short_domain]
+  end
+
+  def self.apps_base_domain
+    Fanforce::DomainEnvironments.method(ENV['RACK_ENV'] || 'development').call[:apps_base]
+  end
+
+  def self.plugins_base_domain
+    Fanforce::DomainEnvironments.method(ENV['RACK_ENV'] || 'development').call[:plugins_base]
+  end
+
+  def self.widgets_base_domain
+    Fanforce::DomainEnvironments.method(ENV['RACK_ENV'] || 'development').call[:widgets_base]
+  end
+
+  def self.api_domain
+    'api.' + base_domain
+  end
+
+  def self.eye_domain
+    'i.' + base_domain
+  end
+
+  def self.assets_domain
+    'assets.' + base_domain
+  end
+
+  def self.controller_domain
+    'controller.' + base_domain
+  end
+
+  def self.addon_management_url
+    controller_domain + '/db'
+  end
+
+  def self.website_domain
+    'www.' + base_domain
+  end
+
+  def self.developers_domain
+    'developers.' + base_domain
+  end
+
+  # these should be moved to edition
+
+  def self.app_domain
+    'app.' + base_domain
+  end
+
+  def self.signup_domain
+    'signup.' + base_domain
+  end
+
+  def self.marketplace_domain
+    'marketplace.' + base_domain
+  end
+
+end

data/lib/fanforce/version.rb

@@ -1,3 +1,3 @@
 class Fanforce
-  VERSION = '0.15.0'
+  VERSION = '0.16.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fanforce
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Caleb Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -67,6 +67,7 @@ files:
 - fanforce.gemspec
 - lib/fanforce.rb
 - lib/fanforce/_base.rb
+- lib/fanforce/domain_environments.rb
 - lib/fanforce/domains.rb
 - lib/fanforce/utils.rb
 - lib/fanforce/version.rb