confetti 0.7.4 → 0.7.5

data/Gemfile.lock

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

data/lib/confetti/config.rb

@@ -39,7 +39,7 @@ module Confetti
     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)
+    Access      = Class.new Struct.new(:origin, :subdomains, :browserOnly)
 
     def initialize(*args)
       @author           = Author.new
@@ -105,9 +105,9 @@ module Confetti
           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)
+            sub = boolean_value(attr["subdomains"], true)
+            browserOnly = boolean_value(attr["browserOnly"])
+            @access_set << Access.new(attr["origin"], sub, browserOnly)
           end
 
         # PhoneGap extensions (gap:)
@@ -217,5 +217,14 @@ module Confetti
 
       imgs
     end
+
+    # convert string (attribute) to boolean
+    def boolean_value value, default=false
+      if default
+        value != "false"
+      else
+        value == "true"
+      end
+    end
   end
 end

data/lib/confetti/version.rb

@@ -1,3 +1,3 @@
 module Confetti
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

data/spec/config_spec.rb

@@ -271,7 +271,6 @@ describe Confetti::Config do
           end
 
           it "should populate splash screen non-standards attributes to extras field" do
-            p @config.splash_set
             @config.splash_set.size.should be 1
             @config.splash_set.first.extras.should_not == nil
             @config.splash_set.first.extras.length.should be 1
@@ -381,6 +380,14 @@ describe Confetti::Config do
           it "should allow subdomains to be set to false" do
             @bar.subdomains.should be_false
           end
+
+          it "should default browserOnly to false" do
+            @bar.browserOnly.should be_false
+          end
+
+          it "should allow browserOnly to be set to true" do
+            @foo.browserOnly.should be_true
+          end
         end
       end
     end
@@ -617,4 +624,42 @@ describe Confetti::Config do
       @config.default_splash.should != nil 
     end
   end
+
+  describe "boolean_value" do
+    describe "without a default parameter" do
+      it "should default to false" do
+        @config.boolean_value(nil).should be_false
+      end
+
+      it "should return false for the string false" do
+        @config.boolean_value("false").should be_false
+      end
+
+      it "should return false for other strings" do
+        @config.boolean_value("falsey").should be_false
+      end
+
+      it "should return true for the string true" do
+        @config.boolean_value("true").should be_true
+      end
+    end
+
+    describe "with true set as the default" do
+      it "should default to true" do
+        @config.boolean_value(nil, true).should be_true
+      end
+
+      it "should return true for the string true" do
+        @config.boolean_value("true", true).should be_true
+      end
+
+      it "should return false for other strings" do
+        @config.boolean_value("falsey", true).should be_true
+      end
+
+      it "should return false for the string false" do
+        @config.boolean_value("false", true).should be_false
+      end
+    end
+  end
 end

data/spec/fixtures/config_with_access.xml

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 4
-  version: 0.7.4
+  - 5
+  version: 0.7.5
 platform: ruby
 authors: 
 - Andrew Lunny
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-10 00:00:00 -07:00
+date: 2012-04-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency