grande 0.0.4 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99f854af250858730eb43878c03ed35d3a7f257c529d75fdcbcddf8e797fb42b
-  data.tar.gz: e8a8f20f0dccfaa1b7af7568dd5b063573ff45c6e23429cee9d0bdb9af44abe9
+  metadata.gz: 1fae0574e0b29e088d81115bd1a39d7a4501b2f4aa720a198c6819c0ad1873db
+  data.tar.gz: 23fbf3ddb5d1e5e98f6c8f2a2b6d78240256ad5adfb398f0c1b69f9cd541e3aa
 SHA512:
-  metadata.gz: 41880ab13a1a273a27516748329c77103f6b7e875ef958fe0d1e5df8fdd95bba9122bf9e1d8fe4be8a141eefdcf0afa1b34b25e0f85fa4b8a5127f9d94e8246d
-  data.tar.gz: 290d8dbd69e9236bc803159e0c455f5aa141a49560fa84f936faf5dfafbd4a545960270cd6891f5cbaa56183f4cb8b61fdc556f4ec15506ef03c07f7ad8892f2
+  metadata.gz: a6b091758ad17f6ef5ca7cde8e49b28aac601c66ff75088625548b237b0f22d54949d417ba3b83f7d1149610e47ea0f3df678d0e74650d433a8b827a9726c4f5
+  data.tar.gz: 3c2f95eed2828a9d711687284ee0390c926d68f2f331d1b637e6654be00287c452185d08b661fb899d61948b41c8498729406897a0d867086443d2e99dc3e741

data/lib/grande/config_loader.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
-require 'yaml'
+require 'comff'
 
 class Grande::ConfigLoader
+  attr_reader :comff
+
   def initialize
-    @conf = nil
+    @comff = nil
 
     default_path = File.join(Grande.c.app.root_path, 'config/config.yml')
 
@@ -23,51 +25,17 @@ class Grande::ConfigLoader
     end
   end
 
-  def get_int(key, default=nil)
-    value = get_str(key)
-    return default if value == nil
-    Integer(value)
-  end
-
-  def get_int!(key)
-    value = get_int(key)
-    raise "Config key #{key} is required" unless value
-    Integer(value)
-  end
-
-  def get_str(key, default=nil)
-    env_var_name = key_to_env_var_name(key)
-    return ENV[env_var_name] if ENV.key?(env_var_name)
-
-    parts = key.split('.')
-    base_obj = if parts.length == 1
-      @conf
-    else
-      @conf.dig(*parts[0...-1])
-    end
-
-    # binding.pry if key =="redis.url"
-
-    base_obj.fetch(parts.last, default)
-  end
-
-  def get_str!(key)
-    none = Object.new
-    value = get_str(key, none)
-    raise "Config key #{key} is required" if value == none
-
-    value
-  end
+  def get_int(*a, **kw); @comff.get_int(*a, **kw); end
+  def get_int!(*a, **kw); @comff.get_int!(*a, **kw); end
+  def get_str(*a, **kw); @comff.get_str(*a, **kw); end
+  def get_str!(*a, **kw); @comff.get_str!(*a, **kw); end
+  def get_bool(*a, **kw); @comff.get_bool(*a, **kw); end
+  def get_bool!(*a, **kw); @comff.get_bool!(*a, **kw); end
 
   private
 
-  # Convert key format from foo.bar.qux
-  # into FOO_BAR_QUX
-  def key_to_env_var_name(key)
-    key.split('.').map(&:upcase).join('_')
-  end
-
   def load_conf_file!(path)
-    @conf = YAML.safe_load(File.read(path))
+    configuration = File.read(path)
+    @comff = Comff.new(configuration)
   end
 end

data/lib/grande/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Grande
-  VERSION = "0.0.4"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grande
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.1
 platform: ruby
 authors:
 - André D. Piske
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-26 00:00:00.000000000 Z
+date: 2021-10-02 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Opinionated starting point for creating ruby apps.
@@ -49,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.18
+rubygems_version: 3.2.28
 signing_key: 
 specification_version: 4
 summary: Superpower your small but grande app