username_not_reserved_validator 1.0.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65ba71714cbad212b9106e2ddd61c40de0c2881a
-  data.tar.gz: 820534e4b31e9e486d898fd6b86ce7dc11f872c0
+  metadata.gz: 8b1699b331aa6025c9136c997b095910a04fff0d
+  data.tar.gz: f990816105af9f43cfa5bd01e4fa289d571bc879
 SHA512:
-  metadata.gz: d192c402f7dedcd44d9583b5c2c042445c7940b523c6b9df4bd8bfc4685289cd3cf870a351ddc2a8cb4f3ace44e1114bd60937a030d38b9f6b5812644e58b18a
-  data.tar.gz: cc8ab773a0c6c87be3a87ff85572ede50fe9336bded0cf25d72b9ef6aba1a9c27b260547aa878291e8ddb237114dcb16d062f2d5a409761f1da7eaa196919330
+  metadata.gz: bf5f8828445a71ff1fa20eab75857cd2c062693c2240b1c70d3bdb45e28d6aef17a31fc4b7ddf22e59f1231fb72d174b773dc7a0157cf933e6e91f83a9fef280
+  data.tar.gz: 3072ebbb5117c4f1136769567d5013092ba312139cd37f32f10dbc49d3498aee83ecd9921ff5a82082e4cc10512a8dc2e99b7e76f5288eff1ddab6721878acbe

data/lib/active_model/validations/username_not_reserved_validator.rb

@@ -0,0 +1,10 @@
+module ActiveModel::Validations
+  class UsernameNotReservedValidator < ActiveModel::EachValidator
+    def validate_each(record, attribute, value)
+      validator = ::UsernameNotReservedValidator::Validator.new(value, self.options)
+      unless validator.valid?
+        record.errors.add(attribute, (options[:message] || :invalid))
+      end
+    end
+  end
+end

data/lib/username_not_reserved_validator.rb

@@ -1,33 +1,4 @@
-class UsernameNotReservedValidator < ActiveModel::EachValidator
-  require 'username_not_reserved_validator/reserved_names'
-
-  @@default_options = { case_insensitive: true }
-
-  def self.default_options
-    @@default_options
-  end
-
-  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_insensitive]
-      words.map!(&:downcase)
-      username = value.downcase
-    else
-      username = value
-    end
-
-    if words.include?(username)
-      record.errors.add(attribute, (options[:message] || :invalid))
-    end
-  end
-end
+require 'username_not_reserved_validator/version'
+require 'username_not_reserved_validator/validator'
+require 'username_not_reserved_validator/reserved_names'
+require 'active_model/validations/username_not_reserved_validator' if defined?(ActiveModel)

data/lib/username_not_reserved_validator/validator.rb

@@ -0,0 +1,30 @@
+module UsernameNotReservedValidator
+  class Validator
+    DEFAULT_OPTIONS = { case_insensitive: true }
+
+    def initialize(username, options = {})
+      @username = username
+      @options = DEFAULT_OPTIONS.merge(options)
+
+      # patch for historical typo
+      if @options.key?(:case_insencitive)
+        @options[:case_insensitive] = @options[:case_insencitive]
+      end
+    end
+
+    def valid?
+      additional_reserved_names = @options[:additional_reserved_names] || []
+      words = ReservedNames.list + additional_reserved_names
+      words += words.map(&:pluralize)
+
+      if @options[:case_insensitive]
+        words.map!(&:downcase)
+        username = @username.downcase
+      else
+        username = @username
+      end
+
+      words.include?(username).!
+    end
+  end
+end

data/lib/username_not_reserved_validator/version.rb

@@ -0,0 +1,3 @@
+module UsernameNotReservedValidator
+  VERSION = '1.2.0'
+end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'rspec'
 require 'active_model'
+require 'pry-byebug'
 
 require 'coveralls'
 Coveralls.wear!

data/spec/username_not_reserved_validator_spec.rb

@@ -161,8 +161,4 @@ describe UsernameNotReservedValidator do
       end
     end
   end
-
-  describe '.default_options' do
-    it { expect(described_class.default_options).to eq( { case_insensitive: true } ) }
-  end
 end

data/username_not_reserved_validator.gemspec

@@ -1,9 +1,10 @@
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'username_not_reserved_validator/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'username_not_reserved_validator'
-  spec.version       = '1.0.5'
+  spec.version       = UsernameNotReservedValidator::VERSION
   spec.authors       = ['SHIOYA, Hiromu']
   spec.email         = ['kwappa.856@gmail.com']
   spec.summary       = 'validates that username is not included in reserved list.'
@@ -20,5 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'coveralls'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: username_not_reserved_validator
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.2.0
 platform: ruby
 authors:
 - SHIOYA, Hiromu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  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
@@ -94,8 +108,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/active_model/validations/username_not_reserved_validator.rb
 - lib/username_not_reserved_validator.rb
 - lib/username_not_reserved_validator/reserved_names.rb
+- lib/username_not_reserved_validator/validator.rb
+- lib/username_not_reserved_validator/version.rb
 - spec/spec_helper.rb
 - spec/username_not_reserved_validator_spec.rb
 - username_not_reserved_validator.gemspec
@@ -119,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: validates that username is not included in reserved list.