loadable_config 1.0.0 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f9e359a1aa612416d1e8c84476e0f2e955208816710333d0d94e88dbcdd07a0
-  data.tar.gz: 5cea5fb4d8af5246fd5b36906f4120ea9a1e128a58772fe856c2ddeb467fab44
+  metadata.gz: 33c373a5e0f4a214006136bab94ad6c340569d39243d42239aa6d585666b5504
+  data.tar.gz: 346a2170ef3e5c8c8c675ee63e725d775fe6b58918f37fb5cc90b720277cf7f9
 SHA512:
-  metadata.gz: ebe69bc54c01a15a12e0611aabace5ed1ed5fd269b0ca2ae66b1bffd291128410f2d8efa634c6ddaa8241af4a16ed559d32a8b3bc4f36dd97fbf73f133294240
-  data.tar.gz: cc068e42ecbf05a68307929ece847b5b3da1a8c525b1a8062df16a23c23f791f86cf833eed87741c10b4bd75fdc339a4ca4d3f8adf050e7b3ec08adc26cac735
+  metadata.gz: 2a7a4699f631c1929510007fb0bb2f57aedbe8b9dd948f2646fada1e5e1ab9ccad49fe33b5b801450658e667acf308c481e5222cb3c80ab7396c4f99ec4ad972
+  data.tar.gz: 444ed617779485ad69f4667c4be6d6781e57b304d1e7d24b9860c3f324d3f8fbc40f46f265d428bf131689228d1a8ea9c6d95240a5c9a26b648a93bad394af5a

data/.circleci/config.yml

@@ -10,7 +10,7 @@ executors:
         type: string
         default: "Gemfile"
     docker:
-      - image: circleci/ruby:<< parameters.ruby-version >>
+      - image: cimg/ruby:<< parameters.ruby-version >>
         environment:
           BUNDLE_JOBS: 3
           BUNDLE_RETRY: 3
@@ -82,15 +82,19 @@ workflows:
   build:
     jobs:
       - test:
-          name: 'ruby 2.5'
-          ruby-version: "2.5"
+          name: 'ruby 2.7'
+          ruby-version: "2.7"
       - test:
-          name: 'ruby 2.6'
-          ruby-version: "2.6"
+          name: 'ruby 3.0'
+          ruby-version: "3.0"
+      - test:
+          name: 'ruby 3.1'
+          ruby-version: "3.1"
       - publish:
           requires:
-            - 'ruby 2.5'
-            - 'ruby 2.6'
+            - 'ruby 2.7'
+            - 'ruby 3.0'
+            - 'ruby 3.1'
           filters:
             branches:
               only: master

data/lib/loadable_config/version.rb

@@ -1,3 +1,3 @@
 class LoadableConfig
-  VERSION = '1.0.0'
+  VERSION = '1.0.3'
 end

data/lib/loadable_config.rb

@@ -7,12 +7,13 @@ require 'yaml'
 require 'singleton'
 
 class LoadableConfig
-  Attribute = Struct.new(:name, :type, :schema, :optional, :serializer)
+  Attribute = Struct.new(:name, :type, :schema, :optional, :serializer, :default)
 
   class << self
     attr_reader :_attributes, :_config_file
 
     def inherited(subclass)
+      super
       subclass.send(:include, Singleton)
     end
 
@@ -20,7 +21,7 @@ class LoadableConfig
       @_config_file = path
     end
 
-    def attribute(attr, type: :string, schema: {}, optional: false, serializer: nil)
+    def attribute(attr, type: :string, schema: {}, serializer: nil, default: nil, optional: !default.nil?)
       @_attributes ||= []
       attr = attr.to_sym
       if ATTRIBUTE_BLACKLIST.include?(attr)
@@ -28,11 +29,12 @@ class LoadableConfig
                                 'attributes must not collide with class methods of LoadableConfig')
       end
 
-      type = [type] unless type.kind_of?(Array)
+      type = [type] unless type.is_a?(Array)
       type.map! { |t| t.to_s }
 
-      _attributes << Attribute.new(attr.to_s, type, schema, optional, serializer)
+      _attributes << Attribute.new(attr.to_s, type, schema, optional, serializer, default)
       attr_accessor attr
+
       define_singleton_method(attr) { instance.send(attr) }
     end
 
@@ -50,6 +52,7 @@ class LoadableConfig
       if @@_configuration.frozen?
         raise ArgumentError.new('Cannot configure LoadableConfig: already configured')
       end
+
       yield(@@_configuration)
       @@_configuration.freeze
     end
@@ -87,7 +90,7 @@ class LoadableConfig
       config_data = preprocessor.call(config_data)
     end
 
-    config = YAML.safe_load(config_data, [], [], true)
+    config = YAML.safe_load(config_data, aliases: true)
     unless config
       raise RuntimeError.new("Cannot configure #{self.class.name}: "\
                              "Configuration file empty for #{self.class.name}.")
@@ -111,10 +114,15 @@ class LoadableConfig
     end
 
     self.class._attributes.each do |attr|
-      value = config[attr.name]
-      if attr.serializer
-        value = attr.serializer.load(value)
+      if config.has_key?(attr.name)
+        value = config[attr.name]
+        if attr.serializer
+          value = attr.serializer.load(value)
+        end
+      else
+        value = attr.default
       end
+
       self.public_send(:"#{attr.name}=", value)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loadable_config
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.3
 platform: ruby
 authors:
 - iKnow Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-08 00:00:00.000000000 Z
+date: 2022-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.11
 signing_key: 
 specification_version: 4
 summary: Simple declarative configuration files