moca_rlibs 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18678bc1db494587ea1476c5c719f41911d55723caf5a3106a77eb24b0713aa6
-  data.tar.gz: e0c9dbbb335aab1afc25b7d720afdf50badff88966eb30483d23874aa3c838e8
+  metadata.gz: 5b147078e15c0cb13012214d313ec93af268b85de8100dcfebae040faaa6cd99
+  data.tar.gz: d29bd7c7bef4f739e0db863f593091e47589ae3863644e285a3d8b65b59442c5
 SHA512:
-  metadata.gz: efb1dea159fac373f90700da583cbe8ab27dbc9750a2adfbdb217fb8a2f0867b3108c53eeae655f4cf9ec2f4b82cb82a281d51d27305c0c60e425c560d9e9c79
-  data.tar.gz: e693ee291cc2484515b51f66dcb37cae35ec084369c2f8e6d3f958023e2a60641b8b729c5012653eaa3e79501cfd089fe3a20198321c474826539bb73c02cad0
+  metadata.gz: a71797fc5bf75331985f97c18a1cb9f62761289ce279434412144d92599d4263f53626857afe7eb1aa1a00d9b2db94bd909e005b8b24f56fe452193b1cfa5e0c
+  data.tar.gz: 11f571d96e4a6faeaa0d3a4923ea30db99c970fe35d98f4154d06aab3c10c898defc283819383c72a125e6aa8cbfa0d68a517375f0407985b3bcf8ad3271c215

data/README.md

@@ -66,8 +66,18 @@ class UserModel
   include ActiveModel::Validations
 
   validates :user_email, email: true
-  validates :user_email, email: {mode: :strict, require_fqdn: true}
-  validates :user_email, email: {domain: 'example.com'}
+  validates :user_email, email: { mode: :strict, require_fqdn: true }
+  validates :user_email, email: { domain: 'example.com' }
+end
+```
+IPアドレスのフォーマットをチェックする
+```ruby
+class UserModel
+  include ActiveModel::Validations
+
+  validates :last_login_ip, ip: true
+  validates :last_login_ip, ip: { version: :v4 }
+  validates :last_login_ip, ip: { version: :v6 }
 end
 ```
 
@@ -171,6 +181,15 @@ params do
   requires :text, type: String, only_printable: true
 end
 ```
+IPアドレスのフォーマットをチェックする
+```ruby
+params do
+  optional :ip,   type: String, ip_address: true
+  optional :ipv4, type: String, ip_address: :v4
+  optional :ipv6, type: String, ip_address: :v6
+end
+```
+
 ## Slack通知送信用クラス
 ```ruby
 # インスタンス化

data/lib/moca_rlibs/active_model_validators/ip.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'active_model'
+require 'active_support/all'
+require 'resolv'
+
+module ActiveModel::Validations
+  # IPアドレスのフォーマットをチェックする
+  class IpValidator < ::ActiveModel::EachValidator
+    PERMITTED_VERSION = %i[v4 v6].freeze
+
+    def initialize(options)
+      options[:version] ||= %i[v4 v6]
+      options[:version] = Array(options[:version])
+      super
+    end
+
+    def validate_each(record, attribute, value)
+      return if value.blank?
+
+      value = value.presence.to_s
+      return if options[:version].include?(:v4) && ::Resolv::IPv4::Regex.match?(value)
+      return if options[:version].include?(:v6) && ::Resolv::IPv6::Regex.match?(value)
+
+      record.errors[attribute] << 'invalid ip format'
+    end
+  end
+end

data/lib/moca_rlibs/grape_validators/ip_address.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'active_support/all'
+require 'grape'
+require 'resolv'
+
+module MocaRlibs::GrapeValidators
+  # 数値の最小値をチェック
+  class IpAddress < Grape::Validations::Base
+    def validate_param!(attr_name, params)
+      return if !@required && params[attr_name].blank?
+
+      version = @option.instance_of?(Proc) ? @option.call(params) : @option
+      value = params[attr_name].presence.to_s
+      return if validate_ip(version, value)
+
+      message = "invalid ip format: #{value}"
+      raise Grape::Exceptions::Validation.new(params: [@scope.full_name(attr_name)], message: message)
+    end
+
+    private
+
+    def validate_ip(version, value)
+      case version
+      when :v4
+        return true if ::Resolv::IPv4::Regex.match?(value)
+      when :v6
+        return true if ::Resolv::IPv6::Regex.match?(value)
+      else
+        return true if ::Resolv::IPv4::Regex.match?(value)
+        return true if ::Resolv::IPv6::Regex.match?(value)
+      end
+      false
+    end
+  end
+end

data/lib/moca_rlibs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MocaRlibs
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/moca_rlibs.rb

@@ -19,6 +19,7 @@ require_relative 'moca_rlibs/grape_validators/only_numbers'
 require_relative 'moca_rlibs/grape_validators/only_alpha'
 require_relative 'moca_rlibs/grape_validators/only_alpha_numeric'
 require_relative 'moca_rlibs/grape_validators/only_printable'
+require_relative 'moca_rlibs/grape_validators/ip_address'
 require_relative 'moca_rlibs/grape_errors/bad_gateway'
 require_relative 'moca_rlibs/grape_errors/bad_request'
 require_relative 'moca_rlibs/grape_errors/conflict'
@@ -36,6 +37,7 @@ require_relative 'moca_rlibs/active_model_validators/only_alpha_numeric'
 require_relative 'moca_rlibs/active_model_validators/only_ascii'
 require_relative 'moca_rlibs/active_model_validators/only_numbers'
 require_relative 'moca_rlibs/active_model_validators/only_printable'
+require_relative 'moca_rlibs/active_model_validators/ip'
 
 require 'active_model'
 require 'email_validator'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moca_rlibs
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - mocaberos
@@ -277,6 +277,7 @@ files:
 - buildspec.yml
 - docker/scripts/test.sh
 - lib/moca_rlibs.rb
+- lib/moca_rlibs/active_model_validators/ip.rb
 - lib/moca_rlibs/active_model_validators/only_alpha.rb
 - lib/moca_rlibs/active_model_validators/only_alpha_numeric.rb
 - lib/moca_rlibs/active_model_validators/only_ascii.rb
@@ -300,6 +301,7 @@ files:
 - lib/moca_rlibs/grape_validators/email_rfc.rb
 - lib/moca_rlibs/grape_validators/email_strict.rb
 - lib/moca_rlibs/grape_validators/ends_with.rb
+- lib/moca_rlibs/grape_validators/ip_address.rb
 - lib/moca_rlibs/grape_validators/length.rb
 - lib/moca_rlibs/grape_validators/max.rb
 - lib/moca_rlibs/grape_validators/min.rb