configurability 1.0.5 → 1.0.6

data.tar.gz.sig

@@ -1 +1,3 @@
-#�Ы�݈�1�O�0���@� #���U(��+�AvߜkU���!��,���<��~�:[@ 
��ߜ����}ߧBAϯ�¹����m-}����9��t]`d�K���t9�BY�_�����?���
+|S��O�@�
+�ជVqGl�G�4�a~�`�q>�z�'t_�m0�� �#jJ����/�j�qj9<�U�I���ۚrK
+��Q�Bﰰ	�t��

data/History.md

@@ -1,3 +1,11 @@
+## 1.0.6 [2011-03-03] Michael Granger <ged@FaerieMUD.org>
+
+Bugfixes:
+
+* Fixed predicate methods for missing sections/values, which previously returned
+  `true` as well.
+
+
 ## 1.0.5 [2011-02-08] Michael Granger <ged@FaerieMUD.org>
 
 Bugfixes:

data/Rakefile

@@ -21,7 +21,8 @@ hoespec = Hoe.spec 'configurability' do
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
 	self.extra_dev_deps.push *{
-		'rspec' => '~> 2.4',
+		'rspec'     => '~> 2.4',
+		'simplecov' => '~> 0.3',
 	}
 
 	self.spec_extras[:licenses] = ["BSD"]

data/lib/configurability.rb

@@ -9,10 +9,10 @@ require 'yaml'
 module Configurability
 
 	# Library version constant
-	VERSION = '1.0.5'
+	VERSION = '1.0.6'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 12fda25efd84 $
+	REVISION = %q$Revision: 631fd470522c $
 
 	require 'configurability/logformatter'
 	require 'configurability/deferredconfig'

data/lib/configurability/config.rb

@@ -458,8 +458,10 @@ class Configurability::Config
 		### Returns +true+ if the given +name+ is the name of a member of
 		### the receiver.
 		def member?( name )
-			return @hash.key?( name.to_s.to_sym )
+			name = name.to_sym if name.respond_to?( :to_sym )
+			return @hash.key?( name )
 		end
+		alias_method :has_member?, :member?
 
 
 		### Merge the specified +other+ object with this config struct. The
@@ -544,7 +546,7 @@ class Configurability::Config
 		### @param [Symbol] key  the config key to create the predicate method body for
  		### @return [Proc] the body of the new method
 		def create_member_predicate( key )
-			return lambda { self[key] ? true : false }
+			return lambda { self.member?( key ) && self[key] ? true : false }
 		end
 
 

data/spec/configurability/config_spec.rb

@@ -93,25 +93,47 @@ describe Configurability::Config do
 		config[:section]['subsection'][:subsubsection].should == 'value'
 	end
 
+	it "autoloads predicates for its members" do
+		config = Configurability::Config.new( TEST_CONFIG )
+		config.mergekey?.should be_true()
+		config.mergemonkey?.should be_false()
+		config.section?.should be_true()
+		config.section.subsection?.should be_true()
+		config.section.subsection.subsubsection?.should be_true()
+		config.section.monkeysubsection?.should be_false()
+	end
 
-	NIL_KEY_CONFIG = %{
-	---
-	trap_on:
-	  "low disk space alert":
-	    ~:
-	      notepad:
-	        patterns:
-	          - pattern1
-	          - pattern2
-	}.gsub(/^\t/, '')
 
-	it "handles nil as a key in the configuration (issue #1)" do
-		config = Configurability::Config.new( NIL_KEY_CONFIG )
-		config[:trap_on]['low disk space alert'][nil][:notepad][:patterns].should == [ 'pattern1', 'pattern2' ]
+	context "a config with nil keys" do
+
+		NIL_KEY_CONFIG = %{
+		---
+		trap_on:
+		  "low disk space alert":
+		    ~:
+		      notepad:
+		        patterns:
+		          - pattern1
+		          - pattern2
+		}.gsub(/^\t{2}/, '')
+
+		before( :each ) do
+			@config = Configurability::Config.new( NIL_KEY_CONFIG )
+		end
+
+		it "doesn't raise a NoMethodError when loading (issue #1)" do
+			@config[:trap_on]['low disk space alert'][nil][:notepad][:patterns].
+				should == [ 'pattern1', 'pattern2' ]
+		end
+
+		it "knows that it has a nil member" do
+			@config[:trap_on]['low disk space alert'].should have_member( nil )
+		end
+
 	end
 
 
-	describe "created with in-memory YAML source" do
+	context "created with in-memory YAML source" do
 
 		before(:each) do
 			@config = Configurability::Config.new( TEST_CONFIG )
@@ -183,7 +205,7 @@ describe Configurability::Config do
 
 
 	# saving if changed since loaded
-	describe " whose internal values have been changed since loaded" do
+	context " whose internal values have been changed since loaded" do
 		before(:each) do
 			@config = Configurability::Config.new( TEST_CONFIG )
 			@config.section.subsection.anothersection = 11451
@@ -203,7 +225,7 @@ describe Configurability::Config do
 
 
 	# loading from a file
-	describe " loaded from a file" do
+	context " loaded from a file" do
 		before(:all) do
 			@tmpfile = Tempfile.new( 'test.conf', '.' )
 			@tmpfile.print( TEST_CONFIG )
@@ -265,7 +287,7 @@ describe Configurability::Config do
 
 
 	# reload if file changes
-	describe " whose file changes after loading" do
+	context " whose file changes after loading" do
 		before(:all) do
 			@tmpfile = Tempfile.new( 'test.conf', '.' )
 			@tmpfile.print( TEST_CONFIG )
@@ -310,7 +332,7 @@ describe Configurability::Config do
 
 
 	# merging
-	describe " created by merging two other configs" do
+	context " created by merging two other configs" do
 		before(:each) do
 			@config1 = Configurability::Config.new
 			@config2 = Configurability::Config.new( TEST_CONFIG )

data/spec/lib/helpers.rb

@@ -10,12 +10,16 @@ BEGIN {
 	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
 }
 
+require 'simplecov'
 require 'rspec'
 
 require 'logger'
 require 'erb'
 require 'yaml'
 
+SimpleCov.start do
+	add_filter '/spec/'
+end
 require 'configurability'
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: configurability
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Michael Granger
@@ -35,7 +35,7 @@ cert_chain:
   cmlhXe46pZNJgWKbxZah85jIjx95hR8vOI+NAM5iH9kOqK13DrxacTKPhqj5PjwF
   -----END CERTIFICATE-----
 
-date: 2011-02-08 00:00:00 -08:00
+date: 2011-03-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,9 +86,24 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: simplecov
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 3
+        version: "0.3"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -100,7 +115,7 @@ dependencies:
         - 0
         version: 2.9.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 description: |-
   Configurability is a mixin that allows you to add configurability to one or
   more objects or classes. You can assign them each a subsection of the
@@ -168,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: configurability
-rubygems_version: 1.5.0
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Configurability is a mixin that allows you to add configurability to one or more objects or classes