Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions app/models/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ class Version < ActiveRecord::Base

validate :platform_and_number_are_unique, on: :create
validate :authors_format, on: :create
validate :metadata_links_format

class AuthorType < Type::String
def cast_value(value)
if value.is_a?(Array)
Expand Down Expand Up @@ -360,4 +362,11 @@ def feature_release(number)
feature_version = Gem::Version.new(number).segments[0, 2].join('.')
Gem::Version.new(feature_version)
end

def metadata_links_format
Linkset::LINKS.each do |link|
errors.add(:metadata, "['#{link}'] does not appear to be a valid URL") if
metadata[link] && metadata[link] !~ Patterns::URL_VALIDATION_REGEXP
end
end
end
13 changes: 7 additions & 6 deletions lib/patterns.rb
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
module Patterns
extend ActiveSupport::Concern

SPECIAL_CHARACTERS = ".-_".freeze
ALLOWED_CHARACTERS = "[A-Za-z0-9#{Regexp.escape(SPECIAL_CHARACTERS)}]+".freeze
ROUTE_PATTERN = /#{ALLOWED_CHARACTERS}/
LAZY_ROUTE_PATTERN = /#{ALLOWED_CHARACTERS}?/
NAME_PATTERN = /\A#{ALLOWED_CHARACTERS}\Z/
GEM_NAME_BLACKLIST = %w(
SPECIAL_CHARACTERS = ".-_".freeze
ALLOWED_CHARACTERS = "[A-Za-z0-9#{Regexp.escape(SPECIAL_CHARACTERS)}]+".freeze
ROUTE_PATTERN = /#{ALLOWED_CHARACTERS}/
LAZY_ROUTE_PATTERN = /#{ALLOWED_CHARACTERS}?/
NAME_PATTERN = /\A#{ALLOWED_CHARACTERS}\Z/
URL_VALIDATION_REGEXP = %r{\Ahttps?:\/\/([^\s:@]+:[^\s:@]*@)?[A-Za-z\d\-]+(\.[A-Za-z\d\-]+)+\.?(:\d{1,5})?([\/?]\S*)?\z}
GEM_NAME_BLACKLIST = %w(
abbrev
base64
benchmark
Expand Down
23 changes: 23 additions & 0 deletions test/unit/version_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,29 @@ class VersionTest < ActiveSupport::TestCase
assert_equal @spec.required_ruby_version.to_s, @version.required_ruby_version
assert_equal @spec.required_rubygems_version.to_s, @version.required_rubygems_version
end

context "metadata" do
should "be invalid with empty string as link" do
assert_raise ActiveRecord::RecordInvalid do
@spec.metadata = { "home" => "" }
@version.update_attributes_from_gem_specification!(@spec)
end
end

should "be invalid with invalid link" do
assert_raise ActiveRecord::RecordInvalid do
@spec.metadata = { "home" => "http:/github.com/bestgemever" }
@version.update_attributes_from_gem_specification!(@spec)
end
end

should "be valid with valid link" do
assert_nothing_raised do
@spec.metadata = { "home" => "https://github.com/bestgemever" }
@version.update_attributes_from_gem_specification!(@spec)
end
end
end
end

context "indexes" do
Expand Down