raindeer 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e75c9fc6090058055514d77cf30350528e2b961dd2d92088ab7407e893c5543a
-  data.tar.gz: e548dccf176c3768d42598ce1889694de5ed7919beb3e2b19bfed8112db80927
+  metadata.gz: 8ff951a5eafc6d661e188c1eb78fb01ae2a148544fd897da8731800305335f2f
+  data.tar.gz: d821af08d8333a88da073564db2f699e905de22fa825ed89ac41dca5dd48fd4b
 SHA512:
-  metadata.gz: 7102994614563cb59203e8e711bd1210d95f5d28441f15eee224fedefbdeaab5939ce395974550161a40ec74d090a9b2cbb9e2b055da3025a450d99e978759e1
-  data.tar.gz: f4742896c7497449528bbf4e6373ac8729473c82936f700dd533efbf8afb12762daad5c636e114a3da32c98e844acb3a56d9cb357b71cf8203dbf51edb920afb
+  metadata.gz: 6c8cc7383ae033d78736e5c7db85057f4a2ab4bbd8b5634d4efc7164b96112dd25ac94e31216f9cbe2ab06a99fa70f1b34a9f742da6725ff3f0fe7295b99f0f2
+  data.tar.gz: 52bd7181b0e4bb0a9a4cf17a0802428849a1a0e5543f1443721661c58c229f528e6e49fc0f97866a5092d2e42772a2ca26cbdd67d61da7b5bca50857ade3bd0c

data/lib/boot.rb

@@ -1,24 +1,26 @@
 # frozen_string_literal: true
 
-require 'low_dependency'
 require 'low_loop'
+require 'low_dependency'
 
-require_relative 'router/router'
+require_relative 'support/config_loader'
 
-host = ENV.fetch('RAIN_HOST', '127.0.0.1').freeze
-port = ENV.fetch('RAIN_PORT', 4133)
-matrix_mode = ENV.fetch('RAIN_MATRIX', nil) == '1'
-mirror_mode = ENV.fetch('RAIN_MIRROR', nil) == '1'
+env = {
+  host: ENV.fetch('RAIN_HOST', nil),
+  port: ENV.fetch('RAIN_PORT', nil),
+  web_root: ENV.fetch('RAIN_WEB_ROOT', nil),
+  matrix_mode: Rain::ConfigLoader.parse_boolean(ENV.fetch('RAIN_MATRIX', nil)),
+  mirror_mode: Rain::ConfigLoader.parse_boolean(ENV.fetch('RAIN_MIRROR', nil))
+}
 
-config = Struct.new(:host, :port, :matrix_mode, :mirror_mode)
+config = Rain::ConfigLoader.load('./config/config.yaml', env)
 
 LowDependency.provide('rain.router') do
   RainRouter.new
 end
 
 LowDependency.provide('low.loop') do
-  # TODO: Use "def method(dependency: Dependency)" in low loop's constructor when this feature is ready.
-  LowLoop.new(config: config.new(host, port, matrix_mode, mirror_mode), router: Low::Providers['rain.router'])
+  LowLoop.new(config:, router: Low::Providers['rain.router'])
 end
 
 require_relative 'system/system'

data/lib/router/router.rb

@@ -59,7 +59,7 @@ module Rain
       end
 
       if response_event.nil?
-        status = LowType::Status[404]
+        status = Low::Types::Status[404]
         response_event = trigger status, action: :render, event: Low::Events::StatusEvent.new(status:, request: event.request)
       end
 

data/lib/support/config_loader.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'ostruct'
+require 'yaml'
+
+module Rain
+  class ConfigLoader
+    class << self
+      def load(filepath, env = {})
+        config_file = YAML.safe_load_file(filepath, symbolize_names: true)
+
+        # Environment variables override config file.
+        config_data = config_file.merge(env) do |_key, old_value, new_value|
+          new_value.nil? ? old_value : new_value
+        end
+
+        OpenStruct.new(config_data)
+      end
+
+      def parse_boolean(value)
+        return true if value == '1'
+        return false if value == '0'
+
+        nil
+      end
+    end
+  end
+end

data/lib/system/page_not_found_node.rb

@@ -3,7 +3,7 @@
 class PageNotFoundNode < LowNode
   observe Status[404]
 
-  def render(event: StatusEvent)
+  def render(event: StatusEvent) # rubocop:disable Lint/UnusedMethodArgument
     <<~HTML
       <div class="page-not-found">
         <em>404</em>

data/lib/system/system_node.rb

@@ -5,7 +5,7 @@ require_relative 'page_not_found_node'
 class SystemNode < LowNode
   observe '/system'
 
-  def render(event: RouteEvent)
+  def render(event: RouteEvent) # rubocop:disable Lint/UnusedMethodArgument
     'SYSTEM!'
   end
 end

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Raindeer
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raindeer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - maedi
@@ -9,6 +9,20 @@ bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: low_dependency
   requirement: !ruby/object:Gem::Requirement
@@ -149,6 +163,7 @@ files:
 - lib/router/router.rb
 - lib/router/trie.rb
 - lib/router/trie_node.rb
+- lib/support/config_loader.rb
 - lib/system/page_not_found_node.rb
 - lib/system/system.rb
 - lib/system/system_node.rb