odania 0.0.32 → 0.0.33

data/spec/fixtures/plugin_config_1.json

@@ -21,49 +21,45 @@
 			"_general": {
 				"redirects": {},
 				"config": {},
-				"direct": {},
-				"dynamic": {},
-				"internal": {
-					"layouts": {
-						"main": {
+				"web": {},
+				"assets": {},
+				"layouts": {
+					"main": {
+						"config": {
 							"styles": {
 								"_general": {
-									"entry_point": "application.html.erb",
-									"direct": {
-										"layouts/mac-beath/img/favicon/favicon.png": {
-											"plugin_url": "layouts/mac-beath/img/favicon/favicon.png",
-											"cacheable": true,
-											"expires": 60
-										},
-										"layouts/mac-beath/img/photos/t12.jpg": {
-											"plugin_url": "layouts/mac-beath/img/photos/t12.jpg"
-										}
-									},
-									"dynamic": {
-										"layouts/simple/application_part1.html": {
-											"plugin_url": "layouts/simple/application_part1.html.erb",
-											"cacheable": true,
-											"expires": 60
-										}
-									},
-									"assets": {}
+									"entry_point": "application.html.erb"
 								},
 								"left_menu": {
-									"entry_point": "application.html.erb",
-									"direct": {},
-									"dynamic": {},
-									"assets": {}
+									"entry_point": "application.html.erb"
 								}
 							}
-						}
-					},
-					"partials": {
-						"footer": {
-							"plugin_url": "partials/footer.html",
-							"cacheable": true,
-							"expires": 60
+						},
+						"assets": {
+							"layouts/mac-beath/img/favicon/favicon.png": {
+								"plugin_url": "layouts/mac-beath/img/favicon/favicon.png",
+								"cacheable": true,
+								"expires": 60
+							},
+							"layouts/mac-beath/img/photos/t12.jpg": {
+								"plugin_url": "layouts/mac-beath/img/photos/t12.jpg"
+							}
+						},
+						"partials": {
+							"layouts/simple/application_part1.html": {
+								"plugin_url": "layouts/simple/application_part1.html.erb",
+								"cacheable": true,
+								"expires": 60
+							}
 						}
 					}
+				},
+				"partials": {
+					"footer": {
+						"plugin_url": "partials/footer.html",
+						"cacheable": true,
+						"expires": 60
+					}
 				}
 			}
 		},
@@ -73,7 +69,7 @@
 					"^/test": "/test2"
 				},
 				"config": {},
-				"direct": {
+				"web": {
 					"/imprint": {
 						"plugin_url": "/my-imprint",
 						"cacheable": true,
@@ -84,11 +80,9 @@
 						"cacheable": false
 					}
 				},
-				"dynamic": {},
-				"internal": {
-					"layouts": {},
-					"partials": {}
-				}
+				"assets": {},
+				"layouts": {},
+				"partials": {}
 			}
 		}
 	}

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

@@ -14,9 +14,11 @@ describe Odania::Config::GlobalConfig do
 			expect(cfg_result['domains']['example.com']['www']['redirects']).to eql(cfg1['domains']['example.com']['www']['redirects'])
 			expect(cfg_result['domains']['example.com']['www']['config']).to eql(cfg1['domains']['example.com']['www']['config'])
 
-			cfg1['domains']['example.com']['www']['direct'].each_pair do |path, data|
+			%w(web assets partials).each do |type|
+				cfg1['domains']['example.com']['www'][type].each_pair do |path, data|
 
-				expect(cfg_result['domains']['example.com']['www']['direct'][path]['plugin_url']).to eql(data['plugin_url'])
+					expect(cfg_result['domains']['example.com']['www'][type][path]['plugin_url']).to eql(data['plugin_url'])
+				end
 			end
 
 		end
@@ -29,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(:direct)
+			expect(duplicates).to have_key(:partials)
 			expect(duplicates).to have_key(:redirect)
 		end
 

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

@@ -22,7 +22,10 @@ describe Odania::Config::PluginConfig do
 
 		it 'dumps the same config' do
 			expect(subject.load(cfg)).to be(true)
-			expect(subject.dump).to eql(cfg)
+			result = subject.dump
+			diff = HashDiff.best_diff result, cfg
+			puts "Best diff: #{diff.inspect}"
+			expect(result).to eql(cfg)
 		end
 	end
 end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ CodeClimate::TestReporter.start
 require 'odania'
 require_relative 'support/consul_mock'
 
+require 'hashdiff'
 
 RSpec.configure do |config|
 	config.before(:each) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odania
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - Mike Petersen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-29 00:00:00.000000000 Z
+date: 2016-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashdiff
+  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
@@ -182,12 +196,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- config/varnish_config.json
 - features/plugin.feature
 - features/step_definitions/plugin_steps.rb
-- features/step_definitions/varnish_steps.rb
 - features/support/env.rb
-- features/varnish.feature
 - lib/odania.rb
 - lib/odania/config.rb
 - lib/odania/config/backend.rb
@@ -195,7 +206,6 @@ files:
 - 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/page_base.rb
@@ -204,16 +214,6 @@ files:
 - lib/odania/config/sub_domain.rb
 - lib/odania/consul.rb
 - lib/odania/plugin.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_final_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/fixtures/global_config.json
@@ -221,24 +221,11 @@ files:
 - spec/lib/odania/config/global_config_spec.rb
 - spec/lib/odania/config/plugin_config_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/final.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
 licenses:
 - MIT
@@ -266,15 +253,12 @@ summary: Helper for the odania portal
 test_files:
 - features/plugin.feature
 - features/step_definitions/plugin_steps.rb
-- features/step_definitions/varnish_steps.rb
 - features/support/env.rb
-- features/varnish.feature
 - 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/plugin_spec.rb
-- spec/lib/odania/varnish_spec.rb
 - spec/lib/odania_spec.rb
 - spec/spec_helper.rb
 - spec/support/consul_mock.rb

data/config/varnish_config.json

@@ -1,7 +0,0 @@
-{
-	"plugin-config": {
-		"name": "odania-varnish",
-		"default": false
-	},
-	"domains": {}
-}

data/features/step_definitions/varnish_steps.rb

@@ -1,7 +0,0 @@
-When(/^I generate the varnish config$/) do
-	Odania.varnish.generate('/tmp/varnish')
-end
-
-Then(/^I have a valid varnish config$/) do
-	pending # Write code here that turns the phrase above into concrete actions
-end

data/features/varnish.feature

@@ -1,8 +0,0 @@
-Feature: Varnish
-	Configuration for varnish. It is the gateway from the web to the plugin infrastructure.
-
-	Scenario: Generate config
-		Given I initialize the gem
-		When I registered the plugin "test-plugin"
-			And I generate the varnish config
-		Then I have a valid varnish config

data/lib/odania/config/internal.rb

@@ -1,58 +0,0 @@
-module Odania
-	module Config
-		class Internal
-			attr_accessor :partials, :layouts
-
-			def initialize
-				reset
-			end
-
-			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, partial_data|
-						self.partials[name].load(partial_data)
-					end
-				end
-
-				unless data['layouts'].nil?
-					data['layouts'].each_pair do |name, layout_data|
-						self.layouts[name].load(layout_data, group_name)
-					end
-				end
-			end
-
-			def dump
-				partial_data = {}
-				partials.each_pair do |web_url, page|
-					partial_data[web_url] = page.dump
-				end
-
-				layout_data = {}
-				layouts.each_pair do |web_url, page|
-					layout_data[web_url] = page.dump
-				end
-
-				{
-					'layouts' => layout_data,
-					'partials' => partial_data
-				}
-			end
-
-			def reset
-				self.layouts = Hash.new { |hash, key| hash[key] = Layout.new }
-				self.partials = Hash.new { |hash, key| hash[key] = Page.new }
-			end
-		end
-	end
-end

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

