confetti 0.2.5 → 0.2.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    confetti (0.2.5)
+    confetti (0.2.6)
       mustache (= 0.11.2)
       thor (= 0.14.3)
 

data/lib/confetti/templates/android_manifest.rb

@@ -15,11 +15,7 @@ module Confetti
       }
 
       def package_name
-        if @config
-          if is_java_package_id(@config.package)
-            @config.package
-          end
-        end
+        convert_to_java_package_id(@config.package)
       end
 
       def class_name

data/lib/confetti/templates/java_checks.rb

@@ -6,7 +6,10 @@ module Confetti
       end
 
       def convert_to_java_identifier(str)
-        str.sub(/^\d/,"_").gsub(/\s/,"").gsub(/[^a-zA-Z0-9_]/,"_")
+        str.
+          sub(/^\d/,"_").
+          gsub(/\s/,"").
+          gsub(/[^a-zA-Z0-9_]/,"_")
       end
 
       def is_java_package_id(str)
@@ -15,6 +18,19 @@ module Confetti
         # second param to #split ensures can't be dot-terminated
         components.length > 1 and components.all? { |s| is_java_identifier(s) }
       end
+
+      def convert_to_java_package_id(str)
+        return str if is_java_package_id(str)
+
+        bits = str.split('.', -1)
+        fixed_bits = bits.reject {|cmp| cmp.empty? }.map do |cmp|
+          convert_to_java_identifier(cmp)
+        end
+
+        fixed_bits.unshift('com') if fixed_bits.length == 1
+
+        fixed_bits.join('.')
+      end
     end
   end
 end

data/lib/confetti/version.rb

@@ -1,3 +1,3 @@
 module Confetti
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/spec/templates/java_checks_spec.rb

@@ -59,5 +59,34 @@ describe Confetti::Template::JavaChecks do
     it "should not accept a single java identifier" do
       is_java_package_id("a27a4").should be_false
     end
+
+    it "should not accept a package with hypens in there" do
+      is_java_package_id("com.makalumedia.rock-am-ring").should be_false
+    end
+  end
+
+  describe "#convert_to_java_package_id" do
+    it "should not affect a valid package id" do
+      pkg = "com.alunny.foo"
+      convert_to_java_package_id(pkg).should == pkg
+    end
+
+    it "should strip out incorrect characters" do
+      pkg = "com.makalumedia.rock-am-ring"
+      fixed_pkg = "com.makalumedia.rock_am_ring"
+      convert_to_java_package_id(pkg).should == fixed_pkg
+    end
+
+    it "should strip out leading dots" do
+      pkg = ".com.alunny.foo"
+      fixed_pkg = "com.alunny.foo"
+      convert_to_java_package_id(pkg).should == fixed_pkg
+    end
+
+    it "should make sense of terrible identifiers" do
+      pkg = "http://BestBusU"
+      fixed_pkg = "com.http___BestBusU"
+      convert_to_java_package_id(pkg).should == fixed_pkg
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: confetti
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Andrew Lunny
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 -07:00
+date: 2011-05-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency