odania 0.0.16 → 0.0.17

data/templates/varnish/general_site.vcl.erb

@@ -0,0 +1,33 @@
+vcl 4.0;
+# generated varnish config: <%= ENVIRONMENT %>
+# local test: <%= LOCAL_TEST_MODE ? 'ENABLED' : 'DISABLED' %>
+
+sub vcl_recv {
+	std.log("pre varnish log info _general:" + req.http.host);
+
+	<% %w(direct dynamic).each do |type| %>
+		<% general_subdomain[type].each_pair do |url, page| %>
+			if (req.url ~ "^<%= prepare_url url %>") {
+				std.log("general page identified 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 %>
+
+	<% general_subdomain.get_redirects.each_pair do |src, target| %>
+		if (req.url ~ "<%= src %>") {
+			std.log("general redirect identified src:'<%= src %>':" + req.url);
+			set req.http.Location = "<%= target %>";
+			return (synth(750, "Permanently moved"));
+		}
+	<% end %>
+}

data/templates/varnish/redirects.vcl.erb

@@ -1,5 +1,6 @@
 vcl 4.0;
 # generated varnish config: <%= ENVIRONMENT %>
+# local test: <%= LOCAL_TEST_MODE ? 'ENABLED' : 'DISABLED' %>
 
 sub vcl_recv {
 	<% redirects.each_pair do |src, target| %>

data/templates/varnish/site.vcl.erb

@@ -3,6 +3,7 @@ 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);
@@ -13,13 +14,22 @@ sub vcl_recv {
 			<%= 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 );
 
-				<% subdomain.pages.each do |page| %>
-					if (req.url ~ "^<%= page.url %>") {
-						std.log("page identified '<%= subdomain.name %>.<%= domain.name %>' Page:'<%= page.url %>':" + req.url);
-
-						set req.backend_hint = <%= page.director %>.backend();
-						<% unless page.backend_url.nil? %>set req.url = "<%= page.backend_url %>";<% end %>
-					}
+	 			<% %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 %>
 
 				<% subdomain.get_redirects.each_pair do |src, target| %>
@@ -34,7 +44,7 @@ sub vcl_recv {
 			<% is_first = false %>
 		<% end %>
 
-		else {
+		<%= is_first ? '' : 'else' %> {
 			# Redirect to default
 			std.log("varnish log info 'redirect to default':" + req.url);
 			set req.http.Location = "http://<%= default_subdomain_for(domain) %>.<%= domain.name %>" + req.url;

data/templates/varnish/sites.vcl.erb

@@ -1,10 +1,10 @@
 vcl 4.0;
 # generated varnish config: <%= ENVIRONMENT %>
+# local test: <%= LOCAL_TEST_MODE ? 'ENABLED' : 'DISABLED' %>
 
 # @see https://www.varnish-cache.org/lists/pipermail/varnish-misc/2011-January/005449.html
 
 # Sites
 <% domains.each_pair do |domain_name, domain| %>
 include "/etc/varnish/sites/<%= domain_name %>.vcl";
-include "/etc/varnish/sites/<%= domain_name %>_assets.vcl";
 <% end %>

data/templates/varnish/websocker.vcl.erb

@@ -1,5 +1,6 @@
 vcl 4.0;
 # generated varnish config: <%= ENVIRONMENT %>
+# local test: <%= LOCAL_TEST_MODE ? 'ENABLED' : 'DISABLED' %>
 # https://www.varnish-cache.org/docs/4.0/users-guide/vcl-example-websockets.html
 
 sub vcl_pipe {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odania
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Mike Petersen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2016-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: diplomat
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Helper for the odania portal
 email:
 - mike@odania-it.de
@@ -118,6 +160,7 @@ files:
 - ".gitignore"
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -128,42 +171,51 @@ files:
 - features/support/env.rb
 - features/varnish.feature
 - lib/odania.rb
+- lib/odania/config.rb
+- lib/odania/config/backend.rb
+- lib/odania/config/backend_group.rb
+- lib/odania/config/domain.rb
+- lib/odania/config/duplicates.rb
+- lib/odania/config/global_config.rb
+- lib/odania/config/internal.rb
+- lib/odania/config/layout.rb
+- lib/odania/config/page.rb
+- lib/odania/config/plugin_config.rb
+- 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/models/backend.rb
-- lib/odania/plugin_config/models/backend_group.rb
-- lib/odania/plugin_config/models/domain.rb
-- lib/odania/plugin_config/models/layout.rb
-- lib/odania/plugin_config/models/page.rb
-- lib/odania/plugin_config/models/redirect.rb
-- lib/odania/plugin_config/models/sub_domain.rb
-- lib/odania/plugin_config/plugin_config.rb
-- lib/odania/template.rb
-- lib/odania/template/asset.rb
-- lib/odania/template/config.rb
-- lib/odania/template/page.rb
+- lib/odania/plugin_config/base.rb
 - lib/odania/varnish.rb
 - lib/odania/varnish/generators/generate_backend_vcl.rb
 - lib/odania/varnish/generators/generate_catch_all_vcl.rb
 - 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
 - odania.gemspec
-- spec/odania/odania_spec.rb
+- spec/fixtures/global_config.json
+- 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
 - spec/spec_helper.rb
+- spec/support/consul_mock.rb
 - tasks/odania.rake
 - tasks/rspec.rake
 - templates/varnish/backend.vcl.erb
 - templates/varnish/catch_all.vcl.erb
 - templates/varnish/default.vcl.erb
 - templates/varnish/general.vcl.erb
+- templates/varnish/general_site.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
@@ -186,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Helper for the odania portal
@@ -196,5 +248,13 @@ test_files:
 - features/step_definitions/varnish_steps.rb
 - features/support/env.rb
 - features/varnish.feature
-- spec/odania/odania_spec.rb
+- spec/fixtures/global_config.json
+- 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
 - spec/spec_helper.rb
+- spec/support/consul_mock.rb

data/lib/odania/plugin_config/models/domain.rb

@@ -1,38 +0,0 @@
-module Odania
-	module PluginConfig
-		class Domain
-			attr_accessor :name, :subdomains
-
-			def initialize(name)
-				self.name = name
-				self.subdomains = Hash.new { |hash, key| hash[key] = SubDomain.new(key) }
-			end
-
-			def add_subdomain(subdomain_name)
-				self.subdomains[subdomain_name]
-			end
-
-			def dump
-				subdomain_data = {}
-				subdomains.each_pair do |name, subdomain|
-					subdomain_data[name] = subdomain.dump
-				end
-
-				{
-					'name' => name,
-					'subdomains' => subdomain_data
-				}
-			end
-
-			def load(data)
-				self.name = data['name']
-
-				unless data['subdomains'].nil?
-					data['subdomains'].each_pair do |name, data|
-						self.subdomains[name].load(data)
-					end
-				end
-			end
-		end
-	end
-end

data/lib/odania/plugin_config/models/layout.rb

@@ -1,31 +0,0 @@
-module Odania
-	module PluginConfig
-		class Layout
-			attr_accessor :config
-
-			def initialize
-				@plugins = []
-			end
-
-			def set_config(config, plugin_name)
-				result = true
-				self.config = config
-				result = false unless @plugins.empty?
-				@plugins << plugin_name
-				result
-			end
-
-			def plugins
-				@plugins
-			end
-
-			def dump
-				config
-			end
-
-			 def load(data)
-				 self.config = data
-			 end
-		end
-	end
-end

data/lib/odania/plugin_config/models/page.rb

@@ -1,23 +0,0 @@
-module Odania
-	module PluginConfig
-		class Page
-			attr_accessor :group_name, :plugin_url
-
-			def dump
-				{
-					'group_name' => group_name,
-					'plugin_url' => plugin_url
-				}
-			end
-
-			def load(data)
-				self.group_name = data['group_name']
-				self.plugin_url = data['plugin_url']
-			end
-
-			 def director
-				 "#{Odania.varnish_sanitize(group_name)}_director"
-			 end
-		end
-	end
-end

data/lib/odania/plugin_config/models/redirect.rb

@@ -1,20 +0,0 @@
-module Odania
-	module PluginConfig
-		class Redirect
-			attr_accessor :src, :target, :plugins
-
-			def initialize(src)
-				self.src = src
-				self.plugins = []
-			end
-
-			def add(target, plugin_name)
-				self.target = target
-				self.plugins << plugin_name
-
-				return false if self.plugins.count > 1
-				true
-			end
-		end
-	end
-end

data/lib/odania/plugin_config/models/sub_domain.rb

@@ -1,99 +0,0 @@
-module Odania
-	module PluginConfig
-		class SubDomain
-			attr_accessor :name, :pages, :config, :assets, :from_plugin
-
-			def initialize(name)
-				self.name = name
-				self.config = {}
-				self.from_plugin = {:config => Hash.new { |hash, key| hash[key] = [] }}
-				self.pages = Hash.new { |hash, key| hash[key] = Page.new }
-				self.assets = Hash.new { |hash, key| hash[key] = Page.new }
-				@plugins = {:page => Hash.new { |hash, key| hash[key] = [] }, :asset => Hash.new { |hash, key| hash[key] = [] }}
-			end
-
-			def set_config(config_data, group_name)
-				errors = []
-				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(web_url, group_name, plugin_url, plugin_name)
-				result = true
-				result = false unless self.assets.key? web_url
-				self.pages[web_url].group_name = group_name
-				self.pages[web_url].plugin_url = plugin_url
-				@plugins[:page][web_url] << plugin_name
-				result
-			end
-
-			def add_asset(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
-				page_data = {}
-				pages.each_pair do |web_url, page|
-					page_data[web_url] = page.dump
-				end
-
-				asset_data = {}
-				assets.each_pair do |web_url, page|
-					asset_data[web_url] = page.dump
-				end
-
-				{
-					'name' => name,
-					'config' => config,
-					'pages' => page_data,
-					'assets' => asset_data
-				}
-			end
-
-			def load(data)
-				reset
-				self.config = data['config']
-
-				unless data['pages'].nil?
-					data['pages'].each_pair do |name, data|
-						self.pages[name].load(data)
-					end
-				end
-
-				unless data['assets'].nil?
-					data['assets'].each_pair do |name, data|
-						self.assets[name].load(data)
-					end
-				end
-			end
-
-			private
-
-			def reset
-				self.from_plugin = {:config => Hash.new { |hash, key| hash[key] = [] }}
-				self.pages = Hash.new { |hash, key| hash[key] = Page.new }
-				self.assets = Hash.new { |hash, key| hash[key] = Page.new }
-				@plugins = {:page => Hash.new { |hash, key| hash[key] = [] }, :asset => Hash.new { |hash, key| hash[key] = [] }}
-			end
-		end
-	end
-end

data/lib/odania/template/asset.rb

@@ -1,15 +0,0 @@
-module Odania
-	module Template
-		class Asset
-			attr_accessor :assets
-
-			def initialize
-				self.assets = Hash.new
-			end
-
-			def get(key)
-				self.assets[key]
-			end
-		end
-	end
-end

data/lib/odania/template/config.rb

@@ -1,15 +0,0 @@
-module Odania
-	module Template
-		class Config
-			attr_accessor :config
-
-			def initialize
-				self.config = Hash.new
-			end
-
-			def get(key)
-				self.config[key]
-			end
-		end
-	end
-end

data/lib/odania/template/page.rb

@@ -1,16 +0,0 @@
-module Odania
-	module Template
-		class Page
-			attr_accessor :pages
-
-			def initialize
-				self.pages = Hash.new
-			end
-
-			def get(key)
-				"<esi:include src=\"/cgi-bin/date.cgi\"/>"
-				self.pages[key]
-			end
-		end
-	end
-end

data/lib/odania/template.rb

@@ -1,8 +0,0 @@
-require_relative 'template/asset'
-require_relative 'template/config'
-require_relative 'template/page'
-
-module Odania
-	module Template
-	end
-end

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

@@ -1,27 +0,0 @@
-module Odania
-	class GenerateSiteAssetsVcl
-		attr_accessor :domain, :assets, :template
-
-		def initialize(domain)
-			self.domain = domain
-			self.template = File.new("#{BASE_DIR}/templates/varnish/site_assets.vcl.erb").read
-
-			self.assets = Hash.new { |hash, key| hash[key] = Odania::PluginConfig::SubDomain.new(key) }
-			domain.subdomains.each_pair do |subdomain_name, subdomain|
-				asset_domain = subdomain.config['asset_url'].nil? ? "#{subdomain.name}.#{domain.name}" : subdomain.config['asset_url']
-
-				subdomain.assets.each_pair do |src, page|
-					self.assets[asset_domain].assets[src] = page
-				end
-			end
-		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/templates/varnish/site_assets.vcl.erb

@@ -1,24 +0,0 @@
-<%
-is_first = true
-%>
-vcl 4.0;
-# generated varnish config: <%= ENVIRONMENT %>
-
-sub vcl_recv {
-	<% assets.each_pair do |asset_domain, subdomain| %>
-		<%= is_first ? '' : 'else ' %>if (req.http.host ~ "^<%= asset_domain %>$") {
-			std.log("subdomain identified assets '<%= asset_domain %>':" + req.http.host + " url: " + req.url );
-
-			<% subdomain.assets.each_pair do |src, page| %>
-				if (req.url ~ "^<%= src %>") {
-					std.log("page identified assets '<%= asset_domain %>' Page:'<%= src %>':" + req.url);
-
-					set req.backend_hint = <%= page.director %>.backend();
-					<% unless page.plugin_url.nil? %>set req.url = "<%= page.plugin_url %>";<% end %>
-				}
-			<% end %>
-
-		}
-		<% is_first = false %>
-	<% end %>
-}