strelka 0.15.0 → 0.16.0

data/spec/strelka_spec.rb

@@ -1,13 +1,31 @@
-#!/usr/bin/env rspec -cfd -b
+# -*- ruby -*-
+# vim: set nosta noet ts=4 sw=4:
+# frozen-string-literal: true
 
 require_relative 'helpers'
 
 require 'rspec'
 require 'strelka'
 
-describe Strelka do
+RSpec.describe Strelka do
+
+	before( :all ) do
+		@original_config_env = ENV[Strelka::CONFIG_ENV]
+	end
+
+	before( :each ) do
+		ENV.delete(Strelka::CONFIG_ENV)
+		Strelka.after_configure_hooks.clear
+	end
+
+	after( :all ) do
+		ENV[Strelka::CONFIG_ENV] = @original_config_env
+	end
+
+
 
 	describe "version methods" do
+
 		it "returns a version string if asked" do
 			expect( described_class.version_string ).to match( /\w+ [\d.]+/ )
 		end
@@ -17,7 +35,159 @@ describe Strelka do
 			expect( described_class.version_string(true) ).
 				to match(/\w+ [\d.]+ \(build [[:xdigit:]]+\)/)
 		end
+
+	end
+
+
+	# let( :config ) { Configurability::Config.new(TESTING_CONFIG_SOURCE) }
+
+
+	it "will load a local config file if it exists and none is specified" do
+		config_object = double( "Configurability::Config object" )
+		allow( config_object ).to receive( :[] ).with( :strelka ).and_return( {} )
+
+		expect( Configurability ).to receive( :gather_defaults ).
+			and_return( {} )
+		expect( Strelka::LOCAL_CONFIG_FILE ).to receive( :exist? ).
+			and_return( true )
+		expect( Configurability::Config ).to receive( :load ).
+			with( Strelka::LOCAL_CONFIG_FILE, {} ).
+			and_return( config_object )
+		expect( config_object ).to receive( :install )
+
+		Strelka.load_config
+	end
+
+
+	it "will load a default config file if none is specified and there's no local config" do
+		config_object = double( "Configurability::Config object" )
+		allow( config_object ).to receive( :[] ).with( :strelka ).and_return( {} )
+
+		expect( Configurability ).to receive( :gather_defaults ).
+			and_return( {} )
+		expect( Strelka::LOCAL_CONFIG_FILE ).to receive( :exist? ).
+			and_return( false )
+		expect( Configurability::Config ).to receive( :load ).
+			with( Strelka::DEFAULT_CONFIG_FILE, {} ).
+			and_return( config_object )
+		expect( config_object ).to receive( :install )
+
+		Strelka.load_config
+	end
+
+
+	it "will load a config file given in an environment variable" do
+		ENV['STRELKA_CONFIG'] = '/usr/local/etc/strelka.yml'
+
+		config_object = double( "Configurability::Config object" )
+		allow( config_object ).to receive( :[] ).with( :strelka ).and_return( {} )
+
+		expect( Configurability ).to receive( :gather_defaults ).
+			and_return( {} )
+		expect( Configurability::Config ).to receive( :load ).
+			with( '/usr/local/etc/strelka.yml', {} ).
+			and_return( config_object )
+		expect( config_object ).to receive( :install )
+
+		Strelka.load_config
+	end
+
+
+	it "will load a config file and install it if one is given" do
+		config_object = double( "Configurability::Config object" )
+		allow( config_object ).to receive( :[] ).with( :strelka ).and_return( {} )
+
+		expect( Configurability ).to receive( :gather_defaults ).
+			and_return( {} )
+		expect( Configurability::Config ).to receive( :load ).
+			with( 'a/configfile.yml', {} ).
+			and_return( config_object )
+		expect( config_object ).to receive( :install )
+
+		Strelka.load_config( 'a/configfile.yml' )
+	end
+
+
+	it "will override default values when loading the config if they're given" do
+		config_object = double( "Configurability::Config object" )
+		allow( config_object ).to receive( :[] ).with( :strelka ).and_return( {} )
+
+		expect( Configurability ).to_not receive( :gather_defaults )
+		expect( Configurability::Config ).to receive( :load ).
+			with( 'a/different/configfile.yml', {database: {dbname: 'test'}} ).
+			and_return( config_object )
+		expect( config_object ).to receive( :install )
+
+		Strelka.load_config( 'a/different/configfile.yml', database: {dbname: 'test'} )
+	end
+
+
+	it "will call any registered callbacks after the config is installed" do
+		config_object = double( "Configurability::Config object" )
+		allow( config_object ).to receive( :[] ).with( :strelka ).and_return( {} )
+
+		expect( Configurability ).to receive( :gather_defaults ).
+			and_return( {} )
+		expect( Configurability::Config ).to receive( :load ).
+			with( 'a/configfile.yml', {} ).
+			and_return( config_object )
+		expect( config_object ).to receive( :install )
+
+		hook_was_called = false
+		Strelka.after_configure do
+			hook_was_called = true
+		end
+		Strelka.load_config( 'a/configfile.yml' )
+
+		expect( hook_was_called ).to be( true )
 	end
 
+
+	it "will immediately call after_config callbacks registered after the config is installed" do
+		config_object = double( "Configurability::Config object" )
+		allow( config_object ).to receive( :[] ).with( :strelka ).and_return( {} )
+
+		expect( Configurability ).to receive( :gather_defaults ).
+			and_return( {} )
+		expect( Configurability::Config ).to receive( :load ).
+			with( 'a/configfile.yml', {} ).
+			and_return( config_object )
+		expect( config_object ).to receive( :install )
+
+		hook_was_called = false
+		Strelka.load_config( 'a/configfile.yml' )
+
+		Strelka.after_configure do
+			hook_was_called = true
+		end
+
+		expect( hook_was_called ).to be( true )
+	end
+
+
+	it "can add new after_configure hooks even while the current ones are being run" do
+		config_object = double( "Configurability::Config object" )
+		allow( config_object ).to receive( :[] ).with( :strelka ).and_return( {} )
+
+		expect( Configurability ).to receive( :gather_defaults ).
+			and_return( {} )
+		expect( Configurability::Config ).to receive( :load ).
+			with( 'a/configfile.yml', {} ).
+			and_return( config_object )
+		expect( config_object ).to receive( :install )
+
+		hook_was_called = false
+		Strelka.after_configure do
+			Strelka.after_configure do
+				hook_was_called = true
+			end
+		end
+
+		Strelka.load_config( 'a/configfile.yml' )
+
+		expect( hook_was_called ).to be( true )
+	end
+
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Mahlon E. Smith
@@ -11,32 +11,31 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  JnC4lpJfCP6aCXa5h2XAQfPSH636cQap
   -----END CERTIFICATE-----
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2019-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configurability
@@ -114,14 +113,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.44'
+        version: '0.53'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.44'
+        version: '0.53'
 - !ruby/object:Gem::Dependency
   name: pluggability
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +211,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: hoe-highline
   requirement: !ruby/object:Gem::Requirement
@@ -280,30 +279,36 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '3.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '3.18'
 description: |-
   Strelka is a framework for creating and deploying
   Mongrel2[http://mongrel2.org/] web applications in Ruby.
@@ -413,6 +418,7 @@ files:
 - lib/strelka/session/default.rb
 - lib/strelka/testing.rb
 - lib/strelka/websocketserver.rb
+- lib/strelka/websocketserver/heartbeat.rb
 - lib/strelka/websocketserver/routing.rb
 - spec/constants.rb
 - spec/data/error.tmpl
@@ -464,6 +470,8 @@ files:
 - spec/strelka/session/db_spec.rb
 - spec/strelka/session/default_spec.rb
 - spec/strelka/session_spec.rb
+- spec/strelka/testing_spec.rb
+- spec/strelka/websocketserver/heartbeat_spec.rb
 - spec/strelka/websocketserver/routing_spec.rb
 - spec/strelka/websocketserver_spec.rb
 - spec/strelka_spec.rb
@@ -488,8 +496,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Strelka is a framework for creating and deploying Mongrel2[http://mongrel2.org/]