confetti 0.7.16 → 0.8.0

data/Gemfile.lock

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

data/lib/confetti.rb

@@ -19,7 +19,6 @@ require 'typedset'
 require 'confetti/version'
 require 'confetti/error'
 require 'confetti/helpers'
-require 'confetti/phonegap'
 
 require 'confetti/template'
 require 'confetti/templates/base'
@@ -37,6 +36,9 @@ require 'confetti/templates/windows_phone7_manifest'
 
 require 'confetti/template_helper'
 
+require 'confetti/config/classes'
+require 'confetti/phonegap/plugin'
+require 'confetti/phonegap'
 require 'confetti/config'
 require 'confetti/config/feature'
 require 'confetti/config/image'

data/lib/confetti/config.rb

@@ -4,17 +4,11 @@ module Confetti
     include PhoneGap
     self.extend TemplateHelper
 
-    class XMLError < Confetti::Error ; end
-
-    class FileError < Confetti::Error ; end
-
-    class FiletypeError < Confetti::Error ; end
-
     attr_accessor :package, :version_string, :version_code, :description,
                   :height, :width, :plist_icon_set
     attr_reader :author, :viewmodes, :name, :license, :content,
                 :icon_set, :feature_set, :preference_set, :xml_doc,
-                :splash_set, :plist_icon_set, :access_set
+                :splash_set, :plist_icon_set, :access_set, :plugin_set
 
     generate_and_write  :android_manifest, :android_strings, :webos_appinfo,
                         :ios_info, :symbian_wrt_info, :blackberry_widgets_config,
@@ -32,15 +26,6 @@ module Confetti
       end
     end
 
-    # classes that represent child elements
-    Author      = Class.new Struct.new(:name, :href, :email)
-    Name        = Class.new Struct.new(:name, :shortname)
-    License     = Class.new Struct.new(:text, :href)
-    Content     = Class.new Struct.new(:src, :type, :encoding)
-    Feature     = Class.new Struct.new(:name, :required)
-    Preference  = Class.new Struct.new(:name, :value, :readonly)
-    Access      = Class.new Struct.new(:origin, :subdomains, :browserOnly)
-
     def initialize(*args)
       @author           = Author.new
       @name             = Name.new
@@ -52,6 +37,7 @@ module Confetti
       @splash_set       = TypedSet.new Image
       @preference_set   = TypedSet.new Preference
       @access_set       = TypedSet.new Access
+      @plugin_set       = TypedSet.new Plugin # defined in PhoneGap module
       @viewmodes        = []
 
       if args.length > 0 && is_file?(args.first)
@@ -116,6 +102,14 @@ module Confetti
           when "splash"
             next if attr["src"].nil? or attr["src"].empty?
             @splash_set << Image.new(attr["src"], attr["height"], attr["width"], attr)
+          when "plugin"
+            next if attr["name"].nil? or attr["name"].empty?
+            plugin = Plugin.new(attr["name"], attr["version"])
+            ele.each_element('param') do |param|
+              p_attr = param.attributes
+              plugin.param_set << Param.new(p_attr["name"], p_attr["value"])
+            end
+            @plugin_set << plugin
           end
         end
       end

data/lib/confetti/config/classes.rb

@@ -0,0 +1,17 @@
+module Confetti
+  class Config
+    class XMLError < Confetti::Error ; end
+    class FileError < Confetti::Error ; end
+    class FiletypeError < Confetti::Error ; end
+
+    # classes that represent child elements
+    Author      = Class.new Struct.new(:name, :href, :email)
+    Name        = Class.new Struct.new(:name, :shortname)
+    License     = Class.new Struct.new(:text, :href)
+    Content     = Class.new Struct.new(:src, :type, :encoding)
+    Feature     = Class.new Struct.new(:name, :required)
+    Preference  = Class.new Struct.new(:name, :value, :readonly)
+    Access      = Class.new Struct.new(:origin, :subdomains, :browserOnly)
+    Param       = Class.new Struct.new(:name, :value)
+  end
+end

data/lib/confetti/config/feature.rb

@@ -3,8 +3,6 @@ module Confetti
     class Feature
       attr_reader :param_set
 
-      Param = Class.new
-
       def initialize(name, src)
         @param_set = TypedSet.new Param
         super name, src

data/lib/confetti/phonegap.rb

@@ -1,7 +1,6 @@
 module Confetti
   module PhoneGap
     PHONEGAP_APIS = %w{camera notification geolocation media contacts file network}
-    Plugin        = Class.new Struct.new(:name, :version)
 
     def add_stock_phonegap_apis
       PHONEGAP_APIS.each do |api|
@@ -25,7 +24,9 @@ module Confetti
       end
     end
 
-    def plugins
+    # deprecated in favor of gap:plugin tags
+    # still supported for ChildBrowser
+    def legacy_plugins
       p_name = /http:\/\/plugins[.]phonegap[.]com\/([^\/]*)\/([^\/]*)/
 
       # find features corresponding to plugins

data/lib/confetti/phonegap/plugin.rb

@@ -0,0 +1,12 @@
+module Confetti
+  module PhoneGap
+    class Plugin < Struct.new(:name, :version)
+      attr_reader :param_set
+
+      def initialize(name, src)
+        @param_set = TypedSet.new Confetti::Config::Param
+        super name, src
+      end
+    end
+  end
+end

data/lib/confetti/version.rb

@@ -1,3 +1,3 @@
 module Confetti
-  VERSION = "0.7.16"
+  VERSION = "0.8.0"
 end

data/spec/config/config_feature_spec.rb

@@ -20,8 +20,8 @@ describe Confetti::Config::Feature do
       @feature.param_set.should be_a TypedSet
     end
 
-    it "should make the param_set set typed to Confetti::Config::Feature::Param" do
-      @feature.param_set.set_class.should be Confetti::Config::Feature::Param
+    it "should make the param_set set typed to Confetti::Config::Param" do
+      @feature.param_set.set_class.should be Confetti::Config::Param
     end
 
     it "should not allow the param_set to be clobbered" do

data/spec/config_spec.rb

@@ -129,6 +129,14 @@ describe Confetti::Config do
         }
       }.should raise_error
     end
+
+    it "has a plugin_set field, that is a TypedSet" do
+      @config.plugin_set.should be_a TypedSet
+    end
+
+    it "plugin_set should be typed to plugin objects" do
+      @config.plugin_set.set_class.should be Confetti::Config::Plugin
+    end
   end
 
   describe "#initialize with file" do
@@ -391,6 +399,52 @@ describe Confetti::Config do
         end
       end
     end
+
+    describe "plugins" do
+      before do
+        @config = Confetti::Config.new
+        @config.populate_from_xml(fixture_dir + "/config-plugins.xml")
+        @plugins = @config.plugin_set
+      end
+
+      it "should populate the plugin set" do
+        @plugins.size.should be 3
+      end
+
+      describe "plugin set created" do
+        before do
+          @child = @plugins.detect { |a| a.name == "ChildBrowser" }
+          @push = @plugins.detect { |a| a.name == "PushNotifications" }
+          @fbconnect = @plugins.detect { |a| a.name == "FBConnect" }
+        end
+
+        it "should set the version properties correctly" do
+          @child.version.should be_nil
+          @push.version.should == "~2.0"
+          @fbconnect.version.should == "~1"
+        end
+
+        describe "params" do
+          it "should be empty when none are specified" do
+            @child.param_set.should be_empty
+            @push.param_set.should be_empty
+          end
+
+          it "should be populated when specified" do
+            @fbconnect.param_set.size.should == 2
+          end
+
+          it "should be populated correctly" do
+            params = @fbconnect.param_set
+            key = params.detect { |pm| pm.name == "APIKey" }
+            secret = params.detect { |pm| pm.name == "APISecret" }
+
+            key.value.should == "SOMEKEY"
+            secret.value.should == "SOMESECRET"
+          end
+        end
+      end
+    end
   end
 
   describe "config generation" do

data/spec/fixtures/config-plugins.xml

@@ -0,0 +1,60 @@
+<?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">
+
+	<name>Confetti Sample App</name>
+
+	<description>
+		This is a sample config.xml for integration testing with Confetti
+	</description>
+
+  <license href="http://www.opensource.org/licenses/mit-license.php">The MIT License
+
+Copyright (c) 2011 Andrew Lunny
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the &quot;Software&quot;), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.</license>
+
+	<author href="http://alunny.github.com"
+		email="alunny@gmail.com">
+		Andrew Lunny
+	</author>
+
+	<icon src="icon.png" height="150" width="200" />
+
+  <gap:splash src="mainsplash.png" height="480" width="360" />
+
+	<preference name="universal" value="true"/>
+	<preference name="phonegap-version" value="1.3.0"/>
+
+	<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"/>
+
+  <access origin="*" />
+
+  <gap:plugin name="ChildBrowser" />
+  <gap:plugin name="PushNotifications" version="~2.0" />
+
+  <gap:plugin name="FBConnect" version="~1" >
+    <param name="APIKey" value="SOMEKEY" />
+    <param name="APISecret" value="SOMESECRET" />
+  </gap:plugin>
+</widget>

