confetti 0.5.5 → 0.6.0

data/Gemfile.lock

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

data/lib/confetti/config.rb

@@ -14,7 +14,7 @@ module Confetti
                   :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, :plugin_set
+                :splash_set, :plist_icon_set, :access_set
 
     generate_and_write  :android_manifest, :android_strings, :webos_appinfo,
                         :ios_info, :symbian_wrt_info, :blackberry_widgets_config,
@@ -40,7 +40,7 @@ module Confetti
     Image       = Class.new Struct.new(:src, :height, :width, :extras)
     Feature     = Class.new Struct.new(:name, :required)
     Preference  = Class.new Struct.new(:name, :value, :readonly)
-    Plugin      = Class.new Struct.new(:name, :value, :platforms)
+    Access      = Class.new Struct.new(:origin, :subdomains)
 
     def initialize(*args)
       @author           = Author.new
@@ -52,7 +52,7 @@ module Confetti
       @feature_set      = TypedSet.new Feature
       @splash_set       = TypedSet.new Image
       @preference_set   = TypedSet.new Preference
-      @plugin_set       = TypedSet.new Plugin
+      @access_set       = TypedSet.new Access
       @viewmodes        = []
 
       if args.length > 0 && is_file?(args.first)
@@ -106,6 +106,10 @@ module Confetti
             @preference_set << Preference.new(attr["name"], attr["value"], attr["readonly"])
           when "license"
             @license = License.new(ele.text.nil? ? "" : ele.text.strip, attr["href"])
+          when "access"
+            sub = attr["subdomains"]
+            sub = sub.nil? ? true : (sub != 'false')
+            @access_set << Access.new(attr["origin"], sub)
           end
 
         # PhoneGap extensions (gap:)
@@ -115,10 +119,6 @@ module Confetti
             next if attr["src"].nil? or attr["src"].empty?
             extras = grab_extras attr
             @splash_set << Image.new(attr["src"], attr["height"], attr["width"], extras)
-          when "plugin"
-            plugin = Plugin.new(attr["name"], attr["value"])
-            plugin.platforms = plugin_platforms(ele)
-            @plugin_set << plugin
           end
         end
       end
@@ -165,14 +165,6 @@ module Confetti
       pref && pref.value && pref.value.to_sym
     end
 
-    # retrieve the specified platforms as a list of lowercase symbols
-    # extracted from children of ele
-    def plugin_platforms ele
-      ele.children.
-        select { |e| e.respond_to?(:name) and e.name == "platform" }.
-        map { |e| e.attributes["name"].downcase.to_sym }
-    end
-
     # mostly an internal method to help with weird cases
     # in particular #phonegap_version
     def preference_obj name

data/lib/confetti/version.rb

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

data/spec/config_spec.rb

@@ -346,28 +346,32 @@ describe Confetti::Config do
         end
       end
 
-      describe "plugins" do
-        it "should append plugins to the plugin set" do
-          @config.plugin_set.size.should be 1
+      describe "access" do
+        it "should append tags to the access set" do
+          @config.access_set.size.should be 2
         end
 
-        describe "created object" do
+        describe "created access object" do
           before do
-            @plugin = @config.plugin_set.first
+            @bar = @config.access_set.detect do |a|
+              a.origin == "http://bar.phonegap.com"
+            end
+            @foo = @config.access_set.detect do |a|
+              a.origin == "http://foo.phonegap.com"
+            end
           end
 
-          it "should have the right name" do
-            @plugin.name.should == "ChildBrowser"
+          it "should read the origins correctly" do
+            @foo.should be_true
+            @bar.should be_true # truthy (should exist)
           end
 
-          it "should have the right value" do
-            package = "com.phonegap.plugins.childBrowser.ChildBrowser"
-            @plugin.value.should == package
+          it "should default subdomains to true" do
+            @foo.subdomains.should be_true
           end
 
-          it "should have the right platforms" do
-            @plugin.platforms.size.should be 1
-            @plugin.platforms.first.should be :android
+          it "should allow subdomains to be set to false" do
+            @bar.subdomains.should be_false
           end
         end
       end

data/spec/fixtures/config.xml

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

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 5
-  version: 0.5.5
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Andrew Lunny
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-16 00:00:00 -07:00
+date: 2012-03-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency