confetti 0.2.10 → 0.3.0

data/Gemfile.lock

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

data/lib/confetti/config.rb

@@ -4,8 +4,9 @@ module Confetti
     include PhoneGap
     self.extend TemplateHelper
 
-    attr_accessor :package, :version_string, :version_code, :description, :height, :width
-    attr_reader :author, :viewmodes, :name, :license, :content, 
+    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
 
@@ -51,6 +52,7 @@ module Confetti
 
       @package = config_doc.attributes["id"]
       @version_string = config_doc.attributes["version"]
+      @version_code = config_doc.attributes["versionCode"]
 
       config_doc.elements.each do |ele|
         attr = ele.attributes
@@ -70,6 +72,8 @@ module Confetti
           @splash_set << Image.new(attr["src"], attr["height"], attr["width"], extras)
         when "feature"
           @feature_set  << Feature.new(attr["name"], attr["required"])
+        when "preference"
+          @preference_set << Preference.new(attr["name"], attr["value"], attr["readonly"])
         when "license"
           @license = License.new(ele.text.nil? ? "" : ele.text.strip, attr["href"])
         end
@@ -88,6 +92,19 @@ module Confetti
       @splash_set.first
     end
 
+    # simple helper for grabbing chosen orientation, or the default
+    # returns one of :portrait, :landscape, or :default
+    def orientation
+      values = %w{portrait landscape default}
+      pref = @preference_set.detect { |pref| pref.name == "orientation" }
+
+      unless pref && pref.value
+        :default
+      else
+        values.include?(pref.value) ? pref.value.to_sym : :default
+      end
+    end
+
     def grab_extras(attributes)
       extras = attributes.keys.inject({}) do |hash, key|
         hash[key] = attributes[key] unless Image.public_instance_methods.include? key

data/lib/confetti/templates/android_manifest.mustache

@@ -3,6 +3,15 @@
     package="{{ package_name }}"
     android:versionName="{{ version }}"
     android:versionCode="{{ version_code }}">
