confetti 0.3.4 → 0.3.5

data/Gemfile.lock

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

data/lib/confetti/config.rb

@@ -102,13 +102,13 @@ module Confetti
     # 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" }
+      values = [:portrait, :landscape, :default]
+      choice = preference :orientation
 
-      unless pref && pref.value
+      unless choice and values.include?(choice)
         :default
       else
-        values.include?(pref.value) ? pref.value.to_sym : :default
+        choice
       end
     end
 
@@ -119,5 +119,14 @@ module Confetti
       end
       extras
     end
+
+    # helper to retrieve a preference's value
+    # returns nil if the preference doesn't exist
+    def preference name
+      name = name.to_s
+      pref = @preference_set.detect { |pref| pref.name == name }
+
+      pref && pref.value && pref.value.to_sym
+    end
   end
 end

data/lib/confetti/version.rb

@@ -1,3 +1,3 @@
 module Confetti
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/spec/config_spec.rb

@@ -434,4 +434,27 @@ describe Confetti::Config do
       end
     end
   end
+
+  describe "preference accessor" do
+    before do
+      @config = Confetti::Config.new
+      @pref = Confetti::Config::Preference.new "permissions", "none"
+      @config.preference_set << @pref
+    end
+
+    it "should return the value of the specified preference" do
+      @config.preference(:permissions).should == :none
+    end
+
+    it "should be nil when the preference is not set" do
+      @config.preference(:size).should be_nil
+    end
+
+    it "should be nil when the preference has no value" do
+      pref = Confetti::Config::Preference.new "privacy"
+      @config.preference_set << pref
+
+      @config.preference(:privacy).should be_nil
+    end
+  end
 end

data/spec/fixtures/android/AndroidManifest_bare.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.app.bare"
+    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.INTERNET" />
+    <application android:icon="@drawable/icon" android:label="@string/app_name"
+    	android:debuggable="true">
+        <activity android:name=".ConfettiBareApp"
+                  android:screenOrientation="unspecified"
+                  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>
+        <activity android:name="com.phonegap.DroidGap" android:label="@string/app_name">
+            <intent-filter>
+            </intent-filter>
+        </activity>
+    </application>
+	<uses-sdk android:minSdkVersion="2" />
+
+</manifest>

data/spec/fixtures/configs/config_bare.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<widget xmlns		= "http://www.w3.org/ns/widgets"
+	id		= "com.app.bare"
+	version 	= "1.0.0">
+
+	<name>Confetti Bare App</name>
+
+	<description>
+		This is a sample config.xml with all Android permissions disabled
+	</description>
+
+	<author href="http://alunny.github.com"
+		email="hardeep.shoker@nitobi.com">
+		Hardeep Shoker
+	</author>
+
+	<icon src="smallicon.png" height="100" width="100" />
+	<icon src="bigicon.png"   height="200" width="200" />
+
+  <preference name="permissions" value="none"/>
+</widget>

data/spec/templates/android_manifest_spec.rb

@@ -97,6 +97,19 @@ describe Confetti::Template::AndroidManifest do
 
       permission_names.should == expected
     end
+
+    describe "when preference specifies no permissions" do
+      before do
+        bare_config = "#{ fixture_dir }/configs/config_bare.xml"
+        @config = Confetti::Config.new bare_config
+        @template = @template_class.new(@config)
+      end
+
+      it "should only render the INTERNET permission" do
+        bare_manifest = File.read "#{ fixture_dir }/android/AndroidManifest_bare.xml"
+        @template.render.should == bare_manifest
+      end
+    end
   end
 
   describe "version code should be set" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Andrew Lunny
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 -07:00
+date: 2011-08-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -144,6 +144,7 @@ files:
 - spec/config/config_name_spec.rb
 - spec/config/config_preference_spec.rb
 - spec/config_spec.rb
+- spec/fixtures/android/AndroidManifest_bare.xml
 - spec/fixtures/android/AndroidManifest_expected.xml
 - spec/fixtures/android/android_manifest_spec.xml
 - spec/fixtures/android/android_manifest_spec_with_expected_orientation.xml
@@ -159,6 +160,7 @@ files:
 - spec/fixtures/config.xml
 - spec/fixtures/config_with_orientation.xml
 - spec/fixtures/config_with_version_code.xml
+- spec/fixtures/configs/config_bare.xml
 - spec/fixtures/empty_elements.xml
 - spec/fixtures/ios/ios_info_expected.plist
 - spec/fixtures/ios/ios_info_spec.plist
@@ -228,6 +230,7 @@ test_files:
 - spec/config/config_name_spec.rb
 - spec/config/config_preference_spec.rb
 - spec/config_spec.rb
+- spec/fixtures/android/AndroidManifest_bare.xml
 - spec/fixtures/android/AndroidManifest_expected.xml
 - spec/fixtures/android/android_manifest_spec.xml
 - spec/fixtures/android/android_manifest_spec_with_expected_orientation.xml
@@ -243,6 +246,7 @@ test_files:
 - spec/fixtures/config.xml
 - spec/fixtures/config_with_orientation.xml
 - spec/fixtures/config_with_version_code.xml
+- spec/fixtures/configs/config_bare.xml
 - spec/fixtures/empty_elements.xml
 - spec/fixtures/ios/ios_info_expected.plist
 - spec/fixtures/ios/ios_info_spec.plist