@@ -1,48 +0,0 @@
-module Odania
-	class GenerateBackendVcl
-		attr_accessor :default_backend, :backend_groups, :template
-
-		def initialize(default_backend, backend_groups)
-			self.default_backend = default_backend
-			self.backend_groups = backend_groups
-			self.template = File.new("#{BASE_DIR}/templates/varnish/backend.vcl.erb").read
-
-			@backend_names = []
-		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 backend_name_for(group_name, instance_name)
-			backend_name = "#{Odania.varnish_sanitize(group_name)}_#{Odania.varnish_sanitize(instance_name)}"
-			@backend_names << backend_name
-			backend_name
-		end
-
-		def backend_name_already_taken(group_name, instance_name)
-			backend_name = "#{Odania.varnish_sanitize(group_name)}_#{Odania.varnish_sanitize(instance_name)}"
-			if @backend_names.include? backend_name
-				$logger.error "The Backend #{backend_name} is already defined!"
-				return true
-			end
-			false
-		end
-
-		def render
-			Erubis::Eruby.new(self.template).result(binding)
-		end
-
-		def write(out_dir)
-			File.write("#{out_dir}/backend.vcl", self.render)
-		end
-	end
-end

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

@@ -1,17 +0,0 @@
-module Odania
-	class GenerateCatchAllVcl
-		attr_accessor :template
-
-		def initialize
-			self.template = File.new("#{BASE_DIR}/templates/varnish/catch_all.vcl.erb").read
-		end
-
-		def render
-			Erubis::Eruby.new(self.template).result(binding)
-		end
-
-		def write(out_dir)
-			File.write("#{out_dir}/catch_all.vcl", self.render)
-		end
-	end
-end

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

@@ -1,17 +0,0 @@
-module Odania
-	class GenerateDefaultVcl
-		attr_accessor :template
-
-		def initialize
-			self.template = File.new("#{BASE_DIR}/templates/varnish/default.vcl.erb").read
-		end
-
-		def render
-			Erubis::Eruby.new(self.template).result(binding)
-		end
-
-		def write(out_dir)
-			File.write("#{out_dir}/default.vcl", self.render)
-		end
-	end
-end

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

@@ -1,17 +0,0 @@
-module Odania
-	class GenerateFinalVcl
-		attr_accessor :template
-
-		def initialize
-			self.template = File.new("#{BASE_DIR}/templates/varnish/final.vcl.erb").read
-		end
-
-		def render
-			Erubis::Eruby.new(self.template).result(binding)
-		end
-
-		def write(out_dir)
-			File.write("#{out_dir}/final.vcl", self.render)
-		end
-	end
-end

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

@@ -1,17 +0,0 @@
-module Odania
-	class GenerateGeneralVcl
-		attr_accessor :template
-
-		def initialize
-			self.template = File.new("#{BASE_DIR}/templates/varnish/general.vcl.erb").read
-		end
-
-		def render
-			Erubis::Eruby.new(self.template).result(binding)
-		end
-
-		def write(out_dir)
-			File.write("#{out_dir}/general.vcl", self.render)
-		end
-	end
-end

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

@@ -1,18 +0,0 @@
-module Odania
-	class GenerateRedirectsVcl
-		attr_accessor :redirects, :template
-
-		def initialize(redirects)
-			self.redirects = redirects
-			self.template = File.new("#{BASE_DIR}/templates/varnish/redirects.vcl.erb").read
-		end
-
-		def render
-			Erubis::Eruby.new(self.template).result(binding)
-		end
-
-		def write(out_dir)
-			File.write("#{out_dir}/redirects.vcl", self.render)
-		end
-	end
-end

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

@@ -1,14 +0,0 @@
-module Odania
-	class GenerateSiteAssetsVcl < GenerateSiteVcl
-
-		def initialize(domain, default_subdomains)
-			super(domain, 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 write(out_dir)
-			File.write("#{out_dir}/sites/#{self.domain.name}_assets.vcl", self.render)
-		end
-	end
-end

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

@@ -1,41 +0,0 @@
-module Odania
-	class GenerateSiteVcl
-		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.vcl.erb").read
-			self.template = File.new("#{BASE_DIR}/templates/varnish/general_site.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}.vcl", self.render)
-		end
-	end
-end

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

@@ -1,31 +0,0 @@
-require_relative 'generate_site_vcl'
-require_relative 'generate_site_assets_vcl'
-
-module Odania
-	class GenerateSitesVcl
-		attr_accessor :domains, :template, :default_subdomains
-
-		def initialize(domains, default_subdomains)
-			self.domains = domains
-			self.default_subdomains = default_subdomains
-			self.template = File.new("#{BASE_DIR}/templates/varnish/sites.vcl.erb").read
-		end
-
-		def render
-			Erubis::Eruby.new(self.template).result(binding)
-		end
-
-		def write(out_dir)
-			File.write("#{out_dir}/sites.vcl", self.render)
-
-			Dir.mkdir "#{out_dir}/sites" unless File.directory? "#{out_dir}/sites"
-			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
-end

data/lib/odania/varnish.rb

@@ -1,92 +0,0 @@
-require_relative 'varnish/generators/generate_backend_vcl'
-require_relative 'varnish/generators/generate_catch_all_vcl'
-require_relative 'varnish/generators/generate_default_vcl'
-require_relative 'varnish/generators/generate_final_vcl'
-require_relative 'varnish/generators/generate_general_vcl'
-require_relative 'varnish/generators/generate_redirects_vcl'
-require_relative 'varnish/generators/generate_sites_vcl'
-
-module Odania
-	class Varnish
-		def generate(out_dir='/etc/varnish')
-			FileUtils.mkdir_p out_dir unless File.directory? out_dir
-			global_config_json = Odania.plugin.get_global_config
-			global_config = Odania.plugin.plugin_config.load_global_config global_config_json
-
-			# Backend config
-			backend_groups = global_config.backend_groups
-			default_backend = global_config.default_backend
-
-			# Domain information config
-			domains = global_config.domains
-			default_subdomains = global_config.default_subdomains
-
-			# Generate catch all vcl
-			gen = GenerateCatchAllVcl.new
-			gen.write(out_dir)
-
-			# Generate catch all vcl
-			gen = GenerateGeneralVcl.new
-			gen.write(out_dir)
-
-			# Generate backend vcl
-			gen = GenerateBackendVcl.new(default_backend, backend_groups)
-			gen.write(out_dir)
-
-			# Generate vcl_recv
-			gen = GenerateSitesVcl.new(domains, default_subdomains)
-			gen.write(out_dir)
-
-			# Generate global redirects
-			gen = GenerateRedirectsVcl.new(global_config.default_redirects)
-			gen.write(out_dir)
-
-			# Generate main vcl
-			gen = GenerateDefaultVcl.new
-			gen.write(out_dir)
-
-			# Generate final vcl
-			gen = GenerateFinalVcl.new
-			gen.write(out_dir)
-
-			puts
-			$logger.info 'Registering internal varnish plugin'
-			register_plugin
-		end
-
-		def reload_config
-			$logger.info 'Updating varnish config'
-			current_number = 0
-			current_number = File.read('/tmp/current_varnish_config_number').to_i if File.exist? '/tmp/current_varnish_config_number'
-			current_number += 1
-			File.write '/tmp/current_varnish_config_number', current_number
-
-			cmd = "varnishadm vcl.load reload#{current_number} /etc/varnish/default.vcl"
-			$logger.info "CMD: #{cmd}"
-			$logger.info `#{cmd}`
-			cmd = "varnishadm vcl.use reload#{current_number}"
-			$logger.info "CMD: #{cmd}"
-			$logger.info `#{cmd}`
-		end
-
-		private
-
-		def register_plugin
-			plugin_config = JSON.parse File.read "#{BASE_DIR}/config/varnish_config.json"
-
-			ips = Odania.ips
-			plugin_config['plugin-config']['ips'] = ips
-			plugin_config['plugin-config']['ip'] = Odania.primary_ip(ips)
-			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
-			Odania.plugin.register plugin_instance_name, plugin_config
-		end
-
-		def get_plugin_name
-			'odania_varnish'
-		end
-	end
-end