missing_validators 1.1.0 → 2.0.0

data/spec/validators/imei_spec.rb

@@ -1,39 +1,37 @@
 require 'spec_helper'
 
 describe ImeiValidator do
-  context "IMEI has valid format" do
-    let(:klass) do
-      Class.new do
-        include ActiveModel::Validations
-        attr_accessor :imei, :name
-        validates :imei, imei: true
-      end
+  let(:klass) do
+    Class.new do
+      include ActiveModel::Validations
+      attr_accessor :imei, :name
+      validates :imei, imei: true
     end
+  end
 
-    subject { klass.new }
-
-    it { should ensure_valid_imei_format_of(:imei) }
-    it { should_not ensure_valid_imei_format_of(:name) }
+  subject { klass.new }
 
-    it { should allow_value(356843052637512).for(:imei) }
-    it { should allow_value("356843052637512").for(:imei) }
-    it { should allow_value("35-684305-2637512").for(:imei) }
-    it { should allow_value("35-684305.263.7512").for(:imei) }
+  it { should ensure_valid_imei_format_of(:imei) }
+  it { should_not ensure_valid_imei_format_of(:name) }
 
-    context "value too short" do
-      it { should_not allow_value("3568430537512").for(:imei) }
-      it { should_not allow_value("3").for(:imei) }
-    end
+  context 'value is valid' do
+    it { should allow_value(356_843_052_637_512).for(:imei) }
+    it { should allow_value('356843052637512').for(:imei) }
+    it { should allow_value('35-684305-2637512').for(:imei) }
+    it { should allow_value('35-684305.263.7512').for(:imei) }
+  end
 
-    it "can't be too long" do
-      should_not allow_value("35684305263751233").for(:imei)
-    end
+  context 'value too short' do
+    it { should_not allow_value('3568430537512').for(:imei) }
+    it { should_not allow_value('3').for(:imei) }
+  end
 
-    context "checksum doesn't match" do
-      it { should_not allow_value("356843052637513").for(:imei) }
-      it { should_not allow_value("156843052637512").for(:imei) }
-    end
+  context 'value is too long' do
+    it { should_not allow_value('35684305263751233').for(:imei) }
+  end
 
-    it { should_not allow_value("invalid").for(:imei) }
+  context 'luhn checksum does not match' do
+    it { should_not allow_value('356843052637513').for(:imei) }
+    it { should_not allow_value('156843052637512').for(:imei) }
   end
 end

data/spec/validators/inequality_validator_spec.rb

@@ -1,26 +1,19 @@
 require 'spec_helper'
 
 describe InequalityValidator do
+  subject(:model) { klass.new }
+
   describe do
     let(:klass) do
       Class.new do
         include ActiveModel::Validations
         attr_accessor :attr
-        validates :attr, inequality: { to: Proc.new { |o| "invalid value" } }
+        validates :attr, inequality: { to: 'invalid value' }
       end
     end
 
-    subject(:model){ klass.new }
-
-    specify "field is the same as the result of the validating proc" do
-      model.attr = "invalid value"
-      expect(model).to be_invalid
-    end
-
-    specify "field is not the same as the result of the validating proc" do
-      model.attr = "valid value"
-      expect(model).to be_valid
-    end
+    it { should allow_value('valid value').for(:attr) }
+    it { should_not allow_value('invalid value').for(:attr) }
   end
 
   describe do
@@ -28,39 +21,34 @@ describe InequalityValidator do
       Class.new do
         include ActiveModel::Validations
         attr_accessor :origin, :destination, :airline
-        validates :origin, inequality: { to: :destination }
+        validates :origin, inequality: { to: ->(o) { o.destination } }
       end
     end
 
-    subject(:model){ klass.new }
-
-    it { should ensure_inequality_of(:origin).to(:destination) }
-    it { should_not ensure_inequality_of(:origin).to(:airline) }
-
-    specify "both fields have same values" do
-      model.origin = model.destination = "MOW"
+    specify 'both fields have same values' do
+      model.origin = model.destination = 'MOW'
       expect(model).to be_invalid
     end
 
-    specify "fields have different value" do
-      model.origin = "NYC"
-      model.destination = "MOW"
+    specify 'fields have different value' do
+      model.origin = 'NYC'
+      model.destination = 'MOW'
       expect(model).to be_valid
     end
 
-    specify "first field has value, the second is nil" do
-      model.origin = "NYC"
+    specify 'first field has value, the second is nil' do
+      model.origin = 'NYC'
       model.destination = nil
       expect(model).to be_valid
     end
 
-    specify "first field is nil, the second has value" do
+    specify 'first field is nil, the second has value' do
       model.origin = nil
-      model.destination = "NYC"
+      model.destination = 'NYC'
       expect(model).to be_valid
     end
 
-    specify "both fields are nil" do
+    specify 'both fields are nil' do
       model.origin = model.destination = nil
       expect(model).to be_invalid
     end

data/spec/validators/latitude_validator_spec.rb

@@ -1,26 +1,24 @@
 require 'spec_helper'
 
 describe LatitudeValidator do
-  context "Latitude has a valid value" do
-    let(:klass) do
-      Class.new do
-        include ActiveModel::Validations
-        attr_accessor :lat
-        validates :lat, latitude: true
-      end
+  let(:klass) do
+    Class.new do
+      include ActiveModel::Validations
+      attr_accessor :lat
+      validates :lat, latitude: true
     end
+  end
 
-    subject { klass.new }
+  subject { klass.new }
 
-    it { should allow_value(-90).for(:lat) }
-    it { should allow_value(90).for(:lat) }
-    it { should allow_value(0).for(:lat) }
-    it { should allow_value(9.33).for(:lat) }
+  it { should allow_value(-90).for(:lat) }
+  it { should allow_value(90).for(:lat) }
+  it { should allow_value(0).for(:lat) }
+  it { should allow_value(9.33).for(:lat) }
 
-    it { should_not allow_value(-90.1).for(:lat) }
-    it { should_not allow_value(90.1).for(:lat) }
+  it { should_not allow_value(-90.1).for(:lat) }
+  it { should_not allow_value(90.1).for(:lat) }
 
-    it { should_not allow_value(nil).for(:lat) }
-    it { should_not allow_value('').for(:lat) }
-  end
+  it { should_not allow_value(nil).for(:lat) }
+  it { should_not allow_value('').for(:lat) }
 end

data/spec/validators/longitude_validator_spec.rb

@@ -1,26 +1,24 @@
 require 'spec_helper'
 
 describe LongitudeValidator do
-  context "Longitude has a valid value" do
-    let(:klass) do
-      Class.new do
-        include ActiveModel::Validations
-        attr_accessor :lon
-        validates :lon, longitude: true
-      end
+  let(:klass) do
+    Class.new do
+      include ActiveModel::Validations
+      attr_accessor :lon
+      validates :lon, longitude: true
     end
+  end
 
-    subject { klass.new }
+  subject { klass.new }
 
-    it { should allow_value(-180).for(:lon) }
-    it { should allow_value(180).for(:lon) }
-    it { should allow_value(0).for(:lon) }
-    it { should allow_value(9.33).for(:lon) }
+  it { should allow_value(-180).for(:lon) }
+  it { should allow_value(180).for(:lon) }
+  it { should allow_value(0).for(:lon) }
+  it { should allow_value(9.33).for(:lon) }
 
-    it { should_not allow_value(-181.1).for(:lon) }
-    it { should_not allow_value(181.1).for(:lon) }
+  it { should_not allow_value(-181.1).for(:lon) }
+  it { should_not allow_value(181.1).for(:lon) }
 
-    it { should_not allow_value(nil).for(:lon) }
-    it { should_not allow_value('').for(:lon) }
-  end
+  it { should_not allow_value(nil).for(:lon) }
+  it { should_not allow_value('').for(:lon) }
 end

data/spec/validators/mac_address_spec.rb

@@ -1,51 +1,48 @@
 require 'spec_helper'
 
 describe MacAddressValidator do
-  context "MAC address has valid format" do
-    let(:klass) do
-      Class.new do
-        include ActiveModel::Validations
-        attr_accessor :mac, :name
-        validates :mac, mac_address: true
-      end
+  let(:klass) do
+    Class.new do
+      include ActiveModel::Validations
+      attr_accessor :mac, :name
+      validates :mac, mac_address: true
     end
-
-    subject { klass.new }
-
-    it { should ensure_valid_mac_address_format_of(:mac) }
-    it { should_not ensure_valid_mac_address_format_of(:name) }
-
-    # Valid formats
-    it { should allow_value("08:00:2b:01:02:03").for(:mac) }
-    it { should allow_value("08-00-2b-01-02-03").for(:mac) }
-    it { should allow_value("08.00.2b.01.02.03").for(:mac) }
-    it { should allow_value("08 00 2b 01 02 03").for(:mac) }
-    it { should allow_value("08002b:010203").for(:mac) }
-    it { should allow_value("08002b.010203").for(:mac) }
-    it { should allow_value("08002b-010203").for(:mac) }
-    it { should allow_value("0800.2b01.0203").for(:mac) }
-    it { should allow_value("0800-2b01-0203").for(:mac) }
-    it { should allow_value("0800 2b01 0203").for(:mac) }
-    it { should allow_value("08002b010203").for(:mac) }
-
-    # Mixed Separators
-    it { should_not allow_value("08-00:2b:01:02:03").for(:mac) }
-    it { should_not allow_value("08.00:2b:01:02:03").for(:mac) }
-    it { should_not allow_value("08 00:2b:01:02:03").for(:mac) }
-    it { should_not allow_value("0800-2b01:0203").for(:mac) }
-    it { should_not allow_value("0800 2b01:0203").for(:mac) }
-
-    # Too Short
-    it { should_not allow_value("08:00:2b:01:02").for(:mac) }
-    it { should_not allow_value("08-00-2b-01-02").for(:mac) }
-
-    # Too Long
-    it { should_not allow_value("08:00:2b:01:02:03:04").for(:mac) }
-
-    # Non-Hex Characters
-    it { should_not allow_value("qq:00:00:00:00:00").for(:mac) }
-
-
-    it { should_not allow_value("invalid").for(:mac) }
   end
+
+  subject { klass.new }
+
+  it { should ensure_valid_mac_address_format_of(:mac) }
+  it { should_not ensure_valid_mac_address_format_of(:name) }
+
+  # Valid formats
+  it { should allow_value('08:00:2b:01:02:03').for(:mac) }
+  it { should allow_value('08-00-2B-01-02-03').for(:mac) }
+  it { should allow_value('08.00.2b.01.02.03').for(:mac) }
+  it { should allow_value('08 00 2B 01 02 03').for(:mac) }
+  it { should allow_value('08002b:010203').for(:mac) }
+  it { should allow_value('08002B.010203').for(:mac) }
+  it { should allow_value('08002b-010203').for(:mac) }
+  it { should allow_value('0800.2b01.0203').for(:mac) }
+  it { should allow_value('0800-2B01-0203').for(:mac) }
+  it { should allow_value('0800 2b01 0203').for(:mac) }
+  it { should allow_value('08002b010203').for(:mac) }
+
+  # Mixed Separators
+  it { should_not allow_value('08-00:2b:01:02:03').for(:mac) }
+  it { should_not allow_value('08.00:2b:01:02:03').for(:mac) }
+  it { should_not allow_value('08 00:2b:01:02:03').for(:mac) }
+  it { should_not allow_value('0800-2b01:0203').for(:mac) }
+  it { should_not allow_value('0800 2B01:0203').for(:mac) }
+
+  # Too Short
+  it { should_not allow_value('08:00:2b:01:02').for(:mac) }
+  it { should_not allow_value('08-00-2B-01-02').for(:mac) }
+
+  # Too Long
+  it { should_not allow_value('08:00:2b:01:02:03:04').for(:mac) }
+
+  # Non-Hex Characters
+  it { should_not allow_value('qq:00:00:00:00:00').for(:mac) }
+
+  it { should_not allow_value('invalid').for(:mac) }
 end

data/spec/validators/url_validator_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe UrlValidator do
-  context "url has valid format" do
+  context 'url has valid format' do
     let(:klass) do
       Class.new do
         include ActiveModel::Validations
@@ -15,28 +15,29 @@ describe UrlValidator do
     it { should ensure_valid_url_format_of(:url) }
     it { should_not ensure_valid_url_format_of(:name) }
 
-    it { should allow_value("http://example.com").for(:url) }
-    it { should allow_value("http://FooBar.cOm").for(:url) }
-    it { should allow_value("http://foo.bar.baz.com").for(:url) }
-    it { should allow_value("http://123.com").for(:url) }
-    it { should allow_value("http://www.example.ru").for(:url) }
-    it { should allow_value("http://user-example.co.uk").for(:url) }
-    it { should allow_value("https://example.com").for(:url) }
-    it { should allow_value("http://example.org/").for(:url) }
-    it { should allow_value("https://example.net/index.html").for(:url) }
-    it { should allow_value("http://example.net/login.php").for(:url) }
-    it { should allow_value("https://example.travel/").for(:url) }
-    it { should allow_value("http://example.aero").for(:url) }
-    it { should allow_value("http://example.aero?foo=bar").for(:url) }
-
-    it { should_not allow_value("example").for(:url) }
-    it { should_not allow_value("http://user_examplecom").for(:url) }
-    it { should_not allow_value("http://user_example.com").for(:url) }
-    it { should_not allow_value("http://user_example.a").for(:url) }
-    it { should_not allow_value("ftp://foo.bar.baz.com").for(:url) }
+    it { should allow_value('http://example.com').for(:url) }
+    it { should allow_value('http://FooBar.cOm').for(:url) }
+    it { should allow_value('http://foo.bar.baz.com').for(:url) }
+    it { should allow_value('http://123.com').for(:url) }
+    it { should allow_value('http://www.example.ru').for(:url) }
+    it { should allow_value('http://user-example.co.uk').for(:url) }
+    it { should allow_value('https://example.com').for(:url) }
+    it { should allow_value('http://example.org/').for(:url) }
+    it { should allow_value('https://example.net/index.html').for(:url) }
+    it { should allow_value('http://example.net/login.php').for(:url) }
+    it { should allow_value('https://example.travel/').for(:url) }
+    it { should allow_value('http://example.aero').for(:url) }
+    it { should allow_value('http://example.aero?foo=bar').for(:url) }
+    it { should allow_value('http://user_example.com').for(:url) }
+
+    it { should_not allow_value('http://user_examplecom').for(:url) }
+    it { should_not allow_value('http://user example.com').for(:url) }
+    it { should_not allow_value('http://user_example.a').for(:url) }
+    it { should_not allow_value(':').for(:url) }
+    it { should_not allow_value('.').for(:url) }
   end
 
