validates_im 1.0.0 → 2.0.0

data/lib/xbox_live_validator.rb

@@ -1,23 +1,36 @@
+# frozen_string_literal: true
+
 # Validates Xbox Live gamertags. From the Xbox Live website:
 #
-# bq. Gamertags can only contain letters, numbers, and spaces, and can't begin
-# with a number.
+# > Gamertags can only contain letters, numbers, and spaces, and can't begin
+# > with a number.
 #
-# In addition we discovered that they have no minimum length but are no more
-# than 15 characters, and also cannot start with a space.
+# Xbox gamertags are 3-12 characters and cannot start with a space.
 #
 # The following error message keys are used to localize invalid screen names.
 #
-# | @xbox_too_long@ | Gamertag is over 15 characters. |
-# | @xbox_invalid_chars@ | Gamertag contains invalid characters. |
-# | @xbox_invalid_first_char@ | Gamertag doesn't start with a letter. |
+# |                           |                                       |
+# |:--------------------------|:--------------------------------------|
+# | `xbox_too_short`          | Gamertag is under 3 characters.       |
+# | `xbox_too_long`           | Gamertag is over 12 characters.       |
+# | `xbox_invalid_chars`      | Gamertag contains invalid characters. |
+# | `xbox_invalid_first_char` | Gamertag doesn't start with a letter. |
 #
 # @example
 #   validates :steam_account, steam: true
+#
+# Options
+# -------
+#
+# |              |                                                  |
+# |:-------------|:-------------------------------------------------|
+# | `:message`   | A custom message to use if the email is invalid. |
+# | `:allow_nil` | If true, `nil` values are allowed.               |
 
 class XboxLiveValidator < AccountNameValidator
-  error_key_prefix 'xbox'
-  max_length 15
-  valid_chars 'A-Za-z0-9 '
-  first_char 'A-Za-z'
+  error_key_prefix "xbox"
+  min_length 3
+  max_length 12
+  valid_chars "A-Za-z0-9 "
+  first_char "A-Za-z"
 end

data/lib/yahoo_im_validator.rb

@@ -1,30 +1,37 @@
+# frozen_string_literal: true
+
 # Validates Yahoo! Instant Messenger screen names. According to the Yahoo!
 # website:
 #
-# bq. Use 4 to 32 characters and start with a letter. You may use letters,
-# numbers, underscores, and one dot (.).
+# > Use 4 to 32 characters and start with a letter. You may use letters,
+# > numbers, underscores, and one dot (.).
 #
 # The following error message keys are used to localize invalid screen names:
 #
-# | @yim_too_short@ | Screen name is less than 3 characters. |
-# | @yim_too_long@ | Screen name is over 16 characters. |
-# | @yim_invalid_chars@ | Screen name contains invalid characters. |
-# | @yim_invalid_first_char@ | Screen name doesn't start with a letter. |
-# | @yim_multiple_periods@ | Screen name has more than one period in it. |
+# |                          |                                             |
+# |:-------------------------|:--------------------------------------------|
+# | `yim_too_short`          | Screen name is fewer than 3 characters.     |
+# | `yim_too_long`           | Screen name is over 16 characters.          |
+# | `yim_invalid_chars`      | Screen name contains invalid characters.    |
+# | `yim_invalid_first_char` | Screen name doesn't start with a letter.    |
+# | `yim_multiple_periods`   | Screen name has more than one period in it. |
 #
 # @example
 #   validates :yim_sn, yahoo_im: true
 #
-# h2. Options
+# Options
+# -------
 #
-# | @:message@ | A custom message to use if the email is invalid. |
-# | @:allow_nil@ | If true, @nil@ values are allowed. |
+# |              |                                                  |
+# |:-------------|:-------------------------------------------------|
+# | `:message`   | A custom message to use if the email is invalid. |
+# | `:allow_nil` | If true, `nil` values are allowed.               |
 
 class YahooImValidator < AccountNameValidator
-  error_key_prefix 'yim'
+  error_key_prefix "yim"
   min_length 4
   max_length 32
   valid_chars 'A-Za-z0-9_\\.'
-  first_char 'A-Za-z'
-  add_validation(:multiple_periods) { |value| value.count('.') < 2 }
+  first_char "A-Za-z"
+  add_validation(:multiple_periods) { |value| value.count(".") < 2 }
 end

data/validates_im.gemspec

@@ -1,63 +1,45 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{validates_im}
-  s.version = "1.0.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Tim Morgan"]
-  s.date = %q{2010-10-30}
-  s.description = %q{Adds ActiveModel validators for common instant messenging services like Skype and AIM.}
-  s.email = %q{git@timothymorgan.info}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.textile"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     ".rspec",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.textile",
-     "Rakefile",
-     "VERSION",
-     "lib/account_name_validator.rb",
-     "lib/aim_validator.rb",
-     "lib/skype_validator.rb",
-     "lib/steam_validator.rb",
-     "lib/validates_im.rb",
-     "lib/xbox_live_validator.rb",
-     "lib/yahoo_im_validator.rb",
-     "spec/account_name_validator_spec.rb",
-     "spec/spec_helper.rb",
-     "validates_im.gemspec"
-  ]
-  s.homepage = %q{http://github.com/riscfuture/validates_im}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A set of Rails validators for common instant messenging services}
-  s.test_files = [
-    "spec/account_name_validator_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 3.0"])
-    else
-      s.add_dependency(%q<activerecord>, [">= 3.0"])
-    end
-  else
-    s.add_dependency(%q<activerecord>, [">= 3.0"])
-  end
-end
+# frozen_string_literal: true
+
+require_relative "lib/validates_im/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "validates_im"
+  spec.version       = ValidatesIm::VERSION
+  spec.authors       = ["Tim Morgan"]
+  spec.email         = "git@timothymorgan.info"
+
+  spec.summary       = "A set of Rails validators for common instant messaging services"
+  spec.description   = "Adds ActiveModel validators for common instant messaging services like Discord, Telegram, Matrix, and Signal (as well as legacy services like AIM, Yahoo!, and Skype)."
+  spec.homepage      = "https://github.com/riscfuture/validates_im"
+  spec.license       = "MIT"
+
+  spec.required_ruby_version = ">= 3.1"
 
+  spec.metadata = {
+    "homepage_uri"          => spec.homepage,
+    "source_code_uri"       => "#{spec.homepage}/tree/master",
+    "changelog_uri"         => "#{spec.homepage}/blob/master/CHANGELOG.md",
+    "bug_tracker_uri"       => "#{spec.homepage}/issues",
+    "rubygems_mfa_required" => "true"
+  }
+
+  spec.files = Dir.chdir(__dir__) do
+    candidates =
+      if system("git rev-parse --is-inside-work-tree > /dev/null 2>&1")
+        `git ls-files -z`.split("\x0").reject do |f|
+          f.start_with?(".github/", "spec/", ".idea/", ".claude/", "bin/") ||
+            f.match?(/\A(?:Gemfile|Gemfile\.lock|Rakefile|\.rspec|\.rubocop\.yml|\.travis\.yml|\.ruby-(?:gemset|version)|\.gitignore|\.document)/)
+        end
+      else
+        Dir["lib/**/*.rb"] + %w[LICENSE README.md CHANGELOG.md validates_im.gemspec]
+      end
+    candidates.select { |f| File.exist?(f) } +
+      Dir["lib/**/*.rb"].reject { |f| candidates.include?(f) } +
+      %w[CHANGELOG.md].reject { |f| candidates.include?(f) || !File.exist?(f) }
+  end.uniq
+
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "activemodel",   ">= 6.1"
+  spec.add_dependency "activesupport", ">= 6.1"
+end

metadata

@@ -1,98 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: validates_im
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+version: !ruby/object:Gem::Version
+  version: 2.0.0
 platform: ruby
-authors: 
+authors:
 - Tim Morgan
-autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-30 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activerecord
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '6.1'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-description: Adds ActiveModel validators for common instant messenging services like Skype and AIM.
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.1'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.1'
+description: Adds ActiveModel validators for common instant messaging services like
+  Discord, Telegram, Matrix, and Signal (as well as legacy services like AIM, Yahoo!,
+  and Skype).
 email: git@timothymorgan.info
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.textile
-files: 
-- .document
-- .gitignore
-- .rspec
-- Gemfile
-- Gemfile.lock
+extra_rdoc_files: []
+files:
+- CHANGELOG.md
 - LICENSE
-- README.textile
-- Rakefile
-- VERSION
+- README.md
 - lib/account_name_validator.rb
 - lib/aim_validator.rb
+- lib/discord_validator.rb
+- lib/matrix_validator.rb
+- lib/signal_validator.rb
 - lib/skype_validator.rb
 - lib/steam_validator.rb
+- lib/telegram_validator.rb
 - lib/validates_im.rb
+- lib/validates_im/version.rb
 - lib/xbox_live_validator.rb
 - lib/yahoo_im_validator.rb
-- spec/account_name_validator_spec.rb
-- spec/spec_helper.rb
 - validates_im.gemspec
-has_rdoc: true
-homepage: http://github.com/riscfuture/validates_im
-licenses: []
-
-post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+homepage: https://github.com/riscfuture/validates_im
+licenses:
+- MIT
+metadata:
+  homepage_uri: https://github.com/riscfuture/validates_im
+  source_code_uri: https://github.com/riscfuture/validates_im/tree/master
+  changelog_uri: https://github.com/riscfuture/validates_im/blob/master/CHANGELOG.md
+  bug_tracker_uri: https://github.com/riscfuture/validates_im/issues
+  rubygems_mfa_required: 'true'
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -3410244154363929374
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '3.1'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.7
-signing_key: 
-specification_version: 3
-summary: A set of Rails validators for common instant messenging services
-test_files: 
-- spec/account_name_validator_spec.rb
-- spec/spec_helper.rb
+rubygems_version: 4.0.11
+specification_version: 4
+summary: A set of Rails validators for common instant messaging services
+test_files: []

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.gitignore

@@ -1,25 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-.rvmrc
-.bundle
-
-## PROJECT::DOCUMENTATION
-.yardoc
-doc

data/.rspec

@@ -1 +0,0 @@
--cfs

data/Gemfile

@@ -1,12 +0,0 @@
-source :rubygems
-
-# DEPENDENCIES
-gem 'activerecord', require: 'active_record'
-
-# DEVELOPMENT
-gem 'jeweler'
-gem 'yard'
-gem 'RedCloth', require: 'redcloth'
-
-# TEST
-gem 'rspec'

data/Gemfile.lock

@@ -1,50 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    RedCloth (4.2.3)
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-      arel (~> 1.0.0)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.1)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    gemcutter (0.6.1)
-    git (1.2.5)
-    i18n (0.4.2)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
-      git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    json_pure (1.4.6)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
-    tzinfo (0.3.23)
-    yard (0.6.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  RedCloth
-  activerecord
-  jeweler
-  rspec
-  yard

data/README.textile

@@ -1,40 +0,0 @@
-h1. validates_im -- Instant messenger account validations for ActiveRecord
-
-| *Author* | Tim Morgan |
-| *Version* | 1.0 (Oct 30, 2010) |
-| *License* | Released under the MIT license. |
-
-h2. About
-
-@validates_im@ is a simple gem that gives you some @EachValidators@ that you can
-use to validate instant messenger account names in your Rails 3.0 application.
-Validators are provided for the most common IM services, like AIM, Yahoo! IM,
-and Skype.
-
-h2. Installation
-
-*Important Note:* This gem is for Rails 3 only.
-
-To install, simply add this gem to your Rails project's @Gemfile@:
-
-<pre><code>
-gem 'validates_im'
-</code></pre>
-
-h2. Usage
-
-The IM validators are @EachValidators@, meant to be used with the @validates@
-method. An example:
-
-<pre><code>
-validates :screen_name,
-          aim: true,
-          presence: true
-</code></pre>
-
-The name of the symbol key is taken from the name of the validator; as such, The
-@XboxLiveValidator@ would be invoked using @:xbox_live@. See the
-{AccountNameValidator} class docs for more information.
-
-The localization keys for validation errors are listed in the documentation for
-each validator class.

data/Rakefile

@@ -1,35 +0,0 @@
-require 'rake'
-begin
-  require 'bundler'
-rescue LoadError
-  puts "Bundler is not installed; install with `gem install bundler`."
-  exit 1
-end
-
-Bundler.require :default
-
-Jeweler::Tasks.new do |gem|
-  gem.name = "validates_im"
-  gem.summary = %Q{A set of Rails validators for common instant messenging services}
-  gem.description = %Q{Adds ActiveModel validators for common instant messenging services like Skype and AIM.}
-  gem.email = "git@timothymorgan.info"
-  gem.homepage = "http://github.com/riscfuture/validates_im"
-  gem.authors = [ "Tim Morgan" ]
-  gem.add_dependency 'activerecord', '>= 3.0'
-end
-Jeweler::GemcutterTasks.new
-
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new
-
-YARD::Rake::YardocTask.new('doc') do |doc|
-  doc.options << "-m" << "textile"
-  doc.options << "--protected"
-  doc.options << "-r" << "README.textile"
-  doc.options << "-o" << "doc"
-  doc.options << "--title" << "validates_im Documentation".inspect
-  
-  doc.files = [ 'lib/*_validator.rb', 'README.textile' ]
-end
-
-task(default: :spec)

data/VERSION

@@ -1 +0,0 @@
-1.0.0

data/spec/account_name_validator_spec.rb

@@ -1,115 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-module SpecSupport
-  class TestAccountNameValidator < AccountNameValidator; end
-  class FakeModel
-    extend ActiveModel::Translation
-    def errors() @errors ||= ActiveModel::Errors.new(self) end
-    def self.lookup_ancestors() [ self ] end
-    def read_attribute_for_validation(_) "mock" end
-  end
-end
-
-describe AccountNameValidator do
-  before :each do
-    SpecSupport::TestAccountNameValidator.validations.clear
-    @model = SpecSupport::FakeModel.new
-  end
-
-  describe ".error_key_prefix" do
-    it "should be the downcased name of the validator by default" do
-      SpecSupport::TestAccountNameValidator.error_key_prefix.should eql(:test_account_name)
-    end
-
-    it "should be able to be set" do
-      SpecSupport::TestAccountNameValidator.error_key_prefix(:foo)
-      SpecSupport::TestAccountNameValidator.error_key_prefix.should eql(:foo)
-      SpecSupport::TestAccountNameValidator.instance_variable_set :@error_key_prefix, nil
-    end
-  end
-
-  describe "#validate_each" do
-    it "should do nothing if given nil and :allow_nil is set" do
-      SpecSupport::TestAccountNameValidator.new(attributes: :field, allow_nil: true).validate_each(@model, :field, nil)
-      @model.errors.should be_empty
-    end
-
-    it "should do nothing if given a blank value and :allow_blank is set" do
-      SpecSupport::TestAccountNameValidator.new(attributes: :field, allow_blank: true).validate_each(@model, :field, "")
-      @model.errors.should be_empty
-    end
-
-    it "should add an error to the record if any validation fails" do
-      SpecSupport::TestAccountNameValidator.add_validation(:not_foo) { |value| value == 'foo' }
-      SpecSupport::TestAccountNameValidator.new(attributes: :field).validate_each(@model, :field, 'bar')
-      @model.errors[:field].should_not be_empty
-      @model.errors[:field].first.should include('test_account_name_not_foo')
-    end
-
-    it "should use a :message option for the message" do
-      SpecSupport::TestAccountNameValidator.add_validation(:not_foo) { |value| value == 'foo' }
-      SpecSupport::TestAccountNameValidator.new(attributes: :field, message: 'bar').validate_each(@model, :field, 'bar')
-      @model.errors[:field].should eql([ 'bar' ])
-    end
-    
-    it "should typecast the value to a string" do
-      SpecSupport::TestAccountNameValidator.add_validation(:not_foo) { |value| value == 'foo' }
-      SpecSupport::TestAccountNameValidator.new(attributes: :field).validate_each(@model, :field, :foo)
-      @model.errors.should be_empty
-    end
-  end
-
-  describe ".add_validation" do
-    before :each do
-      @validator = SpecSupport::TestAccountNameValidator.new(attributes: :field)
-    end
-
-    it "should add a validation block" do
-      SpecSupport::TestAccountNameValidator.add_validation(:not_foo) { |value| value == 'foo' }
-      @validator.validate_each(@model, :field, 'bar')
-      @model.errors[:field].should_not be_empty
-    end
-
-    it "should do nothing if no block is given" do
-      SpecSupport::TestAccountNameValidator.add_validation(:not_foo)
-      @validator.validate_each(@model, :field, 'bar')
-      @model.errors[:field].should be_empty
-    end
-  end
-
-  describe ".min_length" do
-    it "should ensure a minimum length" do
-      SpecSupport::TestAccountNameValidator.min_length 5
-      SpecSupport::TestAccountNameValidator.new(attributes: :field).validate_each(@model, :field, '1234')
-      @model.errors[:field].should_not be_empty
-      @model.errors[:field].first.should include('too_short')
-    end
-  end
-
-  describe ".max_length" do
-    it "should ensure a maximum length" do
-      SpecSupport::TestAccountNameValidator.max_length 5
-      SpecSupport::TestAccountNameValidator.new(attributes: :field).validate_each(@model, :field, '123456')
-      @model.errors[:field].should_not be_empty
-      @model.errors[:field].first.should include('too_long')
-    end
-  end
-
-  describe ".valid_chars" do
-    it "should check for invalid chars" do
-      SpecSupport::TestAccountNameValidator.valid_chars '[A-Z]'
-      SpecSupport::TestAccountNameValidator.new(attributes: :field).validate_each(@model, :field, 'A!Z')
-      @model.errors[:field].should_not be_empty
-      @model.errors[:field].first.should include('invalid_chars')
-    end
-  end
-
-  describe ".first_char" do
-    it "should check for an invalid first character" do
-      SpecSupport::TestAccountNameValidator.first_char '[A-Z]'
-      SpecSupport::TestAccountNameValidator.new(attributes: :field).validate_each(@model, :field, 'abc')
-      @model.errors[:field].should_not be_empty
-      @model.errors[:field].first.should include('invalid_first_char')
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,10 +0,0 @@
-Bundler.require :default, :test
-
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'validates_im'
-
-RSpec.configure do |config|
-  
-end