odania 0.0.36 → 0.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae87f0f013140efcdf8328a06001147992f74057
-  data.tar.gz: 50e7e1e500ad4c62e4d15ebcab5fd6d6394ffcad
+  metadata.gz: 34635dadd6875c21d30dc12b8611e92cdcfc69dc
+  data.tar.gz: 985d41d81e514e86895acc024692c987611d0264
 SHA512:
-  metadata.gz: eb9bbcf5a1b578af277a70b651bf6dadbe7fa199ea31083689e351c7ff4876ea781b44f5f03b36c06f0d6d5900a86967e06484589c8dfbbd99a55368aef90393
-  data.tar.gz: 97e32bec1b907584c1dab1d9c4948d5900e9334a5e967eabc7e7e0059f7a1ddb59339053ddb444efe13ccb2296ffe0e5015308fdd357454517f7f0e0adfde2b7
+  metadata.gz: de518f1f33f55d597c05c53d4b37418afe543354e16be1b4b9c88a304ed05b53768002741dd577e0d134c60ea07b8af94e58c00ecb2d0421a2633c355856f4ed
+  data.tar.gz: c4be69142d66458b3e8b5fbb19455a1a1fb85f82d3a2ff3893f0923ea513f654723bae5048de3deec043c39e3c10021bddc7f13e8a3917782deacb343e750e55

data/Gemfile.lock

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

data/lib/odania/config.rb

@@ -9,6 +9,7 @@ require_relative 'config/sub_domain'
 require_relative 'config/style'
 require_relative 'config/backend'
 require_relative 'config/backend_group'
+require_relative 'config/subdomain_config'
 
 module Odania
 	module Config

data/lib/odania/config/global_config.rb

@@ -9,6 +9,7 @@ module Odania
 				@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?
+				@partials = config['partials'] unless config['partials'].nil?
 
 				unless config['domains'].nil?
 					config['domains'].each_pair do |name, data|
@@ -68,9 +69,24 @@ module Odania
 				config = self.dump
 				puts JSON.pretty_generate config if $debug
 				Odania.plugin.set_global_config config
+
+				generate_subdomain_configs config
+
 				config
 			end
 
+			# Generate a config per subdomain
+			def generate_subdomain_configs(config)
+				$logger.info 'Generating subdomain configs'
+				@valid_domains.each do |domain, subdomains|
+					subdomains.each do |subdomain|
+						$logger.info "Generating Subdomain Config for Domain: #{domain} Subdomain: #{subdomain}"
+						subdomain_config = SubdomainConfig.new(config, domain, subdomain).generate
+						Odania.plugin.set_subdomain_config "#{subdomain}.#{domain}", subdomain_config
+					end
+				end
+			end
+
 			# Add the configuration from the plugin
 			def add_plugin_config(plugin_cfg)
 				config_section = plugin_cfg['config']
@@ -84,6 +100,7 @@ module Odania
 				@plugin_config[group_name] = plugin_cfg['plugin-config']
 				@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?
+				@partials.deep_merge!(plugin_cfg['partials']) unless plugin_cfg['partials'].nil?
 
 				# Add this service as a default backend if specified
 				@default_backend_groups << group_name if plugin_cfg['plugin-config']['default']
@@ -126,6 +143,7 @@ module Odania
 				@backend_groups = Hash.new { |hash, key| hash[key] = BackendGroup.new(key) }
 				@valid_domains = {}
 				@default_domains = {}
+				@partials = {}
 
 				@domains['_general'].add_subdomain('_general')
 			end
@@ -153,6 +171,10 @@ module Odania
 				@default_domains
 			end
 
+			def partials
+				@partials
+			end
+
 			def default_redirects
 				general = @domains['_general'].subdomain('_general')
 				return {} if general.nil?
@@ -164,6 +186,7 @@ module Odania
 				cfg['default_backend_groups'] = @default_backend_groups
 				cfg['default_domains'] = @default_domains
 				cfg['valid_domains'] = @valid_domains
+				cfg['partials'] = @partials
 				cfg
 			end
 		end

data/lib/odania/config/page_base.rb

@@ -1,7 +1,7 @@
 module Odania
 	module Config
 		class PageBase
-			attr_accessor :assets, :partials
+			attr_accessor :assets
 
 			def initialize
 				reset
@@ -15,13 +15,6 @@ module Odania
 						self.assets[name].load(asset_data, group_name)
 					end
 				end
-
-				unless data['partials'].nil?
-					data['partials'].each_pair do |name, partial_data|
-						duplicates[:partials] << name if self.partials.key? name
-						self.partials[name].load(partial_data, group_name)
-					end
-				end
 				duplicates
 			end
 
@@ -31,15 +24,12 @@ module Odania
 
 			def reset
 				self.assets = Hash.new { |hash, key| hash[key] = Page.new }
-				self.partials = Hash.new { |hash, key| hash[key] = Page.new }
 
-				@plugins = {:partials => Hash.new { |hash, key| hash[key] = [] }, :assets => Hash.new { |hash, key| hash[key] = [] }}
+				@plugins = {:assets => Hash.new { |hash, key| hash[key] = [] }}
 			end
 
 			def [](type)
-				type = type.to_sym
-				return self.assets if :assets.eql? type
-				self.partials
+				self.assets
 			end
 
 			def dump
@@ -48,14 +38,8 @@ module Odania
 					asset_data[web_url] = page.dump
 				end
 
-				partial_data = {}
-				partials.each_pair do |web_url, page|
-					partial_data[web_url] = page.dump
-				end
-
 				{
-					'assets' => asset_data,
-					'partials' => partial_data
+					'assets' => asset_data
 				}
 			end
 		end

data/lib/odania/config/plugin_config.rb

@@ -1,7 +1,7 @@
 module Odania
 	module Config
 		class PluginConfig
-			attr_accessor :domains, :config, :valid_domains, :default_domains, :plugin_config
+			attr_accessor :domains, :config, :valid_domains, :default_domains, :plugin_config, :partials
 
 			def initialize
 				reset
@@ -14,6 +14,7 @@ module Odania
 				@plugin_config = data['plugin-config'] unless data['plugin-config'].nil?
 				@valid_domains = data['valid_domains'] unless data['valid_domains'].nil?
 				@default_domains = data['default_domains'] unless data['default_domains'].nil?
+				@partials = data['partials'] unless data['partials'].nil?
 				unless data['domains'].nil?
 					data['domains'].each_pair do |name, domain_data|
 						@domains[name].load(domain_data)
@@ -33,6 +34,7 @@ module Odania
 				@plugin_config = {}
 				@default_domains = {}
 				@valid_domains = {}
+				@partials = {}
 				@domains = Hash.new { |hash, key| hash[key] = Domain.new(key) }
 			end
 
@@ -47,6 +49,7 @@ module Odania
 					'config' => config,
 					'default_domains' => @default_domains,
 					'valid_domains' => @valid_domains,
+					'partials' => @partials,
 					'domains' => domain_data
 				}
 			end

data/lib/odania/config/subdomain_config.rb

@@ -0,0 +1,121 @@
+module Odania
+	module Config
+		class SubdomainConfig
+
+			def initialize(global_config, domain, subdomain)
+				@global_config = global_config
+				@domain = domain
+				@subdomain = subdomain
+			end
+
+			def generate
+				@layout = get_layout_name
+				config = {
+					layout: @layout,
+					config: generate_merged_config,
+					partials: generate_merged_partials
+				}
+
+				layout_config = get_layout_config @layout
+				layout_config.delete('assets')
+				config[:styles] = layout_config['config']['styles']
+
+				if $debug
+					$logger.debug 'Generated config:'
+					$logger.debug JSON.pretty_generate(config)
+				end
+
+				config
+			end
+
+			private
+
+			def get_layout_name
+				# subdomain specific layouts
+				result = retrieve_hash_path @global_config, ['domains', @domain, @subdomain, 'config', 'layout']
+				return result unless result.nil?
+
+				# domain specific layouts
+				result = retrieve_hash_path @global_config, ['domains', @domain, '_general', 'config', 'layout']
+				return result unless result.nil?
+
+				# general layouts
+				result = retrieve_hash_path @global_config, %w(domains _general _general config layout)
+				return result unless result.nil?
+
+				# general layouts
+				result = retrieve_hash_path @global_config, %w(config layout)
+				return result unless result.nil?
+
+				'simple'
+			end
+
+			def get_layout_config(layout)
+				# subdomain specific layouts
+				result = retrieve_hash_path @global_config, ['domains', @domain, @subdomain, 'layouts', layout]
+				return result unless result.nil?
+
+				# domain specific layouts
+				result = retrieve_hash_path @global_config, ['domains', @domain, '_general', 'layouts', layout]
+				return result unless result.nil?
+
+				# general layouts
+				result = retrieve_hash_path @global_config, ['domains', '_general', '_general', 'layouts', layout]
+				return result unless result.nil?
+
+				{}
+			end
+
+			def generate_merged_config
+				config = retrieve_hash_path @global_config, %w(domains _general _general config)
+				config = {} if config.nil?
+
+				# domain specific layouts
+				result = retrieve_hash_path @global_config, ['domains', @domain, '_general', 'config']
+				config.deep_merge!(result) unless result.nil?
+
+				# subdomain specific layouts
+				result = retrieve_hash_path @global_config, ['domains', @domain, @subdomain, 'config']
+				config.deep_merge!(result) unless result.nil?
+
+				config
+			end
+
+			def generate_merged_partials
+				partials = retrieve_hash_path @global_config, %w(partials _general _general default)
+				partials = {} if partials.nil?
+
+				# general specific layout
+				result = retrieve_hash_path @global_config, ['partials', '_general', '_general', 'layouts', @layout]
+				partials.deep_merge!(result) unless result.nil?
+
+				# domain specific
+				result = retrieve_hash_path @global_config, ['partials', @domain, '_general', 'default']
+				partials.deep_merge!(result) unless result.nil?
+
+				# domain specific layout
+				result = retrieve_hash_path @global_config, ['partials', @domain, '_general', 'layouts', @layout]
+				partials.deep_merge!(result) unless result.nil?
+
+				# subdomain
+				result = retrieve_hash_path @global_config, ['partials', @domain, @subdomain, 'default']
+				partials.deep_merge!(result) unless result.nil?
+
+				# subdomain specific layout
+				result = retrieve_hash_path @global_config, ['partials', @domain, @subdomain, 'layouts', @layout]
+				partials.deep_merge!(result) unless result.nil?
+
+				partials
+			end
+
+			def retrieve_hash_path(hash, path)
+				key = path.shift
+
+				return nil until hash.has_key? key
+				return hash[key] if path.empty?
+				retrieve_hash_path hash[key], path
+			end
+
+		end
+	end
+end

data/lib/odania/plugin.rb

@@ -51,6 +51,14 @@ module Odania
 			@consul.config.get get_global_plugin_config_path
 		end
 
+		def set_subdomain_config(full_domain, config)
+			@consul.config.set get_subdomain_config_path(full_domain), config
+		end
+
+		def get_subdomain_config(full_domain)
+			@consul.config.get get_subdomain_config_path(full_domain)
+		end
+
 		def get_domain_config_for(domain, global_config=nil)
 			global_config = get_global_config if global_config.nil?
 
@@ -64,6 +72,10 @@ module Odania
 
 		private
 
+		def get_subdomain_config_path(full_domain)
+			"subdomain_config/#{full_domain}"
+		end
+
 		def get_global_plugin_config_path
 			'global_plugins_config'
 		end

data/lib/odania/version.rb

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

data/spec/fixtures/global_config.json

@@ -40,15 +40,10 @@
 				"assets": {
 				},
 				"layouts": {
-				},
-				"partials": {
 				}
 			}
 		},
 		"example.com": {
-			"_general": {
-				"config": {}
-			},
 			"_general": {
 				"config": {
 				},
@@ -59,8 +54,7 @@
 					}
 				},
 				"assets": {},
-				"layouts": {},
-				"partials": {}
+				"layouts": {}
 			},
 			"www": {
 				"dynamic": {
@@ -126,22 +120,16 @@
 							}
 						}
 					}
-				},
-				"partials": {
-					"footer": {
-						"name": "footer",
-						"group_name": "static-content",
-						"plugin_url": "partials/footer.html",
-						"cacheable": true,
-						"expires": 60
-					},
-					"tracking": {
-						"name": "tracking",
-						"group_name": "static-content",
-						"plugin_url": "partials/tracking.html"
-					}
 				}
 			}
 		}
+	},
+	"partials": {
+		"example.com": {
+			"www": {
+				"tracking": "partials/tracking.html",
+				"footer": "partials/footer.html"
+			}
+		}
 	}
 }

data/spec/fixtures/plugin_config_1.json

@@ -88,8 +88,14 @@
 					}
 				},
 				"assets": {},
-				"layouts": {},
-				"partials": {}
+				"layouts": {}
+			}
+		}
+	},
+	"partials": {
+		"_general": {
+			"_general": {
+
 			}
 		}
 	}

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

@@ -31,7 +31,7 @@ describe Odania::Config::GlobalConfig do
 			duplicates = subject.duplicates
 			expect(subject.duplicates).not_to be_empty
 			expect(duplicates).to have_key(:config)
-			expect(duplicates).to have_key(:partials)
+			expect(duplicates).to have_key(:assets)
 			expect(duplicates).to have_key(:redirect)
 		end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odania
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.37
 platform: ruby
 authors:
 - Mike Petersen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-05 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -212,6 +212,7 @@ files:
 - lib/odania/config/plugin_config.rb
 - lib/odania/config/style.rb
 - lib/odania/config/sub_domain.rb
+- lib/odania/config/subdomain_config.rb
 - lib/odania/consul.rb
 - lib/odania/plugin.rb
 - lib/odania/version.rb