+
+    <supports-screens
+        android:largeScreens="true"
+        android:normalScreens="true"
+        android:smallScreens="true"
+        android:resizeable="true"
+        android:anyDensity="true"
+        />
+
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     {{# permissions }}
@@ -12,6 +21,7 @@
     <application android:icon="@drawable/icon" android:label="@string/app_name"
     	android:debuggable="true">
         <activity android:name=".{{ class_name }}"
+                  android:screenOrientation="{{ app_orientation }}"
                   android:label="@string/app_name" android:configChanges="orientation|keyboardHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -21,4 +31,4 @@
     </application>
 	<uses-sdk android:minSdkVersion="2" />
 
-</manifest> 
+</manifest>

data/lib/confetti/templates/android_manifest.rb

@@ -14,6 +14,12 @@ module Confetti
         "network"       => ["ACCESS_NETWORK_STATE"]
       }
 
+      ORIENTATIONS_MAP = {
+        :default => "unspecified",
+        :landscape => "landscape",
+        :portrait => "portrait"
+      }
+
       def package_name
         convert_to_java_package_id(@config.package)
       end
@@ -34,6 +40,10 @@ module Confetti
         @config.version_code || '1'
       end
 
+      def app_orientation
+        ORIENTATIONS_MAP[@config.orientation]
+      end
+
       def permissions
         permissions = []
         phonegap_api = /http\:\/\/api.phonegap.com\/1[.]0\/(\w+)/

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="{{ version }}" 
+<widget xmlns="http://www.w3.org/ns/widgets" xmlns:rim="http://www.blackberry.com/ns/widgets"
+  version="{{ version }}"
   id="{{ widget_id }}">
 <name>{{ widget_name }}</name>
 <author href="{{ author_href }}" email="{{ author_email }}">{{ author_name }}</author>
@@ -27,4 +27,5 @@
 <rim:loadingScreen backgroundColor="#000000" foregroundImage="resources/loading_foreground.png" onFirstLaunch="true">
   <rim:transitionEffect type="fadeOut"/>
 </rim:loadingScreen>
+<rim:orientation mode="{{app_orientation}}" />
 </widget>

data/lib/confetti/templates/blackberry_widgets_config.rb

@@ -1,14 +1,28 @@
 module Confetti
   module Template
     class BlackberryWidgetsConfig < Base
+      ORIENTATIONS_MAP = {
+        :default => "auto",
+        :landscape => "landscape",
+        :portrait => "portrait"
+      }
+
       def widget_id
-        @config.package
+        if @config.package.nil? or @config.package.empty?
+          "com.default.noname"
+        else
+          @config.package
+        end
       end
 
       def version
-        @config.version_string || "0.0.1"
+        if @config.version_string.nil? or @config.version_string.empty?
+          "0.0.1"
+        else
+          @config.version_string
+        end
       end
-      
+
       def widget_name
         @config.name.name
       end
@@ -44,6 +58,10 @@ module Confetti
       def output_filename
         "config.xml"
       end
+
+      def app_orientation
+        ORIENTATIONS_MAP[@config.orientation]
+      end
     end
   end
 end

data/lib/confetti/templates/ios_info.mustache

@@ -2,46 +2,47 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleIconFiles</key>
-	<array>
-		<string>icon.png</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-	</array>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleDisplayName</key>
-	<string>{{ product_name }}</string>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIconFile</key>
-	<string>icon.png</string>
-	<key>CFBundleIdentifier</key>
-	<string>{{ bundle_identifier }}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>{{ product_name }}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>{{ bundle_version }}</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>NSMainNibFile</key>
-	<string></string>
-	<key>NSMainNibFile~ipad</key>
-	<string>-iPad</string>
+    <key>CFBundleIconFiles</key>
+    <array>
+        <string>icon.png</string>
+    </array>
+    <key>UISupportedInterfaceOrientations~ipad</key>
+    <array>
+        {{# app_orientations }}
+        <string>{{ to_s }}</string>
+        {{/ app_orientations }}
+    </array>
+    <key>UISupportedInterfaceOrientations</key>
+    <array>
+        {{# app_orientations }}
+        <string>{{ to_s }}</string>
+        {{/ app_orientations }}
+    </array>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>English</string>
+    <key>CFBundleDisplayName</key>
+    <string>{{ product_name }}</string>
+    <key>CFBundleExecutable</key>
+    <string>${EXECUTABLE_NAME}</string>
+    <key>CFBundleIconFile</key>
+    <string>icon.png</string>
+    <key>CFBundleIdentifier</key>
+    <string>{{ bundle_identifier }}</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>{{ product_name }}</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>CFBundleVersion</key>
+    <string>{{ bundle_version }}</string>
+    <key>LSRequiresIPhoneOS</key>
+    <true/>
+    <key>NSMainNibFile</key>
+    <string></string>
+    <key>NSMainNibFile~ipad</key>
+    <string>-iPad</string>
 </dict>
-</plist>
+</plist>

data/lib/confetti/templates/ios_info.rb

@@ -1,6 +1,23 @@
 module Confetti
   module Template
     class IosInfo < Base
+      ORIENTATIONS_MAP = {
+        :landscape => [
+          "UIInterfaceOrientationLandscapeLeft",
+          "UIInterfaceOrientationLandscapeRight"
+        ],
+        :portrait => [
+          "UIInterfaceOrientationPortrait",
+          "UIInterfaceOrientationPortraitUpsideDown"
+        ],
+        :default => [
+          "UIInterfaceOrientationLandscapeLeft",
+          "UIInterfaceOrientationLandscapeRight",
+          "UIInterfaceOrientationPortrait",
+          "UIInterfaceOrientationPortraitUpsideDown"
+        ]
+      }
+
       def bundle_identifier
         @config.package
       end
@@ -16,6 +33,10 @@ module Confetti
       def output_filename
         "Info.plist"
       end
+
+      def app_orientations
+        ORIENTATIONS_MAP[@config.orientation]
+      end
     end
   end
 end

data/lib/confetti/version.rb

@@ -1,3 +1,3 @@
 module Confetti
-  VERSION = "0.2.10"
+  VERSION = "0.3.0"
 end

data/spec/config_spec.rb

@@ -400,4 +400,38 @@ describe Confetti::Config do
       end
     end
   end
+
+  describe "orientation helper" do
+    it "should be :default with none set" do
+      c = Confetti::Config.new
+      c.orientation.should be :default
+    end
+
+    describe "with an orientation preference" do
+      before do
+        @config = Confetti::Config.new
+        @orientation_pref = Confetti::Config::Preference.new "orientation"
+        @config.preference_set << @orientation_pref
+      end
+
+      it "should be :default when no value is set" do
+        @config.orientation.should be :default
+      end
+
+      it "should be :landscape when the value is 'landscape'" do
+        @orientation_pref.value = "landscape"
+        @config.orientation.should be :landscape
+      end
+
+      it "should be :portrait when the value is 'portrait'" do
+        @orientation_pref.value = "portrait"
+        @config.orientation.should be :portrait
+      end
+
+      it "should be :default when the value is unexpected" do
+        @orientation_pref.value = "topwise"
+        @config.orientation.should be :default
+      end
+    end
+  end
 end

data/spec/fixtures/{AndroidManifest_expected.xml → android/AndroidManifest_expected.xml}

@@ -3,6 +3,15 @@
     package="com.alunny.confetti"
     android:versionName="1.0.0"
     android:versionCode="1">
+
+    <supports-screens
+        android:largeScreens="true"
+        android:normalScreens="true"
+        android:smallScreens="true"
+        android:resizeable="true"
+        android:anyDensity="true"
+        />
+
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
@@ -13,6 +22,7 @@
     <application android:icon="@drawable/icon" android:label="@string/app_name"
     	android:debuggable="true">
         <activity android:name=".ConfettiSampleApp"
+                  android:screenOrientation="unspecified"
                   android:label="@string/app_name" android:configChanges="orientation|keyboardHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -22,4 +32,4 @@
     </application>
 	<uses-sdk android:minSdkVersion="2" />
 
-</manifest> 
+</manifest>

data/spec/fixtures/{android_manifest_spec.xml → android/android_manifest_spec.xml}

@@ -3,6 +3,15 @@
     package="com.whoever.awesome.app"
     android:versionName="0.0.1"
     android:versionCode="1">
+
+    <supports-screens
+        android:largeScreens="true"
+        android:normalScreens="true"
+        android:smallScreens="true"
+        android:resizeable="true"
+        android:anyDensity="true"
+        />
+
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -11,6 +20,7 @@
     <application android:icon="@drawable/icon" android:label="@string/app_name"
     	android:debuggable="true">
         <activity android:name=".AwesomeApp"
+                  android:screenOrientation="unspecified"
                   android:label="@string/app_name" android:configChanges="orientation|keyboardHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -20,4 +30,4 @@
     </application>
 	<uses-sdk android:minSdkVersion="2" />
 
-</manifest> 
+</manifest>

data/spec/fixtures/android/android_manifest_spec_with_expected_orientation.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.nitobi.johngarrett"
+    android:versionName="1.0"
+    android:versionCode="5">
+
+    <supports-screens
+        android:largeScreens="true"
+        android:normalScreens="true"
+        android:smallScreens="true"
+        android:resizeable="true"
+        android:anyDensity="true"
+        />
+
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <application android:icon="@drawable/icon" android:label="@string/app_name"
+    	android:debuggable="true">
+        <activity android:name=".JohnGarrettDrinkingGame"
+                  android:screenOrientation="landscape"
+                  android:label="@string/app_name" android:configChanges="orientation|keyboardHidden">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+	<uses-sdk android:minSdkVersion="2" />
+
+</manifest>

data/spec/fixtures/{blackberry_widget_config_expected.xml → blackberry/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="1.0.0" 
+<widget xmlns="http://www.w3.org/ns/widgets" xmlns:rim="http://www.blackberry.com/ns/widgets"
+  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>
@@ -47,4 +47,5 @@ THE SOFTWARE.</license>
 <rim:loadingScreen backgroundColor="#000000" foregroundImage="resources/loading_foreground.png" onFirstLaunch="true">
   <rim:transitionEffect type="fadeOut"/>
 </rim:loadingScreen>
+<rim:orientation mode="auto" />
 </widget>

data/spec/fixtures/blackberry/blackberry_widget_config_no_version_or_id.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<widget xmlns		= "http://www.w3.org/ns/widgets"
+  xmlns:gap	= "http://phonegap.com/ns/1.0"
+  version=""
+  id="">
+
+	<name>Regression Test</name>
+
+	<description>
+		This is part of a regression test for blackberry
+	</description>
+
+	<author href="http://alunny.github.com"
+		email="hardeep.shoker@nitobi.com">
+		Andrew Lunny
+	</author>
+
+	<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/fixtures/{blackberry_widget_config_spec.xml → blackberry/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="1.0.0" 
+<widget xmlns="http://www.w3.org/ns/widgets" xmlns:rim="http://www.blackberry.com/ns/widgets"
+  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>
@@ -27,4 +27,5 @@
 <rim:loadingScreen backgroundColor="#000000" foregroundImage="resources/loading_foreground.png" onFirstLaunch="true">
   <rim:transitionEffect type="fadeOut"/>
 </rim:loadingScreen>
+<rim:orientation mode="auto" />
 </widget>

data/spec/fixtures/blackberry/blackberry_widget_config_spec_with_expected_orientation.xml

@@ -0,0 +1,31 @@
+<?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="1.0"
+  id="com.nitobi.johngarrett">
+<name>John Garrett Drinking Game</name>
+<author href="http://www.nitobi.com" email="support@nitobi.com">Tim Kim, Ryan Betts, Fil Maj</author>
+<description>If you're watching a Canucks game, you need play this.</description>
+<license href=""></license>
+<feature id="blackberry.system" required="true" version="1.0.0.0" />
+<feature id="phonegap" required="true" version="0.9.5.1" />
+<feature id="blackberry.find" required="true" version="1.0.0.0" />
+<feature id="blackberry.identity" required="true" version="1.0.0.0" />
+<feature id="blackberry.pim.Address" required="true" version="1.0.0.0" />
+<feature id="blackberry.pim.Contact" required="true" version="1.0.0.0" />
+<feature id="blackberry.io.file" required="true" version="1.0.0.0" />
+<feature id="blackberry.utils" required="true" version="1.0.0.0" />
+<feature id="blackberry.io.dir" required="true" version="1.0.0.0" />
+<feature id="blackberry.app" required="true" version="1.0.0.0" />
+<feature id="blackberry.app.event" required="true" version="1.0.0.0" />
+<access subdomains="true" uri="file:///store/home"/>
+<access subdomains="true" uri="file:///SDCard"/>
+<access subdomains="true" uri="*" />
+<icon rim:hover="false" src="resources/icon.png"/>
+<icon rim:hover="true" src="resources/icon_hover.png"/>
+<content src="index.html"/>
+<rim:loadingScreen backgroundColor="#000000" foregroundImage="resources/loading_foreground.png" onFirstLaunch="true">
+  <rim:transitionEffect type="fadeOut"/>
+</rim:loadingScreen>
+<rim:orientation mode="landscape" />
+</widget>

data/spec/fixtures/config-icons.xml

@@ -10,8 +10,8 @@
 	</description>
 
 	<author href="http://alunny.github.com"
-		email="alunny@gmail.com">
-		Andrew Lunny
+		email="hardeep.shoker@nitobi.com">
+		Hardeep Shoker
 	</author>
 
 	<icon src="smallicon.png" height="100" width="100" />

data/spec/fixtures/config_with_orientation.xml

@@ -0,0 +1,25 @@
+<?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.nitobi.johngarrett"
+	version 	= "1.0"
+    versionCode = "5">
+
+	<name>John Garrett Drinking Game</name>
+
+	<description>
+        If you're watching a Canucks game, you need play this.
+	</description>
+
+	<author href="http://www.nitobi.com" email="support@nitobi.com">
+		Tim Kim, Ryan Betts, Fil Maj
+	</author>
+
+  <icon src="img/beer_72.png" width="72" height="72" />
+  <icon src="img/beer_48.png" width="48" height="48" />
+  <icon src="img/beer_36.png" width="36" height="36" />
+
+  <preference name="orientation" value="landscape" />
+
+  <gap:splash src="img/garrett_cropped2.png" />
+</widget>

data/spec/fixtures/config_with_version_code.xml

@@ -0,0 +1,23 @@
+<?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.nitobi.johngarrett"
+	version 	= "1.0"
+    versionCode = "5">
+
+	<name>John Garrett Drinking Game</name>
+
+	<description>
+        If you're watching a Canucks game, you need play this.
+	</description>
+
+	<author href="http://www.nitobi.com" email="support@nitobi.com">
+		Tim Kim, Ryan Betts, Fil Maj
+	</author>
+
+  <icon src="img/beer_72.png" width="72" height="72" />
+  <icon src="img/beer_48.png" width="48" height="48" />
+  <icon src="img/beer_36.png" width="36" height="36" />
+
+  <gap:splash src="img/garrett_cropped2.png" />
+</widget>

data/spec/fixtures/ios/ios_info_expected.plist

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CFBundleIconFiles</key>
+    <array>
+        <string>icon.png</string>
+    </array>
+    <key>UISupportedInterfaceOrientations~ipad</key>
+    <array>
+        <string>UIInterfaceOrientationLandscapeLeft</string>
+        <string>UIInterfaceOrientationLandscapeRight</string>
+        <string>UIInterfaceOrientationPortrait</string>
+        <string>UIInterfaceOrientationPortraitUpsideDown</string>
+        </array>
+    <key>UISupportedInterfaceOrientations</key>
+    <array>
+        <string>UIInterfaceOrientationLandscapeLeft</string>
+        <string>UIInterfaceOrientationLandscapeRight</string>
+        <string>UIInterfaceOrientationPortrait</string>
+        <string>UIInterfaceOrientationPortraitUpsideDown</string>
+        </array>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>English</string>
+    <key>CFBundleDisplayName</key>
+    <string>Confetti Sample App</string>
+    <key>CFBundleExecutable</key>
+    <string>${EXECUTABLE_NAME}</string>
+    <key>CFBundleIconFile</key>
+    <string>icon.png</string>
+    <key>CFBundleIdentifier</key>
+    <string>com.alunny.confetti</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>Confetti Sample App</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>CFBundleVersion</key>
+    <string>1.0.0</string>
+    <key>LSRequiresIPhoneOS</key>
+    <true/>
+    <key>NSMainNibFile</key>
+    <string></string>
+    <key>NSMainNibFile~ipad</key>
+    <string>-iPad</string>
+</dict>
+</plist>

data/spec/fixtures/ios/ios_info_spec.plist

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CFBundleIconFiles</key>
+    <array>
+        <string>icon.png</string>
+    </array>
+    <key>UISupportedInterfaceOrientations~ipad</key>
+    <array>
+        <string>UIInterfaceOrientationLandscapeLeft</string>
+        <string>UIInterfaceOrientationLandscapeRight</string>
+        <string>UIInterfaceOrientationPortrait</string>
+        <string>UIInterfaceOrientationPortraitUpsideDown</string>
+        </array>
+    <key>UISupportedInterfaceOrientations</key>
+    <array>
+        <string>UIInterfaceOrientationLandscapeLeft</string>
+        <string>UIInterfaceOrientationLandscapeRight</string>
+        <string>UIInterfaceOrientationPortrait</string>
+        <string>UIInterfaceOrientationPortraitUpsideDown</string>
+        </array>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>English</string>
+    <key>CFBundleDisplayName</key>
+    <string>Awesome App</string>
+    <key>CFBundleExecutable</key>
+    <string>${EXECUTABLE_NAME}</string>
+    <key>CFBundleIconFile</key>
+    <string>icon.png</string>
+    <key>CFBundleIdentifier</key>
+    <string>com.whoever.awesome.app</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>Awesome App</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>CFBundleVersion</key>
+    <string>1.0.0</string>
+    <key>LSRequiresIPhoneOS</key>
+    <true/>
+    <key>NSMainNibFile</key>
+    <string></string>
+    <key>NSMainNibFile~ipad</key>
+    <string>-iPad</string>
+</dict>
+</plist>

data/spec/fixtures/ios/ios_info_spec_expected_orientation.plist

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CFBundleIconFiles</key>
+    <array>
+        <string>icon.png</string>
+    </array>
+    <key>UISupportedInterfaceOrientations~ipad</key>
+    <array>
+        <string>UIInterfaceOrientationLandscapeLeft</string>
+        <string>UIInterfaceOrientationLandscapeRight</string>
+        </array>
+    <key>UISupportedInterfaceOrientations</key>
+    <array>
+        <string>UIInterfaceOrientationLandscapeLeft</string>
+        <string>UIInterfaceOrientationLandscapeRight</string>
+        </array>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>English</string>
+    <key>CFBundleDisplayName</key>
+    <string>John Garrett Drinking Game</string>
+    <key>CFBundleExecutable</key>
+    <string>${EXECUTABLE_NAME}</string>
+    <key>CFBundleIconFile</key>
+    <string>icon.png</string>
+    <key>CFBundleIdentifier</key>
+    <string>com.nitobi.johngarrett</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>John Garrett Drinking Game</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>CFBundleVersion</key>
+    <string>1.0</string>
+    <key>LSRequiresIPhoneOS</key>
+    <true/>
+    <key>NSMainNibFile</key>
+    <string></string>
+    <key>NSMainNibFile~ipad</key>
+    <string>-iPad</string>
+</dict>
+</plist>

data/spec/integration_spec.rb

@@ -10,54 +10,54 @@ describe 'Writing Output' do
 
   context "Android" do
     it "should read config.xml and spit out AndroidManifest.xml" do
-      @output_file = "#{ fixture_dir }/AndroidManifest_output.xml"
+      @output_file = "#{ fixture_dir }/android/AndroidManifest_output.xml"
       @config.write_android_manifest @output_file
 
-      files_should_match @output_file, "#{ fixture_dir }/AndroidManifest_expected.xml"
+      files_should_match @output_file, "#{ fixture_dir }/android/AndroidManifest_expected.xml"
     end
 
     it "should read config.xml and spit out strings.xml" do
-      @output_file = "#{ fixture_dir }/android_strings_output.xml"
+      @output_file = "#{ fixture_dir }/android/android_strings_output.xml"
       @config.write_android_strings @output_file
 
-      files_should_match @output_file, "#{ fixture_dir }/android_strings_expected.xml"
+      files_should_match @output_file, "#{ fixture_dir }/android/android_strings_expected.xml"
     end
   end
 
   context "webOS" do
     it "should read config.xml and spit out appinfo.json" do
-      @output_file = "#{ fixture_dir }/appinfo_output.json"
+      @output_file = "#{ fixture_dir }/webos/appinfo_output.json"
       @config.write_webos_appinfo @output_file
 
-      files_should_match @output_file, "#{ fixture_dir }/appinfo_expected.json"
+      files_should_match @output_file, "#{ fixture_dir }/webos/appinfo_expected.json"
     end
   end
 
   context "iOS" do
     it "should read config.xml and spit out Info.plist" do
-      @output_file = "#{ fixture_dir }/ios_info_output.plist"
+      @output_file = "#{ fixture_dir }/ios/ios_info_output.plist"
       @config.write_ios_info @output_file
 
-      files_should_match @output_file, "#{ fixture_dir }/ios_info_expected.plist"
+      files_should_match @output_file, "#{ fixture_dir }/ios/ios_info_expected.plist"
     end
   end
 
   context "Symbian.wrt" do
     it "should read config.xml and spit out info.plist" do
-      @output_file = "#{ fixture_dir }/symbian_wrt_info_output.plist"
+      @output_file = "#{ fixture_dir }/symbian/symbian_wrt_info_output.plist"
       @config.write_symbian_wrt_info @output_file
 
-      files_should_match @output_file, "#{ fixture_dir }/symbian_wrt_info_expected.plist"
+      files_should_match @output_file, "#{ fixture_dir }/symbian/symbian_wrt_info_expected.plist"
     end
   end
 
   context "Blackberry Widgets" do
     it "should read config.xml and spit out config.xml" do
-      @output_file = "#{ fixture_dir }/blackberry_widget_config_output.xml"
+      @output_file = "#{ fixture_dir }/blackberry/blackberry_widget_config_output.xml"
       @config.phonegap_version = "0.9.5.1"
       @config.write_blackberry_widgets_config @output_file
 
-      files_should_match @output_file, "#{ fixture_dir }/blackberry_widget_config_expected.xml"
+      files_should_match @output_file, "#{ fixture_dir }/blackberry/blackberry_widget_config_expected.xml"
     end
   end
 

data/spec/templates/android_manifest_spec.rb

@@ -65,7 +65,7 @@ describe Confetti::Template::AndroidManifest do
       end
 
       it "should render the correct AndroidManifest" do
-        @template.render.should == File.read("#{ fixture_dir }/android_manifest_spec.xml")
+        @template.render.should == File.read("#{ fixture_dir }/android/android_manifest_spec.xml")
       end
     end
   end
@@ -98,4 +98,39 @@ describe Confetti::Template::AndroidManifest do
       permission_names.should == expected
     end
   end
+
+  describe "version code should be set" do
+    before do
+      @config = Confetti::Config.new
+      @config.populate_from_xml("#{fixture_dir}/config_with_version_code.xml")
+    end
+
+    it "should have set @config.version_code correctly" do
+      @config.version_code.should == "5"
+    end
+  end
+
+  describe "#app_orientation" do
+    before do
+      @config = Confetti::Config.new
+      @orientation_pref = Confetti::Config::Preference.new "orientation"
+      @config.preference_set << @orientation_pref
+      @template = @template_class.new(@config)
+    end
+
+    it "should return the right array for portrait orientation" do
+      @orientation_pref.value = "portrait"
+      @template.app_orientation.should == "portrait"
+    end
+
+    it "should return the right array for landscape orientation" do
+      @orientation_pref.value = "landscape"
+      @template.app_orientation.should == "landscape"
+    end
+
+    it "should return the right array for default orientation" do
+      @orientation_pref.value = "default"
+      @template.app_orientation.should == "unspecified"
+    end
+  end
 end

data/spec/templates/android_strings_spec.rb

@@ -49,7 +49,7 @@ describe Confetti::Template::AndroidStrings do
       end
 
       it "should render the correct AndroidManifest" do
-        @template.render.should == File.read("#{ fixture_dir }/android_strings_spec.xml")
+        @template.render.should == File.read("#{ fixture_dir }/android/android_strings_spec.xml")
       end
     end
   end

data/spec/templates/blackberry_widget_config_spec.rb

@@ -85,8 +85,76 @@ describe Confetti::Template::BlackberryWidgetsConfig do
       end
 
       it "should render the correct config.xml" do
-        @template.render.should == File.read("#{ fixture_dir }/blackberry_widget_config_spec.xml")
+        @template.render.should == File.read("#{ fixture_dir }/blackberry/blackberry_widget_config_spec.xml")
       end
     end
   end
+
+  describe "#app_orientation" do
+    before do
+      @config = Confetti::Config.new
+      @orientation_pref = Confetti::Config::Preference.new "orientation"
+      @config.preference_set << @orientation_pref
+      @template = @template_class.new(@config)
+    end
+
+    it "should return the right array for portrait orientation" do
+      @orientation_pref.value = "portrait"
+      @template.app_orientation.should == "portrait"
+    end
+
+    it "should return the right array for landscape orientation" do
+      @orientation_pref.value = "landscape"
+      @template.app_orientation.should == "landscape"
+    end
+
+    it "should return the right array for default orientation" do
+      @orientation_pref.value = "default"
+      @template.app_orientation.should == "auto"
+    end
+  end
+
+  describe "#widget_id" do
+    before do
+      @config = Confetti::Config.new
+      @template = @template_class.new(@config)
+    end
+
+    it "should be the default when @config.package is nil" do
+      @config.package = nil
+      @template.widget_id.should == "com.default.noname"
+    end
+
+    it "should be the default when @config.package is an empty string" do
+      @config.package = ""
+      @template.widget_id.should == "com.default.noname"
+    end
+
+    it "should be @config.package when that's set" do
+      @config.package = "com.what.not"
+      @template.widget_id.should == "com.what.not"
+    end
+  end
+
+  describe "#version" do
+    before do
+      @config = Confetti::Config.new
+      @template = @template_class.new(@config)
+    end
+
+    it "should be the default when @config.version_string is nil" do
+      @config.version_string = nil
+      @template.version.should == "0.0.1"
+    end
+
+    it "should be the default when @config.version_string is an empty string" do
+      @config.version_string = ""
+      @template.version.should == "0.0.1"
+    end
+
+    it "should be @config.version_string when that's set" do
+      @config.version_string = "1.0.0"
+      @template.version.should == "1.0.0"
+    end
+  end
 end

data/spec/templates/ios_info_spec.rb

@@ -61,8 +61,44 @@ describe Confetti::Template::IosInfo do
       end
 
       it "should render the correct Info.plist" do
-        @template.render.should == File.read("#{ fixture_dir }/ios_info_spec.plist")
+        @template.render.should == File.read("#{ fixture_dir }/ios/ios_info_spec.plist")
       end
     end
   end
+
+  describe "#app_orientations" do
+    before do
+      @config = Confetti::Config.new
+      @orientation_pref = Confetti::Config::Preference.new "orientation"
+      @config.preference_set << @orientation_pref
+      @template = @template_class.new(@config)
+
+      @portrait = %w{UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown}
+      @landscape = %w{UIInterfaceOrientationLandscapeRight UIInterfaceOrientationLandscapeLeft}
+      @default = @portrait + @landscape
+    end
+
+    it "should return the right array for portrait orientation" do
+      @orientation_pref.value = "portrait"
+
+      # check that contents are matching
+      # a little longwinded
+      difference = @portrait - @template.app_orientations
+      difference.should be_empty
+    end
+
+    it "should return the right array for landscape orientation" do
+      @orientation_pref.value = "landscape"
+
+      difference = @landscape - @template.app_orientations
+      difference.should be_empty
+    end
+
+    it "should return the right array for default orientation" do
+      @orientation_pref.value = "default"
+
+      difference = @default - @template.app_orientations
+      difference.should be_empty
+    end
+  end
 end

data/spec/templates/symbian_wrt_info_spec.rb

@@ -61,7 +61,7 @@ describe Confetti::Template::SymbianWrtInfo do
       end
 
       it "should render the correct info.plist" do
-        @template.render.should == File.read("#{ fixture_dir }/symbian_wrt_info_spec.plist")
+        @template.render.should == File.read("#{ fixture_dir }/symbian/symbian_wrt_info_spec.plist")
       end
     end
   end

data/spec/templates/webos_appinfo_spec.rb

@@ -62,7 +62,7 @@ describe Confetti::Template::WebosAppinfo do
       end
 
       it "should render the correct appinfo.json" do
-        @template.render.should == File.read("#{ fixture_dir }/webos_appinfo_spec.json")
+        @template.render.should == File.read("#{ fixture_dir }/webos/webos_appinfo_spec.json")
       end
 
       describe "#version method" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: confetti
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 10
-  version: 0.2.10
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Andrew Lunny
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-25 00:00:00 -07:00
+date: 2011-06-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -152,23 +152,29 @@ files:
 - spec/config/config_name_spec.rb
 - spec/config/config_preference_spec.rb
 - spec/config_spec.rb
-- spec/fixtures/AndroidManifest_expected.xml
-- spec/fixtures/android_manifest_spec.xml
-- spec/fixtures/android_strings_expected.xml
-- spec/fixtures/android_strings_spec.xml
-- spec/fixtures/appinfo_expected.json
+- spec/fixtures/android/AndroidManifest_expected.xml
+- spec/fixtures/android/android_manifest_spec.xml
+- spec/fixtures/android/android_manifest_spec_with_expected_orientation.xml
+- spec/fixtures/android/android_strings_expected.xml
+- spec/fixtures/android/android_strings_spec.xml
 - spec/fixtures/bad_config.xml
-- spec/fixtures/blackberry_widget_config_expected.xml
-- spec/fixtures/blackberry_widget_config_spec.xml
+- spec/fixtures/blackberry/blackberry_widget_config_expected.xml
+- spec/fixtures/blackberry/blackberry_widget_config_no_version_or_id.xml
+- spec/fixtures/blackberry/blackberry_widget_config_spec.xml
+- spec/fixtures/blackberry/blackberry_widget_config_spec_with_expected_orientation.xml
 - spec/fixtures/config-icons-custom-attribs.xml
 - spec/fixtures/config-icons.xml
 - spec/fixtures/config.xml
+- spec/fixtures/config_with_orientation.xml
+- spec/fixtures/config_with_version_code.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
-- spec/fixtures/symbian_wrt_info_spec.plist
-- spec/fixtures/webos_appinfo_spec.json
+- spec/fixtures/ios/ios_info_expected.plist
+- spec/fixtures/ios/ios_info_spec.plist
+- spec/fixtures/ios/ios_info_spec_expected_orientation.plist
+- spec/fixtures/symbian/symbian_wrt_info_expected.plist
+- spec/fixtures/symbian/symbian_wrt_info_spec.plist
+- spec/fixtures/webos/appinfo_expected.json
+- spec/fixtures/webos/webos_appinfo_spec.json
 - spec/helpers_spec.rb
 - spec/integration_spec.rb
 - spec/phonegap_spec.rb
@@ -234,23 +240,29 @@ test_files:
 - spec/config/config_name_spec.rb
 - spec/config/config_preference_spec.rb
 - spec/config_spec.rb
-- spec/fixtures/AndroidManifest_expected.xml
-- spec/fixtures/android_manifest_spec.xml
-- spec/fixtures/android_strings_expected.xml
-- spec/fixtures/android_strings_spec.xml
-- spec/fixtures/appinfo_expected.json
+- spec/fixtures/android/AndroidManifest_expected.xml
+- spec/fixtures/android/android_manifest_spec.xml
+- spec/fixtures/android/android_manifest_spec_with_expected_orientation.xml
+- spec/fixtures/android/android_strings_expected.xml
+- spec/fixtures/android/android_strings_spec.xml
 - spec/fixtures/bad_config.xml
-- spec/fixtures/blackberry_widget_config_expected.xml
-- spec/fixtures/blackberry_widget_config_spec.xml
+- spec/fixtures/blackberry/blackberry_widget_config_expected.xml
+- spec/fixtures/blackberry/blackberry_widget_config_no_version_or_id.xml
+- spec/fixtures/blackberry/blackberry_widget_config_spec.xml
+- spec/fixtures/blackberry/blackberry_widget_config_spec_with_expected_orientation.xml
 - spec/fixtures/config-icons-custom-attribs.xml
 - spec/fixtures/config-icons.xml
 - spec/fixtures/config.xml
+- spec/fixtures/config_with_orientation.xml
+- spec/fixtures/config_with_version_code.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
-- spec/fixtures/symbian_wrt_info_spec.plist
-- spec/fixtures/webos_appinfo_spec.json
+- spec/fixtures/ios/ios_info_expected.plist
+- spec/fixtures/ios/ios_info_spec.plist
+- spec/fixtures/ios/ios_info_spec_expected_orientation.plist
+- spec/fixtures/symbian/symbian_wrt_info_expected.plist
+- spec/fixtures/symbian/symbian_wrt_info_spec.plist
+- spec/fixtures/webos/appinfo_expected.json
+- spec/fixtures/webos/webos_appinfo_spec.json
 - spec/helpers_spec.rb
 - spec/integration_spec.rb
 - spec/phonegap_spec.rb

data/spec/fixtures/ios_info_expected.plist

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleIconFiles</key>
-	<array>
-		<string>icon.png</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-	</array>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleDisplayName</key>
-	<string>Confetti Sample App</string>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIconFile</key>
-	<string>icon.png</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.alunny.confetti</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Confetti Sample App</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0.0</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>NSMainNibFile</key>
-	<string></string>
-	<key>NSMainNibFile~ipad</key>
-	<string>-iPad</string>
-</dict>
-</plist>

data/spec/fixtures/ios_info_spec.plist

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleIconFiles</key>
-	<array>
-		<string>icon.png</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-	</array>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleDisplayName</key>
-	<string>Awesome App</string>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIconFile</key>
-	<string>icon.png</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.whoever.awesome.app</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Awesome App</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0.0</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>NSMainNibFile</key>
-	<string></string>
-	<key>NSMainNibFile~ipad</key>
-	<string>-iPad</string>
-</dict>
-</plist>