confit 1.0.2 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2013b7e542bcf8dc35acdd6452fe262bf0707b1b
+  data.tar.gz: fdecbc102cba8a0293f062749420ead9ad495462
+SHA512:
+  metadata.gz: 0ae85fe63e62917f8f35a3ad887447f3f0a0487ecfeceaff1eddfcf34f4eb27eb3dbbbbbade19c95da71f7d50e27d07a88f4b954cecd5ce7522e42fa1df41d74
+  data.tar.gz: 5b2726193ef4926eb8f9833965c9ce7d26a4ef2ec0fecd4b27d3aea10892e4e6611a885fb296ac4c603a7535168ba82ddebc143c66c8a5f43a81df36c2128108

data/lib/confit.rb

@@ -1,86 +1,82 @@
 require 'ostruct'
 require 'rubygems'
-require 'extlib'
 
 class InvalidFileNameError < StandardError; end
 class MissingVariableError < StandardError; end
 class MissingFileError < StandardError; end
 
 module Confit
-  
+
   @@app_config = nil
-  @@strict = nil
+  @@strict = false
   @@files = Array.new
   @@current_file_name = nil
   @@debug = false
-  
-  def self.debug=(bool)
-    @@debug = bool
-  end
-  
-  def self.debug
-    @@debug
-  end
-  
+  @@default_opts = lambda { return {:strict => @@strict, :force => false} }
+
   def self.debug(msg)
     puts "\nDebug:\t#{msg}" if @@debug
   end
-  
+
   def self.strict
     @@strict
   end
 
-  def self.prep_key(key)
-    key.gsub(/\s/, "_")
-  end
-  
-  def self.confit(file=nil, env=nil, strict=false, force=false)
-    self.debug("self.confit(file=#{file}, env=#{env}, strict=#{strict}, force=#{force})")
-    
-    @@app_config = OpenStruct.new if not @@app_config
-    
+  def self.confit(*args, &block)
+    file = args.shift
+    opts = (args.last and args.last.is_a? Hash) ? args.pop : @@default_opts.call
+    env = (args && args.compact) || []
+
+    self.debug("self.confit(file=#{file}, env=#{env}, strict=#{opts[:strict]}, force=#{opts[:force]})")
+
+    @@app_config ||= OpenStruct.new
+
     if not @@files.include?(file) and not file.nil?
       self.debug "New file: #{file}"
       self.prep_config(file)
     else
-      self.debug "File exists: (#{force}) #{file}"
-      return @@app_config if not force
+      self.debug "File exists: (#{opts[:force]}) #{file}"
+      return @@app_config unless opts[:force]
       self.debug "Forcing reload of file"
     end
-    
-    @@strict = strict ? true : false
-    
-    self.process_file(file, env)
+
+    @@strict = opts[:strict] ? true : false
+
+    self.process_file(file, env, &block)
 
     @@app_config
   end
-  
+
   def self.prep_config(file)
     file =~ /([^\/]+)\.yml$/i
     raise InvalidFileNameError, "Filename is not valid: #{file}" if not $1
-    
+
     @@current_file_name = $1
     self.debug "Current file #{@@current_file_name}"
     @@files << file
-    @@app_config.send("#{@@current_file_name}=", OpenStruct.new)  
+    @@app_config.send("#{@@current_file_name}=", OpenStruct.new)
   end
-  
+
   def self.process_file(file, env=nil)
     if not file.nil?
       if File.exist?(file)
-        yaml = env ? YAML.load_file(file)[env] : YAML.load_file(file)
+        #yaml = env ? YAML.load_file(file)[env] : YAML.load_file(file)
+        yaml = YAML.load_file(file)
+        env.each {|key| yaml = yaml[key.to_s]}
+        yield yaml if block_given?
         self.parse_hash(yaml, @@app_config.send(@@current_file_name))
       else
         raise MissingFileError, "File #{file} does not exist!"
       end
     end
   end
-  
+
   def self.load_pair(key, val, parent)
-    self.debug "load_pair: #{parent}.send(#{key}=, #{val})"
-    parent.send("#{key}=", val)
+    _key = key.gsub /\s+/, '_'
+    self.debug "load_pair: #{parent}.send(#{_key}=, #{val})"
+    parent.send("#{_key}=", val)
   end
-  
+
   def self.parse_hash(zee_hash, parent)
     zee_hash.each do |key, val|
       if val.is_a?(Hash)
@@ -91,14 +87,21 @@ module Confit
         self.debug "Not a Hash #{key},#{val}"
         self.load_pair(key, val, parent)
       end
-      
+
     end
   end
-  
+
+  def self.reset!
+    @@app_config = nil
+    @@strict = false
+    @@files = Array.new
+    @@current_file_name = nil
+  end
+
 end
 
 class OpenStruct
-  
+
   def method_missing(mid, *args)
     mname = mid.id2name
     if mname !~ /=/
@@ -117,5 +120,5 @@ class OpenStruct
       end
     end
   end
-  
+
 end

data/lib/confit/kernel.rb

@@ -1,9 +1,9 @@
 require 'confit'
 
 module Kernel
-  
-  def confit(file=nil, env=nil, strict=false, force=false)
-    Confit::confit(file, env, strict, force)
+
+  def confit(*args, &block)
+    Confit::confit(*args, &block)
   end
 
 end

data/test/complex.yml

@@ -23,4 +23,12 @@ poeks_dev:
   uid: 655764281
   a_hash: 
     name: the hash
-    value: the value
+    value: the value
+
+foo:
+  bar:
+    num: 1
+    boo: false
+  baz:
+    num: 2
+    boo: true

data/test/confit_test.rb

@@ -1,35 +1,64 @@
 require File.join(File.expand_path(File.join(File.dirname(__FILE__))), '..', 'lib', 'confit')
 
 require 'test/unit'
+require 'yaml'
 
 class ConfitTest < Test::Unit::TestCase
 
+  @@simple = File.join(File.expand_path(File.join(File.dirname(__FILE__))), 'simple.yml')
+  @@complex = File.join(File.expand_path(File.join(File.dirname(__FILE__))), 'complex.yml')
+
+  def setup
+    Confit.reset!
+  end
+
   def test_missing
-    file = File.join(File.expand_path(File.join(File.dirname(__FILE__))), '..', 'test', 'simple.yml')
-    confit(file, 'dev', true)
-    puts "Doesn't exist: #{confit.test.your_mom}"
+    Confit::confit(@@simple, 'dev', :strict => true)
+    puts "Doesn't exist: #{Confit::confit.test.your_mom}"
   rescue MissingVariableError => e
     assert_equal(e.class.to_s, "MissingVariableError")
   end
-  
+
   def test_simple
-    file = File.join(File.expand_path(File.join(File.dirname(__FILE__))), '..', 'test', 'simple.yml')
-    confit(file, 'dev', true)
-    assert_equal("Poeks", confit.simple.author)
+    Confit::confit(@@simple, 'dev', :strict => true)
+    assert_equal("Poeks", Confit::confit.simple.author)
   end
 
   def test_complex
-    file = File.join(File.expand_path(File.join(File.dirname(__FILE__))), '..', 'test', 'complex.yml')
-    confit(file, nil, true)
-    assert_equal("the value", confit.complex.poeks_dev.a_hash.value)
+    Confit::confit(@@complex, nil, :strict => true)
+    assert_equal("the value", Confit::confit.complex.poeks_dev.a_hash.value)
   end
-  
+
   def test_force
-    file = File.join(File.expand_path(File.join(File.dirname(__FILE__))), '..', 'test', 'complex.yml')
-    confit(file, 'jo_dev', true, true)
-    assert_equal("jo dev", confit.complex.app_name)
-    confit(file, 'poeks_dev', true, true)
-    assert_equal("poeks dev", confit.complex.app_name)
+    Confit::confit(@@complex, 'jo_dev', :strict => true, :force => true)
+    assert_equal("jo dev", Confit::confit.complex.app_name)
+    Confit::confit(@@complex, 'poeks_dev', :strict => true, :force => true)
+    assert_equal("poeks dev", Confit::confit.complex.app_name)
+  end
+
+  def test_key_with_spaces
+    Confit::confit(@@simple, 'dev', :strict => true)
+    assert_equal "Now underscores", Confit::confit.simple.a_key_with_spaces
+  end
+
+  def test_nesting
+    Confit::confit(@@complex, 'foo', 'bar', :strict => false)
+    assert_equal 1, Confit::confit.complex.num
+    assert_equal false, Confit::confit.complex.boo
+    Confit::confit(@@complex, 'foo', 'baz', :force => true)
+    assert_equal 2, Confit::confit.complex.num
+    assert_equal true, Confit::confit.complex.boo
   end
-  
+
+  def test_block
+    Confit::confit @@complex, 'foo', 'bar', :strict => false do |pre_parse_hash|
+      pre_parse_hash['boo_is_false'] = !pre_parse_hash['boo']
+    end
+    assert Confit::confit.complex.boo_is_false
+    Confit::confit @@complex, 'foo', 'baz', :force => true do |pre_parse_hash|
+      pre_parse_hash['boo_is_false'] = !pre_parse_hash['boo']
+    end
+    assert !Confit::confit.complex.boo_is_false
+  end
+
 end

metadata

@@ -1,75 +1,51 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: confit
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+version: !ruby/object:Gem::Version
+  version: 1.1.0
 platform: ruby
-authors: 
+authors:
 - Jen Oslislo
+- Kenichi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-12 00:00:00 -07:00
-default_executable: 
+date: 2015-08-02 00:00:00.000000000 Z
 dependencies: []
-
 description: A teeny, tiny configuration manager for YAML config files.
-email: 
-- twitterpoeks@gmail.com
+email:
+- twitterpoeks@gmail.com, kenichi.nakamura@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/confit/kernel.rb
+files:
+- README.md
 - lib/confit.rb
+- lib/confit/kernel.rb
 - test/complex.yml
 - test/confit_test.rb
 - test/simple.yml
-- README.md
-has_rdoc: true
 homepage: https://github.com/poeks/confit
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: confit
-rubygems_version: 1.4.1
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A teeny, tiny configuration manager for YAML config files.
 test_files: []
-
+has_rdoc: