odania 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d27b77aee7f7a7879b1bbee2a376f58f1654b812
-  data.tar.gz: c5ceaebf77e1071d407805175c951b16d46d5e3a
+  metadata.gz: 3a5a520ac12de40571852067855b0471297d244c
+  data.tar.gz: 69685e1f55249f36906b3184e30336770c2f04c0
 SHA512:
-  metadata.gz: 1c1e8c3902d96ce0b74998f7755a71e4874e7597fcaba907842ce4227ef621fb0046415892249f067a58046555a0cabd927362d50b1ecf348a0a72495b709f9f
-  data.tar.gz: 0e8a2a31c990c247c550d224e2ff95c669d56df085c2993adabfa043d243029ca81db6cf04a39cdf722ada8da8da4a3181e7454bb86795a4333984025f82e3e2
+  metadata.gz: 2ca2320f73fedc397f662e0ce36955493af048d222af10d6824a17ec7e12e09997fedb525db3a116bf91caa70f0cebda3833062f0e294e6321e048ef20c17742
+  data.tar.gz: e4fdeee4b1352e3ed427b5a089b7d02e3a37edf8715d4fa123f45f37e20b11ffab7a487d6ecc639da22cc49632cef2993f095637fb585a522970bdded34eac1c

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    odania (0.0.16)
+    odania (0.0.17)
+      deep_merge
       diplomat
       erubis
       public_suffix
@@ -10,42 +11,81 @@ GEM
   remote: https://rubygems.org/
   specs:
     builder (3.2.2)
-    cucumber (2.1.0)
+    coderay (1.1.0)
+    cucumber (2.3.2)
       builder (>= 2.1.2)
-      cucumber-core (~> 1.3.0)
+      cucumber-core (~> 1.4.0)
+      cucumber-wire (~> 0.0.1)
       diff-lcs (>= 1.1.3)
-      gherkin3 (~> 3.1.0)
+      gherkin (~> 3.2.0)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
-    cucumber-core (1.3.0)
-      gherkin3 (~> 3.1.0)
+    cucumber-core (1.4.0)
+      gherkin (~> 3.2.0)
+    cucumber-wire (0.0.1)
+    deep_merge (1.0.1)
     diff-lcs (1.2.5)
-    diplomat (0.14.0)
+    diplomat (0.15.0)
       faraday (~> 0.9)
       json (~> 1.8)
     erubis (2.7.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    gherkin3 (3.1.2)
+    ffi (1.9.10)
+    formatador (0.2.5)
+    gherkin (3.2.0)
+    guard (2.13.0)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, <= 4.0)
+      lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.6.4)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
     json (1.8.3)
+    listen (3.0.6)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9.7)
+    lumberjack (1.0.10)
+    method_source (0.8.2)
     multi_json (1.11.2)
     multi_test (0.1.2)
     multipart-post (2.0.0)
-    public_suffix (1.5.2)
-    rake (10.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    nenv (0.3.0)
+    notiffany (0.0.8)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    public_suffix (1.5.3)
+    rake (10.5.0)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
+      ffi (>= 0.5.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.3)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    shellany (0.0.1)
+    slop (3.6.0)
+    thor (0.19.1)
 
 PLATFORMS
   ruby
@@ -53,6 +93,8 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.5)
   cucumber
+  guard
+  guard-rspec
   odania!
   rake
   rspec

data/Guardfile

@@ -0,0 +1,31 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+# directories %w(app lib config test spec features)
+
+## Uncomment to clear the screen before every task
+# clearing :on
+
+## Guard internally checks for changes in the Guardfile and exits.
+## If you want Guard to automatically start up again, run guard in a
+## shell loop, e.g.:
+##
+##  $ while bundle exec guard; do echo "Restarting Guard..."; done
+##
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+
+guard :rspec, cmd: 'rspec' do
+	watch(%r{^spec/.+_spec\.rb$})
+	watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
+	watch(%r{^lib/odania/config/(.+)\.rb$}) { |m| 'spec/lib/odania/config/plugin_config_spec.rb' }
+	watch('spec/spec_helper.rb') { 'spec' }
+end

