figleaf 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9587314be7114b5e08704a3f1e2364f41cf90f926c890554b8dd31582dbd7c2
-  data.tar.gz: 7f1731a8135590e9992ff1a2e40382fd36f11f9bb3739d6006546a40069ee948
+  metadata.gz: 37549d550c5b5f23f930cbbe09f7c94f554be0d61175ffd3c100da8d4da57132
+  data.tar.gz: 13de48551a3e5ba8b0ef24a8b206ad2e4ecbbe509bfacabc733d65c1e2d7fa57
 SHA512:
-  metadata.gz: '03471397a014e702344505aee3ebe6289b110278d662ed121fcc634c8a63a20f9207e90b1ca08ec7d6d693246f61b1dede83cec44af33694dae4621b4e892b56'
-  data.tar.gz: 76a9bdcec7177c4485273a93748c454b886f3adb22b12e4dfe485ea7359d9f7d418a15509f7ce7747b0b5225ff0fc896598f877c29354ea67d8090a4a03ee238
+  metadata.gz: 99e014709696659c0c0cdded8e7e1ee79ac485fe82cea11d5f4d4dd63acddcaf8605a30e748d19beb477eb7a7eb9ec4bf13fb41eda39dca00e61ee5aee36d13a
+  data.tar.gz: 539305c3f50e86711a6d921a8a49962b131905b3939c619805d062ef00897af43295526a0ad3a6fd3cdee176124bfe838e945e300a1514906028086680ae850b

data/CHANGELOG.md

@@ -1,28 +1,40 @@
 # Change Log
 
+## 0.3.1 (2024/04/24)
+
+- Allow loading regexps
+
 ## 0.3.0 (2024/04/05)
+
 - Use YAML.safe_load to support versions of Psych >4
 - Target modern rubies
 - Take advantage of Ruby 3's single line methods
 - Use standardrb to auto format all files
 
 ## 0.2.7, 0.2.8 and 0.2.9 (2017/09/28)
-Bugfixes
+
+- Bugfixes
 
 ## 0.2.6 (2017/09/28)
-Add ability to write config files in ruby
+
+- Add ability to write config files in ruby
 
 ## 0.2.5 (2017/09/28)
-Add support for `default` options
+
+- Add support for `default` options
 
 ## 0.2.4 (2017/08/25)
-Relax active support version dependency
+
+- Relax active support version dependency
 
 ## 0.2.3 (2017/03/09)
-Include original error along with file that failed loading
+
+- Include original error along with file that failed loading
 
 ## 0.2.2 (2017/03/08)
-Report what file failed loading on startup
+
+- Report what file failed loading on startup
 
 ## 0.2.1
-Fixes for rails 4
+
+- Fixes for rails 4

data/lib/figleaf/settings.rb

@@ -58,11 +58,11 @@ module Figleaf
       end
 
       def load_file(file, env_to_load = env)
+        property_name = File.basename(file, ".*")
+
         if file.end_with?(".rb")
-          property_name = File.basename(file, ".rb")
           config = load_rb_file(file) or return nil
         else
-          property_name = File.basename(file, ".yml")
           config = load_yaml_file(file) or return nil
         end
 
@@ -84,7 +84,7 @@ module Figleaf
       end
 
       def load_yaml_file(file_path)
-        YAML.safe_load(ERB.new(IO.read(file_path)).result, aliases: true)
+        YAML.safe_load(ERB.new(IO.read(file_path)).result, aliases: true, permitted_classes: [Regexp])
       rescue Psych::SyntaxError => e
         raise InvalidYAML, "#{file_path} has invalid YAML\n" + e.message
       end
@@ -95,7 +95,11 @@ module Figleaf
       end
 
       def default_file_pattern
-        [root.join("config/settings/*.yml"), root.join("config/settings/*.rb")]
+        [
+          root.join("config", "settings", "*.yml"),
+          root.join("config", "settings", "*.yaml"),
+          root.join("config", "settings", "*.rb")
+        ]
       end
 
       def env

data/lib/figleaf/version.rb

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

data/spec/figleaf/configuration_spec.rb

@@ -8,12 +8,12 @@ describe Figleaf::Settings do
       end
       it "should auto define methods and set initial value when setter used" do
         described_class.fictional_feature_enabled = :on
-        described_class.fictional_feature_enabled.should == :on
+        expect(described_class.fictional_feature_enabled).to eq(:on)
       end
 
       it "should return result of proc when set as a proc" do
         described_class.call_this_proc = -> { 3 }
-        described_class.call_this_proc.should == 3
+        expect(described_class.call_this_proc).to eq(3)
       end
     end
 
@@ -25,15 +25,15 @@ describe Figleaf::Settings do
       end
 
       it "should not auto defined setters and getters" do
-        expect { described_class.undefined_setting = :raises_error }.to raise_error
-        expect { described_class.undefined_setting }.to raise_error
+        expect { described_class.undefined_setting = :raises_error }.to raise_error(NoMethodError)
+        expect { described_class.undefined_setting }.to raise_error(NoMethodError)
       end
 
       it "should set/get previous defined attributes" do
-        described_class.fictional_feature_enabled.should eq(:on)
+        expect(described_class.fictional_feature_enabled).to eq(:on)
 
         described_class.fictional_feature_enabled = :off
-        described_class.fictional_feature_enabled.should eq(:off)
+        expect(described_class.fictional_feature_enabled).to eq(:off)
       end
     end
   end
@@ -45,8 +45,8 @@ describe Figleaf::Settings do
         s.enable_fictional_activity_feed = true
       end
 
-      described_class.another_fictional_feature_mode.should eq(:admin)
-      described_class.enable_fictional_activity_feed.should be true
+      expect(described_class.another_fictional_feature_mode).to eq(:admin)
+      expect(described_class.enable_fictional_activity_feed).to be true
     end
   end
 
@@ -56,8 +56,8 @@ describe Figleaf::Settings do
         s.some_boolean = true
       end
 
-      described_class.some_boolean.should be true
-      described_class.some_boolean?.should be true
+      expect(described_class.some_boolean).to be true
+      expect(described_class.some_boolean?).to be true
     end
 
     it "should define predicate methods for false value" do
@@ -65,8 +65,8 @@ describe Figleaf::Settings do
         s.another_boolean = false
       end
 
-      described_class.another_boolean.should be false
-      described_class.another_boolean?.should be false
+      expect(described_class.another_boolean).to be false
+      expect(described_class.another_boolean?).to be false
     end
 
     it "should evaluate presence predicate methods for string value" do
@@ -74,7 +74,7 @@ describe Figleaf::Settings do
         s.not_a_boolean = "Hello, world!"
       end
 
-      described_class.not_a_boolean?.should be true
+      expect(described_class.not_a_boolean?).to be true
     end
 
     it "should return false for empty string" do
@@ -82,7 +82,7 @@ describe Figleaf::Settings do
         s.empty_string = ""
       end
 
-      described_class.empty_string?.should be false
+      expect(described_class.empty_string?).to be false
     end
 
     it "return true for lists" do
@@ -90,7 +90,7 @@ describe Figleaf::Settings do
         s.not_a_boolean = %w[1 2 3]
       end
 
-      described_class.not_a_boolean?.should be true
+      expect(described_class.not_a_boolean?).to be true
     end
   end
 
@@ -105,7 +105,7 @@ describe Figleaf::Settings do
         s.fictional_feature_enabled = :off
       end
 
-      described_class.fictional_feature_enabled.should == :off
+      expect(described_class.fictional_feature_enabled).to eq(:off)
     end
 
     it "should only allow setting of values for previously defined attributes" do
@@ -113,7 +113,7 @@ describe Figleaf::Settings do
         described_class.configure do |s|
           s.undefined_setting = :should_raise_error
         end
-      }.to raise_error
+      }.to raise_error(NoMethodError)
     end
   end
 end

data/spec/figleaf/fighash_spec.rb

@@ -3,23 +3,23 @@ require "spec_helper"
 describe Figleaf::Fighash do
   describe "#to_hash" do
     it "should return class Hash" do
-      subject.to_hash.class.should == Hash
+      expect(subject.to_hash.class).to eq(Hash)
     end
 
     context "should have symbols as keys" do
       it "for symbol keys" do
         subject = described_class.new({a: :b, c: 1, d: "foo"})
-        subject.to_hash.should == {a: :b, c: 1, d: "foo"}
+        expect(subject.to_hash).to eq({a: :b, c: 1, d: "foo"})
       end
 
       it "for string keys" do
         subject = described_class.new({"a" => :b, "c" => 1, "d" => "foo"})
-        subject.to_hash.should == {a: :b, c: 1, d: "foo"}
+        expect(subject.to_hash).to eq({a: :b, c: 1, d: "foo"})
       end
 
       it "should have symbols as keys inside two levels" do
         subject = described_class.new({a: {b: :d}})
-        subject.to_hash.should == {a: {b: :d}}
+        expect(subject.to_hash).to eq({a: {b: :d}})
       end
     end
   end

data/spec/figleaf/settings_spec.rb

@@ -51,8 +51,12 @@ describe Figleaf::Settings do
       expect(described_class.erb.bar).to be_nil
     end
 
+    it "and for regexp values" do
+      expect(described_class.regexp.some_matcher).to eq(/\Amatcher\z/)
+    end
+
     it "raise exception when loading an undefined value" do
-      YAML.stub(:load_yaml_file).and_return({"test" => {}})
+      allow(YAML).to receive(:load_yaml_file).and_return({"test" => {}})
       described_class.load_settings
       expect { described_class.service.blah }.to raise_error NoMethodError
     end
@@ -106,7 +110,7 @@ describe Figleaf::Settings do
       end
 
       it "overrides values" do
-        expect(described_class.default.foo).to eq("overriden")
+        expect(described_class.default.foo).to eq("overridden")
       end
 
       it "respects values set in default" do
@@ -121,7 +125,7 @@ describe Figleaf::Settings do
       end
 
       it "overrides values" do
-        expect(described_class.default_anchor.foo).to eq("overriden")
+        expect(described_class.default_anchor.foo).to eq("overridden")
       end
 
       it "respects values set in default_anchor" do
@@ -130,6 +134,17 @@ describe Figleaf::Settings do
     end
   end
 
+  context "load yaml files" do
+    before do
+      fixtures_path = File.expand_path("../../fixtures/*.yaml", __FILE__)
+      described_class.load_settings(fixtures_path, "test")
+    end
+
+    it "reads them just fine" do
+      expect(described_class.yaml.works).to eq("here")
+    end
+  end
+
   context "load ruby files" do
     before do
       fixtures_path = File.expand_path("../../fixtures/extra/*.rb", __FILE__)
@@ -169,5 +184,9 @@ describe Figleaf::Settings do
     it "and for ENV values" do
       expect(described_class.code.from_env).to eq("foo")
     end
+
+    it "and for regexp values" do
+      expect(described_class.regexp.value).to eq(/\Amatcher\z/)
+    end
   end
 end

data/spec/fixtures/extra/default.yml

@@ -3,4 +3,4 @@ default:
   bar: baz
 
 test:
-  foo: overriden
+  foo: overridden

data/spec/fixtures/extra/default_anchor.yml

@@ -4,4 +4,4 @@ default: &default
 
 test:
   <<: *default
-  foo: overriden
+  foo: overridden

data/spec/fixtures/extra/regexp.rb

@@ -0,0 +1,3 @@
+default do
+  value %r{\Amatcher\z}
+end

data/spec/fixtures/regexp.yml

@@ -0,0 +1,2 @@
+default:
+  some_matcher: !ruby/regexp /\Amatcher\z/

data/spec/fixtures/yaml.yaml

@@ -0,0 +1,3 @@
+---
+test:
+  works: here

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: figleaf
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Juan C. Müller
@@ -75,9 +75,12 @@ files:
 - spec/fixtures/extra/code.rb
 - spec/fixtures/extra/default.yml
 - spec/fixtures/extra/default_anchor.yml
+- spec/fixtures/extra/regexp.rb
 - spec/fixtures/extra/service.yml
+- spec/fixtures/regexp.yml
 - spec/fixtures/service.yml
 - spec/fixtures/string.yml
+- spec/fixtures/yaml.yaml
 - spec/spec_helper.rb
 homepage: http://github.com/jcmuller/figleaf
 licenses: []