ruby-conf 2.4.0 → 2.5.0

data/Gemfile

@@ -1,11 +1,6 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
+group :development, :test do
   gem "rspec"
   gem "rr"
   gem "yard"

data/VERSION

@@ -1 +1 @@
-2.4.0
+2.5.0

data/lib/ruby-conf.rb

@@ -2,15 +2,47 @@
 #
 # @author Hollin Wilkins & Curtis Schofield & Mason Bo-bay-son
 
-$RUBY_CONF = nil
+require 'find'
+require 'digest/md5'
+
+module RubyConf
+
+  class Loader < BasicObject
+    @@conf = @@path = @@mtime = @@md5 = nil
+
+    class << self
+      def nil?() @@conf.nil? end
+      def __rc_loaded_conf() { path:@@path, mtime:@@mtime, md5:@@md5 } end
+      def __rc_conf() @@conf end
+      def __rc_set_conf(conf = nil) @@conf, @@path, @@mtime, @@md5 = conf, nil, nil, nil end
+      def __rc_load(path)
+        __rc_set_conf
+        @@path, @@mtime, @@md5 = path, File.mtime(path).to_i, Digest::MD5.hexdigest(File.read(path)) if load(path) && @@conf
+      end
+      def method_missing(name, *args, &block)
+        if @@mtime && @@mtime != File.mtime(@@path).to_i && @@md5 != Digest::MD5.hexdigest(File.read(@@path))
+          __rc_load(@@path)
+        end
 
-module Magic
-  attr_accessor :__rc_chain
-  def __rc_gather() "#{to_s}#{__rc_chain.nil? ? "" : " #{__rc_chain.__rc_gather}"}" end
-end
+        if @@conf.nil?
+          Find.find('.') do |path|
+            next unless @@conf.nil? && path =~ /\.(?:rb|config|conf)$/
+            if path =~ /\.ruby-conf$/ || File.read(path) =~ /^\s*\#\s*\:\s*ruby-conf\s*$/mi
+              break if __rc_load(path)
+            end
+          end
+        end
+        @@conf.__send__(name, *args, &block)
+      end
+      def to_s() @@conf.to_s end
+      def inspect() @@conf.inspect end
+    end
+  end
 
-class RubyConf < BasicObject
-  @@__rc_configs = {}
+  module Magic
+    attr_accessor :__rc_chain
+    def __rc_gather() "#{to_s}#{__rc_chain.nil? ? "" : " #{__rc_chain.__rc_gather}"}" end
+  end
 
   class Config
     attr_reader :__rc_attributes, :__rc_parent, :__rc_name, :__rc_chains, :__rc_locked
@@ -152,39 +184,44 @@ class RubyConf < BasicObject
     def inspect() __rc_build_inspect end
   end
 
-  def self.define(name = nil, options = {}, &block)
-    config = Config.new(name, &block)
-    @@__rc_configs[name.to_sym] = config unless name.nil?
-
-    const = options.fetch(:as, name)
-    if const && const.to_s[/^[A-Z]/]
-      const = const.to_sym
-      ::Object.const_set(const, config) if !::Object.const_defined?(const) || ::Object.const_get(const).is_a?(Config)
-    end
-
-    if $RUBY_CONF.nil? && (name.nil? || name.to_s =~ /^(?:Rails)?Conf/)
-      $RUBY_CONF = if ::Object.const_defined?(:Rails)
-        cfg = config[:"#{::Rails.env}"] || config[:"#{::Rails.env}_conf"] || config[:"#{::Rails.env}_config"]
-        cfg && cfg.detach || config
-      else
-        config
-      end
+  @@__rc_configs = {}
+  class << self
+    def clear()
+      Loader::__rc_set_conf
+      @@__rc_configs.clear
     end
 
-    config
-  end
+    def [](name) @@__rc_configs[name.to_sym] end
+    def method_missing(name, *args) @@__rc_configs[name.to_sym] end
+    def respond_to?(name) @@__rc_configs.key?(name.to_sym) end
 
-  def self.[](name) @@__rc_configs[name.to_sym] end
+    def define(name = nil, options = {}, &block)
+      config = Config.new(name, &block)
+      @@__rc_configs[name.to_sym] = config unless name.nil?
 
-  def self.method_missing(name, *args) @@__rc_configs[name.to_sym] end
+      const = options.fetch(:as, name)
+      if const && const.to_s[/^[A-Z]/]
+        const = const.to_sym
+        ::Object.const_set(const, config) if !::Object.const_defined?(const) || ::Object.const_get(const).is_a?(Config)
+      end
 
-  def self.respond_to?(name) @@__rc_configs.key?(name.to_sym) end
+      if Loader::__rc_conf.nil? && (name.nil? || name.to_s =~ /^(?:Rails)?Conf/)
+        default_conf = if ::Object.const_defined?(:Rails)
+          cfg = config[:"#{::Rails.env}"] || config[:"#{::Rails.env}_conf"] || config[:"#{::Rails.env}_config"]
+          cfg && cfg.detach || config
+        else
+          config
+        end
+        Loader::__rc_set_conf(default_conf)
+      end
 
-  def self.clear()
-    $RUBY_CONF = nil
-    @@__rc_configs.keys.each do |config|
-      remove_const(config.to_sym) if config.to_s[/^[A-Z]/] && const_defined?(config.to_sym)
+      config
     end
-    @@__rc_configs.clear
   end
+
 end
+
+RUBY_CONF = RubyConf::Loader
+
+
+

data/ruby-conf.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-conf"
-  s.version = "2.4.0"
+  s.version = "2.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Curtis Schofield & Hollin Wilkins & Mason"]
@@ -28,7 +28,10 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/ruby-conf.rb",
     "ruby-conf.gemspec",
+    "spec/lib/a_not_conf.rb",
     "spec/lib/ruby-conf_spec.rb",
+    "spec/lib/test_conf.rb.tmpl",
+    "spec/lib/z_not_loaded.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/blazingpair/ruby-conf"

data/spec/lib/a_not_conf.rb

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+raise "this is missing the ruby-conf comment directive and should not be loaded"

data/spec/lib/ruby-conf_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'ruby-conf'
 
 describe RubyConf do
 
@@ -195,8 +194,10 @@ TEXT
       let(:inherited_config) do 
         RubyConf.define "inherited_config" do
           basic do
+            movie "b"
             thing do
               origin "swamp"
+              type "monster"
             end
           end
 
@@ -209,14 +210,25 @@ TEXT
           city :inherits => basic do
             thing do
               origin "ocean"
+              name "bob"
             end
           end
 
+          chained :inherits => city do
+            thing do
+              origin "space"
+            end
+          end
         end
       end
       it "pre-loads a config with a existing config" do
         inherited_config.laboritory.thing.origin.should == inherited_config.basic.thing.origin
       end
+      it "chains inherited configs" do
+        inherited_config.chained.movie.should == "b"
+        inherited_config.chained.thing.origin.should == "space"
+        inherited_config.chained.thing.name.should == "bob"
+      end
       it "does not overwrite values" do
         inherited_config.city.thing.origin.should == "ocean"
       end
@@ -365,13 +377,48 @@ TEXT
 
   describe "Automatically sets the RAILS_CONF variable" do
 
