fanforce 0.11.2 → 0.12.0.test1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTcyODU0NzE0MjQxODdjNjcyMGZmOWY4NjIxZmI3MjcyYmIxYmFlNw==
+    MzY0MDhhNjc0MmI0MDFkMjVkMzA0ZmQ3NTQ0M2M1YmI3Njc2MGE0Zg==
   data.tar.gz: !binary |-
-    NzY2YmQ4YTFhMWY1N2ZmZjQ5ZDY3NjMyYzY0YmUwNTYyOTg2OGZjYg==
+    ODJiODZmZDNlMDFmNjhmMDllNzg0MzdlZmRjZmVlN2NiMmQ2MWVkNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWY1ZGY2YWM4N2FhN2Q1YjY2ZTQ5M2Q1NTVjMTk0ZDY3NmI3NGIwZWZmMjgz
-    ODJiMDM4YTRhOTRkMmViMDZlN2I4YzkwNzJiYzkxOTRiZjEwMDQzNTMzOTlm
-    NjM3ZDEzNmVkMjEzNTNhNzE1ODlmYmVhNDhjZWQyZGUzZjc3OGQ=
+    NDgxOTM2Njk5ZmM2NDA1NjcxYWM5ZjkxMDJkYjUxYjcyMTE4ZGEzZjIyMzQw
+    ZmVlMmJjZTRkZmVkYjUyMzY0NDhkZWFjMjUwNjY1ZWY0MjExMGFjNTUxNjlj
+    MGRlMDc3ZTQ4NmIwNmYwMjk5MjEzMmI2NzNiYzg4YTg3MDFjMDM=
   data.tar.gz: !binary |-
-    MTRmZjlhMmNjNmIzYjhmZGYzYzUwOTc2MjBjYzhiMDA1NzIzZjJkNDJiYmIx
-    MzhlMTdhNjk2YzBkMTdkMGRmMmIxMmY2ODkyYjJjYWUyNDNkYTIyZTNlNDgw
-    MWNkYmJjYzIxYjA0YWQ4NjcxZDU5NDE0YWEwNTk2ODUyZWU4NjY=
+    MjUzYTYwY2ZjNTYzNzhlZDc4NDdlZTgxZTQyOGJmZTM5ODVmYzYzM2FjZDZk
+    NzRlZDU0OWEwOGE0OTA2ZGMwZWQ1MDFlODM4ZGRhZTRmNWU5NTU1ZjRmODQ2
+    OGQxMjNlOWE1MGQwMmVkMmY3M2RmOWQ3MGNlZTA0NWVhYjY2MjY=

data/lib/fanforce.rb

@@ -1,2 +1,2 @@
-require_relative 'fanforce/domains'
+require_relative 'fanforce/_base'
 require_relative 'fanforce/version'

data/lib/fanforce/_base.rb

@@ -0,0 +1,62 @@
+class Fanforce
+  require_relative 'domains'
+
+  def self.base_domain
+    Fanforce::Domains.method(ENV['RACK_ENV'] || 'development').call[:base]
+  end
+
+  def self.default_smarturl_domain
+    Fanforce::Domains.method(ENV['RACK_ENV'] || 'development').call[:default_smarturl]
+  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.i_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
+
+end

data/lib/fanforce/domains.rb

@@ -1,46 +1,44 @@
-class Fanforce
-
-  if ENV['RACK_ENV'] == 'production'
-    BASE_DOMAIN             = 'fanforce.com'
-    DEFAULT_SMARTURL_DOMAIN = 'fanforce.io'
-    APPS_BASE_DOMAIN        = 'ffapp.io'
-    PLUGINS_BASE_DOMAIN     = 'ffplugin.io'
-    WIDGETS_BASE_DOMAIN     = 'ffwidget.io'
-
-  elsif ENV['RACK_ENV'] == 'test'
-    BASE_DOMAIN             = 'fanforce.gg'
-    DEFAULT_SMARTURL_DOMAIN = 'fanforc.gg'
-    APPS_BASE_DOMAIN        = 'ffapp.gg'
-    PLUGINS_BASE_DOMAIN     = 'ffplugin.gg'
-    WIDGETS_BASE_DOMAIN     = 'ffwidget.gg'
-
-  elsif ENV['RACK_ENV'] == 'staging'
-    BASE_DOMAIN             = 'fanforce-staging.com'
-    DEFAULT_SMARTURL_DOMAIN = 'fanforc.us'
-    APPS_BASE_DOMAIN        = 'ffapp.us'
-    PLUGINS_BASE_DOMAIN     = 'ffplugin.us'
-    WIDGETS_BASE_DOMAIN     = 'ffwidget.us'
-
-  else
-    TOP_LEVEL_DOMAIN        = ENV['FANFORCE_GEM_TOP_LEVEL_DOMAIN'] || 'gg'
-    BASE_DOMAIN             = ENV['FANFORCE_GEM_BASE_DOMAIN'] || 'fanforce.' + TOP_LEVEL_DOMAIN
-    DEFAULT_SMARTURL_DOMAIN = 'fanforc.gg'
-    APPS_BASE_DOMAIN        = 'ffapp.gg'
-    PLUGINS_BASE_DOMAIN     = 'ffplugin.gg'
-    WIDGETS_BASE_DOMAIN     = 'ffwidget.gg'
+module Fanforce::Domains
+
+  def self.development
+    puts "top-level-domain: #{ENV['FANFORCE_GEM_TOP_LEVEL_DOMAIN']}"
+    {
+        :base             => 'fanforce.gg',
+        :default_smarturl => ENV['FANFORCE_GEM_BASE_DOMAIN'] || 'fanforce.' + (ENV['FANFORCE_GEM_TOP_LEVEL_DOMAIN'] || 'gg'),
+        :apps_base        => 'ffapp.gg',
+        :plugins_base     => 'ffplugin.gg',
+        :widgets_base     => 'ffwidget.gg'
+    }
+  end
 
+  def self.test
+    {
+      :base             => 'fanforce.gg',
+      :default_smarturl => 'fanforc.gg',
+      :apps_base        => 'ffapp.gg',
+      :plugins_base     => 'ffplugin.gg',
+      :widgets_base     => 'ffwidget.gg'
+    }
   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'
+  def self.staging
+    {
+        :base             => 'fanforce-staging.com',
+        :default_smarturl => 'fanforc.us',
+        :apps_base        => 'ffapp.us',
+        :plugins_base     => 'ffplugin.us',
+        :widgets_base     => 'ffwidget.us'
+    }
+  end
 
-  # these should be moved to edition
-  APP_DOMAIN           = 'app.' + BASE_DOMAIN
-  SIGNUP_DOMAIN        = 'signup.' + BASE_DOMAIN
-  MARKETPLACE_DOMAIN   = 'appstore.' + BASE_DOMAIN
+  def self.production
+    {
+        :base             => 'fanforce.com',
+        :default_smarturl => 'fanforce.io',
+        :apps_base        => 'ffapp.io',
+        :plugins_base     => 'ffplugin.io',
+        :widgets_base     => 'ffwidget.io'
+    }
+  end
 
 end

data/lib/fanforce/version.rb

@@ -1,3 +1,3 @@
 class Fanforce
-  VERSION = '0.11.2'
+  VERSION = '0.12.0.test1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0.test1
 platform: ruby
 authors:
 - Caleb Clark
@@ -24,6 +24,7 @@ files:
 - Rakefile
 - fanforce.gemspec
 - lib/fanforce.rb
+- lib/fanforce/_base.rb
 - lib/fanforce/domains.rb
 - lib/fanforce/version.rb
 homepage: http://github.com/fanforce/fanforce
@@ -40,9 +41,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3