data/Rakefile

@@ -1,3 +1,4 @@
 require 'bundler/gem_tasks'
+require_relative 'lib/odania'
 
 Dir.glob('tasks/**/*.rake').each(&method(:import))

data/config/varnish_config.json

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

data/lib/odania/{plugin_config/models → config}/backend.rb

@@ -1,5 +1,5 @@
 module Odania
-	module PluginConfig
+	module Config
 		class Backend
 			attr_accessor :service_name, :instance_name, :host, :port
 

data/lib/odania/{plugin_config/models → config}/backend_group.rb

@@ -1,10 +1,11 @@
 module Odania
-	module PluginConfig
+	module Config
 		class BackendGroup
-			attr_accessor :name, :backends
+			attr_accessor :name, :backends, :core_backend
 
 			def initialize(name, backends=[])
 				self.name = name
+				self.core_backend = false
 				self.backends = backends
 			end
 
@@ -12,6 +13,10 @@ module Odania
 				self.backends << backend
 			end
 
+			def check_core_backend(tags)
+				self.core_backend = tags.include?('core-backend')
+			end
+
 			def dump
 				backend_data = []
 				backends.each do |backend|

data/lib/odania/config/domain.rb

@@ -0,0 +1,55 @@
+module Odania
+	module Config
+		class Domain
+			attr_accessor :name, :subdomains, :config, :redirects
+
+			def initialize(name)
+				self.name = name
+				reset
+			end
+
+			def add_subdomain(subdomain_name)
+				self.subdomains[subdomain_name]
+			end
+
+			def subdomain(name)
+				self.subdomains[name]
+			end
+
+			def dump
+				subdomain_data = {}
+				subdomains.each_pair do |name, subdomain|
+					subdomain_data[name] = subdomain.dump
+				end
+				subdomain_data
+			end
+
+			def load(data)
+				self.name = data['name'] unless data['name'].nil?
+				self.add(data)
+			end
+
+			def add(sub_domain_data, group_name=nil)
+				duplicates = Hash.new { |hash, key| hash[key] = [] }
+				unless sub_domain_data.nil?
+					sub_domain_data.each_pair do |name, data|
+						subdomain_duplicates = self.subdomains[name].add(data, group_name)
+						duplicates.deep_merge! subdomain_duplicates
+					end
+				end
+
+				duplicates
+			end
+
+			def [](key)
+				self.subdomains[key]
+			end
+
+			private
+
+			def reset
+				self.subdomains = Hash.new { |hash, key| hash[key] = SubDomain.new(key) }
+			end
+		end
+	end
+end

data/lib/odania/config/duplicates.rb

@@ -0,0 +1,28 @@
+module Odania
+	module Config
+		class Duplicates
+			def initialize
+				@duplicates = Hash.new { |hash, key| hash[key] = Duplicate.new }
+			end
+
+			def add(type, key, group_name)
+				@duplicates[type].add(key, group_name)
+			end
+
+			def duplicates
+				@duplicates
+			end
+
+			class Duplicate
+				def initialize
+					@duplicate = {}
+				end
+
+				def add(key, group_name)
+					@duplicate[key] = [] if @duplicate[key].nil?
+					@duplicate[key] << group_name
+				end
+			end
+		end
+	end
+end

data/lib/odania/config/global_config.rb

