soar_sc_core 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fd8a4529e4c5e8b2073d74b898f488d2f1525ff
-  data.tar.gz: e8af65553109f43a6feec8661aaaa74bccdb4458
+  metadata.gz: 1fcd934d730c12d6be85c1dcf3612edf77b349f9
+  data.tar.gz: b974567e6f3a12e0f5157caa1dc2bce248ffdbce
 SHA512:
-  metadata.gz: bb8c3223738e35ae9056c897de6c97eed055f62c3e939973b810216630e6f0139fce9e7fa72b9918e7ac5fd89ebd54cc2b0391e6cb0cf29295c18c9c2d693c52
-  data.tar.gz: c87aa5b39ef63781192f68daf658faf99067af7515f281b693462f46a45022a97f773768e195928eb9c24ed451c819d351d61ae1b19867882ab80d0c5284d82d
+  metadata.gz: '06874d15bfba09f6f39cd007c9a665077ba9a895cfe3402219f176fa5a8bf0ccd250d0d65f8a743ab7c30b7984e63573970881ba6baa3fc7b3ae84244ae742e4'
+  data.tar.gz: b6883dadd719707fead3006487aabccf3cc55d4ef3d22d5b0d0aa7b4cbdc457a68269d7da474064eab1f641b870b6b4d3c4c495a8c57d13d3afc01e689208589

data/.gitignore

@@ -8,3 +8,5 @@
 /spec/reports/
 /tmp/
 *.gem
+config/environment*
+

data/.ruby-gemset

@@ -0,0 +1 @@
+soar_sc_core

data/.ruby-version

@@ -0,0 +1 @@
+2.3.1

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in soar_sc_core.gemspec
 gemspec
+
+group :test do
+  gem 'rspec', '~> 3.5'
+end

data/README.md

@@ -1,48 +1,6 @@
 # SoarScCore
 
-This is the core SOAR service component library, aggregating SOAR libraries.
-
-## The following libraries are aggregated:
-
-### Web services
-- haml
-- soar_sc_mvc
-- soar_sc_views
-- soar_lexicon
-- soar_configured_factory
-- soar_sc_routing
-- wadling
-
-### API
-- jsender
-- soar_flow
-- soar_wadl_validation
-
-### Bootstrap
-- soar_aspects
-- soar_environment
-- soar_configuration
-
-### Identity management
-- soar_authentication
-- soar_authentication_cas
-- soar_am
-- soar_policy_access_manager
-- soar_authorization
-- soar_smaak
-- smaak
-- soar_pl
-- soar_idm
-- idr_client
-
-### Auditing
-- soar_auditing_provider
-- logstash_auditor
-- log4r_auditor
-
-### Integration
-- soar_sr
-- workflow
+This is the core SOAR service component library, aggregating SOAR libraries. Please see gemspec file for details. 
 
 ## Installation
 
@@ -54,11 +12,15 @@ gem 'soar_sc_core'
 
 And then execute:
 
-    $ bundle
+```bash
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install soar_sc_core
+```bash
+$ gem install soar_sc_core
+```
 
 ## Usage
 
@@ -122,10 +84,17 @@ SoarSc::auditing.info("Your launchpad is designated SoarSc #{SoarSc::VERSION}",S
 run Rack::Cascade.new([unauthenticated, authenticated])
 ```
 
