confetti 0.9.18 → 0.9.19

data/Gemfile.lock

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

data/lib/confetti/config/image.rb

@@ -2,7 +2,7 @@ module Confetti
   class Config
     class Image 
       attr_accessor :src, :width, :height, :extras,
-        :role, :platform, :main, :density, :state
+        :role, :platform, :main, :density, :state, :keep_original
 
       def initialize *args
         @src = args.shift
@@ -18,6 +18,7 @@ module Confetti
         @main     = @extras['main']
         @density  = @extras['density']
         @state    = @extras['state']
+        @keep_original = @extras['keepOriginal']
       end
 
       def defined_attrs
@@ -29,7 +30,8 @@ module Confetti
             "gap:platform" => @platform,
             "gap:main" => @main,
             "gap:density" => @density,
-            "gap:state" => @state
+            "gap:state" => @state,
+            "gap:keepOriginal" => @keep_original
         }
       end
     end

data/lib/confetti/templates/android_manifest.mustache

@@ -27,7 +27,8 @@
         android:debuggable="true" android:hardwareAccelerated="true">
         <activity android:name=".{{ class_name }}"
                   android:screenOrientation="{{ app_orientation }}"
-                  android:label="@string/app_name" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale">
+                  android:label="@string/app_name" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale"
+                  android:windowSoftInputMode="{{ window_soft_input_mode }}">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -38,6 +39,6 @@
             </intent-filter>
         </activity>
     </application>
-    <uses-sdk android:minSdkVersion="{{ min_sdk_version }}" {{{ max_sdk_version_attribute }}}/>
+    <uses-sdk android:minSdkVersion="{{ min_sdk_version }}" {{{ max_sdk_version_attribute }}}{{{ target_sdk_version_attribute }}}/>
 
 </manifest>

data/lib/confetti/templates/android_manifest.rb

@@ -103,10 +103,24 @@ module Confetti
         choice = @config.preference("android-maxSdkVersion")
 
         if int_value?(choice)
-          "android:maxSdkVersion=\"#{ choice }\""
+          "android:maxSdkVersion=\"#{ choice }\" "
         end
       end
 
+      def target_sdk_version_attribute
+        choice = @config.preference("android-targetSdkVersion")
+
+        if int_value?(choice)
+          "android:targetSdkVersion=\"#{ choice }\" "
+        end
+      end
+
+      def window_soft_input_mode
+        choice = @config.preference("android-windowSoftInputMode").to_s
+
+        choice == "" ? "stateUnspecified|adjustUnspecified" : choice
+      end
+
       def int_value? val
         return if val.nil?
 

data/lib/confetti/version.rb

@@ -1,3 +1,3 @@
 module Confetti
-  VERSION = "0.9.18"
+  VERSION = "0.9.19"
 end

data/spec/fixtures/android/AndroidManifest_bare.xml

@@ -20,7 +20,8 @@
         android:debuggable="true" android:hardwareAccelerated="true">
         <activity android:name=".ConfettiBareApp"
                   android:screenOrientation="unspecified"
-                  android:label="@string/app_name" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale">
+                  android:label="@string/app_name" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale"
+                  android:windowSoftInputMode="stateUnspecified|adjustUnspecified">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

data/spec/fixtures/android/AndroidManifest_expected.xml

@@ -26,7 +26,8 @@
         android:debuggable="true" android:hardwareAccelerated="true">
         <activity android:name=".ConfettiSampleApp"
                   android:screenOrientation="unspecified"
-                  android:label="@string/app_name" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale">
+                  android:label="@string/app_name" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale"
+                  android:windowSoftInputMode="stateUnspecified|adjustUnspecified">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

data/spec/fixtures/android/android_manifest_spec.xml

@@ -24,7 +24,8 @@
         android:debuggable="true" android:hardwareAccelerated="true">
         <activity android:name=".AwesomeApp"
                   android:screenOrientation="unspecified"
-                  android:label="@string/app_name" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale">
+                  android:label="@string/app_name" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale"
+                  android:windowSoftInputMode="stateUnspecified|adjustUnspecified">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

data/spec/fixtures/config_with_android_versions.xml

@@ -24,4 +24,5 @@
 
   <preference name="android-minSdkVersion" value="8" />
   <preference name="android-maxSdkVersion" value="10" />
+  <preference name="android-targetSdkVersion" value="9" />
 </widget>

data/spec/templates/android_manifest_spec.rb

@@ -227,7 +227,7 @@ describe Confetti::Template::AndroidManifest do
 
       it "should return that number" do
         @sdk_pref.value = "12"
-        @template.max_sdk_version_attribute.should == 'android:maxSdkVersion="12"'
+        @template.max_sdk_version_attribute.should == 'android:maxSdkVersion="12" '
       end
 
       it "should be nil if not a number" do
@@ -251,6 +251,70 @@ describe Confetti::Template::AndroidManifest do
     end
   end
 
+  describe "#target_sdk_version_attribute" do
+    before do
+      @config = Confetti::Config.new
+      @template = @template_class.new(@config)
+    end
+
+    it "should default to nil" do
+      @template.target_sdk_version_attribute.should be_nil
+    end
+
+    describe "when set" do
+      before do
+        @sdk_pref = Confetti::Config::Preference.new "android-targetSdkVersion"
+        @config.preference_set << @sdk_pref
+      end
+
+      it "should return that number" do
+        @sdk_pref.value = "12"
+        @template.target_sdk_version_attribute.should == 'android:targetSdkVersion="12" '
+      end
+
+      it "should be nil if not a number" do
+        @sdk_pref.value = "twelve"
+        @template.target_sdk_version_attribute.should be_nil
+      end
+    end
+
+    describe "output" do
+      before do
+        path = "#{ fixture_dir }/config_with_android_versions.xml"
+        @config = Confetti::Config.new(path)
+        @template = @template_class.new(@config)
+      end
+
+      it "should write the attributes correctly" do
+        rendered = @template.render       
+        rendered.should match 'android:targetSdkVersion="9"'
+      end
+    end
+  end
+  
+  describe "#window_soft_input_mode" do
+    before do
+      @config = Confetti::Config.new
+      @template = @template_class.new(@config)
+    end
+
+    it "should default to 'internalOnly' do" do
+      @template.window_soft_input_mode.should == "stateUnspecified|adjustUnspecified"
+    end
+
+    describe "when set" do
+      before do
+        @install_pref = Confetti::Config::Preference.new "android-windowSoftInputMode"
+        @config.preference_set << @install_pref
+      end
+
+      it "should use 'auto' when set to 'auto'" do
+        @install_pref.value = "stateVisible|adjustResize"
+        @template.window_soft_input_mode.should == "stateVisible|adjustResize"
+      end
+    end
+  end
+
   describe "version_code" do
     before do
       @config = Confetti::Config.new

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: confetti
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 9
-  - 18
-  version: 0.9.18
+  - 19
+  version: 0.9.19
 platform: ruby
 authors: 
 - Andrew Lunny
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-09 00:00:00 Z
+date: 2013-09-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mustache