confetti 0.6.0 → 0.6.1

data/Gemfile.lock

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

data/lib/confetti/templates/blackberry_widgets_config.mustache

@@ -29,7 +29,9 @@
 
 <access subdomains="true" uri="file:///store/home"/>
 <access subdomains="true" uri="file:///SDCard"/>
-<access subdomains="true" uri="*" />
+{{# access }}
+<access subdomains="{{ subdomains }}" uri="{{ uri }}" />
+{{/ access }}
 
 <icon rim:hover="false" src="resources/icon.png"/>
 <icon rim:hover="true" src="resources/icon_hover.png"/>

data/lib/confetti/templates/blackberry_widgets_config.rb

@@ -98,6 +98,12 @@ module Confetti
 
         gap ? 'com.phonegap' : 'org.apache.cordova'
       end
+
+      def access
+        @config.access_set.map do |a| 
+          { :subdomains => !!a.subdomains, :uri => a.origin }
+        end
+      end
     end
   end
 end

data/lib/confetti/templates/blackberry_widgets_config_legacy.mustache

@@ -24,7 +24,9 @@
 <feature id="blackberry.identity.phone" />
 <access subdomains="true" uri="file:///store/home"/>
 <access subdomains="true" uri="file:///SDCard"/>
-<access subdomains="true" uri="*" />
+{{# access }}
+<access subdomains="{{ subdomains }}" uri="{{ uri }}" />
+{{/ access }}
 <icon rim:hover="false" src="resources/icon.png"/>
 <icon rim:hover="true" src="resources/icon_hover.png"/>
 <content src="index.html"/>

data/lib/confetti/version.rb

@@ -1,3 +1,3 @@
 module Confetti
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/config_spec.rb

@@ -347,6 +347,11 @@ describe Confetti::Config do
       end
 
       describe "access" do
+        before do
+          @config = Confetti::Config.new
+          @config.populate_from_xml(fixture_dir + "/config_with_access.xml")
+        end
+
         it "should append tags to the access set" do
           @config.access_set.size.should be 2
         end

data/spec/fixtures/blackberry/blackberry_widget_config_expected.xml

@@ -50,7 +50,6 @@ THE SOFTWARE.</license>
 <access subdomains="true" uri="file:///store/home"/>
 <access subdomains="true" uri="file:///SDCard"/>
 <access subdomains="true" uri="*" />
-
 <icon rim:hover="false" src="resources/icon.png"/>
 <icon rim:hover="true" src="resources/icon_hover.png"/>
 

data/spec/fixtures/config.xml

@@ -48,6 +48,5 @@ 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"/>
 
-  <access origin="http://foo.phonegap.com" />
-  <access origin="http://bar.phonegap.com" subdomains="false" />
+  <access origin="*" />
 </widget>

data/spec/fixtures/config_legacy.xml

@@ -48,8 +48,5 @@ 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:plugin name="ChildBrowser"
-              value="com.phonegap.plugins.childBrowser.ChildBrowser">
-    <platform name="android" />
-  </gap:plugin>
+  <access origin="*" />
 </widget>

data/spec/fixtures/config_with_access.xml

@@ -0,0 +1,53 @@
+<?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="http://foo.phonegap.com" />
+  <access origin="http://bar.phonegap.com" subdomains="false" />
+</widget>

data/spec/templates/blackberry_widget_config_spec.rb

@@ -45,6 +45,7 @@ describe Confetti::Template::BlackberryWidgetsConfig do
       @config.author.href = "http://brucelee.cn"
       @config.description = "My New App, by Bruce Lee"
       @config.phonegap_version = "0.9.5.1"
+      @config.access_set << Confetti::Config::Access.new('*', true)
     end
 
     it "should accept the config object" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Andrew Lunny
@@ -118,6 +118,7 @@ files:
 - spec/fixtures/config.xml
 - spec/fixtures/config_fullscreen.xml
 - spec/fixtures/config_legacy.xml
+- spec/fixtures/config_with_access.xml
 - spec/fixtures/config_with_orientation.xml
 - spec/fixtures/config_with_version_code.xml
 - spec/fixtures/configs/blank-splash.xml
@@ -204,6 +205,7 @@ test_files:
 - spec/fixtures/config.xml
 - spec/fixtures/config_fullscreen.xml
 - spec/fixtures/config_legacy.xml
+- spec/fixtures/config_with_access.xml
 - spec/fixtures/config_with_orientation.xml
 - spec/fixtures/config_with_version_code.xml
 - spec/fixtures/configs/blank-splash.xml