odania 0.0.35 → 0.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71c39b77fdbe736a7a7352a05acde79ff6e082e5
-  data.tar.gz: aec4430b75ad1736b44df6d98400aaf9ad4bf5bf
+  metadata.gz: ae87f0f013140efcdf8328a06001147992f74057
+  data.tar.gz: 50e7e1e500ad4c62e4d15ebcab5fd6d6394ffcad
 SHA512:
-  metadata.gz: 986331b8dcd18a337313e60e04a3547e68a3df4164398a311fd70bfbd661bb9959137b81254c474e01b4ac3a04e95c26b76b1ecd876f18c81d6ce13336d83c54
-  data.tar.gz: cc82c6eb9fe675f8f9b9bbe300e7ea021565922c9d249848bc302a60346f8b641d8f98c72be2d055614d478830745a791e92d20c8ffb18c9616d2693ac466d7b
+  metadata.gz: eb9bbcf5a1b578af277a70b651bf6dadbe7fa199ea31083689e351c7ff4876ea781b44f5f03b36c06f0d6d5900a86967e06484589c8dfbbd99a55368aef90393
+  data.tar.gz: 97e32bec1b907584c1dab1d9c4948d5900e9334a5e967eabc7e7e0059f7a1ddb59339053ddb444efe13ccb2296ffe0e5015308fdd357454517f7f0e0adfde2b7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    odania (0.0.35)
+    odania (0.0.36)
       deep_merge
       diplomat
       erubis

data/features/plugin.feature

@@ -9,27 +9,27 @@ Feature: Plugins
 	Scenario: Registering multiple instances of one plugin
 		Given I initialize the gem
 		When I registered the plugin "test-plugin"
-			And I registered the plugin "test-plugin"
-			And I registered the plugin "test-plugin"
+		And I registered the plugin "test-plugin"
+		And I registered the plugin "test-plugin"
 		Then I should see "3" instances of the plugin "test-plugin"
 
 	Scenario: Registering multiple plugins
 		Given I initialize the gem
 		When I registered the plugin "test-plugin"
-			And I registered the plugin "test-plugin"
-			And I registered the plugin "test-plugin-2"
+		And I registered the plugin "test-plugin"
+		And I registered the plugin "test-plugin-2"
 		Then I should see "2" instances of the plugin "test-plugin"
-			And I should see "1" instances of the plugin "test-plugin-2"
+		And I should see "1" instances of the plugin "test-plugin-2"
 
 	Scenario: Retrieving plugin instance name
 		Given I initialize the gem
 		When I retrieve plugin instance name for "test-plugin"
-			And I retrieve plugin instance name for "test-plugin"
+		And I retrieve plugin instance name for "test-plugin"
 		Then I should retrieve "test-plugin_1"
 
 	Scenario: Build new joined plugin config
 		Given I initialize the gem
 		When I registered the plugin "test-plugin"
-			And I generate the joined plugin config
+		And I generate the joined plugin config
 		Then I have a joined plugin config
-			And The joined plugin config contains the plugin "test-plugin"
+		And The joined plugin config contains the plugin "test-plugin"

data/features/step_definitions/plugin_steps.rb

@@ -20,9 +20,6 @@ Given(/^I registered the plugin "([^"]*)"$/) do |plugin_name|
 		'ip' => '127.0.0.1',
 		'port' => 80,
 		'tags' => ["plugin-#{plugin_name}"],