+## Testing
+
+### Unit Tests
+```bash
+$ bundle exec rspec
+```
+
 ## Contributing
 
 Bug reports and feature requests are welcome by email to ernst dot van dot graan at hetzner dot co dot za. This gem is sponsored by Hetzner (Pty) Ltd (http://hetzner.co.za)
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/config/config.custom.yml

@@ -0,0 +1,2 @@
+custom_configuration: custom
+    

data/config/config.yml

@@ -0,0 +1 @@
+default_configuration: default

data/lib/soar_sc_core.rb

@@ -76,11 +76,11 @@ module SoarSc
   @configuration = nil
   @environment = {}
   @auditing = nil
-  @dependencies = nil
+  @dependencies = {}
   @startup_flow_id = nil
 
   def self.load_environment_and_configuration
-    environment_file = 'config/environment.yml'
+    environment_file = ENV['ENVIRONMENT_FILE'] ? "config/#{ENV['ENVIRONMENT_FILE']}" : 'config/environment.yml'
     if File.exists?(environment_file)
       environment_loader = SoarEnvironment::Environment.new(environment_file)
     else
@@ -105,7 +105,8 @@ module SoarSc
       config, errors = configuration.load_from_configuration_service(SoarSc::environment)
       self.adapt_configuration_service_errors(errors)
     else
-      config, errors = configuration.load_from_yaml("config/config.yml")
+      config_file = SoarSc::environment['CONFIG_FILE'] ? SoarSc::environment['CONFIG_FILE'] : "config.yml"
+      config, errors = configuration.load_from_yaml("config/#{config_file}")
       errors << 'Failure retrieving configuration from file' if not errors.empty?
       errors << 'Invalid configuration file' if not config.is_a?(::Hash)
     end
@@ -131,7 +132,7 @@ module SoarSc
   def self.inject_dependencies(configuration)
     if configuration and configuration['dependency_injector']
       injector = Object::const_get(configuration['dependency_injector']).new
-      @dependencies = injector.inject_dependencies(configuration)
+      @dependencies.merge injector.inject_dependencies(configuration)
     end
 
     @dependencies

data/lib/soar_sc_core/version.rb

@@ -1,3 +1,3 @@
 module SoarScCore
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/soar_sc_core.gemspec

@@ -26,38 +26,50 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-
+  
+  # web services
   spec.add_dependency "haml", "~> 4.0.7"
-  spec.add_dependency 'jsender', "~> 0.2.0"
+  spec.add_dependency 'wadling', "~> 0.1.9"
+  spec.add_dependency 'soar_sc_mvc', "~> 0.2.0"
   spec.add_dependency 'soar_sc_views', "~> 0.1.2"
-  spec.add_dependency "soar_aspects", "~> 0.1.2"
-  spec.add_dependency "soar_flow", "~> 0.1.1"
   spec.add_dependency "soar_lexicon", "~> 0.1.3"
+  spec.add_dependency 'soar_configured_factory', '~> 0.1.0'
+  spec.add_dependency 'soar_sc_routing', "~> 0.1.7"
+
+  # API
+  spec.add_dependency 'jsender', "~> 0.2.0"
+  spec.add_dependency "soar_flow", "~> 0.1.1"
+  spec.add_dependency "soar_wadl_validation", "~> 0.1.3"
+
+  # Bootstrap
+  spec.add_dependency "soar_aspects", "~> 0.1.2"
   spec.add_dependency "soar_environment", "~> 0.2.0"
   spec.add_dependency "soar_configuration", "~> 0.1.3"
-  spec.add_dependency "soar_wadl_validation", "~> 0.1.3"
-  spec.add_dependency "soar_auditing_provider", "~> 1.4.0"
-  spec.add_dependency "logstash_auditor", "~> 1.0.1"
-  spec.add_dependency "log4r_auditor", "~> 1.0.0"
-  spec.add_dependency "soar_analytics", "~> 0.0.1"
+
+  # Identity management
   spec.add_dependency "soar_authentication", "~>0.1.3"
   spec.add_dependency "soar_authentication_cas", "~> 0.1.2"
+  spec.add_dependency "soar_authorization", "~> 0.1.4"
   spec.add_dependency "soar_am", "~>0.1.2"
   spec.add_dependency "soar_policy_access_manager", "~>0.2.1"
-  spec.add_dependency "soar_authorization", "~> 0.1.4"
-  spec.add_dependency 'soar_configured_factory', '~> 0.1.0'
-  spec.add_dependency 'soar_sc_routing', "~> 0.1.7"
   spec.add_dependency 'smaak', "~> 0.2.2"
   spec.add_dependency 'soar_smaak', "~> 0.1.19"
-  spec.add_dependency 'wadling', "~> 0.1.9"
-  spec.add_dependency 'soar_sr', "~> 1.1.24"
   spec.add_dependency 'soar_pl', "~> 0.0.12"
   spec.add_dependency 'soar_idm', "~> 0.0.2"
   spec.add_dependency 'idr_client', "~> 0.0.3"
+  
+  # Auditing
+  spec.add_dependency "soar_auditing_provider", "~> 1.4.0"
+  spec.add_dependency "logstash_auditor", "~> 1.0.1"
+  spec.add_dependency "log4r_auditor", "~> 1.0.0"
+
+  # Integration
+  spec.add_dependency 'soar_sr', "~> 1.1.24"
   spec.add_dependency 'workflow', "~> 1.2.0"
-  spec.add_dependency 'soar_sc_mvc', "~> 0.2.0"
-  spec.add_dependency 'soar_status', "~> 0.1.0"
 
+  # Misc
+  spec.add_dependency "soar_analytics", "~> 0.0.1"
+  spec.add_dependency 'soar_status', "~> 0.1.0"
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soar_sc_core
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Ernst Van Graan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -25,35 +25,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.7
 - !ruby/object:Gem::Dependency
-  name: jsender
+  name: wadling
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.1.9
 - !ruby/object:Gem::Dependency
-  name: soar_sc_views
+  name: soar_sc_mvc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: soar_aspects
+  name: soar_sc_views
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -67,131 +67,131 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: soar_flow
+  name: soar_lexicon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
-  name: soar_lexicon
+  name: soar_configured_factory
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: soar_environment
+  name: soar_sc_routing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.1.7
 - !ruby/object:Gem::Dependency
-  name: soar_configuration
+  name: jsender
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: soar_wadl_validation
+  name: soar_flow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
-  name: soar_auditing_provider
+  name: soar_wadl_validation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
-  name: logstash_auditor
+  name: soar_aspects
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: log4r_auditor
+  name: soar_environment
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: soar_analytics
+  name: soar_configuration
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: soar_authentication
   requirement: !ruby/object:Gem::Requirement
@@ -221,173 +221,173 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: soar_am
+  name: soar_authorization
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
-  name: soar_policy_access_manager
+  name: soar_am
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: soar_authorization
+  name: soar_policy_access_manager
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
-  name: soar_configured_factory
+  name: smaak
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
-  name: soar_sc_routing
+  name: soar_smaak
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.19
 - !ruby/object:Gem::Dependency
-  name: smaak
+  name: soar_pl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.0.12
 - !ruby/object:Gem::Dependency
-  name: soar_smaak
+  name: soar_idm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.19
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.19
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
-  name: wadling
+  name: idr_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
-  name: soar_sr
+  name: soar_auditing_provider
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.24
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.24
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: soar_pl
+  name: logstash_auditor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: soar_idm
+  name: log4r_auditor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: idr_client
+  name: soar_sr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 1.1.24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 1.1.24
 - !ruby/object:Gem::Dependency
   name: workflow
   requirement: !ruby/object:Gem::Requirement
@@ -403,19 +403,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: soar_sc_mvc
+  name: soar_analytics
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: soar_status
   requirement: !ruby/object:Gem::Requirement
@@ -496,6 +496,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -503,6 +505,8 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- config/config.custom.yml
+- config/config.yml
 - lib/providers/auditing.rb
 - lib/providers/service_registry.rb
 - lib/providers/sessions.rb