odania 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8825d66726c0bd366677b565db4efda65f94781
-  data.tar.gz: f0af777d50dd142c6e8abac8c88b5ad9c7f0bbca
+  metadata.gz: 62d6f1e9704adc70a6639be0dffe1d21d38c1a27
+  data.tar.gz: 1e504dce975347d4eed79fd07f6ae6a7f6900996
 SHA512:
-  metadata.gz: d68b5ee5db78792eb73574caf0a8aa4a4c31b85584167abe16c62c044a3aff78695e3e7756ab7eb41b9cc048a17df7d2624d2aa4d52dc9c698ad5bd3c127b246
-  data.tar.gz: 4bbbc38ab251fb28d5332b3ec9b8ad67439486ecf794410a970fa32d3beecf79c5f1d2c224750aa01a36ee516f0f1cdd53f4b29887ef4321ab7acccbfc8cc1e6
+  metadata.gz: a7d96d1ff2a6f46a40358bdc9121814e1a4caa8d0e37fcf7911b4983bc254fb96f2acba48d1df25943dfd01fbc52ef7dd9fd2da89d083ead5b5aac3b33035fbf
+  data.tar.gz: 1f71f63a376f8f33366a20f45bd686ee692be9219dec1ea4d4f1f14a0ca8193682d5f4d11da2b1249b99e6c8a24d538f3fb78a6c6aa4bfc53c5dbefbca111670

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    odania (0.0.31)
+    odania (0.0.32)
       deep_merge
       diplomat
       erubis
@@ -14,7 +14,7 @@ GEM
     codeclimate-test-reporter (0.5.0)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.1)
-    cucumber (2.3.2)
+    cucumber (2.3.3)
       builder (>= 2.1.2)
       cucumber-core (~> 1.4.0)
       cucumber-wire (~> 0.0.1)
@@ -27,9 +27,9 @@ GEM
     cucumber-wire (0.0.1)
     deep_merge (1.0.1)
     diff-lcs (1.2.5)
-    diplomat (0.15.0)
+    diplomat (0.18.0)
       faraday (~> 0.9)
-      json (~> 1.8)
+      json
     docile (1.1.5)
     erubis (2.7.0)
     faraday (0.9.2)
@@ -37,9 +37,9 @@ GEM
     ffi (1.9.10)
     formatador (0.2.5)
     gherkin (3.2.0)
-    guard (2.13.0)
+    guard (2.14.0)
       formatador (>= 0.2.4)
-      listen (>= 2.7, <= 4.0)
+      listen (>= 2.7, < 4.0)
       lumberjack (~> 1.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
@@ -47,28 +47,30 @@ GEM
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
-    guard-rspec (4.6.4)
+    guard-rspec (4.7.2)
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
+    hashdiff (0.3.0)
     json (1.8.3)
-    listen (3.0.6)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9.7)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
     lumberjack (1.0.10)
     method_source (0.8.2)
-    multi_json (1.11.2)
+    multi_json (1.12.1)
     multi_test (0.1.2)
     multipart-post (2.0.0)
     nenv (0.3.0)
-    notiffany (0.0.8)
+    notiffany (0.1.0)
       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)
+    public_suffix (2.0.1)
     rake (10.5.0)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
@@ -86,6 +88,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
+    ruby_dep (1.3.1)
     shellany (0.0.1)
     simplecov (0.11.2)
       docile (~> 1.1.0)
@@ -104,6 +107,7 @@ DEPENDENCIES
   cucumber
   guard
   guard-rspec
+  hashdiff
   odania!
   rake (< 11.0)
   rspec

data/lib/odania/config/layout.rb

@@ -1,39 +1,29 @@
 module Odania
 	module Config
-		class Layout
-			attr_accessor :styles
+		class Layout < PageBase
+			attr_accessor :config
 
 			def initialize
 				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|
-					style_data[name] = style.dump
-				end
-
-				result = {}
-				result['styles'] =style_data unless style_data.nil?
+				result = super
+				result['config'] = config unless config.nil?
 				result
 			end
 
 			def load(data, group_name)
 				reset
-				unless data['styles'].nil?
-					data['styles'].each_pair do |key, val|
-						self.styles[key].load(val, group_name)
-					end
+				super(data, group_name)
+				unless data['config'].nil?
+					self.config = data['config']
 				end
 			end
 
 			def reset
-				self.styles = Hash.new { |hash, key| hash[key] = Style.new(key) }
+				super
+				self.config = {}
 			end
 		end
 	end

data/lib/odania/config/page_base.rb

@@ -1,7 +1,7 @@
 module Odania
 	module Config
 		class PageBase
-			attr_accessor :direct, :dynamic
+			attr_accessor :assets, :partials
 
 			def initialize
 				reset
@@ -9,17 +9,17 @@ module Odania
 
 			def add(data, group_name=nil)
 				duplicates = Hash.new { |hash, key| hash[key] = [] }
-				unless data['direct'].nil?
-					data['direct'].each_pair do |name, direct_data|
-						duplicates[:direct] << name if self.direct.key? name
-						self.direct[name].load(direct_data, group_name)
+				unless data['assets'].nil?
+					data['assets'].each_pair do |name, asset_data|
+						duplicates[:assets] << name if self.assets.key? name
+						self.assets[name].load(asset_data, group_name)
 					end
 				end
 
-				unless data['dynamic'].nil?
-					data['dynamic'].each_pair do |name, dynamic_data|
-						duplicates[:dynamic] << name if self.direct.key? name
-						self.dynamic[name].load(dynamic_data, group_name)
+				unless data['partials'].nil?
+					data['partials'].each_pair do |name, partial_data|
+						duplicates[:partials] << name if self.partials.key? name
+						self.partials[name].load(partial_data, group_name)
 					end
 				end
 				duplicates
@@ -30,31 +30,31 @@ module Odania
 			end
 
 			def reset
-				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 }
+				self.partials = Hash.new { |hash, key| hash[key] = Page.new }
 
-				@plugins = {:direct => Hash.new { |hash, key| hash[key] = [] }, :dynamic => Hash.new { |hash, key| hash[key] = [] }}
+				@plugins = {:partials => Hash.new { |hash, key| hash[key] = [] }, :assets => Hash.new { |hash, key| hash[key] = [] }}
 			end
 
 			def [](type)
-				return self.direct if 'direct'.eql? type.to_s
-				self.dynamic
+				return self.assets if 'assets'.eql? type.to_s
+				self.partials
 			end
 
 			def dump
-				direct_data = {}
-				direct.each_pair do |web_url, page|
-					direct_data[web_url] = page.dump
+				asset_data = {}
+				assets.each_pair do |web_url, page|
+					asset_data[web_url] = page.dump
 				end
 
-				dynamic_data = {}
-				dynamic.each_pair do |web_url, page|
-					dynamic_data[web_url] = page.dump
+				partial_data = {}
+				partials.each_pair do |web_url, page|
+					partial_data[web_url] = page.dump
 				end
 
 				{
-					'direct' => direct_data,
-					'dynamic' => dynamic_data
+					'assets' => asset_data,
+					'partials' => partial_data
 				}
 			end
 		end

data/lib/odania/config/style.rb

@@ -1,7 +1,7 @@
 module Odania
 	module Config
-		class Style < PageBase
-			attr_accessor :name, :entry_point, :dynamic, :assets
+		class Style
+			attr_accessor :name, :entry_point
 
 			def initialize(name)
 				self.name = name
@@ -15,13 +15,7 @@ module Odania
 			def dump
 				result = super
 
-				asset_data = {}
-				assets.each_pair do |asset_url, page|
-					asset_data[asset_url] = page.dump
-				end
-
 				result['entry_point'] = entry_point
-				result['assets'] = asset_data
 				result
 			end
 
@@ -29,12 +23,6 @@ module Odania
 				reset
 				super(data, group_name)
 				self.entry_point = data['entry_point'] unless data['entry_point'].nil?
-
-				unless data['assets'].nil?
-					data['assets'].each_pair do |name, asset_data|
-						self.assets[name].load(asset_data, group_name)
-					end
-				end
 			end
 
 			private
@@ -42,7 +30,6 @@ module Odania
 			def reset
 				super
 				self.entry_point = nil
-				self.assets = Hash.new { |hash, key| hash[key] = Page.new }
 			end
 		end
 	end

data/lib/odania/config/sub_domain.rb

@@ -1,7 +1,7 @@
 module Odania
 	module Config
 		class SubDomain < PageBase
-			attr_accessor :name, :config, :dynamic, :internal, :from_plugin, :redirects
+			attr_accessor :name, :config, :web, :layouts, :from_plugin, :redirects
 
 			def initialize(name)
 				self.name = name
@@ -20,17 +20,6 @@ module Odania
 				errors
 			end
 
-			def add_page(type, web_url, group_name, url_data, plugin_name)
-				result = true
-				result = false unless self.pages[type].key? web_url
-				self.pages[type][web_url].group_name = group_name
-				self.pages[type][web_url].plugin_url = url_data['plugin_url']
-				self.pages[type][web_url].cacheable = url_data['cacheable'] unless url_data['cacheable'].nil?
-				self.pages[type][web_url].expires = url_data['expires'] unless url_data['expires'].nil?
-				@plugins[:page]["#{type}-#{web_url}"] << plugin_name
-				result
-			end
-
 			def get_redirects
 				return {} if self.redirects.nil?
 				self.redirects
@@ -40,16 +29,23 @@ module Odania
 				@plugins[type][key]
 			end
 
-			def assets
-				self.internal.assets
-			end
-
 			def dump
 				result = super
 
+				layout_data = {}
+				layouts.each_pair do |layout_name, layout|
+					layout_data[layout_name] = layout.dump
+				end
+
+				web_data = {}
+				web.each_pair do |url, page|
+					web_data[url] = page.dump
+				end
+
 				result['redirects'] = self.redirects
 				result['config'] = self.config
-				result['internal'] = self.internal.dump
+				result['web'] = web_data
+				result['layouts'] = layout_data
 				result
 			end
 
@@ -64,7 +60,18 @@ module Odania
 
 				self.config = data['config'] unless data['config'].nil?
 
-				self.internal.load(data['internal'], group_name) unless data['internal'].nil?
+				unless data['web'].nil?
+					data['web'].each_pair do |name, partial_data|
+						self.web[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
+
 				unless data['redirects'].nil?
 					data['redirects'].each_pair do |src_url, target_url|
 						duplicates[:redirect] << src_url if self.redirects.key? src_url
@@ -82,7 +89,8 @@ module Odania
 				self.config = {}
 				self.from_plugin = {:config => Hash.new { |hash, key| hash[key] = [] }}
 				self.redirects = {}
-				self.internal = Internal.new
+				self.layouts = Hash.new { |hash, key| hash[key] = Layout.new }
+				self.web = Hash.new { |hash, key| hash[key] = Page.new }
 			end
 		end
 	end

data/lib/odania/config.rb

@@ -1,11 +1,10 @@
-require_relative 'config/internal'
 require_relative 'config/domain'
 require_relative 'config/duplicates'
-require_relative 'config/layout'
 require_relative 'config/page'
 require_relative 'config/plugin_config'
 require_relative 'config/global_config'
 require_relative 'config/page_base'
+require_relative 'config/layout'
 require_relative 'config/sub_domain'
 require_relative 'config/style'
 require_relative 'config/backend'

data/lib/odania/consul.rb

@@ -72,6 +72,16 @@ module Odania
 				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

data/lib/odania/version.rb

@@ -1,3 +1,3 @@
 module Odania
-  VERSION = '0.0.32'
+  VERSION = '0.0.33'
 end

data/lib/odania.rb

@@ -20,7 +20,6 @@ module Odania
 	autoload :Config, 'odania/config'
 	autoload :Consul, 'odania/consul'
 	autoload :Plugin, 'odania/plugin'
-	autoload :Varnish, 'odania/varnish'
 
 	def self.plugin
 		Odania.configure
@@ -28,11 +27,6 @@ module Odania
 		@plugin
 	end
 
-	def self.varnish
-		@varnish = Varnish.new if @varnish.nil?
-		@varnish
-	end
-
 	def self.consul
 		Odania.configure
 		@consul

data/odania.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
 	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'

data/spec/fixtures/global_config.json

@@ -30,49 +30,30 @@
 					"odania.com$": "www.odania.com",
 					"odania.de$": "www.odania.com/de"
 				},
-				"internal": {
-					"layouts": {
-					},
-					"partials": {
-					}
+				"assets": {
+				},
+				"layouts": {
+				},
+				"partials": {
 				}
 			}
 		},
 		"example.com": {
-
 			"_general": {
-				"config": {
-
-				},
-				"data": {
-					"external": {
-
-					},
-					"internal": {
-
-					},
-					"assets": {
-
-					}
-				}
+				"config": {}
 			},
-
-
 			"_general": {
 				"config": {
 				},
-				"direct": {
+				"web": {
 					"/imprint": {
 						"group_name": "static-content",
 						"plugin_url": "/contents/my-awesome-imprint"
 					}
 				},
-				"internal": {
-					"layouts": {
-					},
-					"partials": {
-					}
-				}
+				"assets": {},
+				"layouts": {},
+				"partials": {}
 			},
 			"www": {
 				"dynamic": {
@@ -105,55 +86,53 @@
 						"plugin_url": "/contents/my-special-imprint"
 					}
 				},
-				"internal": {
-					"layouts": {
-						"main": {
+				"layouts": {
+					"main": {
+						"config": {
 							"styles": {
 								"_general": {
-									"entry_point": "application.html.erb",
-									"direct": {
-										"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"
-										}
-									},
-									"dynamic": {
-										"layouts/simple/application_part1.html": {
-											"group_name": "static-content",
-											"plugin_url": "layouts/simple/application_part1.html.erb",
-											"cacheable": true,
-											"expires": 60
-										}
-									}
+									"entry_point": "application.html.erb"
 								},
 								"left_menu": {
-									"entry_point": "application.html.erb",
-									"direct": {},
-									"dynamic": {}
+									"entry_point": "application.html.erb"
 								}
 							}
-						}
-					},
-					"partials": {
-						"footer": {
-							"name": "footer",
-							"group_name": "static-content",
-							"plugin_url": "partials/footer.html",
-							"cacheable": true,
-							"expires": 60
 						},
-						"tracking": {
-							"name": "tracking",
-							"group_name": "static-content",
-							"plugin_url": "partials/tracking.html"
+						"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": {
+					"footer": {
+						"name": "footer",
+						"group_name": "static-content",
+						"plugin_url": "partials/footer.html",
+						"cacheable": true,
+						"expires": 60
+					},
+					"tracking": {
+						"name": "tracking",
+						"group_name": "static-content",
+						"plugin_url": "partials/tracking.html"
+					}
 				}
 			}
 		}