-		'default_subdomains' => {
-			'_general' => 'default_sub'
-		},
 		'domains' => {
 			'odania.com' => {
 				'contents' => {
@@ -34,7 +31,6 @@ Given(/^I registered the plugin "([^"]*)"$/) do |plugin_name|
 					'languages' => %w(de en),
 					'layout' => 'simple',
 					'language_selector' => 'prefix',
-					'default_subdomain' => 'page_sub',
 					'redirects' => {
 						'^/test' => '/games'
 					}

data/lib/odania/config/global_config.rb

@@ -7,6 +7,8 @@ module Odania
 
 				reset
 				@default_backend_groups = config['default_backend_groups'] unless config['default_backend_groups'].nil?
+				@valid_domains = config['valid_domains'] unless config['valid_domains'].nil?
+				@default_domains = config['default_domains'] unless config['default_domains'].nil?
 
 				unless config['domains'].nil?
 					config['domains'].each_pair do |name, data|
@@ -80,7 +82,8 @@ module Odania
 				end
 
 				@plugin_config[group_name] = plugin_cfg['plugin-config']
-				@default_subdomains.deep_merge(plugin_cfg['default_subdomains']) unless plugin_cfg['default_subdomains'].nil?
+				@valid_domains.deep_merge!(plugin_cfg['valid_domains']) unless plugin_cfg['valid_domains'].nil?
+				@default_domains.deep_merge!(plugin_cfg['default_domains']) unless plugin_cfg['default_domains'].nil?
 
 				# Add this service as a default backend if specified
 				@default_backend_groups << group_name if plugin_cfg['plugin-config']['default']
@@ -121,7 +124,8 @@ module Odania
 				@default_backend_groups = []
 				@duplicates = Duplicates.new
 				@backend_groups = Hash.new { |hash, key| hash[key] = BackendGroup.new(key) }
-				@default_subdomains = {}
+				@valid_domains = {}
+				@default_domains = {}
 
 				@domains['_general'].add_subdomain('_general')
 			end
@@ -141,8 +145,12 @@ module Odania
 				@backend_groups[group_name].backends.first
 			end
 
-			def default_subdomains
-				@default_subdomains
+			def valid_domains
+				@valid_domains
+			end
+
+			def default_domains
+				@default_domains
 			end
 
 			def default_redirects
@@ -154,6 +162,8 @@ module Odania
 			def dump
 				cfg = super
 				cfg['default_backend_groups'] = @default_backend_groups
+				cfg['default_domains'] = @default_domains
+				cfg['valid_domains'] = @valid_domains
 				cfg
 			end
 		end

data/lib/odania/config/plugin_config.rb

@@ -1,7 +1,7 @@
 module Odania
 	module Config
 		class PluginConfig
-			attr_accessor :domains, :config, :default_subdomains, :plugin_config
+			attr_accessor :domains, :config, :valid_domains, :default_domains, :plugin_config
 
 			def initialize
 				reset
@@ -12,7 +12,8 @@ module Odania
 				reset
 				@config = data['config'] unless data['config'].nil?
 				@plugin_config = data['plugin-config'] unless data['plugin-config'].nil?
-				@default_subdomains = data['default_subdomains'] unless data['default_subdomains'].nil?
+				@valid_domains = data['valid_domains'] unless data['valid_domains'].nil?
+				@default_domains = data['default_domains'] unless data['default_domains'].nil?
 				unless data['domains'].nil?
 					data['domains'].each_pair do |name, domain_data|
 						@domains[name].load(domain_data)
@@ -30,6 +31,8 @@ module Odania
 			def reset
 				@config = {}
 				@plugin_config = {}
+				@default_domains = {}
+				@valid_domains = {}
 				@domains = Hash.new { |hash, key| hash[key] = Domain.new(key) }
 			end
 
@@ -42,7 +45,8 @@ module Odania
 				{
 					'plugin-config' => plugin_config,
 					'config' => config,
-					'default_subdomains' => @default_subdomains,
+					'default_domains' => @default_domains,
+					'valid_domains' => @valid_domains,
 					'domains' => domain_data
 				}
 			end

data/lib/odania/version.rb

@@ -1,3 +1,3 @@
 module Odania
-  VERSION = '0.0.35'
+	VERSION = '0.0.36'
 end

data/spec/fixtures/global_config.json

@@ -18,8 +18,15 @@
 			]
 		}
 	},
-	"default_subdomains": {
-		"_general": "www"
+	"valid_domains": {
+		"example.com": [
+			"www"
+		]
+	},
+	"default_domains": {
+		"example.com": [
+			"www"
+		]
 	},
 	"domains": {
 		"_general": {

data/spec/fixtures/plugin_config_1.json

@@ -13,8 +13,15 @@
 	"config": {
 		"title": "This is my awesome title"
 	},
-	"default_subdomains": {
-		"_general": "www"
+	"valid_domains": {
+		"example.com": [
+			"www"
+		]
+	},
+	"default_domains": {
+		"example.com": [
+			"www"
+		]
 	},
 	"domains": {
 		"_general": {

data/spec/lib/odania/config/global_config_spec.rb

@@ -42,23 +42,23 @@ describe Odania::Config::GlobalConfig do
 			$consul_mock.service.services = {
 				cfg_name => [
 					OpenStruct.new({
-						'Node' => 'agent-one',
-						'Address' => '172.20.20.1',
-						'ServiceID' => "#{cfg_name}_1",
-						'ServiceName' => cfg_name,
-						'ServiceTags' => [],
-						'ServicePort' => 80,
-						'ServiceAddress' => '172.20.20.1'
-					}),
+											'Node' => 'agent-one',
+											'Address' => '172.20.20.1',
+											'ServiceID' => "#{cfg_name}_1",
+											'ServiceName' => cfg_name,
+											'ServiceTags' => [],
+											'ServicePort' => 80,
+											'ServiceAddress' => '172.20.20.1'
+										}),
 					OpenStruct.new({
-						'Node' => 'agent-two',
-						'Address' => '172.20.20.2',
-						'ServiceID' => "#{cfg_name}_2",
-						'ServiceName' => cfg_name,
-						'ServiceTags' => [],
-						'ServicePort' => 80,
-						'ServiceAddress' => '172.20.20.1'
-					})
+											'Node' => 'agent-two',
+											'Address' => '172.20.20.2',
+											'ServiceID' => "#{cfg_name}_2",
+											'ServiceName' => cfg_name,
+											'ServiceTags' => [],
+											'ServicePort' => 80,
+											'ServiceAddress' => '172.20.20.1'
+										})
 				]
 			}
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: odania
 version: !ruby/object:Gem::Version
-  version: 0.0.35
+  version: 0.0.36
 platform: ruby
 authors:
 - Mike Petersen