ficus 0.0.3 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0ba933b40ba1c5b1704bb479441920d3a4612b54
+  data.tar.gz: a12978dd4388dc3b75850403351f47f983b27030
+SHA512:
+  metadata.gz: 1a5c5445fa90f0aabd3a2a68440a7e38a8f4e568a49859b318a8927d42a78b8987972e32857c678479f7d0738c4476d2a0de9db657c1dc38f0ef2f5c7f6668fc
+  data.tar.gz: 7d9c0752e7c5e781198d92d941fec2bbc8474c291f6a96ebd7358b71483ecc6de5e4034a58d7fae6e5ab86a2af75a07f12686a8d12014206380ea4b8283edea0

data/ficus.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "ficus"
-  spec.version       = '0.0.3'
+  spec.version       = '0.0.4'
   spec.authors       = ["Drew Fradette"]
   spec.email         = ["drew.fradette@gmail.com"]
   spec.description   = 'A runtime validation configuration DSL'

data/lib/ficus.rb

@@ -1,60 +1,7 @@
 require 'yaml'
+require 'logger'
 require 'recursive-open-struct'
 
-class Ficus < RecursiveOpenStruct
-  class ConfigError < StandardError; end
-  class << self
-    attr_accessor :log, :verbose
-
-    def load(file, &block)
-      @log = []
-      yaml = YAML.load File.read(file)
-      config = Ficus.new(yaml, :recurse_over_arrays => true)
-      config.instance_eval(&block) if block_given?
-
-      errors = log.select{|v| v =~ /^\[ERR\]/}
-      if errors.size > 0
-        log.each{|v| puts v} if ENV['DEBUG']
-        raise ConfigError.new('Unable to start due to invalid settings')
-      end
-      config
-    end
-
-    def log(log = {})
-      @log << log
-    end
-  end
-
-  def section(name, args = {}, &block)
-    sections(name).each do |section|
-      if section.nil?
-        level = args[:optional] ? 'WARN' : 'ERR'
-        Ficus.log "[#{level}] Section #{name} is not defined"
-      else
-        section.parent = self.parent ? "#{self.parent}.#{name}" : name
-        section.instance_eval &block if block_given?
-      end
-    end
-  end
-
-  def sections(name)
-    if name == :all
-      sections(/.*/)
-    elsif name.is_a? String
-      [self.send(name)]
-    elsif name.is_a? Regexp
-      self.marshal_dump.keys.map{|k|
-        self.send(k) unless k == :parent
-      }.compact!
-    end
-  end
-
-  def optional(name, default)
-    self.send("#{name}=", default) if self.send(name).nil?
-  end
-
-  def required(name)
-    prefix = self.parent ? "#{self.parent}." : nil
-    Ficus.log "[ERR] Option #{prefix}#{name} is not defined" if self.send(name).nil?
-  end
-end
+require 'ficus/loader'
+require 'ficus/dsl'
+require 'ficus/exceptions'

data/lib/ficus/dsl.rb

@@ -0,0 +1,36 @@
+class Ficus < RecursiveOpenStruct
+  def section(name, args = {}, &block)
+    sections(name).each do |s|
+      s.parent = self.parent ? "#{self.parent}.#{name}" : name
+      s.instance_eval(&block) if block_given?
+    end
+  rescue NoSection
+    if args[:optional] == true
+      Ficus.warning("Section #{name} is not defined")
+    else
+      Ficus.error("Section #{name} is not defined")
+    end
+  end
+
+  def sections(name)
+    if name == :all
+      sections(/.*/)
+    elsif name.is_a? Regexp
+      matches = self.marshal_dump.keys
+      matches.map { |k| self.send(k) unless k == :parent }.compact!
+    else
+      s = self.send(name)
+      raise NoSection.new if s.nil?
+      [s]
+    end
+  end
+
+  def optional(name, default)
+    self.send("#{name}=", default) if self.send(name).nil?
+  end
+
+  def required(name)
+    prefix = self.parent ? "#{self.parent}." : nil
+    Ficus.error "Option #{prefix}#{name} is not defined" if self.send(name).nil?
+  end
+end

data/lib/ficus/exceptions.rb

@@ -0,0 +1,4 @@
+class Ficus < RecursiveOpenStruct
+  class ConfigError < StandardError; end
+  class NoSection < StandardError; end
+end

data/lib/ficus/loader.rb

@@ -0,0 +1,38 @@
+class Ficus < RecursiveOpenStruct
+  class << self
+    attr_accessor :verbose, :logger, :errors, :warnings
+
+    # Load the configuration file and validate.
+    def load(file, &block)
+      @errors, @warnings, @config = [], [], nil
+      config(file).instance_eval(&block) if block_given?
+
+      warnings.each { |e| logger.warn e }
+      errors.each { |e| logger.error e }
+      raise ConfigError.new('Unable to start due to invalid settings') if errors.size > 0
+      config(file)
+    end
+
+    def error(msg)
+      @errors << msg
+    end
+
+    def warning(msg)
+      @warnings << msg
+    end
+
+    protected
+    def config(file)
+      if @config.nil?
+        yaml = YAML.load File.read(file)
+        @config = Ficus.new(yaml, :recurse_over_arrays => true)
+      end
+      @config
+    end
+
+    def logger
+      @logger ||= Logger.new(STDERR).tap { |l| l.level = Logger::WARN }
+    end
+  end
+end
+

data/spec/ficus_spec.rb

@@ -1,14 +1,13 @@
 require 'spec_helper'
-
 require 'tempfile'
 require 'yaml'
-
 require 'ficus'
 
 describe Ficus do
   before :each do
+    Ficus.logger = logger
     @config = {
-      :general => {:key1=>'value1',:key2=>'value2',:key3=>'value3'},
+      :general => {:key1=>'value1', :key2=>'value2', :key3=>'value3'},
       :misc    => {
         :key4 => 'value4',
         :list => {:item1 => 'value1', :item2 => 'value2'}
@@ -19,7 +18,6 @@ describe Ficus do
   it 'should load the config without any validation' do
     config_file do |config|
       config = Ficus.load(config)
-
       config.to_h.should eq @config
     end
   end
@@ -29,32 +27,32 @@ describe Ficus do
       config = Ficus.load(config) do
         section 'not_real', :optional => true
       end
-      Ficus.log.count{|v| v =~ /^\[WARN\]/}.should eq 1
+      Ficus.warnings.size.should eq 1
     end
   end
 
   it 'should load the config with a error about a missing section' do
     config_file do |config|
-      expect {
+      expect do
         config = Ficus.load(config) do
           section 'not_real'
         end
-      }.to raise_error Ficus::ConfigError
+      end.to raise_error Ficus::ConfigError
 
-      Ficus.log.count{|v| v =~ /^\[ERR\]/}.should eq 1
+      Ficus.errors.size.should eq 1
     end
   end
 
   it 'should load the config but fail to validate' do
     config_file do |config|
-      expect {
+      expect do
         config = Ficus.load(config) do
           section 'general', :optional => true do
             required 'fake_param'
           end
         end
-      }.to raise_error Ficus::ConfigError
-      Ficus.log.count{|v| v =~ /^\[ERR\]/}.should eq 1
+      end.to raise_error Ficus::ConfigError
+      Ficus.errors.size.should eq 1
     end
   end
 
@@ -100,7 +98,7 @@ describe Ficus do
     }
 
     config_file(hash) do |config|
-      expect {
+      expect do
         Ficus.load(config) do
           section 'subsections' do
             section /^section/ do
@@ -108,7 +106,7 @@ describe Ficus do
             end
           end
         end
-      }.to raise_error Ficus::ConfigError
+      end.to raise_error Ficus::ConfigError
     end
   end
 
@@ -121,7 +119,7 @@ describe Ficus do
     }
 
     config_file(hash) do |config|
-      expect {
+      expect do
         Ficus.load(config) do
           section 'subsections' do
             section :all do
@@ -129,7 +127,7 @@ describe Ficus do
             end
           end
         end
-      }.to raise_error Ficus::ConfigError
+      end.to raise_error Ficus::ConfigError
     end
   end
 
@@ -137,8 +135,11 @@ describe Ficus do
     Tempfile.open('config.yml') do |config|
       config.write hash.to_yaml
       config.close
-
       yield config.path
     end
   end
+
+  def logger
+    Logger.new(STDOUT).tap { |log| log.level = Logger::FATAL }
+  end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,9 @@
 $:.unshift File.join(File.dirname(__FILE__), '..')
 
 require 'rspec'
+require 'logger'
 
 if RUBY_VERSION.to_f >= 1.9
-  puts 'Enabling coverage'
   require 'simplecov'
   SimpleCov.add_filter 'vendor'
   SimpleCov.add_filter 'spec'

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ficus
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - Drew Fradette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,49 +27,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A runtime validation configuration DSL
@@ -89,39 +80,35 @@ files:
 - Rakefile
 - ficus.gemspec
 - lib/ficus.rb
+- lib/ficus/dsl.rb
+- lib/ficus/exceptions.rb
+- lib/ficus/loader.rb
 - lib/recursive-open-struct.rb
 - spec/ficus_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/drewfradette/ruby-ficus
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 248691854082786453
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 248691854082786453
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ''
 test_files:
 - spec/ficus_spec.rb