odania 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a5a520ac12de40571852067855b0471297d244c
-  data.tar.gz: 69685e1f55249f36906b3184e30336770c2f04c0
+  metadata.gz: 8231be278b477108ee91b8b72cb153b777dea0c6
+  data.tar.gz: 144e705b3ef3b3eef96860a6ed3e69215afaf997
 SHA512:
-  metadata.gz: 2ca2320f73fedc397f662e0ce36955493af048d222af10d6824a17ec7e12e09997fedb525db3a116bf91caa70f0cebda3833062f0e294e6321e048ef20c17742
-  data.tar.gz: e4fdeee4b1352e3ed427b5a089b7d02e3a37edf8715d4fa123f45f37e20b11ffab7a487d6ecc639da22cc49632cef2993f095637fb585a522970bdded34eac1c
+  metadata.gz: 639da08f0dc6895d1c7627a73ae835b110797a54250a9202e6d4acd9aa403d072026b9517afa924d3a4563cc0931a0ca01019e21e3e7aca7b5ba697647258223
+  data.tar.gz: a993aeef804be2fc9ab2e7618eaac0f18b27cfc077310c9814cd62d9b3ac00160121d972d9e95e07fc554368639d25b9a67dc664c0ff8c9e282d3b1100bda6a9

data/Gemfile.lock

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

data/lib/odania/config/domain.rb

@@ -41,6 +41,10 @@ module Odania
 				duplicates
 			end
 
+			def get_redirects
+				self.subdomains['_general'].get_redirects
+			end
+
 			def [](key)
 				self.subdomains[key]
 			end

data/lib/odania/config/global_config.rb

@@ -49,6 +49,11 @@ module Odania
 						puts 'Error start ' + '+' * 50
 						puts e.inspect
 						puts 'Error end ' + '+' * 50
+						puts 'Error backtrace start ' + '+' * 50
+						e.backtrace.each do |line|
+							puts line
+						end
+						puts 'Error backtrace end ' + '+' * 50
 					end
 				end
 			end
@@ -78,15 +83,17 @@ module Odania
 				@default_subdomains.deep_merge(plugin_cfg['default_subdomains']) unless plugin_cfg['default_subdomains'].nil?
 
 				# Add this service as a default backend if specified
-				@default_backend_groups << group_name if config_section['default']
+				@default_backend_groups << group_name if plugin_cfg['plugin-config']['default']
 
 				# Add config
-				config_section.each_pair do |key, val|
-					unless @config[key].nil?
-						@duplicates.add :config, {key => 'already defined'}, group_name
+				unless config_section.nil?
+					config_section.each_pair do |key, val|
+						unless @config[key].nil?
+							@duplicates.add :config, {key => 'already defined'}, group_name
+						end
 					end
+					@config.deep_merge! config_section
 				end
-				@config.deep_merge! config_section
 
 				# Add Domain Information
 				unless plugin_cfg['domains'].nil?

data/lib/odania/config/internal.rb

@@ -7,7 +7,17 @@ module Odania
 				reset
 			end
 
-			def load(data)
+			def assets
+				result = {}
+				self.layouts.each_pair do |name, layout|
+					layout.assets.each_pair do |key, val|
+						result[key] = val
+					end
+				end
+				result
+			end
+
+			def load(data, group_name)
 				reset
 				unless data['partials'].nil?
 					data['partials'].each_pair do |name, data|
@@ -17,7 +27,7 @@ module Odania
 
 				unless data['layouts'].nil?
 					data['layouts'].each_pair do |name, data|
-						self.layouts[name].load(data)
+						self.layouts[name].load(data, group_name)
 					end
 				end
 			end

data/lib/odania/config/layout.rb

@@ -7,6 +7,11 @@ module Odania
 				reset
 			end
 
+			def assets
+				return {} if self.styles['_general'].nil? or self.styles['_general'].assets.nil?
+				self.styles['_general'].assets
+			end
+
 			def dump
 				style_data = {}
 				styles.each_pair do |name, style|
@@ -18,11 +23,11 @@ module Odania
 				result
 			end
 
-			def load(data)
+			def load(data, group_name)
 				reset
 				unless data['styles'].nil?
 					data['styles'].each_pair do |key, val|
-						self.styles[key].load(val)
+						self.styles[key].load(val, group_name)
 					end
 				end
 			end

data/lib/odania/config/page.rb

@@ -21,6 +21,7 @@ module Odania
 			end
 
 			def director
+				puts self.inspect if self.group_name.nil?
 				"#{Odania.varnish_sanitize(self.group_name)}_director"
 			end
 		end

data/lib/odania/config/style.rb

@@ -1,7 +1,7 @@
 module Odania
 	module Config
 		class Style
-			attr_accessor :name, :entry_point, :direct, :dynamic
+			attr_accessor :name, :entry_point, :direct, :dynamic, :assets
 
 			def initialize(name)
 				self.name = name
@@ -23,26 +23,38 @@ module Odania
 					dynamic_data[web_url] = page.dump
 				end
 
+				asset_data = {}
+				assets.each_pair do |asset_url, page|
+					asset_data[asset_url] = page.dump
+				end
+
 				{
 					'entry_point' => entry_point,
 					'direct' => direct_data,
-					'dynamic' => dynamic_data
+					'dynamic' => dynamic_data,
+					'assets' => asset_data
 				}
 			end
 
-			def load(data)
+			def load(data, group_name)
 				reset
 				self.entry_point = data['entry_point'] unless data['entry_point'].nil?
 
 				unless data['direct'].nil?
 					data['direct'].each_pair do |name, data|
-						self.direct[name].load(data)
+						self.direct[name].load(data, group_name)
 					end
 				end
 
 				unless data['dynamic'].nil?
 					data['dynamic'].each_pair do |name, data|
-						self.dynamic[name].load(data)
+						self.dynamic[name].load(data, group_name)
+					end
+				end
+
+				unless data['assets'].nil?
+					data['assets'].each_pair do |name, data|
+						self.assets[name].load(data, group_name)
 					end
 				end
 			end
@@ -53,6 +65,7 @@ module Odania
 				self.entry_point = nil
 				self.direct = Hash.new { |hash, key| hash[key] = Page.new }
 				self.dynamic = Hash.new { |hash, key| hash[key] = Page.new }
+				self.assets = Hash.new { |hash, key| hash[key] = Page.new }
 				@plugins = {:direct => Hash.new { |hash, key| hash[key] = [] }, :dynamic => Hash.new { |hash, key| hash[key] = [] }}
 			end
 		end

data/lib/odania/config/sub_domain.rb

@@ -31,25 +31,19 @@ module Odania
 				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']
+				return {} if self.redirects.nil?
+				self.redirects
 			end
 
 			def plugins(type, key)
 				@plugins[type][key]
 			end
 
+			def assets
+				self.internal.assets
+			end
+
 			def dump
 				direct_data = {}
 				direct.each_pair do |web_url, page|
@@ -93,7 +87,7 @@ module Odania
 					end
 				end
 
-				self.internal.load(data['internal']) unless data['internal'].nil?
+				self.internal.load(data['internal'], group_name) 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

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

@@ -0,0 +1,41 @@
+module Odania
+	class GenerateSiteAssetsVcl
+		attr_accessor :domain, :template, :default_subdomains
+
+		def default_subdomain_for(domain)
+			return self.default_subdomains[domain.name] unless self.default_subdomains[domain.name].nil?
+			return self.default_subdomains['_general'] unless self.default_subdomains['_general'].nil?
+			'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_assets.vcl.erb").read
+			self.template = File.new("#{BASE_DIR}/templates/varnish/general_site_assets.vcl.erb").read if '_general'.eql? domain.name
+		end
+
+		def render
+			Erubis::Eruby.new(self.template).result(binding)
+		end
+
+		def write(out_dir)
+			File.write("#{out_dir}/sites/#{self.domain.name}_assets.vcl", self.render)
+		end
+	end
+end

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

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

data/lib/odania/version.rb

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

data/lib/odania.rb

@@ -17,7 +17,6 @@ module Odania
 
 	autoload :Config, 'odania/config'
 	autoload :Consul, 'odania/consul'
-	autoload :Erb, 'odania/erb'
 	autoload :Plugin, 'odania/plugin'
 	autoload :Varnish, 'odania/varnish'
 

data/templates/varnish/general.vcl.erb

@@ -18,6 +18,10 @@ sub vcl_recv {
 			std.log("template partial identified! Page:" + req.url);
 			set req.backend_hint = core_backend_director.backend();
 			return (hash);
+		} else if (req.url ~ "^/template/page") {
+			std.log("template page identified! Page:" + req.url);
+			set req.backend_hint = core_backend_director.backend();
+			return (hash);
 		}
 	}
 

data/templates/varnish/general_site_assets.vcl.erb

@@ -0,0 +1,21 @@
+vcl 4.0;
+# generated varnish config: <%= ENVIRONMENT %>
+# local test: <%= LOCAL_TEST_MODE ? 'ENABLED' : 'DISABLED' %>
+
+sub vcl_recv {
+	std.log("pre varnish log info '<%= domain.name %>':" + req.http.host);
+	if (req.http.host ~ "<%= domain.name %>$") {
+		std.log("varnish log info '<%= domain.name %>':" + req.http.host);
+
+		<% general_subdomain.assets.each_pair do |url, page| %>
+			if (req.url ~ "^<%= prepare_url url %>") {
+				std.log("page identified '<%= subdomain.name %>.<%= domain.name %>' Page:'<%= url %>':" + req.url);
+
+				set req.backend_hint = <%= page.director %>.backend();
+				<% unless page.plugin_url.nil? %>set req.url = "<%= page.plugin_url %>";<% end %>
+
+				return (hash);
+			}
+		<% end %>
+	}
+}

data/templates/varnish/site.vcl.erb

@@ -10,7 +10,8 @@ sub vcl_recv {
 	if (req.http.host ~ "<%= domain.name %>$") {
 		std.log("varnish log info '<%= domain.name %>':" + req.http.host);
 
-		<% domain.subdomains.each_pair do |subdomain_name, subdomain| %>
+		<% domain.subdomains.each_pair do |subdomain_name, subdomain|
+			next if '_general'.eql? subdomain_name %>
 			<%= is_first ? '' : 'else ' %>if (req.http.host ~ "^<%= subdomain.name %>.<%= domain.name %>$") {
 				std.log("subdomain identified '<%= subdomain.name %>.<%= domain.name %>':" + req.http.host + " url: " + req.url );
 
@@ -44,12 +45,41 @@ sub vcl_recv {
 			<% is_first = false %>
 		<% end %>
 
+		# Important: This needs to be directly after the subdomain config
 		<%= is_first ? '' : 'else' %> {
-			# Redirect to default
+			# Redirect to default subdomain
 			std.log("varnish log info 'redirect to default':" + req.url);
 			set req.http.Location = "http://<%= default_subdomain_for(domain) %>.<%= domain.name %>" + req.url;
 			return (synth(750, "Permanently moved"));
 		}
+
+		# General part
+		<% domain.get_redirects.each_pair do |src, target| %>
+			if (req.url ~ "<%= src %>") {
+				std.log("general redirect identified '<%= domain.name %>' src:'<%= src %>':" + req.url);
+				set req.http.Location = "<%= target %>";
+				return (synth(750, "Permanently moved"));
+			}
+		<% end %>
+
+		<% subdomain = domain.subdomains['_general'] %>
+		<% %w(direct dynamic).each do |type| %>
+			<% subdomain[type].each_pair do |url, page| %>
+				if (req.url ~ "^<%= prepare_url url %>") {
+					std.log("page identified '<%= subdomain.name %>.<%= domain.name %>' Page:'<%= url %>':" + req.url);
+
+					<% if 'direct'.eql? type %>
+					set req.backend_hint = <%= page.director %>.backend();
+					<% unless page.plugin_url.nil? %>set req.url = "<%= page.plugin_url %>";<% end %>
+					<% else %>
+					set req.backend_hint = core_backend_director.backend();
+					set req.url = "/template/page?req_url=" + req.url + "&req_host=" + req.http.host + "<%= template_url_for(domain, page) %>";
+					<% end %>
+
+					return (hash);
+				}
+			<% end %>
+		<% end %>
 	}
 }
 

data/templates/varnish/site_assets.vcl.erb

@@ -0,0 +1,34 @@
+<%
+is_first = true
+%>
+vcl 4.0;
+# generated varnish config: <%= ENVIRONMENT %>
+# local test: <%= LOCAL_TEST_MODE ? 'ENABLED' : 'DISABLED' %>
+
+sub vcl_recv {
+	std.log("pre varnish log info '<%= domain.name %>':" + req.http.host);
+	if (req.http.host ~ "<%= domain.name %>$") {
+		std.log("varnish log info '<%= domain.name %>':" + req.http.host);
+
+		<% domain.subdomains.each_pair do |subdomain_name, subdomain| %>
+			<% unless '_general'.eql? subdomain_name %><%= is_first ? '' : 'else ' %>if (req.http.host ~ "^<%= subdomain.name %>.<%= domain.name %>$") {<% end %>
+				std.log("subdomain identified '<%= subdomain.name %>.<%= domain.name %>':" + req.http.host + " url: " + req.url );
+
+				<% subdomain.assets.each_pair do |url, page| %>
+					if (req.url ~ "^<%= prepare_url url %>") {
+						std.log("page identified '<%= subdomain.name %>.<%= domain.name %>' Page:'<%= url %>':" + req.url);
+
+						set req.backend_hint = <%= page.director %>.backend();
+						<% unless page.plugin_url.nil? %>set req.url = "<%= page.plugin_url %>";<% end %>
+
+						return (hash);
+					}
+				<% end %>
+
+			<% unless '_general'.eql? subdomain_name %>
+			}
+			<% is_first = false %>
+			<% end %>
+		<% end %>
+	}
+}

data/templates/varnish/sites.vcl.erb

@@ -6,5 +6,6 @@ vcl 4.0;
 
 # Sites
 <% domains.each_pair do |domain_name, domain| %>
+include "/etc/varnish/sites/<%= domain_name %>_assets.vcl";
 include "/etc/varnish/sites/<%= domain_name %>.vcl";
 <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odania
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Mike Petersen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-20 00:00:00.000000000 Z
+date: 2016-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -184,7 +184,6 @@ files:
 - lib/odania/config/style.rb
 - lib/odania/config/sub_domain.rb
 - lib/odania/consul.rb
-- lib/odania/erb.rb
 - lib/odania/plugin.rb
 - lib/odania/plugin_config/base.rb
 - lib/odania/varnish.rb
@@ -193,6 +192,7 @@ files:
 - lib/odania/varnish/generators/generate_default_vcl.rb
 - lib/odania/varnish/generators/generate_general_vcl.rb
 - lib/odania/varnish/generators/generate_redirects_vcl.rb
+- lib/odania/varnish/generators/generate_site_assets_vcl.rb
 - lib/odania/varnish/generators/generate_site_vcl.rb
 - lib/odania/varnish/generators/generate_sites_vcl.rb
 - lib/odania/version.rb
@@ -201,7 +201,6 @@ files:
 - spec/fixtures/plugin_config_1.json
 - spec/lib/odania/config/global_config_spec.rb
 - spec/lib/odania/config/plugin_config_spec.rb
-- spec/lib/odania/erb_spec.rb
 - spec/lib/odania/plugin_spec.rb
 - spec/lib/odania/varnish_spec.rb
 - spec/lib/odania_spec.rb
@@ -214,8 +213,10 @@ files:
 - templates/varnish/default.vcl.erb
 - templates/varnish/general.vcl.erb
 - templates/varnish/general_site.vcl.erb
+- templates/varnish/general_site_assets.vcl.erb
 - templates/varnish/redirects.vcl.erb
 - templates/varnish/site.vcl.erb
+- templates/varnish/site_assets.vcl.erb
 - templates/varnish/sites.vcl.erb
 - templates/varnish/websocker.vcl.erb
 homepage: http://www.odania.com
@@ -252,7 +253,6 @@ test_files:
 - spec/fixtures/plugin_config_1.json
 - spec/lib/odania/config/global_config_spec.rb
 - spec/lib/odania/config/plugin_config_spec.rb
-- spec/lib/odania/erb_spec.rb
 - spec/lib/odania/plugin_spec.rb
 - spec/lib/odania/varnish_spec.rb
 - spec/lib/odania_spec.rb

data/lib/odania/erb.rb

@@ -1,154 +0,0 @@
-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/spec/lib/odania/erb_spec.rb

@@ -1,16 +0,0 @@
-describe Odania::Erb do
-	context 'render simple template' do
-		let(:subject) {
-			Odania::Erb.new('This is a very simple template', 'example.com', {}, 'odania-test', 'test.odania.com')
-		}
-
-		let(:global_cfg) {
-			JSON.parse File.read("#{BASE_DIR}/spec/fixtures/global_config.json")
-		}
-
-		it 'renders simple template' do
-			$consul_mock.config.set('global_plugins_config', global_cfg)
-			expect(subject.render).to eq('This is a very simple template')
-		end
-	end
-end