subnet_format 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c5e37eb8ba898c02c6a639eeb9f947de86aff72
-  data.tar.gz: 8d8a808c81fb60a08abbdef96734752f5522fb70
+  metadata.gz: 717231b95db546203e4c6da350190cbed764959f
+  data.tar.gz: 5ff928829ff380a7e9d591094fbafb11e63aa1a7
 SHA512:
-  metadata.gz: 7dbe40df185d17801413f4edf8e40814b30d122ae02eb4be96e32e70aff4dacdd5a74306d8db5dc8514c12d2888484fc16a69bfd6ba32be437f488f53d62121e
-  data.tar.gz: 2dee15edbd2badc8695a8d4bd25e2b11d2c895880bf21843e233e60ab20b0b632016c7922116077b78ca7fa64d06e041cbd9bad22a80b16b60e54e8c852acbf5
+  metadata.gz: 72921daf1cbdce8f8a42bac730fda047995f4ca61dfb4689465407318d35d5a0c50fa642f733181b277ddc4a87be9fdaee4461d2783e652db02faa64f43227fe
+  data.tar.gz: 642745eb107fd2d06e49cedfa0a3877e41a771c6a6287259b436464e55dc09ab1abdab840c07613452d504f7866004d8f9aca5b2cf4c5243ff90445759496276

data/lib/subnet_format/subnet_format_validator.rb

@@ -3,21 +3,39 @@ require 'ipaddr'
 class SubnetFormatValidator < ActiveModel::Validator
   def validate(record)
     @record = record
-    @ip = IPAddr.new "#{ record.network_address_ip }/#{ record.subnet_mask }"
-    validate_dhcp_range dhcp_start: @record.dhcp_range_start, dhcp_end: @record.dhcp_range_stop
+
+    validate_dhcp_range
   rescue ArgumentError
     ip_argument_error
   end
 
   private
 
-    def validate_dhcp_range(dhcp_values)
-      dhcp_start = dhcp_values[:dhcp_start]
-      dhcp_end   = dhcp_values[:dhcp_end]
-      
-      return if dhcp_start.blank? and dhcp_end.blank?
-      unless @ip.include?(dhcp_start) and @ip.include?(dhcp_end)
-        dhcp_range_error
+    def network_address_prefix
+      @record.send(options[:network_address_prefix] || :network_address_prefix)
+    end
+
+    def subnet_mask
+      @record.send(options[:subnet_mask] || :subnet_mask)
+    end
+
+    def dhcp_range_start
+      @record.send(options[:dhcp_range_start] || :dhcp_range_start)
+    end
+
+    def dhcp_range_stop
+      @record.send(options[:dhcp_range_stop] || :dhcp_range_stop)
+    end
+
+    def ip
+      IPAddr.new "#{ network_address_prefix }/#{ subnet_mask }"
+    end
+
+    def validate_dhcp_range
+      ip_to_validate = ip
+
+      unless ip_to_validate.include?(dhcp_range_start) and ip_to_validate.include?(dhcp_range_stop)
+        dhcp_range_error(ip_to_validate)
       end
     end
 
@@ -25,8 +43,8 @@ class SubnetFormatValidator < ActiveModel::Validator
       @record.errors[:base] << (options[:message] || "is an invalid ip")
     end
 
-    def dhcp_range_error
-      @record.errors[:base] << (options[:message] || 
-        "has an invalid DHCP range, valid range: #{ @ip.to_range.first } to #{ @ip.to_range.last }")
+    def dhcp_range_error(invalid_ip)
+      @record.errors[:base] << (options[:message] ||
+        "has an invalid DHCP range, valid range: #{ invalid_ip.to_range.first } to #{ invalid_ip.to_range.last }")
     end
 end

data/lib/subnet_format/version.rb

@@ -1,3 +1,3 @@
 module SubnetFormat
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/spec_helper.rb

@@ -4,19 +4,33 @@ require 'rspec'
 require 'active_model'
 require 'subnet_format'
 
-class FakeModel
+class FakeModelBase
   include ActiveModel::Validations
+  include ActiveModel::Serialization
 
-  attr_accessor :network_address_ip, :gateway_ip, :dhcp_range_start,
+  attr_accessor :network_address_prefix, :gateway_ip, :dhcp_range_start,
                 :dhcp_range_stop, :subnet_mask
 
+  def initialize(attrs = {})
+    self.network_address_prefix = attrs[:network_address_prefix]
+    self.gateway_ip             = attrs[:gateway_ip]
+    self.dhcp_range_start       = attrs[:dhcp_range_start]
+    self.dhcp_range_stop        = attrs[:dhcp_range_stop]
+    self.subnet_mask            = attrs[:subnet_mask]
+  end
+end
+
+class FakeModel < FakeModelBase
   validates_with SubnetFormatValidator
+end
+
+class FakeModelWithValidationOptions < FakeModelBase
+  attr_accessor :new_network_address_prefix_attr
 
   def initialize(attrs = {})
-    self.network_address_ip = attrs[:network_address_ip]
-    self.gateway_ip         = attrs[:gateway_ip]
-    self.dhcp_range_start   = attrs[:dhcp_range_start]
-    self.dhcp_range_stop    = attrs[:dhcp_range_stop]
-    self.subnet_mask        = attrs[:subnet_mask]
+    super
+    self.new_network_address_prefix_attr = attrs[:network_address_prefix]
   end
+
+  validates_with SubnetFormatValidator, network_address_prefix: :new_network_address_prefix_attr
 end

data/spec/subnet_format_validator_spec.rb

@@ -1,12 +1,42 @@
 describe SubnetFormatValidator do
 
-  let(:fake_model) { FakeModel.new(
-                        subnet_mask: '255.255.255.0',
-                        network_address_ip: '192.168.0.1',
-                        dhcp_range_stop: '192.168.0.30',
-                        dhcp_range_start: '192.168.0.5') }
+  let(:network) {
+    {
+      subnet_mask: '255.255.255.0',
+      network_address_prefix: '192.168.0.1',
+      dhcp_range_stop: '192.168.0.30',
+      dhcp_range_start: '192.168.0.5'
+    }
+  }
+
+  let(:fake_model) { FakeModel.new(network) }
 
   subject { fake_model }
 
   it { should be_valid }
-end
+
+  context 'with an invalid subnet mask' do
+
+    let(:invalid_subnet_mask_options) { network.merge(subnet_mask: '123') }
+
+    let(:fake_model) { FakeModel.new(invalid_subnet_mask_options) }
+
+    it 'should be invalid' do
+      expect(fake_model.valid?).to be_falsey
+    end
+  end
+
+  context 'with options passed' do
+
+    let(:fake_model) { FakeModelWithValidationOptions.new(network) }
+
+    it 'should use them rather than the class method' do
+      expect(FakeModelWithValidationOptions).to_not receive(:network_address_prefix)
+      fake_model.valid?
+    end
+
+    it 'should still be valid' do
+      expect(fake_model.valid?).to be_truthy
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subnet_format
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - John Otander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler