Refactor theme config loading

app/lib/themes.rb

@@ -14,16 +14,20 @@ class Themes
     result = Hash.new
     Dir.glob(Rails.root.join('app', 'javascript', 'flavours', '*', 'theme.yml')) do |path|
       data = YAML.load_file(path)
+      next unless data['pack']
+
       dir = File.dirname(path)
       name = File.basename(dir)
       locales = []
       screenshots = []
+
       if data['locales']
         Dir.glob(File.join(dir, data['locales'], '*.{js,json}')) do |locale|
           localeName = File.basename(locale, File.extname(locale))
           locales.push(localeName) unless localeName.match(/defaultMessages|whitelist|index/)
         end
       end
+
       if data['screenshot']
         if data['screenshot'].is_a? Array
           screenshots = data['screenshot']
@@ -31,20 +35,20 @@ class Themes
           screenshots.push(data['screenshot'])
         end
       end
-      if data['pack']
+
       data['name'] = name
       data['locales'] = locales
       data['screenshot'] = screenshots
       data['skin'] = { 'default' => [] }
       result[name] = data
     end
-    end
 
     Dir.glob(Rails.root.join('app', 'javascript', 'skins', '*', '*')) do |path|
       ext = File.extname(path)
       skin = File.basename(path)
       name = File.basename(File.dirname(path))
-      if result[name]
+      next unless result[name]
+
       if File.directory?(path)
         pack = []
         Dir.glob(File.join(path, '*.{css,scss}')) do |sheet|
@@ -54,15 +58,14 @@ class Themes
         skin = File.basename(path, ext)
         pack = ['common']
       end
+
       if skin != 'default'
         result[name]['skin'][skin] = pack
       end
     end
-    end
 
     @core = core
     @conf = result
-
   end
 
   def core