can_has_validations 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ebceb28bd42a889a2d7b4d8d589dcdc25bf722d2a1f028de00dabeb92beb826
-  data.tar.gz: 6acf11da982dddf4702db8c386af8d0780d940f9b8c4273e881e18fb0a4bc12b
+  metadata.gz: 3e81561f7a3d00cd1e760d29b9e529d51eb841e5b09bc91832fb4b4f0dbc71a1
+  data.tar.gz: 4ddd43af1f9f5397185d491ee7f38191f2c00bcc15a0a2c78b339ad88ddbd725
 SHA512:
-  metadata.gz: 89327c90cb07c1663fbe9cfa245eb62d964499e3b05220de5bc5ed5443f153ea5613249f9e1afec65e5b29c345a43484dd7cafd1988d76a633c97c5ac62819b3
-  data.tar.gz: 177ce2aedb07dd299209d8099b52c3344cfa7f157682a3edc67ea27adce8853d51779138f191bb12171de5ab72976c5bd512c80eaa42b1f6575919c580b636a7
+  metadata.gz: 30e3b36920d45b0d8e9b0d12ef404b03eb838aa12b905e462b38b407c44c23a91db19f21c7918c396982f69f4afd1afed5585ae795d6d32d4ab93d12aede28a5
+  data.tar.gz: 668d9ad8cccfa46754a67d7648f046f36a708c67ff98dcfde4c9392f071446cbbfb365211de82370833cbc92cb25ba118eea18002bbdec8ff204b4ef87e5354f

data/lib/can_has_validations/validators/ipaddr_validator.rb

@@ -37,9 +37,9 @@ module ActiveModel::Validations
       if !options[:allow_block] && (ip.ipv4? && ip.prefix!=32 or ip.ipv6? && ip.prefix!=128)
         record.errors.add(attribute, :single_ip_required, **options.merge(value: value))
       end
-      if allowed_ips && allowed_ips.none?{|blk| blk.include? ip}
+      if allowed_ips && allowed_ips.none?{|blk| ip_within_block? ip, blk}
         record.errors.add(attribute, :ip_not_allowed, **options.merge(value: value))
-      elsif disallowed_ips && disallowed_ips.any?{|blk| blk.include? ip}
+      elsif disallowed_ips && disallowed_ips.any?{|blk| ip_within_block? ip, blk}
         record.errors.add(attribute, :ip_not_allowed, **options.merge(value: value))
       end
     end
@@ -47,6 +47,13 @@ module ActiveModel::Validations
 
     private
 
+    def ip_within_block?(ip, blk)
+      return false unless ip.family == blk.family
+      ip = ip.to_range
+      blk = blk.to_range
+      ip.begin >= blk.begin && ip.end <= blk.end
+    end
+
     def normalize_within(val, key)
       if val.nil? || val.respond_to?(:call) || val.is_a?(Symbol)
         val
@@ -72,20 +79,9 @@ module ActiveModel::Validations
       else
         val
       end
+      # raise "#{val.inspect} did not resolve to an Array of IPAddr" unless res.is_a?(Array) && res.all?{|r| r.is_a?(IPAddr)}
+      # res
     end
 
   end
 end
-
-# tests for & fixes broken IPAddr <= 1.2.2
-if IPAddr.new('192.168.2.0/32').include? '192.168.2.0/24'
-  # warn 'IPAddr <= 1.2.2 is broken; monkey-patching'
-  class IPAddr
-    def include?(other)
-      range = to_range
-      other = coerce_other(other).to_range
-      range.begin <= other.begin && range.end >= other.end
-    end
-    alias === include?
-  end
-end

data/lib/can_has_validations/version.rb

@@ -1,3 +1,3 @@
 module CanHasValidations
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: can_has_validations
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - thomas morgan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-20 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -121,39 +121,39 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Assorted Rails 5.x-6.x validators
 test_files:
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/views/layouts/application.html.erb
+- test/can_has_validations_test.rb
+- test/dummy/README.rdoc
+- test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/config/routes.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environment.rb
+- test/dummy/app/views/layouts/application.html.erb
 - test/dummy/config/application.rb
-- test/dummy/config/database.yml
 - test/dummy/config/boot.rb
+- test/dummy/config/database.yml
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/routes.rb
 - test/dummy/config.ru
-- test/dummy/script/rails
-- test/dummy/Rakefile
-- test/dummy/public/favicon.ico
+- test/dummy/log/test.log
+- test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
-- test/dummy/public/404.html
-- test/dummy/log/test.log
-- test/dummy/README.rdoc
-- test/can_has_validations_test.rb
+- test/dummy/public/favicon.ico
+- test/dummy/script/rails
 - test/test_helper.rb