confetti 0.9.15 → 0.9.16

data/Gemfile.lock

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

data/lib/confetti/config.rb

@@ -9,7 +9,7 @@ module Confetti
     attr_reader :author, :viewmodes, :name, :license, :content,
                 :icon_set, :feature_set, :preference_set, :xml_doc,
                 :splash_set, :plist_icon_set, :access_set, :plugin_set,
-                :url_scheme_set
+                :url_scheme_set, :platform_set
 
     generate_and_write  :android_manifest, :android_strings,
                         :webos_appinfo, :ios_info, :symbian_wrt_info,
@@ -36,6 +36,7 @@ module Confetti
       @icon_set         = TypedSet.new Image
       @plist_icon_set   = [] 
       @feature_set      = TypedSet.new Feature
+      @platform_set     = TypedSet.new Platform
       @splash_set       = TypedSet.new Image
       @preference_set   = TypedSet.new Preference
       @access_set       = TypedSet.new Access
@@ -145,6 +146,8 @@ module Confetti
         # PhoneGap extensions (gap:)
         when "http://phonegap.com/ns/1.0"
           case ele.name
+          when "platform"
+            @platform_set << Platform.new(attr["name"])
           when "splash"
             next if attr["src"].nil? or attr["src"].empty?
             @splash_set << Image.new(attr["src"], attr["height"], attr["width"],
@@ -387,6 +390,15 @@ module Confetti
         features << feat 
       end
 
+      platforms = []
+      @platform_set.each do | platform |
+        plat = REXML::Element.new( "gap:platform" )
+        plat.add_attributes({
+            "name" => platform.name
+            })
+        platforms << plat 
+      end
+
       widget.elements.add name 
       widget.elements.add author
       widget.elements.add description 
@@ -397,6 +409,7 @@ module Confetti
       splashes.each { | splash | widget.elements.add splash }
       preferences.each { | pref | widget.elements.add pref }
       features.each { | feat | widget.elements.add feat }
+      platforms.each { | plat | widget.elements.add plat }
       url_schemes.each { | schm | widget.elements.add schm }
 
       doc << REXML::XMLDecl.new

data/lib/confetti/config/classes.rb

@@ -34,6 +34,14 @@ module Confetti
       end
     end
 
+    class Platform < Struct.new(:name)
+      def defined_attrs
+        {
+          "name" => self[ :name ]
+        }
+      end
+    end
+
     class Content < Struct.new(:src, :type, :encoding)
       def defined_attrs
         {

data/lib/confetti/config/image.rb

@@ -16,8 +16,8 @@ module Confetti
         @role     = @extras['role']
         @platform = @extras['platform']
         @main     = @extras['main']
-        @density     = @extras['density']
-        @state     = @extras['state']
+        @density  = @extras['density']
+        @state    = @extras['state']
       end
 
       def defined_attrs

data/lib/confetti/version.rb

@@ -1,3 +1,3 @@
 module Confetti
-  VERSION = "0.9.15"
+  VERSION = "0.9.16"
 end

data/spec/config/config_platform_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Confetti::Config::Platform do
+  before do
+    @platform = Confetti::Config::Platform.new("ios")
+  end
+
+  it "should have a readable and writable name field" do
+    lambda { @platform.name = "ios" }.should_not raise_error
+    @platform.name.should == "ios"
+  end
+
+  it "should define a defined_attrs method" do
+    platform = Confetti::Config::Platform.new("ios")
+    
+    platform.defined_attrs.should == {
+      "name" => "ios"
+    }
+  end
+end

data/spec/config_spec.rb

@@ -113,6 +113,20 @@ describe Confetti::Config do
       }.should raise_error
     end
 
+    it "has an platform field, that is a TypedSet" do
+      @config.platform_set.should be_a TypedSet
+    end
+
+    it "platform_set should be typed to platform objects" do
+      @config.platform_set.set_class.should be Confetti::Config::Platform
+    end
+
+    it "should not allow platform_set to be clobbered" do
+      lambda { 
+        @config.platform_set = ['ios', 'android']
+      }.should raise_error
+    end
+
     it "has an preference_set field, that is a TypedSet" do
       @config.preference_set.should be_a TypedSet
     end
@@ -381,6 +395,20 @@ describe Confetti::Config do
         end
       end
 
+      describe "platforms" do
+        it "should append platforms to the feature set" do
+          @config.platform_set.size.should be 3
+        end
+
+        it "should include the right platforms" do
+          # first tends to be last listed in xml document
+          platforms_names = @config.platform_set.map { |f| f.name }
+          platforms_names.should include "ios"
+          platforms_names.should include "android"
+          platforms_names.should include "webos"
+        end
+      end
+
       describe "access" do
         before do
           @config = Confetti::Config.new

data/spec/fixtures/config.xml

@@ -39,7 +39,7 @@ THE SOFTWARE.</license>
 
 	<icon src="icon.png" height="150" width="200" />
 
-  <gap:splash src="mainsplash.png" height="480" width="360" />
+  	<gap:splash src="mainsplash.png" height="480" width="360" />
 
 	<preference name="universal" value="true"/>
 	<preference name="phonegap-version" value="1.3.0"/>
@@ -48,7 +48,11 @@ THE SOFTWARE.</license>
 	<feature name="http://api.phonegap.com/1.0/camera" required="true"/>
 	<feature name="http://api.phonegap.com/1.0/notification" required="true"/>
 
+	<gap:platform name="ios" />
+	<gap:platform name="webos" />
+	<gap:platform name="android" />
+
 	<content src="not_index.html" />
 
-  <access origin="*" />
+  	<access origin="*" />
 </widget>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: confetti
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 9
-  - 15
-  version: 0.9.15
+  - 16
+  version: 0.9.16
 platform: ruby
 authors: 
 - Andrew Lunny
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-18 00:00:00 Z
+date: 2013-07-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mustache
@@ -110,6 +110,7 @@ files:
 - spec/config/config_image_spec.rb
 - spec/config/config_license_spec.rb
 - spec/config/config_name_spec.rb
+- spec/config/config_platform_spec.rb
 - spec/config/config_preference_spec.rb
 - spec/config/config_url_scheme_spec.rb
 - spec/config_spec.rb
@@ -216,6 +217,7 @@ test_files:
 - spec/config/config_image_spec.rb
 - spec/config/config_license_spec.rb
 - spec/config/config_name_spec.rb
+- spec/config/config_platform_spec.rb
 - spec/config/config_preference_spec.rb
 - spec/config/config_url_scheme_spec.rb
 - spec/config_spec.rb