odania 0.0.16 → 0.0.17

data/lib/odania/config/sub_domain.rb

@@ -0,0 +1,125 @@
+module Odania
+	module Config
+		class SubDomain
+			attr_accessor :name, :config, :direct, :dynamic, :internal, :from_plugin, :redirects
+
+			def initialize(name)
+				self.name = name
+				reset
+			end
+
+			def set_config(config_data, group_name)
+				errors = []
+				return errors if config_data.nil?
+
+				config_data.each_pair do |key, val|
+					from_plugin[:config][key] << group_name
+					errors << {:type => :config, :plugins => from_plugin[:config][key], :key => key} unless config[key].nil?
+					config[key] = val
+				end
+				errors
+			end
+
+			def add_page(type, web_url, group_name, url_data, plugin_name)
+				result = true
+				result = false unless self.pages[type].key? web_url
+				self.pages[type][web_url].group_name = group_name
+				self.pages[type][web_url].plugin_url = url_data['plugin_url']
+				self.pages[type][web_url].cacheable = url_data['cacheable'] unless url_data['cacheable'].nil?
+				self.pages[type][web_url].expires = url_data['expires'] unless url_data['expires'].nil?
+				@plugins[:page]["#{type}-#{web_url}"] << plugin_name
+				result
+			end
+
+			def add_internal(web_url, group_name, plugin_url, plugin_name)
+				result = true
+				result = false unless self.assets.key? web_url
+				self.assets[web_url].group_name = group_name
+				self.assets[web_url].plugin_url = plugin_url
+				@plugins[:asset][web_url] << plugin_name
+				result
+			end
+
+			def get_redirects
+				return {} if self.config.nil?
+				return {} if self.config['redirects'].nil?
+				self.config['redirects']
+			end
+
+			def plugins(type, key)
+				@plugins[type][key]
+			end
+
+			def dump
+				direct_data = {}
+				direct.each_pair do |web_url, page|
+					direct_data[web_url] = page.dump
+				end
+
+				dynamic_data = {}
+				dynamic.each_pair do |web_url, page|
+					dynamic_data[web_url] = page.dump
+				end
+
+				{
+					'redirects' => self.redirects,
+					'config' => self.config,
+					'direct' => direct_data,
+					'dynamic' => dynamic_data,
+					'internal' => self.internal.dump
+				}
+			end
+
+			def load(data)
+				reset
+				self.add(data)
+			end
+
+			def add(data, group_name=nil)
+				self.config = data['config'] unless data['config'].nil?
+				duplicates = Hash.new { |hash, key| hash[key] = [] }
+
+				unless data['direct'].nil?
+					data['direct'].each_pair do |name, data|
+						duplicates[:direct] << name if self.direct.key? name
+						self.direct[name].load(data, group_name)
+					end
+				end
+
+				unless data['dynamic'].nil?
+					data['dynamic'].each_pair do |name, data|
+						duplicates[:dynamic] << name if self.direct.key? name
+						self.dynamic[name].load(data, group_name)
+					end
+				end
+
+				self.internal.load(data['internal']) unless data['internal'].nil?
+				unless data['redirects'].nil?
+					data['redirects'].each_pair do |src_url, target_url|
+						duplicates[:redirect] << src_url if self.redirects.key? src_url
+						self.redirects[src_url] = target_url
+					end
+				end
+
+				duplicates
+			end
+
+			def [](type)
+				return self.direct if 'direct'.eql? type.to_s
+				self.dynamic
+			end
+
+			private
+
+			def reset
+				self.config = {}
+				self.from_plugin = {:config => Hash.new { |hash, key| hash[key] = [] }}
+				self.direct = Hash.new { |hash, key| hash[key] = Page.new }
+				self.dynamic = Hash.new { |hash, key| hash[key] = Page.new }
+				self.redirects = {}
+				self.internal = Internal.new
+				@plugins = {:direct => Hash.new { |hash, key| hash[key] = [] }, :dynamic => Hash.new { |hash, key| hash[key] = [] }}
+			end
+		end
+	end
+end

data/lib/odania/config.rb

@@ -0,0 +1,16 @@
+require_relative 'config/internal'
+require_relative 'config/domain'
+require_relative 'config/duplicates'
+require_relative 'config/layout'
+require_relative 'config/page'
+require_relative 'config/plugin_config'
+require_relative 'config/global_config'
+require_relative 'config/sub_domain'
+require_relative 'config/style'
+require_relative 'config/backend'
+require_relative 'config/backend_group'
+
+module Odania
+	module Config
+	end
+end

data/lib/odania/consul.rb

@@ -1,6 +1,6 @@
 module Odania
 	class Consul
-		attr_accessor :service, :config, :event, :health
+		attr_reader :service, :config, :event, :health
 
 		def initialize(consul_url)
 			consul_url = "http://#{ENV['CONSUL_PORT_8500_TCP_ADDR']}:#{ENV['CONSUL_PORT_8500_TCP_PORT']}" if consul_url.nil?
@@ -63,7 +63,11 @@ module Odania
 			end
 
 			def get_all_for(plugin_name)
-				instances = get(plugin_name, :all)
+				begin
+					instances = get(plugin_name, :all)
+				rescue
+					instances = []
+				end
 				instances.is_a?(Array) ? instances : [instances]
 			end
 

data/lib/odania/erb.rb

@@ -0,0 +1,154 @@
+module Odania
+	class Erb
+		attr_accessor :variables, :config, :page, :asset
+
+		def initialize(template, domain, partials, group_name, req_host)
+			@template = template
+
+			self.variables = Variables.new(template, domain, partials, group_name, req_host)
+			self.config = Config.new self.variables
+			self.page = Page.new self.variables
+			self.asset = Asset.new self.variables
+
+			if LOCAL_TEST_MODE
+				data = "\n<!-- Domain: #{domain} -->"
+				data += "\n<!-- Group Name: #{group_name} -->"
+				data += "\n<!-- Request Host: #{req_host} -->"
+				data += "\n<!-- Base Domain: #{self.variables.base_domain} -->"
+				data += "\n<!-- Partials: #{JSON.pretty_generate(self.variables.partials)} -->"
+				data += "\n<!-- Config: #{JSON.pretty_generate(self.variables.config)} -->"
+				data += "\n<!-- SubDomain Config: #{JSON.pretty_generate(self.variables.subdomain_config)} -->"
+				#data += "\n<!-- Global Config: #{JSON.pretty_generate(self.variables.global_config)} -->"
+				@template += data.html_safe
+			end
+		end
+
+		def render
+			ERB.new(@template).result(binding)
+		end
+
+		class Variables
+			attr_accessor :template, :config, :subdomain_config, :global_config, :domain
+			attr_accessor :base_domain, :partials, :group_name, :req_host
+
+			def initialize(template, domain, partials, group_name, req_host)
+				self.template = template
+				self.global_config = Odania.plugin.get_global_config
+
+				domain_info = PublicSuffix.parse(domain)
+				self.config, self.base_domain = Odania.plugin.get_domain_config_for domain_info.domain, self.global_config
+				self.subdomain_config = self.config[domain_info.trd] unless domain_info.trd.nil?
+				self.subdomain_config = self.config['_general'] if self.subdomain_config.nil?
+				self.subdomain_config = {} if self.subdomain_config.nil?
+
+				self.domain = domain
+				self.partials = partials
+				self.group_name = group_name
+				self.req_host = req_host
+			end
+
+			def get_partial(page)
+				get_specific %w(internal partials), page
+			end
+
+			def get_config_key(key)
+				get_specific %w(config), key
+			end
+
+			def notify_error_async(type, key, data)
+				data = {
+					domain: self.domain,
+					base_domain: self.base_domain,
+					group_name: self.group_name,
+					req_host: self.req_host,
+					type: type,
+					key: key,
+					data: data
+				}
+				ProcessErrorJob.perform_later data
+			end
+
+			private
+
+			def get_specific(part, page)
+				subdomain = req_host.gsub(".#{domain}", '')
+
+				# subdomain specific layouts
+				result = retrieve_hash_path global_config, ['domains', domain, subdomain] + part + [page]
+				return result unless result.nil?
+
+				# domain specific layouts
+				result = retrieve_hash_path global_config, ['domains', domain, '_general'] + part + [page]
+				return result unless result.nil?
+
+				# general layouts
+				result = retrieve_hash_path global_config, %w(domains _general _general) + part + [page]
+				return result unless result.nil?
+
+				nil
+			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
+
+		class Config
+			def initialize(variables)
+				@variables = variables
+			end
+
+			def get(key)
+				val = @variables.get_config_key(key)
+				return val unless val.nil?
+				"--- Config Key Not found: #{key} ---"
+
+				@variables.notify_error_async :config, 'Key not found', key
+			end
+		end
+
+		class Page
+			def initialize(variables)
+				@variables = variables
+			end
+
+			def get(page)
+				if not @variables.partials[page].nil?
+					"<!-- Page: #{page} -->\n<esi:include src=\"#{@variables.partials[page]}\"/>\n<!-- End Page: #{page} -->"
+				else
+					partial = @variables.get_partial(page)
+
+					if partial.nil?
+						#"<!-- Page: #{page} -->\n<esi:include src=\"http://internal.core/template/partial/#{page}?domain=#{@variables.domain}&group_name=#{@variables.group_name}\"/>\n<!-- End Page: #{page} -->"
+						"\n\n\n<pre>UNHANDLED PAGE: #{page} !!!!!!!!!!!!!!!!!!!!</pre>\n\n\n"
+					else
+						"<!-- Page: #{page} -->\n<esi:include src=\"http://internal.core/template/partial/#{page}?domain=#{@variables.domain}&group_name=#{@variables.group_name}&plugin_url=#{partial['plugin_url']}&req_host=#{@variables.req_host}\"/>\n<!-- End Page: #{page} -->"
+					end
+				end
+			end
+		end
+
+		class Asset
+			def initialize(variables)
+				@variables = variables
+			end
+
+			def get(asset)
+				asset_url = get_asset_url(@variables.domain)
+				asset_url = "//#{asset_url}" unless asset_url.include? '//'
+				"#{asset_url}/#{asset}"
+			end
+
+			private
+
+			def get_asset_url(domain)
+				return @variables.subdomain_config['asset_url'] unless @variables.subdomain_config['asset_url'].nil?
+				domain
+			end
+		end
+	end
+end

data/lib/odania/plugin.rb

@@ -1,26 +1,25 @@
-require_relative 'plugin_config/plugin_config'
-
 module Odania
 	class Plugin
 		INSTANCE_FILES_PATH = '/tmp/plugin_instance_name_'
 
 		def initialize(consul)
 			@consul = consul
-			@plugin_config = PluginConfig::Base.new
+			@plugin_config = Config::GlobalConfig.new
 		end
 
 		def register(plugin_instance_name, plugin_config)
-			plugin_name = plugin_config['name']
+			plugin_name = plugin_config['plugin-config']['name']
 
 			# Write configuration of the plugin
 			@consul.config.set(get_plugin_config_path_for(plugin_name), plugin_config)
 
 			# Register service
-			consul_config = @consul.service.build_config(plugin_name, plugin_instance_name, plugin_config['ip'], plugin_config['tags'], plugin_config['port'])
+			consul_config = @consul.service.build_config(plugin_name, plugin_instance_name, plugin_config['plugin-config']['ip'], plugin_config['plugin-config']['tags'], plugin_config['plugin-config']['port'])
 			@consul.service.register(consul_config)
 
 			# Fire event
 			@consul.event.fire 'service-registered', "#{plugin_name}|#{plugin_instance_name}"
+			"#{plugin_name}|#{plugin_instance_name}"
 		end
 
 		def deregister(plugin_instance_name)
@@ -61,6 +60,14 @@ module Odania
 			@consul.config.get get_global_plugin_config_path
 		end
 
+		def get_domain_config_for(domain, global_config=nil)
+			global_config = get_global_config if global_config.nil?
+
+			domain_info = PublicSuffix.parse(domain)
+			return global_config['domains'][domain_info.domain], domain unless global_config['domains'][domain_info.domain].nil?
+			return false, nil
+		end
+
 		def health
 			@consul.health
 		end

data/lib/odania/plugin_config/{plugin_config.rb → base.rb}

@@ -1,25 +1,20 @@
 # Generate a joined configuration for all available plugins
 
+require_relative 'duplicates'
 require_relative 'models/backend'
 require_relative 'models/backend_group'
 require_relative 'models/domain'
 require_relative 'models/layout'
 require_relative 'models/page'
+require_relative 'models/partial'
 require_relative 'models/redirect'
 require_relative 'models/sub_domain'
 
 module Odania
 	module PluginConfig
-		class Base
+		class Base22
 			def initialize
-				@default_backend_groups = []
-				@backend_groups = Hash.new { |hash, key| hash[key] = BackendGroup.new(key) }
-				@redirects = Hash.new { |hash, key| hash[key] = Redirect.new(key) }
-				@domains = Hash.new { |hash, key| hash[key] = Domain.new(key) }
-				@default_subdomains = {}
-				@layouts = Hash.new { |hash, key| hash[key] = Layout.new }
-
-				@duplicates = Duplicates.new
+				reset
 			end
 
 			def load_from_consul
@@ -53,6 +48,7 @@ module Odania
 					end
 				end
 
+
 				unless config['redirects'].nil?
 					config['redirects'].each_pair do |src, target|
 						@redirects[src].target = target
@@ -71,6 +67,12 @@ module Odania
 					end
 				end
 
+				unless config['partials'].nil?
+					config['partials'].each_pair do |name, data|
+						@partials[name].load(data)
+					end
+				end
+
 				self
 			end
 
@@ -140,6 +142,14 @@ module Odania
 					end
 				end
 
+				unless config['partials'].nil?
+					config['partials'].each_pair do |name, partial_file|
+						unless @partials[name].load(name, partial_file, group_name)
+							@duplicates.add(group_name, :partial, name, @partials[name].plugins)
+						end
+					end
+				end
+
 				@default_subdomains = config['default_subdomains'] unless config['default_subdomains'].nil?
 			end
 
@@ -163,7 +173,8 @@ module Odania
 					'backends' => {},
 					'redirects' => {},
 					'domains' => {},
-					'layouts' => {}
+					'layouts' => {},
+					'partials' => {}
 				}
 
 				@backend_groups.each_pair do |group_name, instance|
@@ -182,6 +193,10 @@ module Odania
 					config['layouts'][name] = layout.dump
 				end
 
+				@partials.each_pair do |name, partial|
+					config['partials'][name] = partial.dump
+				end
+
 				puts JSON.pretty_generate config if $debug
 				Odania.plugin.set_global_config config
 			end
@@ -218,30 +233,10 @@ module Odania
 				@domains = Hash.new { |hash, key| hash[key] = Domain.new(key) }
 				@default_subdomains = {}
 				@layouts = Hash.new { |hash, key| hash[key] = Layout.new }
+				@partials = Hash.new { |hash, key| hash[key] = Partial.new }
 
 				@duplicates = Duplicates.new
 			end
 		end
-
-		class Duplicates
-			def initialize
-				@duplicates = Hash.new { |hash, key| hash[key] = Hash.new { |hash, key| hash[key] = Duplicate.new } }
-			end
-
-			def add(group, type, key, plugin_info)
-				@duplicates[group][type].add(key, plugin_info)
-			end
-
-			class Duplicate
-				def initialize
-					@duplicate = {}
-				end
-
-				def add(key, plugin_info)
-					@duplicate[key] = [] if @duplicate[key].nil?
-					@duplicate[key] += plugin_info
-				end
-			end
-		end
 	end
 end

data/lib/odania/varnish/generators/generate_backend_vcl.rb

@@ -8,6 +8,18 @@ module Odania
 			self.template = File.new("#{BASE_DIR}/templates/varnish/backend.vcl.erb").read
 		end
 
+		def core_backends
+			core_backends = []
+			self.backend_groups.each_pair do |group_name, backend_group|
+				if backend_group.core_backend
+					backend_group.backends.each do |backend|
+						core_backends << "#{Odania.varnish_sanitize(group_name)}_#{Odania.varnish_sanitize(backend.instance_name)}"
+					end
+				end
+			end
+			core_backends
+		end
+
 		def render
 			Erubis::Eruby.new(self.template).result(binding)
 		end

data/lib/odania/varnish/generators/generate_site_vcl.rb

@@ -8,10 +8,26 @@ module Odania
 			'www'
 		end
 
+		def template_url_for(domain, page)
+			"&domain=#{domain.name}"+
+			"&plugin_url=#{page.plugin_url.nil? ? '/' : page.plugin_url}"+
+			"&group_name=#{Odania.varnish_sanitize(page.group_name)}"
+		end
+
+		def prepare_url(url)
+			return "/#{url}" unless '/'.eql? url[0]
+			url
+		end
+
+		def general_subdomain
+			self.domain['_general']
+		end
+
 		def initialize(domain, default_subdomains)
 			self.domain = domain
 			self.default_subdomains = default_subdomains
 			self.template = File.new("#{BASE_DIR}/templates/varnish/site.vcl.erb").read
+			self.template = File.new("#{BASE_DIR}/templates/varnish/general_site.vcl.erb").read if '_general'.eql? domain.name
 		end
 
 		def render

data/lib/odania/varnish/generators/generate_sites_vcl.rb

@@ -1,5 +1,4 @@
 require_relative 'generate_site_vcl'
-require_relative 'generate_site_assets_vcl'
 
 module Odania
 	class GenerateSitesVcl
@@ -22,9 +21,6 @@ module Odania
 			self.domains.each_pair do |domain_name, domain|
 				out = GenerateSiteVcl.new(domain, default_subdomains)
 				out.write out_dir
-
-				out = GenerateSiteAssetsVcl.new(domain)
-				out.write out_dir
 			end
 		end
 	end

data/lib/odania/varnish.rb

@@ -9,16 +9,16 @@ module Odania
 	class Varnish
 		def generate(out_dir='/etc/varnish')
 			FileUtils.mkdir_p out_dir unless File.directory? out_dir
-			global_config = Odania.plugin.get_global_config
-			plugin_config = Odania.plugin.plugin_config.load_global_config global_config
+			global_config_json = Odania.plugin.get_global_config
+			global_config = Odania.plugin.plugin_config.load_global_config global_config_json
 
 			# Backend config
-			backend_groups = plugin_config.backend_groups
-			default_backend = plugin_config.default_backend
+			backend_groups = global_config.backend_groups
+			default_backend = global_config.default_backend
 
 			# Domain information config
-			domains = plugin_config.domains
-			default_subdomains = plugin_config.default_subdomains
+			domains = global_config.domains
+			default_subdomains = global_config.default_subdomains
 
 			# Generate catch all vcl
 			gen = GenerateCatchAllVcl.new
@@ -37,7 +37,7 @@ module Odania
 			gen.write(out_dir)
 
 			# Generate global redirects
-			gen = GenerateRedirectsVcl.new(plugin_config.redirects)
+			gen = GenerateRedirectsVcl.new(global_config.default_redirects)
 			gen.write(out_dir)
 
 			# Generate main vcl
@@ -47,7 +47,6 @@ module Odania
 			puts
 			puts 'Registering internal varnish plugin'
 			register_plugin
-			puts
 		end
 
 		 def reload_config
@@ -71,10 +70,10 @@ module Odania
 			plugin_config = JSON.parse File.read "#{BASE_DIR}/config/varnish_config.json"
 
 			ips = Odania.ips
-			plugin_config['ips'] = ips
-			plugin_config['ip'] = ips.first
-			plugin_config['port'] = 80
-			plugin_config['tags'] = ["plugin-#{get_plugin_name}"]
+			plugin_config['plugin-config']['ips'] = ips
+			plugin_config['plugin-config']['ip'] = ips.first
+			plugin_config['plugin-config']['port'] = 80
+			plugin_config['plugin-config']['tags'] = ["plugin-#{get_plugin_name}"]
 			puts JSON.pretty_generate plugin_config if $debug
 
 			plugin_instance_name = Odania.plugin.get_plugin_instance_name get_plugin_name

data/lib/odania/version.rb

@@ -1,3 +1,3 @@
 module Odania
-  VERSION = '0.0.16'
+  VERSION = '0.0.17'
 end

data/lib/odania.rb

@@ -4,16 +4,21 @@ require 'erubis'
 require 'fileutils'
 require 'uri/http'
 require 'public_suffix'
+require 'deep_merge'
+require 'json'
+require 'socket'
 
 BASE_DIR = File.absolute_path File.join File.dirname(__FILE__), '..'
 ENVIRONMENT = ENV['ENVIRONMENT'].nil? ? 'development' : ENV['ENVIRONMENT']
+LOCAL_TEST_MODE = 'development'.eql?(ENVIRONMENT)
 
 module Odania
 	CORE_PLUGIN_NAME = 'odania-core'
 
+	autoload :Config, 'odania/config'
 	autoload :Consul, 'odania/consul'
+	autoload :Erb, 'odania/erb'
 	autoload :Plugin, 'odania/plugin'
-	autoload :Template, 'odania/template'
 	autoload :Varnish, 'odania/varnish'
 
 	def self.plugin
@@ -42,6 +47,7 @@ module Odania
 	end
 
 	def self.varnish_sanitize(name)
+		raise 'Could not sanitize varnish name!!' if name.nil?
 		name.gsub(/[^0-9a-zA-Z_]/, '_')
 	end
 end

data/odania.gemspec

@@ -22,8 +22,11 @@ Gem::Specification.new do |spec|
 	spec.add_development_dependency 'rake'
 	spec.add_development_dependency 'rspec'
 	spec.add_development_dependency 'cucumber'
+	spec.add_development_dependency 'guard'
+	spec.add_development_dependency 'guard-rspec'
 
 	spec.add_dependency 'diplomat'
 	spec.add_dependency 'erubis'
 	spec.add_dependency 'public_suffix'
+	spec.add_dependency 'deep_merge'
 end