lib/tasks/phonelib_tasks.rake in phonelib-0.0.2 vs lib/tasks/phonelib_tasks.rake in phonelib-0.1.0

@@ -8,62 +8,66 @@
 
     # get metadata from google
     url = 'http://libphonenumber.googlecode.com/svn/trunk/resources/PhoneNumberMetaData.xml'
     xml_data = Net::HTTP.get_response(URI.parse(url)).body
 
-    # save in file for backup
+    # save in file for debug
     File.open("data/PhoneNumberMetaData.xml", "w+") do |f|
       f.write(xml_data)
     end
 
-    # start parsing 
+    # start parsing
     doc = Nokogiri::XML(xml_data)
 
     main = doc.elements.first.elements.first
     countries = []
     main.elements.each do |el|
       # each country
       country = {}
-      el.attributes.each do |k, v| 
-        country[k.to_sym] = v.to_s
+      el.attributes.each do |k, v|
+        country[k.to_sym] = v.to_s.tr(" \n", "")
       end
 
       country[:types] = {}
 
-      el.children.each do | phone_type | 
-        if phone_type.name != 'comment' && phone_type.name != 'text'
-          phone_type_sym = phone_type.name.to_sym  
-           
+      el.children.each do | phone_type |
+        if !%w(comment text).include?(phone_type.name)
+          phone_type_sym = phone_type.name.to_sym
+
           if phone_type.name != 'availableFormats'
             country[:types][phone_type_sym] = {}
             phone_type.elements.each do |pattern|
-              country[:types][phone_type_sym][pattern.name.to_sym] = pattern.children.first.to_s.tr(" \n", "")
+              country[:types][phone_type_sym][pattern.name.to_sym] =
+                  pattern.children.first.to_s.tr(" \n", "")
             end
           else
             country[:formats] = []
             phone_type.children.each do |format|
-              
-              if format.name != 'text' && format.name != 'comment'
-                current_format = { regex: format.first[1].to_s.tr(" \n", "") }
 
+              if !%w(comment text).include?(format.name)
+                current_format = {}
+                format.each do |f|
+                  current_format[f[0].to_sym] = f[1]
+                end
+
                 format.children.each do |f|
                   if f.name != 'text'
                     current_format[f.name.to_sym] = f.children.first.to_s.tr(" \n", "")
                   end
                 end
 
-                country[:formats].push(current_format) 
+                country[:formats].push(current_format)
               end
-            end    
-          end  
-          
-        end 
+            end
+          end
+
+        end
       end
-      
-      countries.push(country)   
+
+      countries.push(country)
     end
     target = 'data/phone_data.yml'
     File.open(target, "w+") do |f|
       f.write(countries.to_yaml)
     end
   end
-end  
+end
\ No newline at end of file