confetti 0.2.3 → 0.2.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    confetti (0.2.3)
+    confetti (0.2.4)
       mustache (= 0.11.2)
       thor (= 0.14.3)
 

data/lib/confetti/config.rb

@@ -4,7 +4,7 @@ module Confetti
     include PhoneGap
     self.extend TemplateHelper
 
-    attr_accessor :package, :version, :description, :height, :width
+    attr_accessor :package, :version_string, :version_code, :description, :height, :width
     attr_reader :author, :viewmodes, :name, :license, :content, 
                 :icon_set, :feature_set, :preference_set, :xml_doc,
                 :splash_set
@@ -50,18 +50,18 @@ module Confetti
       @xml_doc = config_doc
 
       @package = config_doc.attributes["id"]
-      @version = config_doc.attributes["version"]
+      @version_string = config_doc.attributes["version"]
 
       config_doc.elements.each do |ele|
         attr = ele.attributes
 
         case ele.name
         when "name"
-          @name = Name.new(ele.text.strip, attr["shortname"])
+          @name = Name.new(ele.text.nil? ? "" : ele.text.strip, attr["shortname"])
         when "author"
-          @author = Author.new(ele.text.strip, attr["href"], attr["email"])
+          @author = Author.new(ele.text.nil? ? "" : ele.text.strip, attr["href"], attr["email"])
         when "description"
-          @description = ele.text.strip
+          @description = ele.text.nil? ? "" : ele.text.strip
         when "icon"
           extras = grab_extras attr
           @icon_set << Image.new(attr["src"], attr["height"], attr["width"], extras)
@@ -71,7 +71,7 @@ module Confetti
         when "feature"
           @feature_set  << Feature.new(attr["name"], attr["required"])
         when "license"
-          @license = License.new(ele.text.strip, attr["href"])
+          @license = License.new(ele.text.nil? ? "" : ele.text.strip, attr["href"])
         end
       end
     end

data/lib/confetti/templates/android_manifest.mustache

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="{{ package_name }}"
     android:versionName="{{ version }}"
-    android:versionCode="1">
+    android:versionCode="{{ version_code }}">
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     {{# permissions }}

data/lib/confetti/templates/android_manifest.rb

@@ -31,7 +31,11 @@ module Confetti
       end
 
       def version
-        @config.version || '0.0.1'
+        @config.version_string || '0.0.1'
+      end
+
+      def version_code
+        @config.version_code || '1'
       end
 
       def permissions

data/lib/confetti/templates/blackberry_widgets_config.mustache

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Widget Configuration Reference: http://docs.blackberry.com/en/developers/deliverables/15274/ -->
 <widget xmlns="http://www.w3.org/ns/widgets" xmlns:rim="http://www.blackberry.com/ns/widgets" 
-  version="2.0" 
+  version="{{ version }}" 
   id="{{ widget_id }}">
 <name>{{ widget_name }}</name>
 <author href="{{ author_href }}" email="{{ author_email }}">{{ author_name }}</author>

data/lib/confetti/templates/blackberry_widgets_config.rb

@@ -5,6 +5,10 @@ module Confetti
         @config.package
       end
 
+      def version
+        @config.version_string || "0.0.1"
+      end
+      
       def widget_name
         @config.name.name
       end

data/lib/confetti/templates/ios_info.rb

@@ -6,7 +6,7 @@ module Confetti
       end
 
       def bundle_version
-        @config.version
+        @config.version_string
       end
 
       def product_name

data/lib/confetti/templates/symbian_wrt_info.rb

@@ -6,7 +6,7 @@ module Confetti
       end
 
       def version
-        @config.version
+        @config.version_string
       end
 
       def display_name

data/lib/confetti/templates/webos_appinfo.rb

@@ -20,12 +20,12 @@ module Confetti
       end
 
       def version
-        if @config.version.nil?
+        if @config.version_string.nil?
           '0.0.1'
-        elsif @config.version.match /^(\d)+[.](\d)+[.](\d)+$/
-          @config.version
-        elsif @config.version.match /^((\d)+[.])*(\d)+$/
-          fix_version(@config.version)
+        elsif @config.version_string.match /^(\d)+[.](\d)+[.](\d)+$/
+          @config.version_string
+        elsif @config.version_string.match /^((\d)+[.])*(\d)+$/
+          fix_version(@config.version_string)
         else
           fail "need a valid version number of the form 0.0.0"
         end

data/lib/confetti/version.rb

@@ -1,3 +1,3 @@
 module Confetti
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/config_spec.rb

@@ -14,9 +14,14 @@ describe Confetti::Config do
       @config.package.should == "com.alunny.greatapp"
     end
 
-    it "has a writable and readable version field" do
-      lambda { @config.version = "0.1.0" }.should_not raise_error
-      @config.version.should == "0.1.0"
+    it "has a writable and readable version_string field" do
+      lambda { @config.version_string = "0.1.0" }.should_not raise_error
+      @config.version_string.should == "0.1.0"
+    end
+
+    it "has a writable and readable version_code field" do
+      lambda { @config.version_code = 12 }.should_not raise_error
+      @config.version_code.should == 12
     end
 
     it "has a writable and readable height field" do
@@ -174,9 +179,32 @@ describe Confetti::Config do
         @config.populate_from_xml(fixture_dir + "/config.xml")
       end
 
+      describe "that has empty tags" do
+        before do
+          @config.populate_from_xml(fixture_dir + "/empty_elements.xml")
+        end
+
+        it "should set the author to the empty string" do
+          @config.author.name.should == ""
+        end
+
+        it "should set the name to the empty string" do
+          @config.name.name.should == ""
+        end
+
+        it "should set the description to the empty string" do
+          @config.description.should == ""
+        end
+
+        it "should set the license to the empty string" do
+          @config.license.text.should == ""
+        end
+
+      end
+
       it "should keep a reference to the xml doc" do
         @config.xml_doc.should_not == nil
-        @config.xml_doc.class.should == REXML::Element 
+        @config.xml_doc.class.should == REXML::Element
       end
 
       it "should populate the app's package when present" do
@@ -187,8 +215,8 @@ describe Confetti::Config do
         @config.name.name.should == "Confetti Sample App"
       end
 
-      it "should populate the app's version when present" do
-        @config.version.should == "1.0.0"
+      it "should populate the app's version_string when present" do
+        @config.version_string.should == "1.0.0"
       end
 
       it "should populate the app's description when present" do

data/spec/fixtures/blackberry_widget_config_expected.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Widget Configuration Reference: http://docs.blackberry.com/en/developers/deliverables/15274/ -->
 <widget xmlns="http://www.w3.org/ns/widgets" xmlns:rim="http://www.blackberry.com/ns/widgets" 
-  version="2.0" 
+  version="1.0.0" 
   id="com.alunny.confetti">
 <name>Confetti Sample App</name>
 <author href="http://alunny.github.com" email="alunny@gmail.com">Andrew Lunny</author>

data/spec/fixtures/blackberry_widget_config_spec.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Widget Configuration Reference: http://docs.blackberry.com/en/developers/deliverables/15274/ -->
 <widget xmlns="http://www.w3.org/ns/widgets" xmlns:rim="http://www.blackberry.com/ns/widgets" 
-  version="2.0" 
+  version="1.0.0" 
   id="com.whoever.awesome.app">
 <name>Awesome App</name>
 <author href="http://brucelee.cn" email="blee@hotmail.com">Bruce Lee</author>

data/spec/fixtures/empty_elements.xml

@@ -0,0 +1,22 @@
+<?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 />
+
+  <description />
+
+  <license href="http://www.opensource.org/licenses/mit-license.php" />
+
+	<author href="http://alunny.github.com"
+    email="alunny@gmail.com" />
+	<icon src="icon.png" height="150" width="200" />
+
+  <gap:splash src="mainsplash.png" height="480" width="360" />
+
+	<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"/>
+</widget>

data/spec/templates/blackberry_widget_config_spec.rb

@@ -39,7 +39,7 @@ describe Confetti::Template::BlackberryWidgetsConfig do
       @config = Confetti::Config.new
       @config.name.name = "Awesome App"
       @config.package = "com.whoever.awesome.app"
-      @config.version = "1.0.0"
+      @config.version_string = "1.0.0"
       @config.author.name = "Bruce Lee"
       @config.author.email = "blee@hotmail.com"
       @config.author.href = "http://brucelee.cn"

data/spec/templates/ios_info_spec.rb

@@ -34,7 +34,7 @@ describe Confetti::Template::IosInfo do
       @config = Confetti::Config.new
       @config.name.name = "Awesome App"
       @config.package = "com.whoever.awesome.app"
-      @config.version = "1.0.0"
+      @config.version_string = "1.0.0"
     end
 
     it "should accept the config object" do

data/spec/templates/symbian_wrt_info_spec.rb

@@ -34,7 +34,7 @@ describe Confetti::Template::SymbianWrtInfo do
       @config = Confetti::Config.new
       @config.name.name = "Awesome App"
       @config.package = "com.whoever.awesome.app"
-      @config.version = "1.0.0"
+      @config.version_string = "1.0.0"
     end
 
     it "should accept the config object" do

data/spec/templates/webos_appinfo_spec.rb

@@ -35,7 +35,7 @@ describe Confetti::Template::WebosAppinfo do
       @config.name.name = "Awesome App"
       @config.package = "com.whoever.awesome.app"
       @config.author.name = "Bruce Lee"
-      @config.version = "1.0.0"
+      @config.version_string = "1.0.0"
     end
 
     it "should accept the config object" do
@@ -66,33 +66,33 @@ describe Confetti::Template::WebosAppinfo do
       end
 
       describe "#version method" do
-        it "should return the default (0.0.1) when version is not set" do
-          @config.version = nil
+        it "should return the default (0.0.1) when version_string is not set" do
+          @config.version_string = nil
           @template.version.should == "0.0.1"
         end
 
-        it "should raise an error if version isn't even close" do
-          @config.version = 'breakfast'
+        it "should raise an error if version_string isn't even close" do
+          @config.version_string = 'breakfast'
           lambda { @template.version }.should raise_error
         end
 
         it "should add empty digits if string has one segment" do
-          @config.version = '1'
+          @config.version_string = '1'
           @template.version.should == "1.0.0"
         end
 
         it "should add empty digits if string has two segments" do
-          @config.version = '1.1'
+          @config.version_string = '1.1'
           @template.version.should == "1.1.0"
         end
 
         it "should truncate extra digits if string has too many segments" do
-          @config.version = '1.2.3.4.5'
+          @config.version_string = '1.2.3.4.5'
           @template.version.should == "1.2.3"
         end
 
         it "should return config.version when it is valid" do
-          @config.version = '0.1.0'
+          @config.version_string = '0.1.0'
           @template.version.should == "0.1.0"
         end
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: confetti
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Andrew Lunny
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 -07:00
+date: 2011-04-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -163,6 +163,7 @@ files:
 - spec/fixtures/config-icons-custom-attribs.xml
 - spec/fixtures/config-icons.xml
 - spec/fixtures/config.xml
+- spec/fixtures/empty_elements.xml
 - spec/fixtures/ios_info_expected.plist
 - spec/fixtures/ios_info_spec.plist
 - spec/fixtures/symbian_wrt_info_expected.plist
@@ -244,6 +245,7 @@ test_files:
 - spec/fixtures/config-icons-custom-attribs.xml
 - spec/fixtures/config-icons.xml
 - spec/fixtures/config.xml
+- spec/fixtures/empty_elements.xml
 - spec/fixtures/ios_info_expected.plist
 - spec/fixtures/ios_info_spec.plist
 - spec/fixtures/symbian_wrt_info_expected.plist