-  describe "url must be in a specific domain" do
+  describe 'url must be in a specific domain' do
     let(:klass) do
       Class.new do
         include ActiveModel::Validations
@@ -48,17 +49,17 @@ describe UrlValidator do
 
     subject { klass.new }
 
-    it { should allow_value("http://example.org").for(:url1) }
-    it { should_not allow_value("http://example.com").for(:url1) }
+    it { should allow_value('http://example.org').for(:url1) }
+    it { should_not allow_value('http://example.com').for(:url1) }
 
-    it { should allow_value("http://example.org").for(:url2) }
-    it { should allow_value("http://example.edu").for(:url2) }
-    it { should allow_value("http://example.com.au").for(:url2) }
-    it { should allow_value("http://example.Com.Au").for(:url2) }
-    it { should_not allow_value("http://example.com").for(:url2) }
+    it { should allow_value('http://example.org').for(:url2) }
+    it { should allow_value('http://example.edu').for(:url2) }
+    it { should allow_value('http://example.com.au').for(:url2) }
+    it { should allow_value('http://example.Com.Au').for(:url2) }
+    it { should_not allow_value('http://example.com').for(:url2) }
   end
 
-  describe "url must be domain root" do
+  describe 'url must be domain root' do
     let(:klass) do
       Class.new do
         include ActiveModel::Validations
@@ -70,18 +71,17 @@ describe UrlValidator do
 
     subject { klass.new }
 
-    it { should allow_value("http://example.org").for(:url1) }
-    it { should allow_value("http://example.org/").for(:url1) }
-    it { should_not allow_value("http://example.com/test").for(:url1) }
-    it { should_not allow_value("http://example.com/#fragment").for(:url1) }
-    it { should_not allow_value("http://example.com/?key=value").for(:url1) }
+    it { should allow_value('http://example.org').for(:url1) }
+    it { should allow_value('http://example.org/').for(:url1) }
+    it { should_not allow_value('http://example.com/test').for(:url1) }
+    it { should_not allow_value('http://example.com/#fragment').for(:url1) }
+    it { should_not allow_value('http://example.com/?key=value').for(:url1) }
 
-
-    it { should allow_value("http://example.org").for(:url2) }
-    it { should allow_value("http://example.org/lorem").for(:url2) }
+    it { should allow_value('http://example.org').for(:url2) }
+    it { should allow_value('http://example.org/lorem').for(:url2) }
   end
 
-  describe "url must have a specific scheme" do
+  describe 'url must have a specific scheme' do
     let(:klass) do
       Class.new do
         include ActiveModel::Validations
@@ -93,12 +93,12 @@ describe UrlValidator do
 
     subject { klass.new }
 
-    it { should allow_value("http://example.org").for(:url1) }
-    it { should_not allow_value("https://example.org").for(:url1) }
+    it { should allow_value('http://example.org').for(:url1) }
+    it { should_not allow_value('https://example.org').for(:url1) }
 
-    it { should allow_value("http://example.org").for(:url2) }
-    it { should allow_value("https://example.org").for(:url2) }
-    it { should allow_value("HTTPS://example.org").for(:url2) }
-    it { should_not allow_value("ftp://example.org").for(:url2) }
+    it { should allow_value('http://example.org').for(:url2) }
+    it { should allow_value('https://example.org').for(:url2) }
+    it { should allow_value('HTTPS://example.org').for(:url2) }
+    it { should_not allow_value('ftp://example.org').for(:url2) }
   end
 end