configru 3.1.0 → 3.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f0e43a0f04efab82159aa7a8bfce6965514e297f
+  data.tar.gz: 2c3ca705fca4c7ebe13dc08517c6d163ec8a30e5
+SHA512:
+  metadata.gz: 6ff4b868839bc60a86e4841873ff3f456e5f8db673982053ba217aa4f79712713d630fce62a7413b4a40a3dda95e3dc2a3c17ffb458d3bee9bd81c0bea5181af
+  data.tar.gz: e20b5336317db72005c6e15b34fe8f4bdf76ca488c522ff35ce0c40f5867ed2926e3e142bf37635fd0ac8d8b9fbeaa7230fe4aa5935ee5aa0a51ce35281d6ce9

data/ChangeLog.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 3.2.0 (25 May 2013)
+
+ * Validate values against arrays using `include?`
+
 ## 3.1.0 (28 October 2012)
 
  * Added required options

data/Gemfile

@@ -1,8 +1,8 @@
 source :rubygems
 
 group :development do
-  gem "rake", "~> 0.9.0"
-  gem "rspec", "~> 2.11.0"
+  gem "rake", "~> 10.0.0"
+  gem "rspec", "~> 2.12.0"
   gem "simplecov", "~> 0.7.0"
 end
 

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    configru (3.1.0)
+    configru (3.2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
     multi_json (1.3.6)
-    rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
+    rake (10.0.2)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.0)
+    rspec-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
+    rspec-mocks (2.12.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -27,6 +27,6 @@ PLATFORMS
 
 DEPENDENCIES
   configru!
-  rake (~> 0.9.0)
-  rspec (~> 2.11.0)
+  rake (~> 10.0.0)
+  rspec (~> 2.12.0)
   simplecov (~> 0.7.0)

data/README.md

@@ -6,7 +6,7 @@ YAML configuration file loader
 
 ```ruby
 # Gemfile
-gem "configru", "~> 2.0.0"
+gem "configru", "~> 3.1.0"
 ```
 ### Example
 

data/lib/configru/option.rb

@@ -6,7 +6,11 @@ module Configru
 
     def valid?(value)
       return true unless self.validation
-      self.validation === value
+      if self.validation.is_a? Array
+        self.validation.include? value
+      else
+        self.validation === value
+      end
     end
 
     def transform(value)
@@ -32,9 +36,7 @@ module Configru
     def valid?(values)
       return true unless self.validation
       values.all? do |x|
-        # Use === instead of passing validation as the block to #all? so that
-        # non-block validations (Regexp, Range) work
-        self.validation === x
+        super(x)
       end
     end
 

data/lib/configru/version.rb

@@ -1,3 +1,3 @@
 module Configru
-  VERSION = "3.1.0"
+  VERSION = "3.2.0"
 end

data/spec/configru_spec.rb

@@ -116,6 +116,20 @@ describe Configru do
     end.to raise_error(Configru::OptionValidationError)
   end
 
+  it 'validates options against arrays' do
+    Configru.load(example_file :d) do
+      option :example, String, '', ['example_d']
+    end
+
+    Configru.example.should == 'example_d'
+
+    expect do
+      Configru.load(example_file :d) do
+        option :example, String, '', ['foo', 'bar']
+      end
+    end.to raise_error(Configru::OptionValidationError)
+  end
+
   it 'applies transformations to options' do
     Configru.load(example_file :d) do
       option :example, String, '' do

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: configru
 version: !ruby/object:Gem::Version
-  version: 3.1.0
-  prerelease: 
+  version: 3.2.0
 platform: ruby
 authors:
 - Curtis McEnroe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-28 00:00:00.000000000 Z
+date: 2013-05-26 00:00:00.000000000 Z
 dependencies: []
 description: YAML configuration file loader
 email:
@@ -47,33 +46,26 @@ files:
 - spec/structhash_spec.rb
 homepage: https://github.com/programble/configru
 licenses: []
+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: -933194907027225468
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -933194907027225468
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: YAML configuration file loader
 test_files:
 - spec/configru_spec.rb