+    after do
+      dir = Dir["./**/test_conf.rb.tmpl"].first[/^(.*?)\/test_conf.rb.tmpl$/, 1]
+      File.delete("#{dir}/test_conf.rb") if File.exists?("#{dir}/test_conf.rb")
+    end
+
+    it "will autoload the first ruby-conf that it can find if none is provided" do
+      dir = Dir["./**/test_conf.rb.tmpl"].first[/^(.*?)\/test_conf.rb.tmpl$/, 1]
+
+      val = Random.rand.to_s
+      File.write("#{dir}/test_conf.rb", File.read("#{dir}/test_conf.rb.tmpl").gsub('{{VALUE}}', val))
+
+      RUBY_CONF.should be_nil
+      RUBY_CONF.ident.should == "FOUND AND LOADED BASIC CONFIG #{val}"
+      loaded = RUBY_CONF.__rc_loaded_conf
+
+      FileUtils.touch(loaded[:path], mtime: 100)
+      File.mtime(loaded[:path]).to_i.should_not == loaded[:mtime]
+      RUBY_CONF.ident.should == "FOUND AND LOADED BASIC CONFIG #{val}"
+      RUBY_CONF.__rc_loaded_conf[:mtime].should == loaded[:mtime]
+
+      val = Random.rand.to_s
+      File.write("#{dir}/test_conf.rb", File.read("#{dir}/test_conf.rb.tmpl").gsub('{{VALUE}}', val))
+      FileUtils.touch(loaded[:path], mtime: 100)
+      RUBY_CONF.ident.should == "FOUND AND LOADED BASIC CONFIG #{val}"
+      RUBY_CONF.__rc_loaded_conf[:mtime].should_not == loaded[:mtime]
+
+      RubyConf.clear
+      module ::Rails
+        def self.env() "foo" end
+      end
+      ::Object.const_defined?(:Rails).should be_true
+      RUBY_CONF.should be_nil
+      RUBY_CONF.ident.should == "FOUND AND LOADED RAILS ENV CONFIG #{val}"
+    end
+
     it "sets the first unnamed config as default" do
-      $RUBY_CONF.should be_nil
+      RUBY_CONF.should be_nil
       first = RubyConf.define { ident "first" }
-      $RUBY_CONF.should_not be_nil
+      RUBY_CONF.should_not be_nil
       second = RubyConf.define { ident "second" }
-      $RUBY_CONF.should == first
-      $RUBY_CONF.ident.should == "first"
+      RUBY_CONF.__rc_conf.should == first
+      RUBY_CONF.ident.should == "first"
     end
 
     it "sets the proper config based on Rails environment and detaches, if it exists" do
@@ -380,36 +427,35 @@ TEXT
       end
       ::Object.const_defined?(:Rails).should be_true
 
-      $RUBY_CONF.should be_nil
+      RUBY_CONF.should be_nil
       RubyConf.define do
         foo { ident "correct" }
         bar { ident "wrong" }
       end
-      $RUBY_CONF.ident.should == "correct"
+      RUBY_CONF.ident.should == "correct"
 
       RubyConf.clear
-      $RUBY_CONF.should be_nil
+      RUBY_CONF.should be_nil
       RubyConf.define do
         foo_conf { ident "correct" }
         bar_conf { ident "wrong" }
       end
-      $RUBY_CONF.ident.should == "correct"
+      RUBY_CONF.ident.should == "correct"
 
       RubyConf.clear
-      $RUBY_CONF.should be_nil
+      RUBY_CONF.should be_nil
       RubyConf.define do
         foo_config { ident "correct" }
         bar_config { ident "wrong" }
       end
-      $RUBY_CONF.ident.should == "correct"
+      RUBY_CONF.ident.should == "correct"
 
       RubyConf.clear
-      $RUBY_CONF.should be_nil
+      RUBY_CONF.should be_nil
       RubyConf.define do
         ident "correct"
       end
-      $RUBY_CONF.ident.should == "correct"
-
+      RUBY_CONF.ident.should == "correct"
     end
   end
 end

data/spec/lib/test_conf.rb.tmpl

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+#this has the ruby-conf comment directive should be auto-loaded when required
+#:ruby-conf
+
+RubyConf.define do
+  ident "FOUND AND LOADED BASIC CONFIG {{VALUE}}"
+  foo do
+    ident "FOUND AND LOADED RAILS ENV CONFIG {{VALUE}}"
+  end
+end
+

data/spec/lib/z_not_loaded.rb

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+#:ruby-conf
+
+raise "this has the ruby-conf comment directive, but another file should have already won"

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'rr'
 require 'ruby-conf'
+require 'fileutils'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-conf
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -95,7 +95,10 @@ files:
 - VERSION
 - lib/ruby-conf.rb
 - ruby-conf.gemspec
+- spec/lib/a_not_conf.rb
 - spec/lib/ruby-conf_spec.rb
+- spec/lib/test_conf.rb.tmpl
+- spec/lib/z_not_loaded.rb
 - spec/spec_helper.rb
 homepage: http://github.com/blazingpair/ruby-conf
 licenses:
@@ -112,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 121205113869847411
+      hash: 3183998097160756917
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: