fanforce-base 1.3.0 → 1.6.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/fanforce/base/domain_environments.rb +5 -5
- data/lib/fanforce/base/domains.rb +7 -7
- data/lib/fanforce/base/version.rb +1 -1
- data/test/base/domains_test.rb +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1207434e2a14665ae6ee7e00c0a69498fcd79839
|
4
|
+
data.tar.gz: ba214033fa6de22c2ff8a090a701ab7927bb3344
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f499d5db211d369304d4ed8e7408f2ae6e36be5566acbb19a068a5a34538c02f7557bd01ee2d5b0ac36afeb1a610836ba8e7c463a17a92dd149ddae6b0791f31
|
7
|
+
data.tar.gz: 48f9a86a8f5889004895c0f165a7588fb163defc231dea334bc33da99686bf52d739371322117f2cd5beb3fb083632bcdce2a024c18a010f01cd59982bdba2df
|
@@ -5,9 +5,9 @@ module Fanforce::Base::DomainEnvironments
|
|
5
5
|
def self.development
|
6
6
|
root_domain = (ENV['FANFORCE_GEM_TOP_LEVEL_DOMAIN'] || 'dev')
|
7
7
|
{
|
8
|
-
:base => ENV['FANFORCE_GEM_BASE_DOMAIN']
|
8
|
+
:base => ENV['FANFORCE_GEM_BASE_DOMAIN'] || "fanforce.#{root_domain}",
|
9
9
|
:default_short_domain => ENV['FANFORCE_GEM_DEFAULT_SHORT_DOMAIN'] || "fnfrc.#{root_domain}",
|
10
|
-
:
|
10
|
+
:plugins_base => ENV['FANFORCE_GEM_PLUGINS_BASE_DOMAIN'] || "ffplugin.#{root_domain}",
|
11
11
|
}
|
12
12
|
end
|
13
13
|
|
@@ -17,7 +17,7 @@ module Fanforce::Base::DomainEnvironments
|
|
17
17
|
{
|
18
18
|
:base => 'fanforce.dev',
|
19
19
|
:default_short_domain => 'fnfrc.dev',
|
20
|
-
:
|
20
|
+
:plugins_base => 'ffplugin.dev',
|
21
21
|
}
|
22
22
|
end
|
23
23
|
|
@@ -27,7 +27,7 @@ module Fanforce::Base::DomainEnvironments
|
|
27
27
|
{
|
28
28
|
:base => 'fanforce-staging.com',
|
29
29
|
:default_short_domain => 'fnfrc.us',
|
30
|
-
:
|
30
|
+
:plugins_base => 'ffplugin.us',
|
31
31
|
}
|
32
32
|
end
|
33
33
|
|
@@ -37,7 +37,7 @@ module Fanforce::Base::DomainEnvironments
|
|
37
37
|
{
|
38
38
|
:base => 'fanforce.com',
|
39
39
|
:default_short_domain => 'fanforce.io',
|
40
|
-
:
|
40
|
+
:plugins_base => 'ffplugin.io',
|
41
41
|
}
|
42
42
|
end
|
43
43
|
|
@@ -34,10 +34,10 @@ module Fanforce::Base::Domains
|
|
34
34
|
Fanforce::Base::DomainEnvironments.method(environment).call[:default_short_domain]
|
35
35
|
end
|
36
36
|
|
37
|
-
# Base domain used for
|
37
|
+
# Base domain used for plugins (i.e., ffplugin.com) for current environment
|
38
38
|
# @return [domain]
|
39
|
-
def
|
40
|
-
Fanforce::Base::DomainEnvironments.method(environment).call[:
|
39
|
+
def plugins_base_domain
|
40
|
+
Fanforce::Base::DomainEnvironments.method(environment).call[:plugins_base]
|
41
41
|
end
|
42
42
|
|
43
43
|
# Domain for accessing supercore-api (i.e., api.fanforce.com) for current environment
|
@@ -46,7 +46,7 @@ module Fanforce::Base::Domains
|
|
46
46
|
'api.' + base_domain
|
47
47
|
end
|
48
48
|
|
49
|
-
# Domain for accessing supercore-api with https (
|
49
|
+
# Domain for accessing supercore-api with https (through heroku) for current environment
|
50
50
|
# @return [domain]
|
51
51
|
def api_domain_ssl
|
52
52
|
environment == 'development' ? api_domain : "#{environ.to_s}-supercore-api.herokuapp.com"
|
@@ -86,16 +86,16 @@ module Fanforce::Base::Domains
|
|
86
86
|
# The following should be moved to edition config
|
87
87
|
###########
|
88
88
|
|
89
|
-
# Domain for accessing the Client Panel
|
89
|
+
# Domain for accessing the Client Panel for current environment
|
90
90
|
# @return [domain]
|
91
91
|
def client_domain
|
92
92
|
'app.' + base_domain
|
93
93
|
end
|
94
94
|
|
95
|
-
# Domain for accessing the Signup Panel
|
95
|
+
# Domain for accessing the Signup Panel for current environment
|
96
96
|
# @return [domain]
|
97
97
|
def signup_domain
|
98
98
|
'signup.' + base_domain
|
99
99
|
end
|
100
100
|
|
101
|
-
end
|
101
|
+
end
|
data/test/base/domains_test.rb
CHANGED
@@ -8,7 +8,7 @@ describe Fanforce::Base::Domains do
|
|
8
8
|
|
9
9
|
assert Fanforce.base_domain == Fanforce::Base::DomainEnvironments.method(rack_env.to_s).call[:base]
|
10
10
|
assert Fanforce.default_short_domain == Fanforce::Base::DomainEnvironments.method(rack_env.to_s).call[:default_short_domain]
|
11
|
-
assert Fanforce.
|
11
|
+
assert Fanforce.plugins_base_domain == Fanforce::Base::DomainEnvironments.method(rack_env.to_s).call[:plugins_base]
|
12
12
|
|
13
13
|
assert Fanforce.api_domain
|
14
14
|
assert Fanforce.api_domain_ssl
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fanforce-base
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.6.0.rc1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Caleb Clark
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-02-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rack
|
@@ -77,9 +77,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
77
77
|
version: '0'
|
78
78
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
|
-
- - '
|
80
|
+
- - '>'
|
81
81
|
- !ruby/object:Gem::Version
|
82
|
-
version:
|
82
|
+
version: 1.3.1
|
83
83
|
requirements: []
|
84
84
|
rubyforge_project:
|
85
85
|
rubygems_version: 2.0.14
|