@@ -0,0 +1,154 @@
+module Odania
+	module Config
+		class GlobalConfig < PluginConfig
+			# Load the global configuration
+			def load_global_config(config)
+				throw 'Invalid global config!' if config.nil?
+
+				reset
+				@default_backend_groups = config['default_backend_groups'] unless config['default_backend_groups'].nil?
+
+				unless config['domains'].nil?
+					config['domains'].each_pair do |name, data|
+						@domains[name].load(data)
+					end
+				end
+
+				# load backends from consul
+				Odania.plugin.get_all.each_pair do |name, instances|
+					instances.each do |instance|
+						add_backend(instance)
+					end
+				end
+
+				#puts config.inspect
+				#puts @backend_groups.inspect
+				#puts @default_backend_groups.inspect
+
+				self
+			end
+
+			def load_from_consul
+				Odania.plugin.get_all.each_pair do |plugin_name, instances|
+					puts "PLUGIN NAME #{plugin_name} - #{instances.count}" if $debug
+					instances.each do |instance|
+						add_backend(instance)
+					end
+
+					config = Odania.plugin.config_for plugin_name
+					next if config.nil?
+
+					begin
+						puts JSON.pretty_generate config if $debug
+						self.add_plugin_config(config)
+					rescue => e
+						puts 'Error loading configuration'
+						puts 'Config start ' + '+' * 50
+						puts JSON.pretty_generate config
+						puts 'Config end ' + '+' * 50
+						puts 'Error start ' + '+' * 50
+						puts e.inspect
+						puts 'Error end ' + '+' * 50
+					end
+				end
+			end
+
+			def generate_global_config
+				puts 'Loading plugin configs from consul'
+				load_from_consul
+
+				puts 'Generating global config'
+				config = self.dump
+				puts JSON.pretty_generate config if $debug
+				Odania.plugin.set_global_config config
+				config
+			end
+
+			# Add the configuration from the plugin
+			def add_plugin_config(plugin_cfg)
+				config_section = plugin_cfg['config']
+				group_name = plugin_cfg['plugin-config']['name']
+
+				if $debug
+					puts 'Loading configuration'
+					puts JSON.pretty_generate plugin_cfg
+				end
+
+				@plugin_config[group_name] = plugin_cfg['plugin-config']
+				@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']
+
+				# Add config
+				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
+
+				# Add Domain Information
+				unless plugin_cfg['domains'].nil?
+					plugin_cfg['domains'].each_pair do |name, data|
+						@domains[name].add(data, group_name).each do |duplicate_key, duplicate_data|
+							@duplicates.add duplicate_key, duplicate_data, group_name
+						end
+					end
+				end
+
+				true
+			end
+
+			def add_backend(backend_config)
+				return if backend_config.ServiceAddress.nil? or backend_config.ServiceAddress.empty?
+
+				backend = Backend.new(backend_config.ServiceName, backend_config.ServiceID, backend_config.ServiceAddress, backend_config.ServicePort)
+				@backend_groups[backend_config.ServiceName].add_backend backend
+				@backend_groups[backend_config.ServiceName].check_core_backend backend_config.ServiceTags
+			end
+
+			def reset
+				super
+
+				@default_backend_groups = []
+				@duplicates = Duplicates.new
+				@backend_groups = Hash.new { |hash, key| hash[key] = BackendGroup.new(key) }
+				@default_subdomains = {}
+
+				@domains['_general'].add_subdomain('_general')
+			end
+
+			def duplicates
+				@duplicates.duplicates
+			end
+
+			def backend_groups
+				@backend_groups
+			end
+
+			def default_backend
+				group_name = @default_backend_groups.first
+				group_name = @backend_groups.keys.first if group_name.nil?
+				raise 'No backend found' if @backend_groups.empty?
+				@backend_groups[group_name].backends.first
+			end
+
+			def default_subdomains
+				@default_subdomains
+			end
+
+			def default_redirects
+				general = @domains['_general'].subdomain('_general')
+				return {} if general.nil?
+				general.redirects
+			end
+
+			def dump
+				cfg = super
+				cfg['default_backend_groups'] = @default_backend_groups
+				cfg
+			end
+		end
+	end
+end

data/lib/odania/config/internal.rb

@@ -0,0 +1,48 @@
+module Odania
+	module Config
+		class Internal
+			attr_accessor :partials, :layouts
+
+			def initialize
+				reset
+			end
+
+			def load(data)
+				reset
+				unless data['partials'].nil?
+					data['partials'].each_pair do |name, data|
+						self.partials[name].load(data)
+					end
+				end
+
+				unless data['layouts'].nil?
+					data['layouts'].each_pair do |name, data|
+						self.layouts[name].load(data)
+					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/config/layout.rb

@@ -0,0 +1,35 @@
+module Odania
+	module Config
+		class Layout
+			attr_accessor :styles
+
+			def initialize
+				reset
+			end
+
+			def dump
+				style_data = {}
+				styles.each_pair do |name, style|
+					style_data[name] = style.dump
+				end
+
+				result = {}
+				result['styles'] =style_data unless style_data.nil?
+				result
+			end
+
+			def load(data)
+				reset
+				unless data['styles'].nil?
+					data['styles'].each_pair do |key, val|
+						self.styles[key].load(val)
+					end
+				end
+			end
+
+			def reset
+				self.styles = Hash.new { |hash, key| hash[key] = Style.new(key) }
+			end
+		end
+	end
+end

data/lib/odania/config/page.rb

@@ -0,0 +1,28 @@
+module Odania
+	module Config
+		class Page
+			attr_accessor :group_name, :plugin_url, :cacheable, :expires
+
+			def dump
+				result = {}
+				result['group_name'] = self.group_name unless self.group_name.nil?
+				result['plugin_url'] = self.plugin_url unless self.plugin_url.nil?
+				result['cacheable'] = self.cacheable unless self.cacheable.nil?
+				result['expires'] = self.expires unless self.expires.nil?
+				result
+			end
+
+			def load(data, group_name=nil)
+				self.group_name = data['group_name'] unless data['group_name'].nil?
+				self.group_name = group_name unless group_name.nil?
+				self.plugin_url = data['plugin_url']
+				self.cacheable = data['cacheable'] unless data['cacheable'].nil?
+				self.expires = data['expires'] unless data['expires'].nil?
+			end
+
+			def director
+				"#{Odania.varnish_sanitize(self.group_name)}_director"
+			end
+		end
+	end
+end

data/lib/odania/config/plugin_config.rb

@@ -0,0 +1,51 @@
+module Odania
+	module Config
+		class PluginConfig
+			attr_accessor :domains, :config, :default_subdomains, :plugin_config
+
+			def initialize
+				reset
+			end
+
+			# Load the global configuration
+			def load(data)
+				reset
+				@config = data['config'] unless data['config'].nil?
+				@plugin_config = data['plugin-config'] unless data['plugin-config'].nil?
+				@default_subdomains = data['default_subdomains'] unless data['default_subdomains'].nil?
+				unless data['domains'].nil?
+					data['domains'].each_pair do |name, data|
+						@domains[name].load(data)
+					end
+				end
+
+				true
+			end
+
+			def [](key)
+				@domains[key]
+			end
+
+			# Reset configuration
+			def reset
+				@config = {}
+				@plugin_config = {}
+				@domains = Hash.new { |hash, key| hash[key] = Domain.new(key) }
+			end
+
+			def dump
+				domain_data = {}
+				@domains.each_pair do |name, domain|
+					domain_data[name] = domain.dump
+				end
+
+				{
+					'plugin-config' => plugin_config,
+					'config' => config,
+					'default_subdomains' => @default_subdomains,
+					'domains' => domain_data
+				}
+			end
+		end
+	end
+end

data/lib/odania/config/style.rb

@@ -0,0 +1,60 @@
+module Odania
+	module Config
+		class Style
+			attr_accessor :name, :entry_point, :direct, :dynamic
+
+			def initialize(name)
+				self.name = name
+				reset
+			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
+
+				{
+					'entry_point' => entry_point,
+					'direct' => direct_data,
+					'dynamic' => dynamic_data
+				}
+			end
+
+			def load(data)
+				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)
+					end
+				end
+
+				unless data['dynamic'].nil?
+					data['dynamic'].each_pair do |name, data|
+						self.dynamic[name].load(data)
+					end
+				end
+			end
+
+			private
+
+			def reset
+				self.entry_point = nil
+				self.direct = Hash.new { |hash, key| hash[key] = Page.new }
+				self.dynamic = 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
+	end
+end