data/spec/phonegap_spec.rb

@@ -30,7 +30,7 @@ describe Confetti::PhoneGap do
     end
   end
 
-  describe "#plugins" do
+  describe "#legacy_plugins" do
     before do
       @obj.feature_set = []
       childbrowser  = "http://plugins.phonegap.com/ChildBrowser/1.0.1"
@@ -44,17 +44,17 @@ describe Confetti::PhoneGap do
     end
 
     it "should return an array with 2 entries" do
-      @obj.plugins.length.should be 2
+      @obj.legacy_plugins.length.should be 2
     end
 
     it "should return an array with 2 Plugin objects" do
-      @obj.plugins.first.should be_a Confetti::PhoneGap::Plugin
-      @obj.plugins.last.should be_a Confetti::PhoneGap::Plugin
+      @obj.legacy_plugins.first.should be_a Confetti::PhoneGap::Plugin
+      @obj.legacy_plugins.last.should be_a Confetti::PhoneGap::Plugin
     end
 
     it "should return the right data as plugins" do
-      childbrowser = @obj.plugins.first
-      fbconnect = @obj.plugins.last
+      childbrowser = @obj.legacy_plugins.first
+      fbconnect = @obj.legacy_plugins.last
 
       childbrowser.name.should == "ChildBrowser"
       childbrowser.version.should == "1.0.1"

data/spec/plugin_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Confetti::PhoneGap::Plugin do
+  before do
+    @child = Confetti::PhoneGap::Plugin.new("ChildBrowser", "~2.0")
+  end
+
+  it "should have a readable and writable name field" do
+    lambda { @child.name = "MediaBrowser" }.should_not raise_error
+    @child.name.should == "MediaBrowser"
+  end
+
+  it "should have a readable and writable version field" do
+    lambda { @child.version = "1.0" }.should_not raise_error
+    @child.version.should == "1.0"
+  end
+
+  describe "parameter set" do
+    it "should have a param_set field, that is a TypedSet" do
+      @child.param_set.should be_a TypedSet
+    end
+
+    it "should make the param_set set typed to Confetti::Config::Param" do
+      @child.param_set.set_class.should be Confetti::Config::Param
+    end
+
+    it "should not allow the param_set to be clobbered" do
+      lambda {
+        @child.param_set = { :accuracy => 2.0 }
+      }.should raise_error
+    end
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 16
-  version: 0.7.16
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Andrew Lunny
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-29 00:00:00 -07:00
+date: 2012-06-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,11 +66,13 @@ files:
 - confetti.gemspec
 - lib/confetti.rb
 - lib/confetti/config.rb
+- lib/confetti/config/classes.rb
 - lib/confetti/config/feature.rb
 - lib/confetti/config/image.rb
 - lib/confetti/error.rb
 - lib/confetti/helpers.rb
 - lib/confetti/phonegap.rb
+- lib/confetti/phonegap/plugin.rb
 - lib/confetti/template.rb
 - lib/confetti/template_helper.rb
 - lib/confetti/templates/android_manifest.mustache
@@ -120,6 +122,7 @@ files:
 - spec/fixtures/config-icons-custom-attribs.xml
 - spec/fixtures/config-icons.xml
 - spec/fixtures/config-long-desc.xml
+- spec/fixtures/config-plugins.xml
 - spec/fixtures/config.xml
 - spec/fixtures/config_fullscreen.xml
 - spec/fixtures/config_legacy.xml
@@ -144,6 +147,7 @@ files:
 - spec/helpers_spec.rb
 - spec/integration_spec.rb
 - spec/phonegap_spec.rb
+- spec/plugin_spec.rb
 - spec/spec_helper.rb
 - spec/template_spec.rb
 - spec/templates/android_manifest_spec.rb
@@ -212,6 +216,7 @@ test_files:
 - spec/fixtures/config-icons-custom-attribs.xml
 - spec/fixtures/config-icons.xml
 - spec/fixtures/config-long-desc.xml
+- spec/fixtures/config-plugins.xml
 - spec/fixtures/config.xml
 - spec/fixtures/config_fullscreen.xml
 - spec/fixtures/config_legacy.xml
@@ -236,6 +241,7 @@ test_files:
 - spec/helpers_spec.rb
 - spec/integration_spec.rb
 - spec/phonegap_spec.rb
+- spec/plugin_spec.rb
 - spec/spec_helper.rb
 - spec/template_spec.rb
 - spec/templates/android_manifest_spec.rb