simple-conf 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2Q5Yzc0ZTdhOTJlYzc1YzA0ZWU0ZTMzY2M1ZDliOWI0ZmE2MzJjYw==
+    M2QxYWZhN2FlNjc0ZTdmMzFiNDkwOTk5NTBiZWE1ZTIxNjMyYmYwMw==
   data.tar.gz: !binary |-
-    Zjc3YThiMzQ0MzU4MGZjYmQyYmFhMGY4YTY0ZmIyMWRmNTQ5MTc1Yg==
+    YzQ1MzY0ZjYyYzA0ZjljYmQ2MmQ4YWE3NGU0NDdiYmEwYmZkZTI2MQ==
 SHA512:
   metadata.gz: !binary |-
-    YzAzOGJhZThlNGFlN2RjZTYzYzRlOGM0YjFiYzUxNDgzYjNiZWIyZTQ4YTg1
-    N2IzMzYxNzhiNDQ1NjRmZDVkZmZjNGIxZjJlZTAxYjcwN2ZlNzlhZTE5ZjE4
-    OTAwYzFhZDQxODQ1YWQwOTdhM2UwNDdmMGY3NjZmYWU5ZThiMTc=
+    NWVkZjZiNzQ4YWFkOWY4NjQ4YjlhYzcwNDgxZGJlY2FhZDNlZjRjODI4NDVm
+    YzQ1NGIwZDcxZGZmNDQyOTJlNDVjZmIxMDYxZWIyYjcwYmFhNmY5MzM1MmU2
+    M2ZhMjg4MTg1MGE2NjhmN2YzMzU5YmE0OTUzZDNjMzlmMzA5Mzg=
   data.tar.gz: !binary |-
-    NTg1Njk0MThkMTUxZjQ2YzAwODE5ZDA3YzFkNjg0NTAxMWVkNTExYmJlNzhh
-    Y2VmZTc0YjRmMTQ4ZmZiZWViZWM3MTAxMGQ3MjczZjM5YjE4MDlmYTQzNmVk
-    ODVjMjM1NjE5YWE5MzA5NmQ0MGQyYTA4OGQ5Y2IwZmVkNGI0OTk=
+    OGUzZjg1MTlkYTUyYTAxOWEwNWZjOTFjNjBiMDYwZTgwMzZjNDk2NGUxMzI3
+    MjNkY2U3MWVlMzJkZDE0YjUyNDJmOWZiMWEzZDY5OTVhOWMzMmQ3M2Q0NzNk
+    NzZmNDJkMWMyNjk4MGQ4MDEwNzM4Y2JjMTcyNTgxMTkyMmI5N2I=

data/lib/simple-conf/loader.rb

@@ -12,7 +12,11 @@ module SimpleConf
           attr_reader :keys
         end
 
-        @keys = []
+        @keys = Set.new
+
+        def keys
+          @keys.to_a
+        end
       }
     end
 
@@ -27,6 +31,10 @@ module SimpleConf
     def load_file_by_rails_env(path)
       yaml_file(path).fetch(Rails.env, {}).each_pair do |key, value|
         set(key, value)
+
+        klass.class_eval %Q{
+          @keys << :#{key}
+        }
       end if rails_environment_defined?
     end
 
@@ -39,6 +47,10 @@ module SimpleConf
     def load_file_by_klass_env(path)
       yaml_file(path).fetch(klass.env, {}).each_pair do |key, value|
         set(key, value)
+
+        klass.class_eval %Q{
+          @keys << :#{key}
+        }
       end if klass.respond_to?(:env)
     end
 
@@ -57,10 +69,10 @@ module SimpleConf
 
     def underscore(camel_case_string)
       camel_case_string.gsub(/::/, '/').
-      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-      gsub(/([a-z\d])([A-Z])/,'\1_\2').
-      tr("-", "_").
-      downcase
+        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+        gsub(/([a-z\d])([A-Z])/,'\1_\2').
+        tr("-", "_").
+        downcase
     end
 
     def yaml_file(path)
@@ -76,8 +88,6 @@ module SimpleConf
         class << self
           attr_reader :#{key}
         end
-
-        @keys.push(:#{key})
       }
     end
 

data/lib/simple-conf/version.rb

@@ -1,3 +1,3 @@
 module SimpleConf
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/simple_conf_spec.rb

@@ -69,6 +69,12 @@ describe SimpleConf do
   it 'on include properties depenending on env method' do
     expect(Settings.domain).to eq('test.example.com')
   end
+
+
+  it 'should not include env keys' do
+    expect(Settings.keys).not_to include(:test)
+    expect(Settings.keys).to include(:domain)
+  end
 end
 
 describe SimpleConf do
@@ -125,12 +131,6 @@ describe SimpleConf do
     expect(Options2).to respond_to(:group1)
     expect(Options2).to respond_to(:group2)
   end
-
-  it 'should have .keys for iterating by root keys of the configuration file' do
-    expect(Options2.keys.size).to eq(2)
-    expect(Options2.keys).to include(:group1)
-    expect(Options2.keys).to include(:group2)
-  end
 end
 
 describe SimpleConf do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-conf
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Alexander Korsak