odania 0.0.18 → 0.0.19

data/.travis.yml

@@ -0,0 +1,20 @@
+language: ruby
+rvm:
+  - 2.2
+  - jruby-19mode
+  - jruby-head
+  - ruby-head
+  - ree
+matrix:
+  allow_failures:
+    - rvm: jruby-19mode
+    - rvm: ree
+    - rvm: ruby-head
+    - rvm: jruby-head
+notifications:
+  email: true
+script:
+  - bundle exec rake
+addons:
+  code_climate:
+    repo_token: 5c5ba859225f328f35c67cf8e9d4940272e8304ee980317bd80440ba064621a5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    odania (0.0.18)
+    odania (0.0.19)
       deep_merge
       diplomat
       erubis
@@ -11,6 +11,8 @@ GEM
   remote: https://rubygems.org/
   specs:
     builder (3.2.2)
+    codeclimate-test-reporter (0.4.7)
+      simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
     cucumber (2.3.2)
       builder (>= 2.1.2)
@@ -28,6 +30,7 @@ GEM
     diplomat (0.15.0)
       faraday (~> 0.9)
       json (~> 1.8)
+    docile (1.1.5)
     erubis (2.7.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
@@ -84,6 +87,11 @@ GEM
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
     shellany (0.0.1)
+    simplecov (0.10.0)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     slop (3.6.0)
     thor (0.19.1)
 
@@ -92,6 +100,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.5)
+  codeclimate-test-reporter
   cucumber
   guard
   guard-rspec

data/README.md

@@ -1,5 +1,8 @@
 # Odania
 
+[![Build Status](https://travis-ci.org/Odania-IT/odania-gem.png?branch=master)](https://travis-ci.org/Odania-IT/odania-gem)
+[![Code Climate](https://codeclimate.com/github/Odania-IT/odania-gem/badges/gpa.svg)](https://codeclimate.com/github/Odania-IT/odania-gem)
+
 Helper for the Odania Portal
 
 ## Installation
@@ -20,6 +23,8 @@ Or install it yourself as:
 
 TODO: Write usage instructions here
 
+This is used for creating several configurations required by Odania Portal.
+
 ## Contributing
 
 1. Fork it ( https://github.com/Odania-IT/odania-gem/fork )

data/Rakefile

@@ -2,3 +2,5 @@ require 'bundler/gem_tasks'
 require_relative 'lib/odania'
 
 Dir.glob('tasks/**/*.rake').each(&method(:import))
+
+task :default => [:spec]

data/lib/odania/config/backend_group.rb

@@ -33,8 +33,8 @@ module Odania
 				self.name = data['name']
 
 				unless data['backends'].nil?
-					data['backends'].each do |data|
-						self.backends << Backend.new.load(data)
+					data['backends'].each do |backend_data|
+						self.backends << Backend.new.load(backend_data)
 					end
 				end
 			end

data/lib/odania/config/global_config.rb

@@ -15,7 +15,7 @@ module Odania
 				end
 
 				# load backends from consul
-				Odania.plugin.get_all.each_pair do |name, instances|
+				Odania.plugin.get_all.each_pair do |_name, instances|
 					instances.each do |instance|
 						add_backend(instance)
 					end
@@ -87,7 +87,7 @@ module Odania
 
 				# Add config
 				unless config_section.nil?
-					config_section.each_pair do |key, val|
+					config_section.each_pair do |key, _val|
 						unless @config[key].nil?
 							@duplicates.add :config, {key => 'already defined'}, group_name
 						end

data/lib/odania/config/internal.rb

@@ -9,7 +9,7 @@ module Odania
 
 			def assets
 				result = {}
-				self.layouts.each_pair do |name, layout|
+				self.layouts.each_pair do |_name, layout|
 					layout.assets.each_pair do |key, val|
 						result[key] = val
 					end
@@ -20,14 +20,14 @@ module Odania
 			def load(data, group_name)
 				reset
 				unless data['partials'].nil?
-					data['partials'].each_pair do |name, data|
-						self.partials[name].load(data)
+					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, data|
-						self.layouts[name].load(data, group_name)
+					data['layouts'].each_pair do |name, layout_data|
+						self.layouts[name].load(layout_data, group_name)
 					end
 				end
 			end

data/lib/odania/config/page_base.rb

@@ -0,0 +1,62 @@
+module Odania
+	module Config
+		class PageBase
+			attr_accessor :direct, :dynamic
+
+			def initialize
+				reset
+			end
+
+			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)
+					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)
+					end
+				end
+				duplicates
+			end
+
+			def load(data, group_name)
+				self.add(data, group_name)
+			end
+
+			def reset
+				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
+
+			def [](type)
+				return self.direct if 'direct'.eql? type.to_s
+				self.dynamic
+			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
+
+				{
+					'direct' => direct_data,
+					'dynamic' => dynamic_data
+				}
+			end
+		end
+	end
+end

data/lib/odania/config/plugin_config.rb

@@ -14,8 +14,8 @@ module Odania
 				@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)
+					data['domains'].each_pair do |name, domain_data|
+						@domains[name].load(domain_data)
 					end
 				end
 

data/lib/odania/config/style.rb

@@ -1,7 +1,7 @@
 module Odania
 	module Config
-		class Style
-			attr_accessor :name, :entry_point, :direct, :dynamic, :assets
+		class Style < PageBase
+			attr_accessor :name, :entry_point, :dynamic, :assets
 
 			def initialize(name)
 				self.name = name
@@ -13,48 +13,26 @@ module Odania
 			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
+				result = super
 
 				asset_data = {}
 				assets.each_pair do |asset_url, page|
 					asset_data[asset_url] = page.dump
 				end
 
-				{
-					'entry_point' => entry_point,
-					'direct' => direct_data,
-					'dynamic' => dynamic_data,
-					'assets' => asset_data
-				}
+				result['entry_point'] = entry_point
+				result['assets'] = asset_data
+				result
 			end
 
 			def load(data, group_name)
 				reset
+				super(data, group_name)
 				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, group_name)
-					end
-				end
-
-				unless data['dynamic'].nil?
-					data['dynamic'].each_pair do |name, data|
-						self.dynamic[name].load(data, group_name)
-					end
-				end
-
 				unless data['assets'].nil?
-					data['assets'].each_pair do |name, data|
-						self.assets[name].load(data, group_name)
+					data['assets'].each_pair do |name, asset_data|
+						self.assets[name].load(asset_data, group_name)
 					end
 				end
 			end
@@ -62,11 +40,9 @@ module Odania
 			private
 
 			def reset
+				super
 				self.entry_point = nil
-				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 }
-				@plugins = {:direct => Hash.new { |hash, key| hash[key] = [] }, :dynamic => Hash.new { |hash, key| hash[key] = [] }}
 			end
 		end
 	end

data/lib/odania/config/sub_domain.rb

@@ -1,7 +1,7 @@
 module Odania
 	module Config
-		class SubDomain
-			attr_accessor :name, :config, :direct, :dynamic, :internal, :from_plugin, :redirects
+		class SubDomain < PageBase
+			attr_accessor :name, :config, :dynamic, :internal, :from_plugin, :redirects
 
 			def initialize(name)
 				self.name = name
@@ -45,47 +45,24 @@ module Odania
 			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
+				result = super
 
-				{
-					'redirects' => self.redirects,
-					'config' => self.config,
-					'direct' => direct_data,
-					'dynamic' => dynamic_data,
-					'internal' => self.internal.dump
-				}
+				result['redirects'] = self.redirects
+				result['config'] = self.config
+				result['internal'] = self.internal.dump
+				result
 			end
 
 			def load(data)
 				reset
+				super(data, nil)
 				self.add(data)
 			end
 
 			def add(data, group_name=nil)
-				self.config = data['config'] unless data['config'].nil?
-				duplicates = Hash.new { |hash, key| hash[key] = [] }
+				duplicates = super(data, group_name)
 
-				unless data['direct'].nil?
-					data['direct'].each_pair do |name, data|
-						duplicates[:direct] << name if self.direct.key? name
-						self.direct[name].load(data, group_name)
-					end
-				end
-
-				unless data['dynamic'].nil?
-					data['dynamic'].each_pair do |name, data|
-						duplicates[:dynamic] << name if self.direct.key? name
-						self.dynamic[name].load(data, group_name)
-					end
-				end
+				self.config = data['config'] unless data['config'].nil?
 
 				self.internal.load(data['internal'], group_name) unless data['internal'].nil?
 				unless data['redirects'].nil?
@@ -98,21 +75,14 @@ module Odania
 				duplicates
 			end
 
-			def [](type)
-				return self.direct if 'direct'.eql? type.to_s
-				self.dynamic
-			end
-
 			private
 
 			def reset
+				super
 				self.config = {}
 				self.from_plugin = {:config => Hash.new { |hash, key| hash[key] = [] }}
-				self.direct = Hash.new { |hash, key| hash[key] = Page.new }
-				self.dynamic = Hash.new { |hash, key| hash[key] = Page.new }
 				self.redirects = {}
 				self.internal = Internal.new
-				@plugins = {:direct => Hash.new { |hash, key| hash[key] = [] }, :dynamic => Hash.new { |hash, key| hash[key] = [] }}
 			end
 		end
 	end

data/lib/odania/config.rb

@@ -5,6 +5,7 @@ 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/sub_domain'
 require_relative 'config/style'
 require_relative 'config/backend'

data/lib/odania/consul.rb

@@ -55,7 +55,7 @@ module Odania
 		class Service
 			def get_all
 				services = {}
-				Diplomat::Service.get_all.each_pair do |key, value|
+				Diplomat::Service.get_all.each_pair do |key, _value|
 					services[key.to_s] = get_all_for(key)
 				end
 				puts "SERVICES: #{JSON.pretty_generate services}" if $debug

data/lib/odania/plugin.rb

@@ -39,7 +39,7 @@ module Odania
 			plugin_instance_name_file = "#{INSTANCE_FILES_PATH}#{plugin_name}"
 
 			plugin_instance_name = nil
-			plugin_instance_name = File.read plugin_instance_name_file if File.exists? plugin_instance_name_file
+			plugin_instance_name = File.read plugin_instance_name_file if File.exist? plugin_instance_name_file
 			return plugin_instance_name unless plugin_instance_name.nil?
 
 			available_instances = @consul.service.get_all_for plugin_name

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

@@ -1,39 +1,12 @@
 module Odania
-	class GenerateSiteAssetsVcl
-		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
+	class GenerateSiteAssetsVcl < GenerateSiteVcl
 
 		def initialize(domain, default_subdomains)
-			self.domain = domain
-			self.default_subdomains = 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 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

data/lib/odania/varnish.rb

@@ -52,7 +52,7 @@ module Odania
 		 def reload_config
 			 puts 'Updating varnish config'
 			 current_number = 0
-			 current_number = File.read('/tmp/current_varnish_config_number').to_i if File.exists? '/tmp/current_varnish_config_number'
+			 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
 

data/lib/odania/version.rb

@@ -1,3 +1,3 @@
 module Odania
-  VERSION = '0.0.18'
+  VERSION = '0.0.19'
 end

data/lib/odania.rb

@@ -10,7 +10,7 @@ require 'socket'
 
 BASE_DIR = File.absolute_path File.join File.dirname(__FILE__), '..'
 ENVIRONMENT = ENV['ENVIRONMENT'].nil? ? 'development' : ENV['ENVIRONMENT']
-LOCAL_TEST_MODE = 'development'.eql?(ENVIRONMENT)
+LOCAL_TEST_MODE = 'development'.eql?(ENVIRONMENT) unless defined? LOCAL_TEST_MODE
 
 module Odania
 	CORE_PLUGIN_NAME = 'odania-core'

data/odania.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
 	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_dependency 'diplomat'
 	spec.add_dependency 'erubis'

data/spec/fixtures/plugin_config_1.json

@@ -45,12 +45,14 @@
 											"cacheable": true,
 											"expires": 60
 										}
-									}
+									},
+									"assets": {}
 								},
 								"left_menu": {
 									"entry_point": "application.html.erb",
 									"direct": {},
-									"dynamic": {}
+									"dynamic": {},
+									"assets": {}
 								}
 							}
 						}

data/spec/spec_helper.rb

@@ -1,5 +1,8 @@
 ENV['ENVIRONMENT'] = 'test'
 
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
+
 require 'odania'
 require_relative 'support/consul_mock'
 
@@ -8,7 +11,6 @@ RSpec.configure do |config|
 	config.before(:each) do
 		$consul_mock = ConsulMock.new
 
-
 		allow(Odania).to receive(:plugin) do
 			Odania::Plugin.new($consul_mock)
 		end

data/spec/support/consul_mock.rb

@@ -105,8 +105,15 @@ class ConsulMock < Odania::Consul
 	end
 
 	class Health
+		def initialize
+			@health_states = [
+				{'Node' => '04977bad2036', 'CheckID' => 'serfHealth', 'Name' => 'Serf Health Status', 'Status' => 'passing', 'Notes' => '', 'Output' => 'Agent alive and reachable', 'ServiceID' => '', 'ServiceName' => ''},
+				{'Node' => '04977bad2036', 'CheckID' => 'service_1', 'Name' => "Service 'static-content' check", 'Status' => 'passing', 'Notes' => '', 'Output' => 'HTTP GET http://172.17.0.4:80/health: 200 OK Output: OK', 'ServiceID' => 'static_content_1', 'ServiceName' => 'static-content'}
+			]
+		end
+
 		def state(state=:any)
-			Diplomat::Health.state(state)
+			@health_states
 		end
 
 		def service(name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: odania
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Mike Petersen
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  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
@@ -157,7 +171,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -180,12 +198,12 @@ files:
 - lib/odania/config/internal.rb
 - lib/odania/config/layout.rb
 - lib/odania/config/page.rb
+- lib/odania/config/page_base.rb
 - lib/odania/config/plugin_config.rb
 - lib/odania/config/style.rb
 - lib/odania/config/sub_domain.rb
 - lib/odania/consul.rb
 - lib/odania/plugin.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