confetti 0.3.7 → 0.3.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    confetti (0.3.6)
+    confetti (0.3.8)
       mustache (~> 0.11.2)
       thor (~> 0.14.3)
 
@@ -25,14 +25,14 @@ GEM
       term-ansicolor (~> 1.0.5)
     json (1.4.6)
     mustache (0.11.2)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
+    rspec-mocks (2.6.0)
     term-ansicolor (1.0.5)
     thor (0.14.6)
 
@@ -43,4 +43,4 @@ DEPENDENCIES
   aruba
   confetti!
   cucumber
-  rspec (~> 2.1.0)
+  rspec (~> 2.6.0)

data/confetti.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency "mustache", "~> 0.11.2"
   s.add_dependency "thor", "~> 0.14.3"
 
-  s.add_development_dependency "rspec", "~> 2.1.0"
+  s.add_development_dependency "rspec", "~> 2.6.0"
   s.add_development_dependency "cucumber"
   s.add_development_dependency "aruba"
 end

data/lib/confetti.rb

@@ -29,5 +29,7 @@ Dir[File.join(CURRENT_DIR, 'confetti', 'templates', '*')].each do |file|
 end
 require 'confetti/template_helper'
 
+require 'confetti/cli'
+
 require 'confetti/config'
 require 'confetti/config/feature'

data/lib/confetti/cli.rb

@@ -11,8 +11,10 @@ module Confetti
 
       begin
         config.send msg
-      rescue
-        fail "Confetti Failed: format #{ output_file } unsupported"
+      rescue Confetti::Config::FiletypeError
+        fail "Confetti failed: #{ output_file } unsupported"
+      rescue Confetti::Error => e
+        fail "Confetti Failed: #{ e.message }"
       end
     end
   end

data/lib/confetti/config.rb

@@ -8,15 +8,29 @@ module Confetti
 
     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
+                :splash_set, :plist_icon_set, :plugin_set
 
     generate_and_write  :android_manifest, :android_strings, :webos_appinfo,
                         :ios_info, :symbian_wrt_info, :blackberry_widgets_config
 
+    # handle bad generate/write calls
+    def method_missing(method_name, *args)
+      bad_call = /^(generate)|(write)_(.*)$/
+      matches = method_name.to_s.match(bad_call)
+
+      if matches
+        raise FiletypeError, "#{ matches[3] } not supported"
+      else
+        super method_name, *args
+      end
+    end
+
     # classes that represent child elements
     Author      = Class.new Struct.new(:name, :href, :email)
     Name        = Class.new Struct.new(:name, :shortname)
@@ -25,6 +39,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)
 
     def initialize(*args)
       @author           = Author.new
@@ -36,6 +51,7 @@ module Confetti
       @feature_set      = TypedSet.new Feature
       @splash_set       = TypedSet.new Image
       @preference_set   = TypedSet.new Preference
+      @plugin_set       = TypedSet.new Plugin
       @viewmodes        = []
 
       if args.length > 0 && is_file?(args.first)
@@ -65,33 +81,46 @@ module Confetti
       config_doc.elements.each do |ele|
         attr = ele.attributes
 
-        case ele.name
-        when "name"
-          @name = Name.new(ele.text.nil? ? "" : ele.text.strip, attr["shortname"])
-        when "author"
-          @author = Author.new(ele.text.nil? ? "" : ele.text.strip, attr["href"], attr["email"])
-        when "description"
-          @description = ele.text.nil? ? "" : ele.text.strip
-        when "icon"
-          extras = grab_extras attr
-          @icon_set << Image.new(attr["src"], attr["height"], attr["width"], extras)
-          # used for the info.plist file
-          @plist_icon_set << attr["src"]
-        when "splash"
-          extras = grab_extras attr
-          @splash_set << Image.new(attr["src"], attr["height"], attr["width"], extras)
-        when "feature"
-          @feature_set  << Feature.new(attr["name"], attr["required"])
-        when "preference"
-          @preference_set << Preference.new(attr["name"], attr["value"], attr["readonly"])
-        when "license"
-          @license = License.new(ele.text.nil? ? "" : ele.text.strip, attr["href"])
+        case ele.namespace
+
+        # W3C widget elements
+        when "http://www.w3.org/ns/widgets"
+          case ele.name
+          when "name"
+            @name = Name.new(ele.text.nil? ? "" : ele.text.strip, attr["shortname"])
+          when "author"
+            @author = Author.new(ele.text.nil? ? "" : ele.text.strip, attr["href"], attr["email"])
+          when "description"
+            @description = ele.text.nil? ? "" : ele.text.strip
+          when "icon"
+            extras = grab_extras attr
+            @icon_set << Image.new(attr["src"], attr["height"], attr["width"], extras)
+            # used for the info.plist file
+            @plist_icon_set << attr["src"]
+          when "feature"
+            @feature_set  << Feature.new(attr["name"], attr["required"])
+          when "preference"
+            @preference_set << Preference.new(attr["name"], attr["value"], attr["readonly"])
+          when "license"
+            @license = License.new(ele.text.nil? ? "" : ele.text.strip, attr["href"])
+          end
+
+        # PhoneGap extensions (gap:)
+        when "http://phonegap.com/ns/1.0"
+          case ele.name
+          when "splash"
+            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
+    end
 
-  end
-
-  def icon
+    def icon
       @icon_set.first
     end
 
@@ -132,5 +161,13 @@ 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
   end
 end

data/lib/confetti/version.rb

@@ -1,3 +1,3 @@
 module Confetti
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

data/spec/cli_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Confetti::CLI do
+  include HelpfulPaths
+
+  describe "generate method" do
+    before do
+      Dir.stub(:pwd).and_return(fixture_dir)
+      @cli = Confetti::CLI.new
+      Confetti::Config.any_instance.stub(:open)
+    end
+
+    describe "with a correct ouput file" do
+      it "should not raise an error" do
+        lambda { @cli.generate "android_manifest" }.should_not raise_error
+      end
+    end
+
+    describe "with an unsupported output file" do
+      it "should raise the correct error" do
+        lambda { 
+          @cli.generate "mgm_dvd"
+        }.should raise_error RuntimeError,
+                            "Confetti failed: mgm_dvd unsupported"
+      end
+    end
+  end
+end

data/spec/config_spec.rb

@@ -329,6 +329,32 @@ describe Confetti::Config do
           features_names.should include "http://api.phonegap.com/1.0/notification"
         end
       end
+
+      describe "plugins" do
+        it "should append plugins to the plugin set" do
+          @config.plugin_set.size.should be 1
+        end
+
+        describe "created object" do
+          before do
+            @plugin = @config.plugin_set.first
+          end
+
+          it "should have the right name" do
+            @plugin.name.should == "ChildBrowser"
+          end
+
+          it "should have the right value" do
+            package = "com.phonegap.plugins.childBrowser.ChildBrowser"
+            @plugin.value.should == package
+          end
+
+          it "should have the right platforms" do
+            @plugin.platforms.size.should be 1
+            @plugin.platforms.first.should be :android
+          end
+        end
+      end
     end
   end
 

data/spec/fixtures/config.xml

@@ -46,4 +46,9 @@ THE SOFTWARE.</license>
 	<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"/>
+
+  <gap:plugin name="ChildBrowser"
+              value="com.phonegap.plugins.childBrowser.ChildBrowser">
+    <platform name="android" />
+  </gap:plugin>
 </widget>

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: confetti
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: false
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Andrew Lunny
@@ -17,18 +16,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-30 00:00:00 -07:00
+date: 2011-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mustache
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 55
         segments: 
         - 0
         - 11
@@ -40,11 +37,9 @@ dependencies:
   name: thor
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 33
         segments: 
         - 0
         - 14
@@ -56,27 +51,23 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 2
-        - 1
+        - 6
         - 0
-        version: 2.1.0
+        version: 2.6.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -86,11 +77,9 @@ dependencies:
   name: aruba
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -147,6 +136,7 @@ files:
 - lib/confetti/templates/webos_appinfo.rb
 - lib/confetti/version.rb
 - lib/typedset.rb
+- spec/cli_spec.rb
 - spec/config/config_author_spec.rb
 - spec/config/config_content_spec.rb
 - spec/config/config_feature_spec.rb
@@ -204,27 +194,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: confetti
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Generate mobile app config files
@@ -237,6 +223,7 @@ test_files:
 - features/support/setup.rb
 - features/symbian.wrt.feature
 - features/webos.feature
+- spec/cli_spec.rb
 - spec/config/config_author_spec.rb
 - spec/config/config_content_spec.rb
 - spec/config/config_feature_spec.rb