confetti 0.2.2 → 0.2.3

data/Gemfile.lock

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

data/lib/confetti/config.rb

@@ -6,7 +6,8 @@ module Confetti
 
     attr_accessor :package, :version, :description, :height, :width
     attr_reader :author, :viewmodes, :name, :license, :content, 
-                :icon_set, :feature_set, :preference_set, :xml_doc
+                :icon_set, :feature_set, :preference_set, :xml_doc,
+                :splash_set
 
     generate_and_write  :android_manifest, :android_strings, :webos_appinfo,
                         :ios_info, :symbian_wrt_info, :blackberry_widgets_config
@@ -16,7 +17,7 @@ module Confetti
     Name        = Class.new Struct.new(:name, :shortname)
     License     = Class.new Struct.new(:text, :href)
     Content     = Class.new Struct.new(:src, :type, :encoding)
-    Icon        = Class.new Struct.new(:src, :height, :width, :extras)
+    Image       = Class.new Struct.new(:src, :height, :width, :extras)
     Feature     = Class.new Struct.new(:name, :required)
     Preference  = Class.new Struct.new(:name, :value, :readonly)
 
@@ -25,8 +26,9 @@ module Confetti
       @name             = Name.new
       @license          = License.new
       @content          = Content.new
-      @icon_set         = TypedSet.new Icon
+      @icon_set         = TypedSet.new Image
       @feature_set      = TypedSet.new Feature
+      @splash_set       = TypedSet.new Image
       @preference_set   = TypedSet.new Preference
       @viewmodes        = []
 
@@ -61,11 +63,11 @@ module Confetti
         when "description"
           @description = ele.text.strip
         when "icon"
-          extras = attr.keys.inject({}) do |hash, key|
-            hash[key] = attr[key] unless Icon.public_instance_methods.include? key
-            hash
-          end
-          @icon_set << Icon.new(attr["src"], attr["height"], attr["width"], extras)
+          extras = grab_extras attr
+          @icon_set << Image.new(attr["src"], attr["height"], attr["width"], extras)
+        when "splash"
+          extras = grab_extras attr
+          @splash_set << Image.new(attr["src"], attr["height"], attr["width"], extras)
         when "feature"
           @feature_set  << Feature.new(attr["name"], attr["required"])
         when "license"
@@ -81,5 +83,13 @@ module Confetti
     def biggest_icon
       @icon_set.max { |a,b| a.width.to_i <=> b.width.to_i }
     end
+
+    def grab_extras(attributes)
+      extras = attributes.keys.inject({}) do |hash, key|
+        hash[key] = attributes[key] unless Image.public_instance_methods.include? key
+        hash
+      end
+      extras
+    end
   end
 end

data/lib/confetti/version.rb

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

data/spec/config/config_image_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Confetti::Config::Image do
+  before do
+    @image = Confetti::Config::Image.new
+  end
+
+  it "should have a readable and writable src field" do
+    lambda { @image.src = "icon.png" }.should_not raise_error
+    @image.src.should == "icon.png"
+  end
+
+  it "should have a readable and writable width field" do
+    lambda { @image.width = 50 }.should_not raise_error
+    @image.width.should == 50
+  end
+
+  it "should have a readable and writable height field" do
+    lambda { @image.height = 50 }.should_not raise_error
+    @image.height.should == 50
+  end
+end

data/spec/config_spec.rb

@@ -84,8 +84,8 @@ describe Confetti::Config do
       @config.icon_set.should be_a TypedSet
     end
 
-    it "icon_set should be typed to icon objects" do
-      @config.icon_set.set_class.should be Confetti::Config::Icon
+    it "icon_set should be typed to Image objects" do
+      @config.icon_set.set_class.should be Confetti::Config::Image
     end
 
     it "should not allow icon_set to be clobbered" do
@@ -210,6 +210,40 @@ describe Confetti::Config do
         end
       end
 
+      describe "splash screens" do
+        it "should append splash screens to the splash_set" do
+          @config.splash_set.size.should be 1
+        end
+        
+        it "should set the splash screen's src correctly" do
+          @config.splash_set.first.src.should == "mainsplash.png"
+        end
+
+        it "should set the splash screen's height correctly" do
+          @config.splash_set.first.height.should == "480"
+        end
+
+        it "should set the splash screen's width correctly" do
+          @config.splash_set.first.width.should == "360"
+        end
+
+        describe "with custom splash screen attributes" do
+          before do
+            @config = Confetti::Config.new
+            @config.populate_from_xml(fixture_dir + "/config-icons-custom-attribs.xml")
+          end
+
+          it "should populate splash screen non-standards attributes to extras field" do
+            @config.splash_set.size.should be 1
+            @config.splash_set.first.extras.should_not == nil
+            @config.splash_set.first.extras.length.should be 1
+            @config.splash_set.first.extras["main"].should == "true"
+          end
+
+        end
+
+      end
+
       describe "icons" do
         it "should append icons to the icon_set" do
           @config.icon_set.size.should be 1
@@ -250,6 +284,7 @@ describe Confetti::Config do
             @config.icon_set.first.extras.length.should be 1
             @config.icon_set.first.extras["hover"].should == "true"
           end
+
         end
       end
 
@@ -299,12 +334,12 @@ describe Confetti::Config do
         @config = Confetti::Config.new(fixture_dir + "/config.xml")
       end
 
-      it "#icon should return an icon" do
-        @config.icon.should be_a Confetti::Config::Icon
+      it "#icon should return an Image" do
+        @config.icon.should be_a Confetti::Config::Image
       end
 
-      it "#biggest_icon should return an icon" do
-        @config.biggest_icon.should be_a Confetti::Config::Icon
+      it "#biggest_icon should return an Image" do
+        @config.biggest_icon.should be_a Confetti::Config::Image
       end
     end
 
@@ -313,8 +348,8 @@ describe Confetti::Config do
         @config.populate_from_xml(fixture_dir + "/config-icons.xml")
       end
 
-      it "#icon should return a single icon" do
-        @config.icon.should be_a Confetti::Config::Icon
+      it "#icon should return a single Image" do
+        @config.icon.should be_a Confetti::Config::Image
       end
 
       it "#biggest_icon should return the bigger of the two" do

data/spec/fixtures/config-icons-custom-attribs.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <widget xmlns		= "http://www.w3.org/ns/widgets"
   xmlns:rim="http://www.blackberry.com/ns/widgets"
+  xmlns:gap	= "http://phonegap.com/ns/1.0"
 	id		= "com.alunny.confetti"
 	version 	= "1.0.0">
 
@@ -16,6 +17,7 @@
 	</author>
 
 	<icon src="smallicon.png" height="100" width="100" rim:hover="true" />
+  <gap:splash src="mainsplash.png" height="480" width="360" rim:main="true" />
 
 	<feature name="http://api.phonegap.com/1.0/geolocation"/>
 	<feature name="http://api.phonegap.com/1.0/network"/>

data/spec/fixtures/config.xml

@@ -1,5 +1,6 @@
 <?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">
 
@@ -38,6 +39,8 @@ THE SOFTWARE.</license>
 
 	<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"/>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: confetti
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Andrew Lunny
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 -07:00
+date: 2011-03-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -147,7 +147,7 @@ files:
 - spec/config/config_author_spec.rb
 - spec/config/config_content_spec.rb
 - spec/config/config_feature_spec.rb
-- spec/config/config_icon_spec.rb
+- spec/config/config_image_spec.rb
 - spec/config/config_license_spec.rb
 - spec/config/config_name_spec.rb
 - spec/config/config_preference_spec.rb
@@ -212,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: confetti
-rubygems_version: 1.6.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Generate mobile app config files
@@ -228,7 +228,7 @@ test_files:
 - spec/config/config_author_spec.rb
 - spec/config/config_content_spec.rb
 - spec/config/config_feature_spec.rb
-- spec/config/config_icon_spec.rb
+- spec/config/config_image_spec.rb
 - spec/config/config_license_spec.rb
 - spec/config/config_name_spec.rb
 - spec/config/config_preference_spec.rb

data/spec/config/config_icon_spec.rb

@@ -1,22 +0,0 @@
-require 'spec_helper'
-
-describe Confetti::Config::Icon do
-  before do
-    @icon = Confetti::Config::Icon.new
-  end
-
-  it "should have a readable and writable src field" do
-    lambda { @icon.src = "icon.png" }.should_not raise_error
-    @icon.src.should == "icon.png"
-  end
-
-  it "should have a readable and writable width field" do
-    lambda { @icon.width = 50 }.should_not raise_error
-    @icon.width.should == 50
-  end
-
-  it "should have a readable and writable height field" do
-    lambda { @icon.height = 50 }.should_not raise_error
-    @icon.height.should == 50
-  end
-end