Code cleanup

core/modules.rb

@@ -9,50 +9,56 @@ module BeEF
     # Return configuration hashes of all modules that are enabled
     # @return [Array] configuration hashes of all enabled modules
     def self.get_enabled
-      return BeEF::Core::Configuration.instance.get('beef.module').select {|k,v| v['enable'] == true and v['category'] != nil }
+      BeEF::Core::Configuration.instance.get('beef.module').select do |_k, v|
+        v['enable'] == true && !v['category'].nil?
+      end
     end
 
     # Return configuration hashes of all modules that are loaded
     # @return [Array] configuration hashes of all loaded modules
     def self.get_loaded
-      return BeEF::Core::Configuration.instance.get('beef.module').select {|k,v| v['loaded'] == true }
+      BeEF::Core::Configuration.instance.get('beef.module').select do |_k, v|
+        v['loaded'] == true
+      end
     end
 
     # Return an array of categories specified in module configuration files
     # @return [Array] all available module categories sorted alphabetically
     def self.get_categories
       categories = []
-      BeEF::Core::Configuration.instance.get('beef.module').each {|k,v|
-        flatcategory = ""
-        if v['category'].kind_of?(Array)
-          # Therefore this module has nested categories (sub-folders), munge them together into a string with '/' characters, like a folder.
-          v['category'].each {|cat|
-            flatcategory << cat + "/"
-          }
+      BeEF::Core::Configuration.instance.get('beef.module').each_value do |v|
+        flatcategory = ''
+        if v['category'].is_a?(Array)
+          # Therefore this module has nested categories (sub-folders),
+          # munge them together into a string with '/' characters, like a folder.
+          v['category'].each do |cat|
+            flatcategory << "#{cat}/"
+          end
         else
           flatcategory = v['category']
         end
-        if not categories.include?(flatcategory)
-          categories << flatcategory
-        end
-      }
-      return categories.sort.uniq #This is now uniqued, because otherwise the recursive function to build the json tree breaks if there are duplicates.
+        categories << flatcategory unless categories.include? flatcategory
+      end
+
+      # This is now uniqued, because otherwise the recursive function to build
+      # the json tree breaks if there are duplicates.
+      categories.sort.uniq
     end
 
     # Get all modules currently stored in the database
     # @return [Array] DataMapper array of all BeEF::Core::Models::CommandModule's in the database
     def self.get_stored_in_db
-      return BeEF::Core::Models::CommandModule.all(:order => [:id.asc])
+      BeEF::Core::Models::CommandModule.all(:order => [:id.asc])
     end
 
-    # Loads all enabled modules 
+    # Loads all enabled modules
     # @note API Fire: post_soft_load
     def self.load
       BeEF::Core::Configuration.instance.load_modules_config
-      self.get_enabled.each { |k,v|
-        BeEF::Module.soft_load(k)
-      }
-      BeEF::API::Registrar.instance.fire(BeEF::API::Modules, 'post_soft_load')
+      get_enabled.each_key do |k|
+        BeEF::Module.soft_load k
+      end
+      BeEF::API::Registrar.instance.fire BeEF::API::Modules, 'post_soft_load'
     end
   end
 end