confetti 0.2.1 → 0.2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    confetti (0.2.0)
+    confetti (0.2.2)
       mustache (= 0.11.2)
       thor (= 0.14.3)
 
@@ -43,6 +43,4 @@ DEPENDENCIES
   aruba
   confetti!
   cucumber
-  mustache (= 0.11.2)
   rspec (~> 2.1.0)
-  thor (= 0.14.3)

data/features/blackberry.feature

@@ -6,4 +6,4 @@ Feature: Blackberry
 	Scenario: I need a (BB widget) config.xml
 		When I have a config.xml file
 		And I run "confetti generate blackberry_widgets_config"
-		Then a file named "bb-config.xml" should exist
+		Then a file named "config.xml" should exist

data/lib/confetti/config.rb

@@ -68,6 +68,8 @@ module Confetti
           @icon_set << Icon.new(attr["src"], attr["height"], attr["width"], extras)
         when "feature"
           @feature_set  << Feature.new(attr["name"], attr["required"])
+        when "license"
+          @license = License.new(ele.text.strip, attr["href"])
         end
       end
     end

data/lib/confetti/templates/blackberry_widgets_config.mustache

@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Widget Configuration Reference: http://docs.blackberry.com/en/developers/deliverables/15274/ -->
 <widget xmlns="http://www.w3.org/ns/widgets" xmlns:rim="http://www.blackberry.com/ns/widgets" 
-  version="{{ widget_version }}" 
+  version="2.0" 
   id="{{ widget_id }}">
 <name>{{ widget_name }}</name>
 <author href="{{ author_href }}" email="{{ author_email }}">{{ author_name }}</author>
 <description>{{ widget_description }}</description>
-<license></license>
+<license href="{{ license_href }}">{{ license_text }}</license>
 <feature id="blackberry.system" required="true" version="1.0.0.0"/>
 <feature id="phonegap" required="false" version="1.0.0"/>
 <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"/>
 <content src="index.html"/>

data/lib/confetti/templates/blackberry_widgets_config.rb

@@ -1,10 +1,6 @@
 module Confetti
   module Template
     class BlackberryWidgetsConfig < Base
-      def widget_version
-        @config.version
-      end
-
       def widget_id
         @config.package
       end
@@ -29,8 +25,16 @@ module Confetti
         @config.description
       end
 
+      def license_href
+        @config.license.href
+      end
+
+      def license_text
+        @config.license.text
+      end
+
       def output_filename
-        "bb-config.xml"
+        "config.xml"
       end
     end
   end

data/lib/confetti/version.rb

@@ -1,3 +1,3 @@
 module Confetti
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/fixtures/blackberry_widget_config_expected.xml

@@ -1,16 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Widget Configuration Reference: http://docs.blackberry.com/en/developers/deliverables/15274/ -->
 <widget xmlns="http://www.w3.org/ns/widgets" xmlns:rim="http://www.blackberry.com/ns/widgets" 
-  version="1.0.0" 
+  version="2.0" 
   id="com.alunny.confetti">
 <name>Confetti Sample App</name>
 <author href="http://alunny.github.com" email="alunny@gmail.com">Andrew Lunny</author>
 <description>This is a sample config.xml for integration testing with Confetti</description>
-<license></license>
+<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>
 <feature id="blackberry.system" required="true" version="1.0.0.0"/>
 <feature id="phonegap" required="false" version="1.0.0"/>
 <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"/>
 <content src="index.html"/>

data/spec/fixtures/blackberry_widget_config_spec.xml

@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Widget Configuration Reference: http://docs.blackberry.com/en/developers/deliverables/15274/ -->
 <widget xmlns="http://www.w3.org/ns/widgets" xmlns:rim="http://www.blackberry.com/ns/widgets" 
-  version="1.0.0" 
+  version="2.0" 
   id="com.whoever.awesome.app">
 <name>Awesome App</name>
 <author href="http://brucelee.cn" email="blee@hotmail.com">Bruce Lee</author>
 <description>My New App, by Bruce Lee</description>
-<license></license>
+<license href=""></license>
 <feature id="blackberry.system" required="true" version="1.0.0.0"/>
 <feature id="phonegap" required="false" version="1.0.0"/>
 <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"/>
 <content src="index.html"/>

data/spec/fixtures/config.xml

@@ -9,6 +9,28 @@
 		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

data/spec/integration_spec.rb

@@ -52,7 +52,7 @@ describe 'Writing Output' do
   end
 
   context "Blackberry Widgets" do
-    it "should read config.xml and spit out bb-config.xml" do
+    it "should read config.xml and spit out config.xml" do
       @output_file = "#{ fixture_dir }/blackberry_widget_config_output.xml"
       @config.write_blackberry_widgets_config @output_file
 

data/spec/templates/blackberry_widget_config_spec.rb

@@ -18,18 +18,19 @@ describe Confetti::Template::BlackberryWidgetsConfig do
   describe "templated attributes" do
     subject { @template = @template_class.new }
 
-    it { should respond_to :widget_version }
     it { should respond_to :widget_id }
     it { should respond_to :widget_name }
     it { should respond_to :author_name }
     it { should respond_to :author_email }
     it { should respond_to :author_href }
     it { should respond_to :widget_description }
+    it { should respond_to :license_text }
+    it { should respond_to :license_href }
   end
 
   describe "default values" do
-    it "should define output filename as \"bb-config.xml\"" do
-      @template_class.new.output_filename.should == "bb-config.xml"
+    it "should define output filename as \"config.xml\"" do
+      @template_class.new.output_filename.should == "config.xml"
     end
   end
 
@@ -64,10 +65,6 @@ describe Confetti::Template::BlackberryWidgetsConfig do
         @template.widget_name.should == "Awesome App"
       end
 
-      it "should set version correctly" do
-        @template.widget_version.should == "1.0.0"
-      end
-
       it "should set description correctly" do
         @template.widget_description.should == "My New App, by Bruce Lee"
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: confetti
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Andrew Lunny
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 -07:00
+date: 2011-03-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -212,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: confetti
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Generate mobile app config files