validates_simple 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08fcb5de3cf9ef6dadd9d4c51960683c0430e58c
-  data.tar.gz: 5e204a2105312c35704f3302b5ad7c53f0db8139
+  metadata.gz: bdae6f59f59eb6adb7152b99d44d0f3c678f5383
+  data.tar.gz: e4e789bd55ddfa84c0815e4db33596f700546c3a
 SHA512:
-  metadata.gz: 7bdaa68f65acc4498af7b52424a47cd272fa93439bd60622f9c6f88527531bee11fa008135aa864bff5bb85d241d15e7f44e13d542322991d598e3020ae991af
-  data.tar.gz: 60fdc95d3a5531ed5569cbc38b644ecc0d2f7e1db39d5714e5918f3ec7edecd6539015ba6c73cb554562d5ee1d71b6419429ec4c07fbeef32fbe5bb730096a7e
+  metadata.gz: dcdfe6efba25d6528eed3011244fb5d862346d4c964c38de0b5a842fd57b9316cf1da7027aec38d64c687a96120bfca05cd05ea3f41806b2abf1921ae75cddf0
+  data.tar.gz: f0b5dd8fcea22cd98b082aea5dcdfd8bb17cacd185f7b4550f40205d693a611a322077fb4bafb15db27314a54ff586749ecb19bebde32fc632142b292b895616

data/README.md

@@ -14,6 +14,7 @@ json etc. So i am creating one.
                 else
                   false
                 end
+              end
               validates(field, callback, message)
             end
           end
@@ -21,14 +22,14 @@ json etc. So i am creating one.
 
 2. It can reuse defined validations when defining one
 
-       module Validation
-         module Rules
-           def validates_numericality_of(field, message='')
-             validates_presence_of(field)
-             validates_format_of(field, /^\d+(\.\d+)?$/
-           end
-         end
-       end
+        module Validation
+          module Rules
+            def validates_numericality_of(field, message='')
+              validates_presence_of(field)
+              validates_format_of(field, /^\d+(\.\d+)?$/
+            end
+          end
+        end
 
 3. It should provide some predefined validations
   * validates_presence_of - checks if the field is present and it is not nil or empty string
@@ -37,9 +38,12 @@ json etc. So i am creating one.
   * validates_numericality_of - checks if a field is a correct number format
   * validates_greather_then - checks if a field is greather then some value
   * validates_less_then - checks if a field is less then some value
-  * etc
+  * validates_length_of_within - checks if the length is in some bounds
+  * validates_option_in - checks if the field is one of allowed options
 
 For additional info check the specs for usage [validates simple specs](https://github.com/sirfilip/validates_simple/blob/master/spec/validation_spec.rb)
 
 
 License: MIT
+
+[![Gem Version](https://badge.fury.io/rb/validates_simple.png)](http://badge.fury.io/rb/validates_simple)

data/lib/validates_simple.rb

@@ -3,5 +3,5 @@ require File.expand_path('../validation/rules', __FILE__)
 require File.expand_path('../validation/validator', __FILE__)
 
 module Validation
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/validation/rules.rb

@@ -5,9 +5,20 @@ module Validation
       @rules << {:callback => callback, :message => Error.new(field, message)}
     end
 
+    def validates_presence_of_field(field, message='')
+      callback = lambda do |data|
+        if data.has_key?(field)
+          true
+        else
+          false
+        end
+      end
+      validates(field, callback, message)
+    end
+
     def validates_presence_of(field, message='')
       callback = lambda do |data|
-        if data.has_key?(field) && data[field].to_s !~ /^\s*$/
+        if data.fetch(field, nil).to_s !~ /\A\s*\z/
           true
         else
           false
@@ -108,5 +119,32 @@ module Validation
       end
       validates(field, callback, message)
     end
+
+    def validates_option_in(field, options, message='')
+      validates_presence_of(field, message)
+      callback = lambda do |data|
+        if options.include? data[field]
+          true
+        else
+          false
+        end
+      end
+      validates(field, callback, message)
+    end
+
+    def validates_url_format_of(field, message='')
+      require 'uri'
+      validates_presence_of(field, message)
+      callback = lambda do |data|
+        url = URI.parse(data[field]) rescue nil
+        if url.nil?
+          false
+        else
+          true
+        end
+      end
+      validates(field, callback, message)
+    end
+
   end 
 end

data/spec/validation_spec.rb

@@ -11,6 +11,16 @@ describe Validation do
     end
   end
 
+  describe '#validates_presence_of_field' do 
+    it 'checks if the field is present regardless of the value' do
+      validator.validates_presence_of_field('a field')
+      validator.validate({'a field' => false}).should be_true
+      validator.validate({'a field' => nil}).should be_true
+      validator.validate({'a field' => ''}).should be_true
+      validator.validate({'another field' => false}).should be_false
+    end
+  end
+
   describe "#validates presence of" do
     it "fails if field is not inside of the hash" do
      validator.validates_presence_of('fieldname', ":field is required")
@@ -113,6 +123,23 @@ describe Validation do
     end
   end
 
+  describe '#validates_option_in' do
+    it 'checks if the option is one of the predefined' do
+      validator.validates_option_in('subscription', ['basic', 'premium'], 'Subscription must be basic or premium')
+      validator.validate({'subscription' => 'basic'}).should be_true
+      validator.validate({'subscription' => 'other'}).should be_false
+      validator.validate({'other-field' => 42}).should be_false
+    end
+  end
+
+  describe '#validates_url_format_of' do
+    it 'checks if the url is in a correct format' do
+      validator.validates_url_format_of('url', 'Url format is not allowed')
+      validator.validate({'url' => 'http://google.com'}).should be_true
+      validator.validate({'url' => 'f:||asdsdfsadf'}).should be_false
+    end
+  end
+
   describe 'a simple sample of successfull validation' do
     it "validates successfully" do
       validator.validates_presence_of('username', 'Username is required')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_simple
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Filip Kostovski