easy_json_config 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ebea935c18c52549ce6006f694c66906b791e33a
-  data.tar.gz: 2962d01c1efc4eb69cf77d51c1adf4d625a340c6
+SHA256:
+  metadata.gz: 26da301be576b29c521829a92f93ef11ca50c89ab7586f2acae0a7253431cb42
+  data.tar.gz: 8f4d542dbb5172d545f8dc331170ea1d32144e4a1a9f7133424933ec8114c0c8
 SHA512:
-  metadata.gz: 12f88a16f96acda902e2ea941be41ca91d0cf57be36a1679e094e96403c3fa60ea1ccd0ec902d4f0217ceb0d0968187d7ffc0af5a533b9898e89f4adb035b7b0
-  data.tar.gz: 44c30a5ac6afb8518fd64ed235172746e53cc222951e76e405c4f0070fb6c4ddb08c994b463e023ce10e8f81309fd480db9ae823caf2e6c789ecd0fd3b0f2d43
+  metadata.gz: 69f4d45122eb100972476ff1521c73e1e31556a22b066944310a31d917fcfdfc232f01e322851718b7fe711621d120f11cc780618ba529fd4651cfbb0a104d8d
+  data.tar.gz: 450c60f78888d1f55139a95ac9c41378d314bb6e4f04c7f8fe08e16adc55ee041ac8f639c539c4108096896bd8ed1bb5638efc97aa4e81e641db3f385bc7d0cb

data/lib/easy_json_config/config.rb

@@ -13,11 +13,20 @@ module EasyJSON
     attr_reader :path
 
     def [](key)
-      values[key]
+      @config = Hashly.deep_merge(@config, @frozen_values)
+      @config[key]
+    end
+
+    def []=(key, value)
+      @config[key] = value
     end
 
     def to_s
-      "Config path: #{path}\nValues: #{JSON.pretty_generate values}"
+      "Config path: #{path}\nContent: #{JSON.pretty_generate @config}"
+    end
+
+    def to_h
+      Hashly.deep_merge(@config, @frozen_values).to_h
     end
 
     # Add a hash of default keys and values to be merged over the current defaults (if any).
@@ -32,22 +41,13 @@ module EasyJSON
       @frozen_values = Hashly.deep_merge(@frozen_values, new_frozen_values)
     end
 
-    # returns a hash containing the json config file values merged over the default values.
-    def values
-      config = Hashly.deep_merge(@defaults, @json_config)
-      config = Hashly.deep_merge(config, @frozen_values)
-      missing_required_keys = Hashly.deep_diff_by_key(config, @required_keys)
-      raise "The following keys are missing from #{path}: #{missing_required_keys}" unless missing_required_keys.empty?
-      config
-    end
-
-    def values_without_sensitive_or_hardcoded_keys
-      non_sensitive_values = Hashly.deep_reject(values) { |k, _v| @sensitive_keys.include?(k) }
-      Hashly.deep_reject_by_hash(non_sensitive_values, @frozen_values)
+    def config_without_sensitive_or_hardcoded_keys
+      non_sensitive_content = Hashly.deep_reject(@config) { |k, _v| @sensitive_keys.include?(k) }
+      Hashly.deep_reject_by_hash(non_sensitive_content, @frozen_values)
     end
 
     def save
-      ::File.write(path, values_without_sensitive_or_hardcoded_keys.to_json)
+      ::File.write(path, config_without_sensitive_or_hardcoded_keys.to_json)
     end
 
     def add_required_keys(new_required_keys)
@@ -72,11 +72,23 @@ module EasyJSON
         instance.add_defaults(defaults)
         instance.freeze_values(frozen_values)
         instance.add_required_keys(required_keys)
+        instance.initialize_config
         return instance
       end
       EasyJSON.configs[path] = super(path, defaults, frozen_values, required_keys) # create new instance if none existed
     end
 
+    # returns a hash containing the json config file values merged over the default values.
+    def initialize_config
+      @config ||= {}
+      @config = Hashly.deep_merge(@config, @defaults)
+      @config = Hashly.deep_merge(@config, @json_config)
+      @config = Hashly.deep_merge(@config, @frozen_values)
+      missing_required_keys = Hashly.deep_diff_by_key(@config, @required_keys)
+      raise "The following keys are missing from #{path}: #{missing_required_keys}" unless missing_required_keys.empty?
+      @config
+    end
+
     private
 
     def initialize(path, defaults, frozen_values, required_keys)
@@ -86,6 +98,7 @@ module EasyJSON
       @required_keys = required_keys || {}
       ::File.write(path, "{\n}") unless ::File.exist?(path) # Add empty config if none exists
       @json_config = JSON.parse(::File.read(path))
+      initialize_config
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_json_config
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Alex Munoz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2022-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -67,8 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Ruby library for ease of using a basic json config file with the ability