ficus 0.0.2 → 0.0.3

data/.gitignore

@@ -1,3 +1,6 @@
+.rspec
+vendor
+.idea
 *.gem
 *.rbc
 .bundle

data/README.md

@@ -2,6 +2,10 @@
 
 A simple YAML configuration DSL that does runtime validation.
 
+## Important Note
+This uses the [`recursive-open-struct`](https://github.com/aetherknight/recursive-open-struct) but due to gem missing a [crucial fix](https://github.com/aetherknight/recursive-open-struct/commit/0c16caa1b9a19d12e97829f02083f0b7d21f0100) 
+I have simply added the latest version with the fix to the `lib`. When it's fixed in rubygems, I will add it as a gem dependency.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -32,6 +36,13 @@ section_2:
 
 optional_section:
   key5: value5
+
+pattern_section_1:
+  key6: value6
+
+pattern_section_2:
+  key6: value6
+
 ```
 
 And now we can use Ficus to load the config and validate it at the same time.
@@ -58,6 +69,10 @@ config = Ficus.load 'config.yml' do
   section 'not_defined', :optional => true do
     require 'key6'
   end
+
+  section /^pattern_section_.+/ do
+    require 'key6'
+  end
 end
 
 config.section_1.key1         # value1

data/Rakefile

@@ -1 +1,3 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new('spec')

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.2'
+  spec.version       = '0.0.3'
   spec.authors       = ["Drew Fradette"]
   spec.email         = ["drew.fradette@gmail.com"]
   spec.description   = 'A runtime validation configuration DSL'

data/lib/ficus.rb

@@ -15,7 +15,7 @@ class Ficus < RecursiveOpenStruct
       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")
+        raise ConfigError.new('Unable to start due to invalid settings')
       end
       config
     end
@@ -26,13 +26,26 @@ class Ficus < RecursiveOpenStruct
   end
 
   def section(name, args = {}, &block)
-    section = self.send(name)
-    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?
+    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
 

data/spec/ficus_spec.rb

@@ -70,9 +70,72 @@ describe Ficus do
     end
   end
 
-  def config_file
+  it 'should validate conformant subsections' do
+    hash = {
+        :subsections => {
+            :section1 => {:key1=>'value1'},
+            :section2 => {:key1=>'value1'},
+        }
+    }
+
+    config_file(hash) do |config|
+      config = Ficus.load(config) do
+        section 'subsections' do
+          section /^section/ do
+            required :key1
+          end
+        end
+      end
+      config.subsections.section1.key1.should eq 'value1'
+      config.subsections.section2.key1.should eq 'value1'
+    end
+  end
+
+  it 'should invalidate nonconformant subsections' do
+    hash = {
+        :subsections => {
+            :section1 => {:key1=>'value1'},
+            :section2 => {},
+        }
+    }
+
+    config_file(hash) do |config|
+      expect {
+        Ficus.load(config) do
+          section 'subsections' do
+            section /^section/ do
+              required :key1
+            end
+          end
+        end
+      }.to raise_error Ficus::ConfigError
+    end
+  end
+
+  it 'should validate all subsections' do
+    hash = {
+        :subsections => {
+            :section1 => {:key1=>'value1'},
+            :section2 => {},
+        }
+    }
+
+    config_file(hash) do |config|
+      expect {
+        Ficus.load(config) do
+          section 'subsections' do
+            section :all do
+              required :key1
+            end
+          end
+        end
+      }.to raise_error Ficus::ConfigError
+    end
+  end
+
+  def config_file(hash=@config)
     Tempfile.open('config.yml') do |config|
-      config.write @config.to_yaml
+      config.write hash.to_yaml
       config.close
 
       yield config.path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ficus
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -571402621650926821
+      hash: 248691854082786453
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -571402621650926821
+      hash: 248691854082786453
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25