confetti 0.3.2 → 0.3.3

data/Gemfile.lock

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

data/lib/confetti.rb

@@ -17,6 +17,7 @@ require "mustache"
 # internal dependencies
 require 'typedset'
 require 'confetti/version'
+require 'confetti/error'
 require 'confetti/helpers'
 require 'confetti/phonegap'
 

data/lib/confetti/config.rb

@@ -4,6 +4,10 @@ module Confetti
     include PhoneGap
     self.extend TemplateHelper
 
+    class XMLError < Confetti::Error ; end
+
+    class FileError < Confetti::Error ; end
+
     attr_accessor :package, :version_string, :version_code, :description,
                   :height, :width
     attr_reader :author, :viewmodes, :name, :license, :content,
@@ -40,9 +44,12 @@ module Confetti
 
     def populate_from_xml(xml_file)
       begin
-        config_doc = REXML::Document.new(File.read(xml_file)).root
+        file = File.read(xml_file)
+        config_doc = REXML::Document.new(file).root
       rescue REXML::ParseException
-        raise ArgumentError, "malformed config.xml"
+        raise XMLError, "malformed config.xml"
+      rescue Errno::ENOENT
+        raise FileError, "file #{ xml_file } doesn't exist"
       end
 
       fail "no doc parsed" unless config_doc

data/lib/confetti/error.rb

@@ -0,0 +1,3 @@
+module Confetti
+  class Error < Exception ; end
+end

data/lib/confetti/version.rb

@@ -1,3 +1,3 @@
 module Confetti
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/spec/config_spec.rb

@@ -162,16 +162,16 @@ describe Confetti::Config do
       }.should raise_error
     end
 
-    it "should raise an error if can't parse" do
+    it "should raise an error if the file doesn't exist" do
       lambda {
         @config.populate_from_xml("foo.goo")
-      }.should raise_error
+      }.should raise_error Confetti::Config::FileError
     end
 
     it "should raise an error with malformed xml" do
       lambda {
         @config.populate_from_xml("#{ fixture_dir }/bad_config.xml")
-      }.should raise_error ArgumentError
+      }.should raise_error Confetti::Config::XMLError
     end
 
     describe "when setting attributes from config.xml" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Andrew Lunny
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-15 00:00:00 -07:00
+date: 2011-08-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,6 +114,7 @@ files:
 - lib/confetti/cli.rb
 - lib/confetti/config.rb
 - lib/confetti/config/feature.rb
+- lib/confetti/error.rb
 - lib/confetti/helpers.rb
 - lib/confetti/phonegap.rb
 - lib/confetti/template.rb