figleaf 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1c3ffa2ddc1516568962663915086576c9537c7f
-  data.tar.gz: dc3a87ec97a6c98c2a34c2c1b726ec158744c59a
+SHA256:
+  metadata.gz: d9587314be7114b5e08704a3f1e2364f41cf90f926c890554b8dd31582dbd7c2
+  data.tar.gz: 7f1731a8135590e9992ff1a2e40382fd36f11f9bb3739d6006546a40069ee948
 SHA512:
-  metadata.gz: 758279631bd487d533e30b88bbe731a47ff136b34cddeb03c1e64dec22168d32d54fb6596d5886d238335e1f6ff591c07ea5e05df80849e57edd344615147d75
-  data.tar.gz: cef0b6499ad5c4d7c7b0e8a24ba26d42c68676e6e1afae4668d78398433cb51c522f469f6c52b0cc71e1c2f96f59c45315893868c2218629ae8995cb7a38c046
+  metadata.gz: '03471397a014e702344505aee3ebe6289b110278d662ed121fcc634c8a63a20f9207e90b1ca08ec7d6d693246f61b1dede83cec44af33694dae4621b4e892b56'
+  data.tar.gz: 76a9bdcec7177c4485273a93748c454b886f3adb22b12e4dfe485ea7359d9f7d418a15509f7ce7747b0b5225ff0fc896598f877c29354ea67d8090a4a03ee238

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 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
+
 ## 0.2.6 (2017/09/28)
 Add ability to write config files in ruby
 

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
@@ -13,13 +13,15 @@ group :development do
   gem "rb-fsevent", require: false
   gem "rb-inotify", require: false
 
-  gem 'guard-bundler', :require => false
-  gem 'guard-livereload', :require => false
-  gem 'guard-rspec', :require => false
-  gem 'libnotify', :require => false # linux notifications
-  gem 'ruby_gntp', :require => false # os x notifications
-  gem "terminal-notifier-guard", :require => false
+  gem "guard-bundler", require: false
+  gem "guard-livereload", require: false
+  gem "guard-rspec", require: false
+  gem "libnotify", require: false # linux notifications
+  gem "ruby_gntp", require: false # os x notifications
+  gem "terminal-notifier-guard", require: false
 
-  gem "pry"
-  gem "pry-debugger", platforms: :ruby_19
+  gem "pry", require: false
+  gem "pry-byebug", require: false
+
+  gem "standard", require: false
 end

data/Guardfile

@@ -1,19 +1,19 @@
 platform = RUBY_PLATFORM.match(/(linux|darwin)/)[0].to_sym
 notification case platform
-  when :darwin
-    :gntp
-  when :linux
-    require 'libnotify'
-    :libnotify
-  end
+when :darwin
+  :gntp
+when :linux
+  require "libnotify"
+  :libnotify
+end
 
 guard :bundler do
-  require 'guard/bundler'
-  require 'guard/bundler/verify'
+  require "guard/bundler"
+  require "guard/bundler/verify"
   helper = Guard::Bundler::Verify.new
 
-  files = ['Gemfile']
-  files += Dir['*.gemspec'] if files.any? { |f| helper.uses_gemspec?(f) }
+  files = ["Gemfile"]
+  files += Dir["*.gemspec"] if files.any? { |f| helper.uses_gemspec?(f) }
 
   # Assume files are symlinked from somewhere
   files.each { |file| watch(helper.real_path(file)) }

data/Rakefile

@@ -18,4 +18,4 @@ task :clean do
 end
 
 desc "Run rspec by default"
-task :default => :spec
+task default: :spec

data/figleaf.gemspec

@@ -1,19 +1,17 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/figleaf/version', __FILE__)
+require File.expand_path("../lib/figleaf/version", __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Juan C. Müller"]
-  gem.email         = ["jcmuller@gmail.com"]
-  gem.description   = %q{YAML based DRY settings manager.}
-  gem.summary       = %q{YAML based DRY settings manager.}
-  gem.homepage      = "http://github.com/jcmuller/figleaf"
+  gem.authors = ["Juan C. Müller"]
+  gem.email = ["jcmuller@gmail.com"]
+  gem.description = "YAML based DRY settings manager."
+  gem.summary = "YAML based DRY settings manager."
+  gem.homepage = "http://github.com/jcmuller/figleaf"
 
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "figleaf"
+  gem.files = `git ls-files`.split($\)
+  gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
+  gem.name = "figleaf"
   gem.require_paths = ["lib"]
-  gem.version       = Figleaf::VERSION
+  gem.version = Figleaf::VERSION
 
   gem.add_dependency "activesupport", ">= 3"
   gem.add_dependency "hashie", ">= 2"

data/lib/figleaf/config.rb

@@ -1,45 +1,37 @@
 module Figleaf
   # Convert a ruby block to nested hash
   class Config
-    def initialize
-      @property = LazyBlockHash.new
-    end
+    def initialize = @property = LazyBlockHash.new
 
-    def call(&block)
-      instance_eval(&block)
+    def call(&)
+      instance_eval(&)
 
       property
+    rescue => e
+      raise Settings::InvalidRb, "Configuration has invalid Ruby\n" + e.message
     end
 
-    def method_missing(method_name, *args, &block)
-      process_method(method_name, *args, &block)
-    end
+    def method_missing(method_name, *, &) = process_method(method_name, *, &)
 
-    def test(&block)
-      process_method(:test, [], &block)
-    end
+    def test(&) = process_method(:test, [], &)
 
     def process_method(method_name, *args, &block)
       @property[method_name.to_s] =
-        if block_given?
+        if block
           obj = self.class.new
-          Proc.new { obj.call(&block) }
+          proc { obj.call(&block) }
+        elsif args.count == 1
+          args[0]
         else
-          if args.count == 1
-            args[0]
-          else
-            args
-          end
+          args
         end
     end
 
-    def respond_to_missing?(method_name, *args)
-      true
-    end
+    def respond_to_missing?(method_name, *args) = true
 
     private
 
-      attr_reader :property
+    attr_reader :property
   end
 
   class LazyBlockHash < Hash
@@ -50,6 +42,8 @@ module Figleaf
       else
         val
       end
+    rescue => e
+      raise Settings::InvalidRb, "Configuration has invalid Ruby\n" + e.message
     end
   end
 end

data/lib/figleaf/settings.rb

@@ -10,7 +10,7 @@ module Figleaf
       # Public - configure pre-defined attributes
       #
       def configure
-        self.auto_define.tap do |cached_auto_define|
+        auto_define.tap do |cached_auto_define|
           self.auto_define = false
           yield self
           self.auto_define = cached_auto_define
@@ -20,13 +20,13 @@ module Figleaf
       # Public - configure auto defined settings attributes
       # and load yaml settings from confing/settings directory
       #
-      def configure!(&block)
+      def configure!(&)
         load_settings
-        configure_with_auto_define(&block)
+        configure_with_auto_define(&)
       end
 
       def configure_with_auto_define
-        self.auto_define.tap do |cached_auto_define|
+        auto_define.tap do |cached_auto_define|
           self.auto_define = true
           yield self
           self.auto_define = cached_auto_define
@@ -46,23 +46,23 @@ module Figleaf
 
             next if property.nil?
 
-            if self.respond_to?(property_name) &&
-                self.send(property_name).respond_to?(:merge) &&
+            if respond_to?(property_name) &&
+                send(property_name).respond_to?(:merge) &&
                 property.respond_to?(:merge)
-              property = self.send(property_name).merge(property)
+              property = send(property_name).merge(property)
             end
 
-            self.send("#{property_name}=", property)
+            send(:"#{property_name}=", property)
           end
         end
       end
 
       def load_file(file, env_to_load = env)
-        if file.end_with?('.rb')
-          property_name = File.basename(file, '.rb')
+        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')
+          property_name = File.basename(file, ".yml")
           config = load_yaml_file(file) or return nil
         end
 
@@ -70,7 +70,7 @@ module Figleaf
 
         default = config["default"]
         property = config[env_to_load]
-        property = default.merge(property) if !default.nil?
+        property = default.merge(property || {}) if !default.nil?
 
         [property_name, use_hashie_if_hash(property)]
       end
@@ -84,23 +84,23 @@ module Figleaf
       end
 
       def load_yaml_file(file_path)
-        YAML.load(ERB.new(IO.read(file_path)).result)
+        YAML.safe_load(ERB.new(IO.read(file_path)).result, aliases: true)
       rescue Psych::SyntaxError => e
         raise InvalidYAML, "#{file_path} has invalid YAML\n" + e.message
       end
 
       def root
         return Rails.root if defined?(Rails)
-        Pathname.new('.')
+        Pathname.new(".")
       end
 
       def default_file_pattern
-        [root.join('config/settings/*.yml'), root.join('config/settings/*.rb')]
+        [root.join("config/settings/*.yml"), root.join("config/settings/*.rb")]
       end
 
       def env
         return Rails.env if defined?(Rails)
-        ENV['ENVIRONMENT']
+        ENV["ENVIRONMENT"]
       end
 
       def use_hashie_if_hash(property)
@@ -109,20 +109,20 @@ module Figleaf
       end
 
       def override_with_local!(local_file)
-        #this file (i.e. test.local.rb) is an optional place to put settings
+        # this file (i.e. test.local.rb) is an optional place to put settings
         local_file.tap do |local_settings_path|
-          eval(IO.read(local_settings_path), binding) if File.exists?(local_settings_path)
+          eval(IO.read(local_settings_path), binding) if File.exist?(local_settings_path)
         end
       end
 
       def method_missing(method_name, *args)
         getter_name, modifier = extract_getter_name_and_modifier(method_name)
 
-        if self.auto_define && modifier == '=' && args.length == 1
-          self.define_cattr_methods(getter_name)
-          self.send(method_name, args.shift)
-        elsif modifier == '?' && args.empty?
-          self.send(getter_name).present?
+        if auto_define && modifier == "=" && args.length == 1
+          define_cattr_methods(getter_name)
+          send(method_name, args.shift)
+        elsif modifier == "?" && args.empty?
+          send(getter_name).present?
         else
           super
         end
@@ -136,11 +136,10 @@ module Figleaf
       def define_cattr_methods(getter_name)
         cattr_writer getter_name
         define_singleton_method(getter_name) do
-          result = class_variable_get "@@#{getter_name}"
+          result = class_variable_get :"@@#{getter_name}"
           result.respond_to?(:call) ? result.call : result
         end
       end
-
     end
   end
 end

data/lib/figleaf/version.rb

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

data/lib/figleaf.rb

@@ -1,15 +1,15 @@
-require 'active_support/concern'
-require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/module/attribute_accessors'
+require "active_support/concern"
+require "active_support/core_ext/class/attribute"
+require "active_support/core_ext/module/attribute_accessors"
 require "active_support/core_ext/object/blank"
-require 'hashie'
-require 'pathname'
-require 'yaml'
-require 'erb'
+require "erb"
+require "hashie"
+require "pathname"
+require "yaml"
 
 module Figleaf
-  autoload :Config, 'figleaf/config'
-  autoload :Fighash, 'figleaf/fighash'
-  autoload :Settings, 'figleaf/settings'
-  autoload :VERSION, 'figleaf/version'
+  autoload :Config, "figleaf/config"
+  autoload :Fighash, "figleaf/fighash"
+  autoload :Settings, "figleaf/settings"
+  autoload :VERSION, "figleaf/version"
 end

data/spec/figleaf/config_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 module Figleaf
   RSpec.describe Config do
@@ -30,13 +30,13 @@ module Figleaf
     describe "#call" do
       subject(:called) { config.call(&code) }
       it "stores first level keywords as keys" do
-        expect(called.keys).to contain_exactly(*%w(
+        expect(called.keys).to contain_exactly(*%w[
           default
           failer
           production
           setting_set_on_root
           test
-        ))
+        ])
       end
 
       it "expands default" do

data/spec/figleaf/configuration_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Figleaf::Settings do
   describe "setters and getters" do
@@ -87,7 +87,7 @@ describe Figleaf::Settings do
 
     it "return true for lists" do
       described_class.configure_with_auto_define do |s|
-        s.not_a_boolean = %w(1 2 3)
+        s.not_a_boolean = %w[1 2 3]
       end
 
       described_class.not_a_boolean?.should be true
@@ -116,5 +116,4 @@ describe Figleaf::Settings do
       }.to raise_error
     end
   end
