Moves Models into their own namespace - Ref #1315

lib/wpscan/finders/dynamic_finder/version/finder.rb

@@ -9,9 +9,9 @@ module WPScan
 
           # @param [ String ] number
           # @param [ Hash ] finding_opts
-          # @return [ WPScan::Version ]
+          # @return [ Model::Version ]
           def create_version(number, finding_opts)
-            WPScan::Version.new(number, version_finding_opts(finding_opts))
+            Model::Version.new(number, version_finding_opts(finding_opts))
           end
 
           # @param [ Hash ] opts

lib/wpscan/finders/dynamic_finder/wp_items/finder.rb

@@ -31,7 +31,7 @@ module WPScan
               configs.each do |klass, config|
                 item = process_response(opts, target.homepage_res, slug, klass, config)
 
-                found << item if item.is_a?(WpItem)
+                found << item if item.is_a?(Model::WpItem)
               end
             end
 
@@ -70,7 +70,7 @@ module WPScan
 
                 item = process_response(opts, response, slug, klass, config)
 
-                found << item if item.is_a?(WpItem)
+                found << item if item.is_a?(Model::WpItem)
               end
             end
 

lib/wpscan/finders/dynamic_finder/wp_version.rb

@@ -4,9 +4,9 @@ module WPScan
       module WpVersion
         module Finder
           def create_version(number, finding_opts)
-            return unless WPScan::WpVersion.valid?(number)
+            return unless Model::WpVersion.valid?(number)
 
-            WPScan::WpVersion.new(number, version_finding_opts(finding_opts))
+            Model::WpVersion.new(number, version_finding_opts(finding_opts))
           end
         end
 

lib/wpscan/finders/finder/wp_version/smart_url_checker.rb

@@ -7,7 +7,7 @@ module WPScan
           include CMSScanner::Finders::Finder::SmartURLChecker
 
           def create_version(number, opts = {})
-            WPScan::WpVersion.new(
+            Model::WpVersion.new(
               number,
               found_by: opts[:found_by] || found_by,
               confidence: opts[:confidence] || 80,

lib/wpscan/target.rb

@@ -21,7 +21,7 @@ module WPScan
 
     # @return [ XMLRPC, nil ]
     def xmlrpc
-      @xmlrpc ||= interesting_findings&.select { |f| f.is_a?(WPScan::XMLRPC) }&.first
+      @xmlrpc ||= interesting_findings&.select { |f| f.is_a?(Model::XMLRPC) }&.first
     end
 
     # @param [ Hash ] opts