From ab7b7de60a81f2186b0918fb4e07d26d8c984fd0 Mon Sep 17 00:00:00 2001 From: erwanlr Date: Thu, 1 Jan 2015 19:45:10 +0100 Subject: [PATCH] Detects version in a release date format - Fixes #745 --- lib/common/models/wp_item/versionable.rb | 2 +- .../samples/common/models/wp_item/versionable/s2member.txt | 5 +++++ spec/shared_examples/wp_item_versionable.rb | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 spec/samples/common/models/wp_item/versionable/s2member.txt diff --git a/lib/common/models/wp_item/versionable.rb b/lib/common/models/wp_item/versionable.rb index 4b61d323..e25eb238 100755 --- a/lib/common/models/wp_item/versionable.rb +++ b/lib/common/models/wp_item/versionable.rb @@ -13,7 +13,7 @@ class WpItem # This check is needed because readme_url can return nil if has_readme? response = Browser.get(readme_url) - @version = response.body[%r{(?:stable tag|version): #{WpVersion.version_pattern}}i, 1] + @version = response.body[%r{(?:stable tag|version): ([0-9.]+)}i, 1] end end @version diff --git a/spec/samples/common/models/wp_item/versionable/s2member.txt b/spec/samples/common/models/wp_item/versionable/s2member.txt new file mode 100644 index 00000000..284e00fd --- /dev/null +++ b/spec/samples/common/models/wp_item/versionable/s2member.txt @@ -0,0 +1,5 @@ +Version: 141007 +Stable tag: 141007 + +Tested up to: 4.0 +Requires at least: 3.3 \ No newline at end of file diff --git a/spec/shared_examples/wp_item_versionable.rb b/spec/shared_examples/wp_item_versionable.rb index d9e4c47f..afe8fa80 100644 --- a/spec/shared_examples/wp_item_versionable.rb +++ b/spec/shared_examples/wp_item_versionable.rb @@ -40,6 +40,13 @@ shared_examples 'WpItem::Versionable' do @expected = '5.1.15' end end + + context 'when version is in a release date format' do + it 'detects and returns it' do + @file = '/s2member.txt' + @expected = '141007' + end + end end end end