-
 end

data/spec/figleaf/fighash_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Figleaf::Fighash do
   describe "#to_hash" do
@@ -8,18 +8,18 @@ describe Figleaf::Fighash do
 
     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" }
+        subject = described_class.new({a: :b, c: 1, d: "foo"})
+        subject.to_hash.should == {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" }
+        subject = described_class.new({"a" => :b, "c" => 1, "d" => "foo"})
+        subject.to_hash.should == {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 } }
+        subject = described_class.new({a: {b: :d}})
+        subject.to_hash.should == {a: {b: :d}}
       end
     end
   end

data/spec/figleaf/settings_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Figleaf::Settings do
   describe "self.load_settings" do
@@ -47,12 +47,12 @@ describe Figleaf::Settings do
     end
 
     it "and for erb values" do
-      expect(described_class.erb.foo).to eq('foo')
+      expect(described_class.erb.foo).to eq("foo")
       expect(described_class.erb.bar).to be_nil
     end
 
     it "raise exception when loading an undefined value" do
-      YAML.stub(:load_yaml_file).and_return({ "test" => {} })
+      YAML.stub(:load_yaml_file).and_return({"test" => {}})
       described_class.load_settings
       expect { described_class.service.blah }.to raise_error NoMethodError
     end
@@ -62,8 +62,8 @@ describe Figleaf::Settings do
         let(:overload) { File.expand_path("../../fixtures/errors/*.yml", __FILE__) }
 
         it "reports the file that has errors" do
-          expect { described_class.load_settings(overload, "test") }.
-            to raise_error(described_class::InvalidYAML)
+          expect { described_class.load_settings(overload, "test") }
+            .to raise_error(described_class::InvalidYAML)
         end
       end
 
@@ -71,8 +71,8 @@ describe Figleaf::Settings do
         let(:overload) { File.expand_path("../../fixtures/errors/*.rb", __FILE__) }
 
         it "reports the file that has errors" do
-          expect { described_class.load_settings(overload, "test") }.
-            to raise_error(described_class::InvalidRb)
+          expect { described_class.load_settings(overload, "test") }
+            .to raise_error(described_class::InvalidRb)
         end
       end
     end
@@ -84,8 +84,8 @@ describe Figleaf::Settings do
       end
 
       it "merge values for matching env" do
-        expect(described_class.service.foo).to eq 'overridden'
-        expect(described_class.service.extra).to eq 'extra'
+        expect(described_class.service.foo).to eq "overridden"
+        expect(described_class.service.extra).to eq "extra"
         expect(described_class.service.bool_false).to eq(false)
         expect(described_class.service.bool_true).to eq(true)
       end
@@ -167,7 +167,7 @@ describe Figleaf::Settings do
     end
 
     it "and for ENV values" do
-      expect(described_class.code.from_env).to eq('foo')
+      expect(described_class.code.from_env).to eq("foo")
     end
   end
 end

data/spec/fixtures/extra/code.rb

@@ -17,5 +17,5 @@ test do
   bool_false false
   array 1, 2, 3, 4
   array_alt [1, 2, 3, 4]
-  from_env ENV['FIGLEAF_TEST_FOO']
+  from_env ENV["FIGLEAF_TEST_FOO"]
 end

data/spec/spec_helper.rb

@@ -19,5 +19,5 @@ RSpec.configure do |config|
   config.order = "random"
 end
 
-ENV['FIGLEAF_TEST_FOO'] ||= 'foo'
+ENV["FIGLEAF_TEST_FOO"] ||= "foo"
 # ENV['FIGLEAF_TEST_BAR'] intentionally left blank

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: figleaf
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - Juan C. Müller
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2024-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -82,7 +82,7 @@ files:
 homepage: http://github.com/jcmuller/figleaf
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -97,27 +97,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: YAML based DRY settings manager.
-test_files:
-- spec/figleaf/config_spec.rb
-- spec/figleaf/configuration_spec.rb
-- spec/figleaf/fighash_spec.rb
-- spec/figleaf/settings_spec.rb
-- spec/fixtures/array.yml
-- spec/fixtures/boolean.yml
-- spec/fixtures/erb.yml
-- spec/fixtures/errors/bad_file.rb
-- spec/fixtures/errors/bad_file.yml
-- spec/fixtures/extra/array.yml
-- spec/fixtures/extra/boolean.yml
-- spec/fixtures/extra/code.rb
-- spec/fixtures/extra/default.yml
-- spec/fixtures/extra/default_anchor.yml
-- spec/fixtures/extra/service.yml
-- spec/fixtures/service.yml
-- spec/fixtures/string.yml
-- spec/spec_helper.rb
+test_files: []