username_not_reserved_validator 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28d4d936419d5ab68478ec81a28ab74fa212c8f9
-  data.tar.gz: 0b7a2099d2601440e5696b9401c0543eb7e0cc35
+  metadata.gz: e74167cc482f88531e7a5ac8bd378762e4e2adc8
+  data.tar.gz: c8c506c99a48c70b1ec6c2285c3ac513527b6d50
 SHA512:
-  metadata.gz: 01f38353cd067eaff856dde5174d42acc8bafda64cd2ede5b07e8e336c87d122cbb249ed477f3b121e73f14ad6707f1a9dd994c19849c298e52e5b3981d6cbf5
-  data.tar.gz: 36381bc0aeabf69ea0536241f11356ad57764e1be5359568c132625a81f9dd55daf37e6e9e2c75ace81b080cbfe55fec9f41bf51be0cd71b6e9aebd7bbba1e3d
+  metadata.gz: b4299f46607a67099e13a11c7c248822765bdfc71e5142aee1499fea5f164274971cbba062d60983cbdde2da3c15ff5b461e53c897cf03ae65c2feaceba2c6f8
+  data.tar.gz: 7caed99110a1a0376d7d73d8508bab15383d95096e9fe25afc09e08fa8e016524bbe60e13b5dc996a9a2fe11f2a803f02fa09971e9b47f2a98f41060d1ecdf5d

data/.travis.yml

@@ -2,4 +2,4 @@ language: ruby
 rvm:
 - 2.0.0
 - 2.1.5
-- 2.2.1
+- 2.2.3

data/README.md

@@ -47,8 +47,9 @@ end
 
 * `additional_reserved_names` (Array of String / default: `[]`)
  * specify additional reserved names
-* `case_insencitve` (Boolean / default: `true`)
+* `case_insensitive` (Boolean / default: `true`)
  * if set to `false`, comparison is case sencitive
+ * also key `case_insencitive` will be accepted due to historical typo
 * `message` (Symbol / default: `:invalid`)
  * specify custom key of error message
 
@@ -59,7 +60,7 @@ class User < ActiveRecord::Base
   validates(:name,
             username_not_reserved: {
               additional_reserved_names: %w[foo bar],
-              case_insencitve: true,
+              case_insensitive: true,
               message: :reserved_username
             }
            )

data/lib/username_not_reserved_validator.rb

@@ -1,7 +1,7 @@
 class UsernameNotReservedValidator < ActiveModel::EachValidator
   require 'username_not_reserved_validator/reserved_names'
 
-  @@default_options = { case_insencitive: true }
+  @@default_options = { case_insensitive: true }
 
   def self.default_options
     @@default_options
@@ -9,11 +9,17 @@ class UsernameNotReservedValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
     options = @@default_options.merge(self.options)
+
+    # patch for historical typo
+    if options.key?(:case_insencitive)
+      options[:case_insensitive] = options[:case_insencitive]
+    end
+
     additional_reserved_names = options[:additional_reserved_names] || []
     words = ReservedNames.list + additional_reserved_names
     words += words.map(&:pluralize)
 
-    if options[:case_insencitive]
+    if options[:case_insensitive]
       words.map!(&:downcase)
       username = value.downcase
     else

data/spec/spec_helper.rb

@@ -33,6 +33,10 @@ class WithCaseInsencitiveValidationUser < TestModel
   validates :name, username_not_reserved: { case_insencitive: false }
 end
 
+class WithCaseInsensitiveValidationUser < TestModel
+  validates :name, username_not_reserved: { case_insensitive: false }
+end
+
 class WithAdditionalReservedNamesValidationUser < TestModel
   validates :name, username_not_reserved: { additional_reserved_names: %w[additional_reserved_username] }
 end

data/spec/username_not_reserved_validator_spec.rb

@@ -4,8 +4,8 @@ describe UsernameNotReservedValidator do
   let(:reserved_usernames) { UsernameNotReservedValidator::ReservedNames.list }
   let(:valid_username)   { 'valid_username' }
   let(:invalid_username) { 'account' }
-  let(:invalid_camelized_username)  { reserved_usernames.first(30).sample.camelize }
-  let(:invalid_pluralized_username) { reserved_usernames.first(30).sample.pluralize }
+  let(:invalid_camelized_username)  { invalid_username.camelize }
+  let(:invalid_pluralized_username) { invalid_username.pluralize }
   let(:invalid_additional_username) { 'additional_reserved_username' }
 
   describe '#validate_each' do
@@ -117,26 +117,38 @@ describe UsernameNotReservedValidator do
     end
 
     describe 'model with case insencitive validation' do
-      subject(:user) { WithCaseInsencitiveValidationUser.new(name: username) }
+      shared_examples_for 'rejects username without case validation' do
+        subject(:user) { model_class.new(name: username) }
 
-      context 'with valid username' do
-        let(:username) { valid_username }
-        include_examples 'accepts username'
-      end
+        context 'with valid username' do
+          let(:username) { valid_username }
+          include_examples 'accepts username'
+        end
 
-      context 'with invalid username' do
-        let(:username) { invalid_username }
-        include_examples 'rejects username'
+        context 'with invalid username' do
+          let(:username) { invalid_username }
+          include_examples 'rejects username'
+        end
+
+        context 'with invalid camelized username' do
+          let(:username) { invalid_camelized_username }
+          include_examples 'accepts username'
+        end
+
+        context 'with invalid pluralized username' do
+          let(:username) { invalid_pluralized_username }
+          include_examples 'rejects username'
+        end
       end
 
-      context 'with invalid camelized username' do
-        let(:username) { invalid_camelized_username }
-        include_examples 'accepts username'
+      context 'WithCaseInsensitiveValidationUser' do
+        let(:model_class) { WithCaseInsensitiveValidationUser }
+        include_examples 'rejects username without case validation'
       end
 
-      context 'with invalid pluralized username' do
-        let(:username) { invalid_pluralized_username }
-        include_examples 'rejects username'
+      context 'WithCaseInsencitiveValidationUser' do
+        let(:model_class) { WithCaseInsencitiveValidationUser }
+        include_examples 'rejects username without case validation'
       end
     end
 
@@ -151,6 +163,6 @@ describe UsernameNotReservedValidator do
   end
 
   describe '.default_options' do
-    it { expect(described_class.default_options).to eq( { case_insencitive: true } ) }
+    it { expect(described_class.default_options).to eq( { case_insensitive: true } ) }
   end
 end

data/username_not_reserved_validator.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "username_not_reserved_validator"
-  spec.version       = "1.0.2"
+  spec.version       = "1.0.3"
   spec.authors       = ["SHIOYA, Hiromu"]
   spec.email         = ["kwappa.856@gmail.com"]
   spec.summary       = "validates that username is not included in reserved list."

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: username_not_reserved_validator
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - SHIOYA, Hiromu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-22 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: validates that username is not included in reserved list.
@@ -87,9 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -109,17 +109,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: validates that username is not included in reserved list.