activemodel-ipaddr_validator 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be71e5c90ac86d95518c142d9243969badeca1bd
-  data.tar.gz: b8e2b5727b7405ae66420a0c9db5d19c17b38823
+  metadata.gz: 037d801907b11ed64c3a96e80547ac4b656de833
+  data.tar.gz: ab0d5cdc1cbd57954d348438e6a955754e0750a2
 SHA512:
-  metadata.gz: 7b29d674a86724069d6500a7538f51627df082444e62ffc69fb921cfe7737a284bfc702bb570c87ca499b6d495c0bcd6980b56300de579ffa61d09392f32063b
-  data.tar.gz: 0fca558ff8310aff7dd62a9ec395ad10b4d1775f672f3a87bb8b91b9bd2cb4568c3073d4a967014806eaefa2713e9072d95db082ede5092f9897da6a6a750e3e
+  metadata.gz: a623d971fb524e0c7e17c433e13552465bc7d1ce5ebc2f9dbf6d417d994c5d65d5f2bbb31c2881a0eed23823ed39b76dd57bf2e72e5e9d31ac8696ace8c68a9e
+  data.tar.gz: e5bec3f0def4897570ea9bb75e5b440c308e258019f3bf7c58fd2b3a10becbc812d6276e1648ebf396cae380cfffd4b6ced6be2ab7214177561fc7b7d7c2fd92

data/.coverrails.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in activemodel-ipaddr_validator.gemspec
 gemspec
+
+group :test do
+  gem 'coveralls', require: false
+end

data/README.md

@@ -1,4 +1,7 @@
-# activemodel-ipaddr_validator [![Build Status](https://travis-ci.org/increments/activemodel-ipaddr_validator.svg?branch=master)](https://travis-ci.org/increments/activemodel-ipaddr_validator)
+# activemodel-ipaddr_validator
+
+[![Build Status](https://travis-ci.org/yuku-t/activemodel-ipaddr_validator.svg?branch=master)](https://travis-ci.org/yuku-t/activemodel-ipaddr_validator) [![Code Climate](https://codeclimate.com/github/yuku-t/activemodel-ipaddr_validator/badges/gpa.svg)](https://codeclimate.com/github/yuku-t/activemodel-ipaddr_validator) [![Coverage Status](https://coveralls.io/repos/yuku-t/activemodel-ipaddr_validator/badge.svg)](https://coveralls.io/r/yuku-t/activemodel-ipaddr_validator) [![Dependency Status](https://gemnasium.com/yuku-t/activemodel-ipaddr_validator.svg)](https://gemnasium.com/yuku-t/activemodel-ipaddr_validator)
+
 
 ## Usage
 

data/activemodel-ipaddr_validator.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.authors         = ['Yuku Takahashi']
   spec.email           = ['yuku@qiita.com']
   spec.summary         = 'A IPv4 and IPv6 validator for Rails 3 and 4.'
-  spec.homepage        = 'https://github.com/increments/activemodel-ipaddr_validator'
+  spec.homepage        = 'https://github.com/yuku-t/activemodel-ipaddr_validator'
   spec.license         = 'MIT'
 
   spec.files           = `git ls-files -z`.split("\x0")

data/lib/ipaddr_validator.rb

@@ -11,8 +11,8 @@ class IpaddrValidator < ActiveModel::EachValidator
         else
           [value]
         end
-      array.all? do |string|
-        validate_single_ipaddr(string, options)
+      array.all? do |value|
+        validate_single_ipaddr(value, options)
       end
     end
 
@@ -22,8 +22,13 @@ class IpaddrValidator < ActiveModel::EachValidator
 
     private
 
-    def validate_single_ipaddr(string, options)
-      ip = IPAddr.new(string)
+    def validate_single_ipaddr(value, options)
+      ip =
+        if value.is_a?(IPAddr)
+          value
+        else
+           IPAddr.new(value)
+        end
       case
       when options[:ipv4] && ip.ipv4?
         true

data/lib/ipaddr_validator/version.rb

@@ -1,3 +1,3 @@
 class IpaddrValidator
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/ipaddr_validator_spec.rb

@@ -38,6 +38,41 @@ shared_examples_for 'invalid array is given', given: :invalid_array do
   end
 end
 
+shared_examples_for 'valid IPv4 IPAddr is given', given: :ipv4_ipaddr do
+  let(:value) do
+    IPAddr.new('192.168.2.0/24')
+  end
+end
+
+shared_examples_for 'valid IPv6 IPAddr is given', given: :ipv6_ipaddr do
+  let(:value) do
+    IPAddr.new('3ffe:505:2::1')
+  end
+end
+
+shared_examples_for 'valid IPv4 array of IPAddrs is given', given: :ipv4_array_ipaddr do
+  let(:value) do
+    [IPAddr.new('192.168.2.0/24'), IPAddr.new('192.168.3.0/24')]
+  end
+end
+
+shared_examples_for 'valid IPv6 array of IPAddrs is given', given: :ipv6_array_ipaddr do
+  let(:value) do
+    [IPAddr.new('3ffe:505:2::1'), IPAddr.new('3ffe:505:2::2')]
+  end
+end
+
+shared_examples_for 'invalid string is given', given: :invalid_ipaddr do
+  let(:value) do
+    nil
+  end
+end
+
+shared_examples_for 'invalid array is given', given: :invalid_array_ipaddr do
+  let(:value) do
+    [nil]
+  end
+end
 # Shared examples for options.
 
 IpaddrValidator.default_options.keys.product([true, false]).each do |option, value|
@@ -62,42 +97,74 @@ describe IpaddrValidator do
       described_class.valid?(value, options)
     end
 
-    context 'when a valid IPv4 string is given', given: :ipv4 do
-      context 'and ipv4 option is true', ipv4: true do
-        context 'and array option is true', array: true do
-          it { should be_falsey }
+    context 'when strings are given' do
+      context 'when a valid IPv4 string is given', given: :ipv4 do
+        context 'and ipv4 option is true', ipv4: true do
+          context 'and array option is true', array: true do
+            it { should be_falsey }
+          end
+
+          context 'and array option is false', array: false do
+            it { should be_truthy }
+          end
         end
 
-        context 'and array option is false', array: false do
-          it { should be_truthy }
+        context 'and ipv4 option is false', ipv4: false do
+          it { should be_falsey }
         end
       end
 
-      context 'and ipv4 option is false', ipv4: false do
-        it { should be_falsey }
-      end
-    end
+      context 'when a valid IPv6 string is given', given: :ipv6 do
+        context 'and ipv6 option is true', ipv6: true do
+          context 'and array option is true', array: true do
+            it { should be_falsey }
+          end
 
-    context 'when a valid IPv6 string is given', given: :ipv6 do
-      context 'and ipv6 option is true', ipv6: true do
-        context 'and array option is true', array: true do
+          context 'and array option is false', array: false do
+            it { should be_truthy }
+          end
+        end
+
+        context 'and ipv6 option is false', ipv6: false do
           it { should be_falsey }
         end
+      end
 
-        context 'and array option is false', array: false do
-          it { should be_truthy }
+      context 'when a valid IPv4 array is given', given: :ipv4_array do
+        context 'and ipv4 option is true', ipv4: true do
+          context 'and array option is true', array: true do
+            it { should be_truthy }
+          end
+
+          context 'and array option is false', array: false do
+            it { should be_falsey }
+          end
+        end
+
+        context 'and ipv4 option is false', ipv4: false do
+          it { should be_falsey }
         end
       end
 
-      context 'and ipv6 option is false', ipv6: false do
-        it { should be_falsey }
+      context 'when a valid IPv6 array is given', given: :ipv6_array do
+        context 'and ipv6 option is true', ipv6: true do
+          context 'and array option is true', array: true do
+            it { should be_truthy }
+          end
+
+          context 'and array option is false', array: false do
+            it { should be_falsey }
+          end
+        end
+
+        context 'and ipv6 option is false', ipv6: false do
+          it { should be_falsey }
+        end
       end
-    end
 
-    context 'when a valid IPv4 array is given', given: :ipv4_array do
-      context 'and ipv4 option is true', ipv4: true do
+      context 'when an invalid string is given', given: :invalid do
         context 'and array option is true', array: true do
-          it { should be_truthy }
+          it { should be_falsey }
         end
 
         context 'and array option is false', array: false do
@@ -105,44 +172,100 @@ describe IpaddrValidator do
         end
       end
 
-      context 'and ipv4 option is false', ipv4: false do
-        it { should be_falsey }
+      context 'when an invalid array is given', given: :invalid_array do
+        context 'and array option is true', array: true do
+          it { should be_falsey }
+        end
+
+        context 'and array option is false', array: false do
+          it { should be_falsey }
+        end
       end
     end
 
-    context 'when a valid IPv6 array is given', given: :ipv6_array do
-      context 'and ipv6 option is true', ipv6: true do
-        context 'and array option is true', array: true do
-          it { should be_truthy }
+    context 'when IPAddrs are given' do
+      context 'when a valid IPv4 IPAddr is given', given: :ipv4_ipaddr do
+        context 'and ipv4 option is true', ipv4: true do
+          context 'and array option is true', array: true do
+            it { should be_falsey }
+          end
+
+          context 'and array option is false', array: false do
+            it { should be_truthy }
+          end
         end
 
-        context 'and array option is false', array: false do
+        context 'and ipv4 option is false', ipv4: false do
           it { should be_falsey }
         end
       end
 
-      context 'and ipv6 option is false', ipv6: false do
-        it { should be_falsey }
+      context 'when a valid IPv6 IPAddr is given', given: :ipv6_ipaddr do
+        context 'and ipv6 option is true', ipv6: true do
+          context 'and array option is true', array: true do
+            it { should be_falsey }
+          end
+
+          context 'and array option is false', array: false do
+            it { should be_truthy }
+          end
+        end
+
+        context 'and ipv6 option is false', ipv6: false do
+          it { should be_falsey }
+        end
       end
-    end
 
-    context 'when an invalid string is given', given: :invalid do
-      context 'and array option is true', array: true do
-        it { should be_falsey }
+      context 'when a valid IPv4 array of IPAddrs is given', given: :ipv4_array_ipaddr do
+        context 'and ipv4 option is true', ipv4: true do
+          context 'and array option is true', array: true do
+            it { should be_truthy }
+          end
+
+          context 'and array option is false', array: false do
+            it { should be_falsey }
+          end
+        end
+
+        context 'and ipv4 option is false', ipv4: false do
+          it { should be_falsey }
+        end
       end
 
-      context 'and array option is false', array: false do
-        it { should be_falsey }
+      context 'when a valid IPv6 array of IPAddrs is given', given: :ipv6_array_ipaddr do
+        context 'and ipv6 option is true', ipv6: true do
+          context 'and array option is true', array: true do
+            it { should be_truthy }
+          end
+
+          context 'and array option is false', array: false do
+            it { should be_falsey }
+          end
+        end
+
+        context 'and ipv6 option is false', ipv6: false do
+          it { should be_falsey }
+        end
       end
-    end
 
-    context 'when an invalid array is given', given: :invalid_array do
-      context 'and array option is true', array: true do
-        it { should be_falsey }
+      context 'when an invalid IPAddr is given', given: :invalid_ipaddr do
+        context 'and array option is true', array: true do
+          it { should be_falsey }
+        end
+
+        context 'and array option is false', array: false do
+          it { should be_falsey }
+        end
       end
 
-      context 'and array option is false', array: false do
-        it { should be_falsey }
+      context 'when an invalid array  of IPAddrs is given', given: :invalid_array_ipaddr do
+        context 'and array option is true', array: true do
+          it { should be_falsey }
+        end
+
+        context 'and array option is false', array: false do
+          it { should be_falsey }
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'coveralls'
+Coveralls.wear!
+
 require 'active_model'
 require 'ipaddr_validator'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel-ipaddr_validator
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Yuku Takahashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -73,6 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coverrails.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -87,7 +88,7 @@ files:
 - lib/ipaddr_validator/version.rb
 - spec/ipaddr_validator_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/increments/activemodel-ipaddr_validator
+homepage: https://github.com/yuku-t/activemodel-ipaddr_validator
 licenses:
 - MIT
 metadata: {}
@@ -107,8 +108,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A IPv4 and IPv6 validator for Rails 3 and 4.
 test_files: []
+has_rdoc: