rails_validation 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a389d0d19b46ee2decfcc88b2754df9cab1160fb
-  data.tar.gz: 6efab23503029cbff7c90462084f82c5724ed476
+  metadata.gz: 0a6430d0457190675c4c8b225d4d27d96f3dd968
+  data.tar.gz: bf919202e41dd1af795a2fc11af48951ae7f89da
 SHA512:
-  metadata.gz: 7b5bae3f292468b31726545577560ceb7fe6eb26a7a8446fb31906d414564b435dc5c85afce695ea42892d3bae631abcae2c98e3c5636e32a1c299f3401e954e
-  data.tar.gz: 630efab572e2f88be0215a50fef010bddbdc4749782be8efbe1ceb0953ea7f4a021d1fa10e302dba41f431b1d479b90f51d326b34e0e4ff027af30a104ace1fd
+  metadata.gz: f533787c7776c1d5eca670be4b9b82089b30813086b3d904cb839fca35f50675ab8d52ebafc1b3abc271b7d7109c132e724b35ca13ef71b730e3be121a111038
+  data.tar.gz: 5b079f2626f910d8b119caf1a78f534d11125fa9512ad671170d26d06f32efb0670b13ec62e75ec612e68988661f919ccdd027ba1bf9c3936ae2a63a441970c4

data/config/locales/en.yml

@@ -0,0 +1,10 @@
+en:
+  rails_validation:
+    email:
+      invalid: 'not a valid email address'
+    qq:
+      invalid: 'not a valid qq number'
+    phone:
+      invalid: 'not a valid phone number'
+    url_name:
+      invalid: 'url_name invalid'

data/config/locales/zh-CN.yml

@@ -0,0 +1,10 @@
+zh-CN:
+  rails_validations:
+    email:
+      invalid: '邮箱格式不正确'
+    qq:
+      invalid: 'qq格式不正确'
+    phone:
+      invalid: '手机号码格式不正确'
+    url_name:
+      invalid: 'url_name格式不正确'

data/lib/rails_validation.rb

@@ -1,4 +1,7 @@
-require 'validators/email_validator'
+require 'validations/email_validator'
+require 'validations/phone_validator'
+require 'validations/qq_validator'
+require 'validations/url_name_validator'
 I18n.load_path += Dir["#{File.dirname(__FILE__)}/../config/locales/*.yml"]
 module RailsValidations
 end

data/lib/validations/email_validator.rb

@@ -0,0 +1,22 @@
+# Validate email, works with UTF-8
+# The validation is intentionally simply, you can never be sure an email is
+# valid anyway (a user can mistype gmail as gmaill, for example).
+#
+# - User part: one or more alphabet character or number or _ or -.
+# - Domain part: one or more alphabet character or number or _ or -.
+# - tld part: 2 or more alphabet characters, numbers, or -
+class EmailValidator < ActiveModel::EachValidator
+  REGEXP = /^([a-zA-Z0-9_-])+@(([a-zA-Z0-9_-])+)((\.([a-zA-Z0-9_-])+)*)((\.[a-zA-Z0-9_-]{2,3}){1,2})$/
+  def validate_each(record, attribute, value)
+    record.errors.add attribute, (options[:message] || I18n.t('rails_validation.email.invalid')) unless value =~ REGEXP
+  end
+end
+module ActiveModel
+  module Validations
+    module HelperMethods
+      def validates_email_of(*attr_names)
+        validates_with EmailValidator, _merge_attributes(attr_names)
+      end
+    end
+  end
+end

data/lib/validations/phone_validator.rb

@@ -0,0 +1,16 @@
+# basic phone format validator
+class PhoneValidator < ActiveModel::EachValidator
+  REGEXP = /^1\d{10}$/
+  def validate_each(record, attribute, value)
+    record.errors.add attribute, (options[:message] || I18n.t('rails_validation.phone.invalid')) unless value =~ REGEXP
+  end
+end
+module ActiveModel
+  module Validations
+    module HelperMethods
+      def validates_phone_of(*attr_names)
+        validates_with PhoneValidator, _merge_attributes(attr_names)
+      end
+    end
+  end
+end

data/lib/validations/qq_validator.rb

@@ -0,0 +1,16 @@
+# qq format validation, works with qq format
+class QqValidator < ActiveModel::EachValidator
+  REGEXP = /^[1-9]*[1-9][0-9]*$/
+  def validate_each(record, attribute, value)
+    record.errors.add attribute, (options[:message] || I18n.t('rails_validation.qq.invalid')) unless value =~ REGEXP
+  end
+end
+module ActiveModel
+  module Validations
+    module HelperMethods
+      def validates_qq_of(*attr_names)
+        validates_with QqValidator, _merge_attributes(attr_names)
+      end
+    end
+  end
+end

data/lib/validations/url_name_validator.rb

@@ -0,0 +1,16 @@
+#zhe800 url_name validator
+class UrlNameValidator < ActiveModel::EachValidator
+  REGEXP = /^\w+_\d+$/
+  def validate_each(record, attribute, value)
+    record.errors.add attribute, (options[:message] || I18n.t('rails_validation.url_name.invalid')) unless value =~ REGEXP
+  end
+end
+module ActiveModel
+  module Validations
+    module HelperMethods
+      def validates_url_name_of(*attr_names)
+        validates_with UrlNameValidator, _merge_attributes(attr_names)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,91 @@
+ENV["RAILS_ENV"] ||= 'test'
+require 'rubygems'
+require 'bundler/setup'
+
+require 'action_controller'
+require 'action_dispatch'
+require 'action_pack'
+require 'action_view'
+require 'active_model'
+require 'active_record'
+require 'active_support'
+require 'active_support/all'
+
+
+# Include our validators
+Dir["#{File.dirname(__FILE__)}/../lib/**/*.rb"].sort.each { |f| require f }
+
+# Make sure I18N works
+I18n.enforce_available_locales = false if I18n.respond_to?(:enforce_available_locales)
+I18n.load_path += Dir["#{File.dirname(__FILE__)}/../config/locales/*.yml"]
+
+
+module ValidationsSpecHelper
+  include ActiveSupport
+  include ActionPack
+  include ActionView::Context if defined?(ActionView::Context)
+  include ActionController::RecordIdentifier if defined?(ActionController::RecordIdentifier)
+  include ActionView::RecordIdentifier if defined?(ActionView::RecordIdentifier)
+
+
+  class Record
+    extend ActiveModel::Naming
+    include ActiveModel::Conversion
+    include ActiveModel::Validations
+
+    def initialize attr={}
+      attr.each { |k, v| send("#{k}=", v) }
+      super()
+    end
+
+
+    def v; @value end
+    def v= v; @value = v end
+    def v2; @value2 end
+    def v2= v; @value2 = v end
+  end
+
+
+  def model v, v2=nil
+    described_class.new v: v, v2: v2
+  end
+
+
+  def model_errors v
+    m = model v
+    m.valid?
+    return m.errors[:v]
+  end
+
+
+  def with_validation validate_string
+    described_class.clear_validators!
+    described_class.class_eval "validates :v, #{validate_string}"
+
+    yield
+  end
+end
+
+
+RSpec::Matchers.define :be_valid do
+  match { |record | record.valid? == true && record.errors.blank? }
+end
+
+RSpec::Matchers.define :be_invalid do |i18n_key, i18n_params={}|
+  match do |record|
+  record.valid? == false &&
+  record.errors.first.present? &&
+  record.errors.first[1] == I18n.t("rails_validation.#{i18n_key}", **i18n_params)
+end
+end
+
+
+shared_examples :validation do |validation|
+  it 'accepts a custom error message' do
+    with_validation "#{validation}: { message: 'foobar' }" do
+      m = described_class.new v: 'not even remotely valid'
+      expect(m.valid?).to eq(false)
+      expect(m.errors[:v].first).to eq('foobar')
+    end
+  end
+end

data/spec/validations/email_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+module ValidationsSpecHelper
+  class Email < ValidationsSpecHelper::Record
+  end
+end
+
+
+describe ValidationsSpecHelper::Email do
+  include ValidationsSpecHelper
+
+  it_behaves_like :validation, 'email'
+
+  it 'gives an error on invalid emails' do
+    with_validation 'email: true' do
+      %w{
+        not\ valid
+        invalid@example.
+        invalid@@example.com
+        invalid@example..com
+        @example.com
+        invalid@.com
+        invalid@example.c
+        in\ valid@example.com
+        invalid@exam\ ple.com
+      }.each do |v|
+        expect(model(v)).to be_invalid('email.invalid')
+      end
+    end
+  end
+
+
+  it 'works for valid emails' do
+    with_validation 'email: true' do
+      %w{
+        valid@example.com
+        valid112@example.com
+        valid-example@example.com
+        valid_address@example.com
+        valid@more.than.one.example.com
+        valid@example.anewtld.com
+      }.each do |v|
+        expect(model(v)).to be_valid
+      end
+    end
+  end
+end
+

metadata

@@ -1,22 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: rails_validation
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Clark King
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
-dependencies: []
-description: A Rails model validation
+date: 2015-08-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: iban-tools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+description: A Rails model validation, my first gem, just a practice work
 email: wskongdesheng@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- config/locales/en.yml
+- config/locales/zh-CN.yml
 - lib/rails_validation.rb
+- lib/validations/email_validator.rb
+- lib/validations/phone_validator.rb
+- lib/validations/qq_validator.rb
+- lib/validations/url_name_validator.rb
+- spec/spec_helper.rb
+- spec/validations/email_spec.rb
 homepage: https://github.com/wskongdesheng/rails_validation
 licenses:
 - MIT
@@ -40,5 +104,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Rails validationa
-test_files: []
+summary: Rails validation
+test_files:
+- spec/validations/email_spec.rb
+- spec/spec_helper.rb