confetti 0.4.1 → 0.4.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    confetti (0.4.1)
+    confetti (0.4.2)
       mustache (~> 0.11.2)
       thor (~> 0.14.3)
 

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2010 Andrew Lunny
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.

data/lib/confetti/config.rb

@@ -69,7 +69,9 @@ module Confetti
         raise FileError, "file #{ xml_file } doesn't exist"
       end
 
-      fail "no doc parsed" unless config_doc
+      if config_doc.nil?
+        raise XMLError, "no doc parsed"
+      end
 
       # save reference to xml doc
       @xml_doc = config_doc

data/lib/confetti/version.rb

@@ -1,3 +1,3 @@
 module Confetti
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/lib/typedset.rb

@@ -1,22 +1,19 @@
 require "set"
 
-# based on RestricedSet from Ruby's stdlib, cf
-# http://github.com/ruby/ruby/blob/72ef219804e5524848170a197887a95718334e2a/lib/set.rb#L627-717
-# not sure why it's been commented out
-# I should follow these things
-
 class TypedSet < Set
-  attr_reader :klass
-  alias set_class klass
+  attr_reader :set_class
 
   def initialize (klass, *args)
-    raise ArgumentError, "require a Class object" unless klass.class == Class
-    @klass = klass
+    raise ArgumentError, "require a class object" unless klass.class == Class
+    @set_class = klass
     super args
   end
 
   def add o
-    raise ArgumentError, "members must be of class #{@klass}" unless o.class == @klass
+    unless o.class == @set_class
+      raise ArgumentError, "members must be of class #{ @set_class }"
+    end
+
     super o
   end
   alias << add

data/spec/config_spec.rb

@@ -174,6 +174,13 @@ describe Confetti::Config do
       }.should raise_error Confetti::Config::XMLError
     end
 
+    it "should raise an error if no root node is found" do
+      File.stub(:read).and_return(nil)
+      lambda {
+        @config.populate_from_xml("#{ fixture_dir }/empty_non_existent.xml")
+      }.should raise_error Confetti::Config::XMLError
+    end
+
     describe "when setting attributes from config.xml" do
       before do
         @config.populate_from_xml(fixture_dir + "/config.xml")

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Andrew Lunny
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-21 00:00:00 -07:00
+date: 2011-10-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,6 +98,7 @@ files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - bin/confetti