odania 0.1.0 → 0.2.0

data/lib/odania/config/subdomain_config.rb

@@ -1,124 +0,0 @@
-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 = {
-					domain: @domain,
-					subdomain: @subdomain,
-					full_domain: "#{@subdomain}.#{@domain}",
-					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].clone if path.empty?
-				retrieve_hash_path hash[key], path
-			end
-
-		end
-	end
-end

data/lib/odania/consul.rb

@@ -1,138 +0,0 @@
-module Odania
-	class Consul
-		attr_reader :service, :config, :event, :health
-
-		def initialize(consul_url)
-			consul_url = ENV['CONSUL_ADDR'] if consul_url.nil?
-			consul_url = 'http://consul:8500' if consul_url.nil?
-			$logger.info "Consul URL: #{consul_url}" if $debug
-			Diplomat.configure do |config|
-				# Set up a custom Consul URL
-				config.url = consul_url
-			end
-
-			@service = Service.new
-			@config = Config.new
-			@event = Event.new
-			@health = Health.new
-		end
-
-		class Config
-			def get(path)
-				begin
-					JSON.parse Diplomat::Kv.get path
-				rescue Diplomat::KeyNotFound
-					nil
-				end
-			end
-
-			def get_all(path)
-				retrieve_value path
-			end
-
-			def set(key, value)
-				Diplomat::Kv.put(key, JSON.dump(value))
-			end
-
-			def delete(key)
-				Diplomat::Kv.delete(key)
-			end
-
-			protected
-
-			def retrieve_value(plugin_path)
-				begin
-					result = {}
-					Diplomat::Kv.get(plugin_path, :recurse => true).each do |data|
-						result[data[:key]] = JSON.parse data[:value]
-					end
-					result
-				rescue Diplomat::KeyNotFound
-					{}
-				end
-			end
-		end
-
-		class Service
-			def get_all
-				services = {}
-				Diplomat::Service.get_all.each_pair do |key, _value|
-					services[key.to_s] = get_all_for(key)
-				end
-				$logger.info "SERVICES: #{JSON.pretty_generate services}" if $debug
-				services
-			end
-
-			def get_all_for(plugin_name)
-				begin
-					instances = get(plugin_name, :all)
-				rescue
-					instances = []
-				end
-				instances.is_a?(Array) ? instances : [instances]
-			end
-
-			# TODO Is there an easier way to get the first service tagges with "core-backend"?
-			def get_core_service
-				core_backends = []
-				Diplomat::Service.get_all.each_pair do |key, tags|
-					core_backends << key if tags.include? 'core-backend'
-				end
-
-				get(core_backends.shuffle.first)
-			end
-
-			def get(key, scope=:first)
-				Diplomat::Service.get(key, scope)
-			end
-
-			def register(consul_config)
-				if Diplomat::Service.register consul_config
-					$logger.info 'Service registered' if $debug
-				else
-					$logger.error 'Error registering service'
-				end
-			end
-
-			def deregister(name)
-				Diplomat::Service.deregister name
-			end
-
-			def build_config(plugin_name, plugin_instance_name, ip, tags=[], port=80)
-				{
-					'id' => plugin_instance_name,
-					'name' => plugin_name,
-					'tags' => tags,
-					'address' => ip,
-					'port' => port,
-					'token' => plugin_instance_name,
-					'checks' => [
-						{
-							'id' => plugin_name,
-							'name' => "HTTP on port #{port}",
-							'http' => "http://#{ip}:#{port}/health",
-							'interval' => '10s',
-							'timeout' => '1s'
-						}
-					]
-				}
-			end
-		end
-
-		class Event
-			def fire(key, value)
-				Diplomat::Event.fire key, value
-			end
-		end
-
-		class Health
-			def state(state=:any)
-				Diplomat::Health.state(state)
-			end
-
-			def service(name)
-				Diplomat::Health.service(name)
-			end
-		end
-	end
-end

data/lib/odania/plugin.rb

@@ -1,103 +0,0 @@
-module Odania
-	class Plugin
-		INSTANCE_FILES_PATH = '/tmp/plugin_instance_name_'
-
-		def initialize(consul)
-			@consul = consul
-			@plugin_config = Config::GlobalConfig.new
-		end
-
-		def register(plugin_instance_name, plugin_config)
-			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['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)
-			@consul.service.deregister(plugin_instance_name)
-		end
-
-		def get_all
-			@consul.service.get_all
-		end
-
-		def config_for(plugin_name)
-			@consul.config.get get_plugin_config_path_for(plugin_name)
-		end
-
-		# Generate a unique number for this instance of the plugin
-		def get_plugin_instance_name(plugin_name)
-			"#{plugin_name}_#{Socket.gethostname.gsub(/[^0-9a-zA-Z_]/, '_')}"
-		end
-
-		def plugin_config
-			@plugin_config
-		end
-
-		def set_global_config(config)
-			@consul.config.set get_global_plugin_config_path, config
-		end
-
-		def get_global_config
-			@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 set_valid_domain_config(config)
-			@consul.config.set get_valid_domain_config_path, config
-		end
-
-		def get_valid_domain_config
-			@consul.config.get get_valid_domain_config_path
-		end
-
-		def get_domain_config_for(domain, global_config=nil)
-			global_config = get_global_config if global_config.nil?
-
-			return global_config['domains'][domain], domain unless global_config['domains'][domain].nil?
-			return false, nil
-		end
-
-		def health
-			@consul.health
-		end
-
-		private
-
-		def get_subdomain_config_path(full_domain)
-			"subdomain_config/#{full_domain}"
-		end
-
-		def get_valid_domain_config_path
-			'valid_domain_config'
-		end
-
-		def get_global_plugin_config_path
-			'global_plugins_config'
-		end
-
-		def get_plugin_config_path
-			'plugins_config'
-		end
-
-		def get_plugin_config_path_for(plugin_name)
-			"#{get_plugin_config_path}/#{plugin_name}"
-		end
-	end
-end

data/odania.gemspec

@@ -1,34 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'odania/version'
-
-Gem::Specification.new do |spec|
-	spec.name = 'odania'
-	spec.version = Odania::VERSION
-	spec.authors = ['Mike Petersen']
-	spec.email = ['mike@odania-it.de']
-	spec.summary = %q{Helper for the odania portal}
-	spec.description = %q{Helper for the odania portal}
-	spec.homepage = 'http://www.odania.com'
-	spec.license = 'MIT'
-
-	spec.files = `git ls-files -z`.split("\x0")
-	spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-	spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
-	spec.require_paths = ['lib']
-
-	spec.add_development_dependency 'bundler', '~> 1.5'
-	spec.add_development_dependency 'rake', '< 11.0'
-	spec.add_development_dependency 'rspec'
-	spec.add_development_dependency 'cucumber'
-	spec.add_development_dependency 'guard'
-	spec.add_development_dependency 'guard-rspec'
-	spec.add_development_dependency 'codeclimate-test-reporter'
-	spec.add_development_dependency 'hashdiff'
-
-	spec.add_dependency 'diplomat'
-	spec.add_dependency 'erubis'
-	spec.add_dependency 'public_suffix'
-	spec.add_dependency 'deep_merge'
-end

data/spec/fixtures/global_config.json

@@ -1,135 +0,0 @@
-{
-	"config": {
-		"title": "This is my awesome title",
-		"default_backend_groups": [
-			"odania-static"
-		]
-	},
-	"plugin-config": {
-		"odania-static": {
-			"name": "odania-core",
-			"default": true,
-			"author": [
-				"Mike Petersen <mike@odania-it.com>"
-			],
-			"url": "http://www.odania.com",
-			"sites": [
-				"www.domain.de"
-			]
-		}
-	},
-	"valid_domains": {
-		"example.com": [
-			"www"
-		]
-	},
-	"default_domains": {
-		"example.com": [
-			"www"
-		]
-	},
-	"domains": {
-		"_general": {
-			"_general": {
-				"config": {
-				},
-				"redirects": {
-					"odania.com$": "www.odania.com",
-					"odania.de$": "www.odania.com/de"
-				},
-				"assets": {
-				},
-				"layouts": {
-				}
-			}
-		},
-		"example.com": {
-			"_general": {
-				"config": {
-				},
-				"web": {
-					"/imprint": {
-						"group_name": "static-content",
-						"plugin_url": "/contents/my-awesome-imprint"
-					}
-				},
-				"assets": {},
-				"layouts": {}
-			},
-			"www": {
-				"dynamic": {
-					"/de/openhab/2015-09-17-testing-openhab2": {
-						"group_name": "static-content",
-						"plugin_url": "/contents/www.example.com/web/de/openhab/2015-09-17-testing-openhab2.html",
-						"cacheable": true,
-						"expires": 60
-					},
-					"/de": {
-						"group_name": "static-content",
-						"plugin_url": "/contents/www.example.com/web/de/index.html"
-					}
-				},
-				"direct": {
-					"/favicon.ico": {
-						"group_name": "odania-core",
-						"plugin_url": "/admin/favicon.ico"
-					},
-					"/assets/admin/js/admin.js": {
-						"group_name": "odania-core",
-						"plugin_url": "/assets/admin/js/admin.js"
-					},
-					"hamster.jpeg": {
-						"group_name": "static-content",
-						"plugin_url": "/contents/www.example.com/assets/hamster.jpeg"
-					},
-					"imprint": {
-						"group_name": "static-content",
-						"plugin_url": "/contents/my-special-imprint"
-					}
-				},
-				"layouts": {
-					"main": {
-						"config": {
-							"styles": {
-								"_general": {
-									"entry_point": "application.html.erb"
-								},
-								"left_menu": {
-									"entry_point": "application.html.erb"
-								}
-							}
-						},
-						"assets": {
-							"layouts/mac-beath/img/favicon/favicon.png": {
-								"group_name": "static-content",
-								"plugin_url": "layouts/mac-beath/img/favicon/favicon.png",
-								"cacheable": true,
-								"expires": 60
-							},
-							"layouts/mac-beath/img/photos/t12.jpg": {
-								"group_name": "static-content",
-								"plugin_url": "layouts/mac-beath/img/photos/t12.jpg"
-							}
-						},
-						"partials": {
-							"layouts/simple/application_part1.html": {
-								"group_name": "static-content",
-								"plugin_url": "layouts/simple/application_part1.html.erb",
-								"cacheable": true,
-								"expires": 60
-							}
-						}
-					}
-				}
-			}
-		}
-	},
-	"partials": {
-		"example.com": {
-			"www": {
-				"tracking": "partials/tracking.html",
-				"footer": "partials/footer.html"
-			}
-		}
-	}
-}