confetti 0.9.11 → 0.9.12

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    confetti (0.9.10)
+    confetti (0.9.12)
       mustache (~> 0.11.2)
 
 GEM

data/lib/confetti/config.rb

@@ -180,7 +180,9 @@ module Confetti
     def preference name
       pref = preference_obj(name)
 
-      pref && pref.value && pref.value.to_sym
+      if pref && pref.value && !pref.value.empty?
+        pref.value.to_sym
+      end
     end
 
     # mostly an internal method to help with weird cases

data/lib/confetti/templates/ios_info.rb

@@ -46,9 +46,12 @@ module Confetti
 
       def devices 
         nibs = ["NSMainNibFile"]
+
         @config.preference_set.each do |preference|
-          nibs << "NSMainNibFile~ipad"  if preference.name.match /^universal$/
+          next unless preference.name
+          nibs << "NSMainNibFile~ipad" if preference.name.match /^universal$/
         end
+
         nibs
       end
 

data/lib/confetti/version.rb

@@ -1,3 +1,3 @@
 module Confetti
-  VERSION = "0.9.11"
+  VERSION = "0.9.12"
 end

data/spec/config_spec.rb

@@ -208,6 +208,12 @@ describe Confetti::Config do
       }.should raise_error Confetti::Config::EncodingError
     end
 
+    it "should handle blank values in preference tags" do
+      lambda {
+        @config.populate_from_xml("#{ fixture_dir }/config_empty_value.xml")
+      }.should_not raise_error
+    end
+
     describe "when setting attributes from config.xml" do
       before do
         @config.populate_from_xml(fixture_dir + "/config.xml")
@@ -592,6 +598,13 @@ describe Confetti::Config do
 
       @config.preference(:privacy).should be_nil
     end
+
+    it "should be nil when the preference has an empty string as the value" do
+      pref = Confetti::Config::Preference.new "nonsense", ""
+      @config.preference_set << pref
+
+      @config.preference(:nonsense).should be_nil
+    end
   end
 
   describe "feature accessor" do

data/spec/fixtures/config_empty_pref.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<widget xmlns		= "http://www.w3.org/ns/widgets"
+  xmlns:gap	= "http://phonegap.com/ns/1.0"
+	id		= "com.alunny.confetti"
+	version 	= "1.0.0">
+
+	<name>Confetti Sample App</name>
+
+	<description>
+		This is a sample config.xml for integration testing with Confetti
+	</description>
+
+  <license href="http://www.opensource.org/licenses/mit-license.php">The MIT License
+
+Copyright (c) 2011 Andrew Lunny
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the &quot;Software&quot;), 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 &quot;AS IS&quot;, 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.</license>
+
+	<author href="http://alunny.github.com"
+		email="alunny@gmail.com">
+		Andrew Lunny
+	</author>
+
+	<icon src="icon.png" height="150" width="200" />
+
+  <gap:splash src="mainsplash.png" height="480" width="360" />
+
+	<preference name="universal" value="true"/>
+	<preference name="phonegap-version" value="1.3.0"/>
+	<preference />
+
+	<feature name="http://api.phonegap.com/1.0/geolocation" required="true"/>
+	<feature name="http://api.phonegap.com/1.0/camera" required="true"/>
+	<feature name="http://api.phonegap.com/1.0/notification" required="true"/>
+
+  <access origin="*" />
+</widget>

data/spec/fixtures/config_empty_value.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<widget xmlns		= "http://www.w3.org/ns/widgets"
+  xmlns:gap	= "http://phonegap.com/ns/1.0"
+	id		= "com.alunny.confetti"
+	version 	= "1.0.0">
+
+	<name>Confetti Sample App</name>
+
+	<description>
+		This is a sample config.xml for integration testing with Confetti
+	</description>
+
+  <license href="http://www.opensource.org/licenses/mit-license.php">The MIT License
+
+Copyright (c) 2011 Andrew Lunny
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the &quot;Software&quot;), 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 &quot;AS IS&quot;, 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.</license>
+
+	<author href="http://alunny.github.com"
+		email="alunny@gmail.com">
+		Andrew Lunny
+	</author>
+
+	<icon src="icon.png" height="150" width="200" />
+
+  <gap:splash src="mainsplash.png" height="480" width="360" />
+
+	<preference name="universal" value="true"/>
+    <preference name="phonegap-version" value=""/>
+
+	<feature name="http://api.phonegap.com/1.0/geolocation" required="true"/>
+	<feature name="http://api.phonegap.com/1.0/camera" required="true"/>
+	<feature name="http://api.phonegap.com/1.0/notification" required="true"/>
+
+  <access origin="*" />
+</widget>

data/spec/templates/ios_info_spec.rb

@@ -213,4 +213,12 @@ describe Confetti::Template::IosInfo do
       end
     end
   end
+
+  describe "devices" do
+    it "should not raise error with an empty preference" do
+      config = Confetti::Config.new("#{ fixture_dir }/config_empty_pref.xml")
+      template = @template_class.new(config)
+      lambda { template.devices }.should_not raise_error
+    end
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 11
-  version: 0.9.11
+  - 12
+  version: 0.9.12
 platform: ruby
 authors: 
 - Andrew Lunny
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-31 00:00:00 -07:00
+date: 2012-12-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -127,6 +127,8 @@ files:
 - spec/fixtures/config-plugins.xml
 - spec/fixtures/config-to_xml.xml
 - spec/fixtures/config.xml
+- spec/fixtures/config_empty_pref.xml
+- spec/fixtures/config_empty_value.xml
 - spec/fixtures/config_fullscreen.xml
 - spec/fixtures/config_legacy.xml
 - spec/fixtures/config_with_access.xml
@@ -224,6 +226,8 @@ test_files:
 - spec/fixtures/config-plugins.xml
 - spec/fixtures/config-to_xml.xml
 - spec/fixtures/config.xml
+- spec/fixtures/config_empty_pref.xml
+- spec/fixtures/config_empty_value.xml
 - spec/fixtures/config_fullscreen.xml
 - spec/fixtures/config_legacy.xml
 - spec/fixtures/config_with_access.xml