From 884f64addb42b4941f28e94e7636778026563577 Mon Sep 17 00:00:00 2001
From: Christian Mehlmauer <firefart@gmail.com>
Date: Wed, 18 Feb 2015 18:37:47 +0100
Subject: [PATCH] move version detection to seperate function and change line
 endings

---
 lib/common/models/wp_item/versionable.rb | 99 +++++++++++++-----------
 1 file changed, 53 insertions(+), 46 deletions(-)

diff --git a/lib/common/models/wp_item/versionable.rb b/lib/common/models/wp_item/versionable.rb
index 483e0f3e..891d51a4 100755
--- a/lib/common/models/wp_item/versionable.rb
+++ b/lib/common/models/wp_item/versionable.rb
@@ -1,46 +1,53 @@
-# encoding: UTF-8
-
-class WpItem
-  attr_writer :version
-
-  module Versionable
-
-    # Get the version from the readme.txt
-    #
-    # @return [ String ] The version number
-    def version
-      unless @version
-        # This check is needed because readme_url can return nil
-        if has_readme?
-          response = Browser.get(readme_url)
-          version = response.body[/\b(?:stable tag|version):\s*(?!trunk)([0-9a-z\.-]+)/i, 1]
-          if version.nil? || version !~ /[0-9]+/
-            extracted_versions = response.body.scan(/[=]+\s+(?:v(?:ersion)?\s*)?([0-9\.-]+)[ \ta-z0-9\(\)\.-]*[=]+/i)
-            return if extracted_versions.nil? || extracted_versions.length == 0
-            extracted_versions.flatten!
-            # must contain at least one number
-            extracted_versions = extracted_versions.select { |x| x =~ /[0-9]+/ }
-            sorted = extracted_versions.sort { |x,y|
-              begin
-                Gem::Version.new(x) <=> Gem::Version.new(y)
-              rescue
-                0
-              end
-            }
-            @version = sorted.last
-          else
-            @version = version
-          end
-        end
-      end
-      @version
-    end
-
-    # @return [ String ]
-    def to_s
-      item_version = self.version
-      "#@name#{' - v' + item_version.strip if item_version}"
-    end
-
-  end
-end
+# encoding: UTF-8
+
+class WpItem
+  attr_writer :version
+
+  module Versionable
+
+    # Get the version from the readme.txt
+    #
+    # @return [ String ] The version number
+    def version
+      unless @version
+        # This check is needed because readme_url can return nil
+        if has_readme?
+          response = Browser.get(readme_url)
+          @version = extract_version(response.body)
+        end
+      end
+      @version
+    end
+
+    # @return [ String ]
+    def to_s
+      item_version = self.version
+      "#@name#{' - v' + item_version.strip if item_version}"
+    end
+
+    # Extracts the version number from a given string/body
+    #
+    # @return [ String ] detected version
+    def extract_version(body)
+      version = body[/\b(?:stable tag|version):\s*(?!trunk)([0-9a-z\.-]+)/i, 1]
+      if version.nil? || version !~ /[0-9]+/
+        extracted_versions = body.scan(/[=]+\s+(?:v(?:ersion)?\s*)?([0-9\.-]+)[ \ta-z0-9\(\)\.-]*[=]+/i)
+        return if extracted_versions.nil? || extracted_versions.length == 0
+        extracted_versions.flatten!
+        # must contain at least one number
+        extracted_versions = extracted_versions.select { |x| x =~ /[0-9]+/ }
+        sorted = extracted_versions.sort { |x,y|
+          begin
+            Gem::Version.new(x) <=> Gem::Version.new(y)
+          rescue
+            0
+          end
+        }
+        return sorted.last
+      else
+        return version
+      end
+    end
+
+  end
+end