username_not_reserved_validator 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d47110cc300997ff7ede20ad9b5e88a748e520fb
-  data.tar.gz: 2d311a68bd5b8a0e1b16ca60cd48418fcb716343
+  metadata.gz: 9ec6488df3ec58634c942eb9151ffa4cfb83a199
+  data.tar.gz: 9db69886edf7e099ca98bdbbf2cbb0efc71a6e40
 SHA512:
-  metadata.gz: 9c2fc1d92bf99d0609ce641d228adc03fd95862cc3d00c64c50dc20b6e120c64d3eb97d3f19f1db83ce3741f8b2023333bc2b7b3a52320039db9647201be6c8b
-  data.tar.gz: f1b1cf722cb1fbd4fceb71d1fa7e0726a06e4562ae7498da9262ef9fd0c2ade1f10dd4f24763794720e2c221c1fd42f8bafded1462babb4258d03ad6656f9a65
+  metadata.gz: 336f8f94107f9523cb353e5a86b7657e66f798914feb57259d5d76db3a5d74d63bcaa9917336620116300f3ad87e1283835783c8734fa9ad06c5727c3e7bb440
+  data.tar.gz: c1d9ef08e67ce4aedbb3d5007073d9ed7abb718a029ff65813986b1d3e8a4c8ab27ee44ce1787b4ba2a68a210b9aec45c5d34b81c00f02c5187366fb3fdafa5b

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
 - 2.0.0
-- 2.1.1
+- 2.1.5
+- 2.2.0

data/README.md

@@ -1,14 +1,12 @@
 # UsernameNotReservedValidator
 
 [![Build Status](https://travis-ci.org/kwappa/username_not_reserved_validator.png)](https://travis-ci.org/kwappa/username_not_reserved_validator)
-
 [![Coverage Status](https://coveralls.io/repos/kwappa/username_not_reserved_validator/badge.png?branch=master)](https://coveralls.io/r/kwappa/username_not_reserved_validator?branch=master)
-
 [![Code Climate](https://codeclimate.com/github/kwappa/username_not_reserved_validator.png)](https://codeclimate.com/github/kwappa/username_not_reserved_validator)
 
-custom validator for ActiveModel.
+Custom validator for ActiveModel.
 
-validates that username is not included in the reserved name list.
+Validates that username is not included in the list of reserved names.
 
 e.g:
 
@@ -37,13 +35,12 @@ Or install it yourself as:
 
 ### validation settings
 
-write validation setting on your ActiveModel
-
+Add validation setting on your ActiveModel.
 
-```
+```ruby
 class User < ActiveRecord::Base
   validates(:name, username_not_reserved: true)
-)
+end
 ```
 
 ### options
@@ -51,9 +48,23 @@ class User < ActiveRecord::Base
 * `additional_reserved_names` (Array of String / default: `[]`)
  * specify additional reserved names
 * `case_insencitve` (Boolean / default: `true`)
- * if set to `false`, comparison is case insencitive
+ * if set to `false`, comparison is case sencitive
 * `message` (Symbol / default: `:invalid`)
- * specify key of error message
+ * specify custom key of error message
+
+e.g.)
+
+```ruby
+class User < ActiveRecord::Base
+  validates(:name,
+            username_not_reserved: {
+              additional_reserved_names: %w[foo bar],
+              case_insencitve: true,
+              message: :reserved_username
+            }
+           )
+end
+```
 
 ## Referenced resources
 
@@ -61,4 +72,4 @@ class User < ActiveRecord::Base
 * http://bitarts.jp/blog/archives/004363.html
 * https://github.com/balexand/email_validator
 
-with tons of thanks :sushi:
+With tons of thanks :sushi:

data/lib/username_not_reserved_validator/reserved_names.rb

@@ -152,6 +152,8 @@ module UsernameNotReservedValidator::ReservedNames
     activity
     password
     auth
+    oauth
+    oauth2
     session
     register
     login
@@ -215,6 +217,7 @@ module UsernameNotReservedValidator::ReservedNames
     code
     guest
     app
+    application
     maintenance
     roc
     id

data/spec/username_not_reserved_validator_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe UsernameNotReservedValidator do
-
   let(:reserved_usernames) { UsernameNotReservedValidator::ReservedNames.list }
   let(:valid_username) { 'valid_username' }
   let(:invalid_username) { reserved_usernames.first(30).sample }
@@ -9,134 +8,149 @@ describe UsernameNotReservedValidator do
   let(:invalid_pluralized_username) { reserved_usernames.first(30).sample.pluralize }
   let(:invalid_additional_username) { 'additional_reserved_username' }
 
-
-  describe 'sample user name' do
-    context 'when valid' do
-      it 'does not included in reserved list' do
-        expect(reserved_usernames.map(&:downcase)).to_not include(valid_username)
-        expect(reserved_usernames.map(&:downcase).map(&:pluralize)).to_not include(valid_username)
+  describe '#validate_each' do
+    describe 'sample user name' do
+      context 'when valid' do
+        it 'does not included in reserved list' do
+          expect(reserved_usernames.map(&:downcase)).to_not include(valid_username)
+          expect(reserved_usernames.map(&:downcase).map(&:pluralize)).to_not include(valid_username)
+        end
       end
-    end
 
-    context 'when invalid' do
-      it 'included in reserved list' do
-        expect(reserved_usernames).to include(invalid_username)
-      end
+      context 'when invalid' do
+        it 'included in reserved list' do
+          expect(reserved_usernames).to include(invalid_username)
+        end
 
-      context 'when camelized invalid name' do
-        it 'included only downcase list' do
-          expect(reserved_usernames).to_not include(invalid_camelized_username)
-          expect(reserved_usernames.map(&:downcase)).to include(invalid_camelized_username.downcase)
+        context 'when camelized invalid name' do
+          it 'included only downcase list' do
+            expect(reserved_usernames).to_not include(invalid_camelized_username)
+            expect(reserved_usernames.map(&:downcase)).to include(invalid_camelized_username.downcase)
+          end
         end
-      end
 
-      context 'when pluarized invalid name' do
-        it 'included in pluralized list' do
-          expect(reserved_usernames).to include(invalid_pluralized_username.singularize)
+        context 'when pluarized invalid name' do
+          it 'included in pluralized list' do
+            expect(reserved_usernames).to include(invalid_pluralized_username.singularize)
+          end
         end
-      end
 
-      context 'when additional invalid name' do
-        it 'does not included in reserved list' do
-          expect(reserved_usernames.map(&:downcase)).to_not include(invalid_additional_username)
-          expect(reserved_usernames.map(&:downcase).map(&:pluralize)).to_not include(invalid_additional_username)
+        context 'when additional invalid name' do
+          it 'does not included in reserved list' do
+            expect(reserved_usernames.map(&:downcase)).to_not include(invalid_additional_username)
+            expect(reserved_usernames.map(&:downcase).map(&:pluralize)).to_not include(invalid_additional_username)
+          end
         end
       end
     end
-  end
 
-  shared_examples_for 'accepts username' do
-    it { expect(user).to be_valid }
-  end
+    shared_examples_for 'accepts username' do
+      it { expect(user).to be_valid }
+    end
 
-  shared_examples_for 'rejects username' do
-    it { expect(user).to_not be_valid }
-  end
+    shared_examples_for 'rejects username' do
+      it { expect(user).to_not be_valid }
+    end
 
+    describe 'model without validation' do
+      subject(:user) { WithoutValidationUser.new(name: username) }
 
-  describe 'model without validation' do
-    subject(:user) { WithoutValidationUser.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 'accepts username'
+      end
 
-    context 'with invalid username' do
-      let(:username) { invalid_username }
-      include_examples 'accepts username'
-    end
+      context 'with invalid camelized username' do
+        let(:username) { invalid_camelized_username }
+        include_examples 'accepts 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 'accepts username'
+      end
 
-    context 'with invalid pluralized username' do
-      let(:username) { invalid_pluralized_username }
-      include_examples 'accepts username'
+      context 'with additionals invalid username' do
+        let(:username) { invalid_additional_username }
+        include_examples 'accepts username'
+      end
     end
 
-    context 'with additionals invalid username' do
-      let(:username) { invalid_additional_username }
-      include_examples 'accepts username'
-    end
-  end
+    describe 'model with validation' do
+      subject(:user) { WithValidationUser.new(name: username) }
 
-  describe 'model with validation' do
-    subject(:user) { WithValidationUser.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'
+      end
 
-    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 'rejects username'
+      end
 
-    context 'with invalid camelized username' do
-      let(:username) { invalid_camelized_username }
-      include_examples 'rejects username'
-    end
+      context 'with invalid pluralized username' do
+        let(:username) { invalid_pluralized_username }
+        include_examples 'rejects username'
+      end
 
-    context 'with invalid pluralized username' do
-      let(:username) { invalid_pluralized_username }
-      include_examples 'rejects username'
+      describe 'name "user" and "users"' do
+        context 'when "user"' do
+          let(:username) { 'user' }
+          include_examples 'rejects username'
+        end
+        context 'when "users"' do
+          let(:username) { 'users' }
+          include_examples 'rejects username'
+        end
+      end
     end
-  end
 
-  describe 'model with case insencitive validation' do
-    subject(:user) { WithCaseInsencitiveValidationUser.new(name: username) }
+    describe 'model with case insencitive validation' do
+      subject(:user) { WithCaseInsencitiveValidationUser.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'
-    end
+      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 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'
+      context 'with invalid pluralized username' do
+        let(:username) { invalid_pluralized_username }
+        include_examples 'rejects username'
+      end
     end
-  end
 
-  describe 'model with validation and additional reserved username' do
-    subject(:user) { WithAdditionalReservedNamesValidationUser.new(name: username) }
+    describe 'model with validation and additional reserved username' do
+      subject(:user) { WithAdditionalReservedNamesValidationUser.new(name: username) }
 
-    context 'with additionals invalid username' do
-      let(:username) { invalid_additional_username }
-      include_examples 'rejects username'
+      context 'with additionals invalid username' do
+        let(:username) { invalid_additional_username }
+        include_examples 'rejects username'
+      end
     end
   end
+
+  describe '.default_options' do
+    it { expect(described_class.default_options).to eq( { case_insencitive: 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.0"
+  spec.version       = "1.0.1"
   spec.authors       = ["SHIOYA, Hiromu"]
   spec.email         = ["kwappa.856@gmail.com"]
   spec.summary       = "validates that username is not included in reserved list."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: username_not_reserved_validator
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - SHIOYA, Hiromu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: validates that username is not included in reserved list.