confetti 0.7.6 → 0.7.7

data/Gemfile.lock

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

data/lib/confetti/templates/windows_phone7_manifest.rb

@@ -22,7 +22,9 @@ module Confetti
       end
 
       def guid
-        guid = Digest::MD5.hexdigest @config.package 
+        package = @config.package
+        package ||= 'com.example.app'
+        guid = Digest::MD5.hexdigest package 
         res = "{#{ guid[0..7] }-#{ guid[8..11] }-"
         res << "#{ guid[12..15] }-#{ guid[16..19] }-"
         res << "#{ guid[20,guid.length-1]}}"
@@ -38,20 +40,32 @@ module Confetti
       end
 
       def capabilities
+        default_permissions = %w{camera contacts device geolocation
+            networking media}
         permissions = []                                                
+        capabilities = []                                                
         phonegap_api = /http\:\/\/api.phonegap.com\/1[.]0\/(\w+)/          
+        filtered_features = @config.feature_set.clone
 
-        feature_names = @config.feature_set.map { |f| f.name }          
-        feature_names.sort
+        filtered_features.each { |f|
+            next if f.name.nil?
+            matches = f.name.match(phonegap_api)
+            next unless matches.length > 1 
+            next unless GAP_PERMISSIONS_MAP.has_key?(matches[1])
+            permissions << matches[1]
+        }
 
-        feature_names.each do |f|
-          feature_name = f.match(phonegap_api)[1] if f.match(phonegap_api)
-          associated_permissions = GAP_PERMISSIONS_MAP[feature_name]
-          permissions.concat(associated_permissions) if associated_permissions
+        if @config.feature_set.empty? and
+            @config.preference(:permissions) != :none
+            permissions = default_permissions
         end
+
+        permissions.each { |p|
+            capabilities.concat(GAP_PERMISSIONS_MAP[p])
+        }
       
-        permissions.sort! 
-        permissions.map { |f| { :name => f } }
+        capabilities.sort! 
+        capabilities.map { |f| { :name => f } }
       end
 
       def output_filename 

data/lib/confetti/version.rb

@@ -1,3 +1,3 @@
 module Confetti
-  VERSION = "0.7.6"
+  VERSION = "0.7.7"
 end

data/spec/fixtures/windowsphone7/WMAppManifest.xml

@@ -8,9 +8,9 @@
     
     <IconPath IsRelative="true" IsResource="false">ApplicationIcon.png</IconPath>
     <Capabilities>
-      <Capability Name="D_HW_FRONTCAMERA" />
       <Capability Name="ID_CAP_ISV_CAMERA" />
       <Capability Name="ID_CAP_LOCATION" />
+      <Capability Name="ID_HW_FRONTCAMERA" />
       <Capability Name="ID_CAP_WEBBROWSERCOMPONENT" />
     </Capabilities>
     

data/spec/templates/windows_phone7_manifest_spec.rb

@@ -33,17 +33,79 @@ describe Confetti::Template::WindowsPhone7Manifest do
     @template.guid.should == "{1005a3fc-23ab-99bd-bdd1-9e83f3d7b989}" 
   end
 
-  describe "with a config object" do
+  describe "with a bad config object" do
 
-    before do
-      @config = Confetti::Config.new "#{fixture_dir}/config.xml"
+    describe "on rendering" do
+
+      it "should generate a dummy uuid if non provided" do
+        @config = Confetti::Config.new
+        @config.package = "com.example.app"
+        @template = @template_class.new @config
+        @template.guid.should == "{a163ec9b-9996-caee-009d-cdac1b7e0722}"
+      end
+
+      it "should not fail when a bad feature is found" do
+        @config = Confetti::Config.new
+        bad_feature = Confetti::Config::Feature.new(
+            "http://api.phonegap.com/1.0/badfeature",
+            "true"
+            )
+        good_feature = Confetti::Config::Feature.new(
+            "http://api.phonegap.com/1.0/networking",
+            "true"
+            )
+        @config.feature_set << bad_feature
+        @config.feature_set << good_feature
+        @template = @template_class.new @config
+        @template.capabilities.should == [{:name => "ID_CAP_NETWORKING"}]
+      end
     end
+  end
+
+  describe "with a good config object" do
+
+    describe "on rendering" do
+
+      it "should render a valid wp7 manifest" do
+        @config = Confetti::Config.new "#{fixture_dir}/config.xml"
+        @template = @template_class.new @config 
+        @template.render.should == File.read(
+            "#{fixture_dir}/windowsphone7/WMAppManifest.xml"
+          )
+      end
+
+      it "should add a feature when a valid on is found" do
+        @config = Confetti::Config.new
+        feature = Confetti::Config::Feature.new(
+            "http://api.phonegap.com/1.0/geolocation",
+            "true"
+            )
+        @config.feature_set << feature 
+        @template = @template_class.new @config
+        @template.capabilities.should == [{:name=>"ID_CAP_LOCATION"}]
+      end
+
+      it "should add default capabilities when none are specified" do
+        @config = Confetti::Config.new
+        @template = @template_class.new @config
+        @template.capabilities.should == [
+            {:name => "ID_CAP_CONTACTS"},
+            {:name => "ID_CAP_IDENTITY_DEVICE"},
+            {:name => "ID_CAP_ISV_CAMERA"},
+            {:name => "ID_CAP_LOCATION"},
+            {:name => "ID_CAP_MICROPHONE"},
+            {:name => "ID_CAP_NETWORKING"},
+            {:name => "ID_HW_FRONTCAMERA"},
+        ]
+      end
 
-    it "should render" do
-      @template = @template_class.new @config 
-      @template.render.should == File.read(
-          "#{fixture_dir}/windowsphone7/WMAppManifest.xml"
-        )
+      it "should no add any capabilities when preference permissions is none" do
+        @config = Confetti::Config.new
+        @template = @template_class.new @config
+        @config.preference_set <<
+            Confetti::Config::Preference.new("permissions", "none")
+        @template.capabilities.should == []
+      end
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 6
-  version: 0.7.6
+  - 7
+  version: 0.7.7
 platform: ruby
 authors: 
 - Andrew Lunny
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-18 00:00:00 -07:00
+date: 2012-04-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency