has_validated_attributes 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c9b904fc55cbad4d43f33eef17eaea5c5da5624
-  data.tar.gz: 8ac267e89e79e4377d26059fea2560d1fd7ff3a9
+  metadata.gz: 4ae3da84725736fe09eb9151a3c819c19b32cd3c
+  data.tar.gz: 354508adbc4b167363194956aa50b4fc98ede9e9
 SHA512:
-  metadata.gz: bc21794016ba13c880ad91c55957fa5e950a216d5503fb6300def08df9260435e87ce31c54e0ede1b4ffc187a4299867178234193c7b82106df6e321ca676a7f
-  data.tar.gz: 83075d95872d904788dca6db2d0632e4e2a37f1aee6ecfed20ceb083d71dc69e3db21cedae9fffffae4c1ab911c8ef1a550b989ffffb6652d023f8045b3355ea
+  metadata.gz: c56000936872f767087128b3f9d348582a4ead07480da32fdcf5dbab3577055ef74b333366e427ace9c0b9ef83137755dab008b5d62191edf8851311d8378b39
+  data.tar.gz: 1f81240a106e9b231aa3b74f6839c46febe2a86a9b8cfc42fc67f2f7fbe41721a9a5e6fa049565023b37dbe933b815ecf7730eb66e6a143cf0cea0f1547b9414

data/lib/has_validated_attributes.rb

@@ -2,6 +2,8 @@
 
 module HasValidatedAttributes
   extend ActiveSupport::Concern
+  NO_CONTROL_CHARS_REGEX = /\A[^[:cntrl:]]*\Z/
+  NO_CONTROL_CHARS_ERROR_MSG = "avoid non-printing characters"
 
   #instance methods
   def self.validations(*args)
@@ -20,8 +22,15 @@ module HasValidatedAttributes
     end
   end
 
+  class SafeTextValidator < ::ActiveModel::EachValidator
+    def validate_each(record, attribute, value)
+      record.errors[attribute] << NO_CONTROL_CHARS_ERROR_MSG unless NO_CONTROL_CHARS_REGEX =~ value.to_s.gsub(/[\n\r\t]/, '')
+    end
+  end
+
   #loading all methods dynamically
-  validations :name => {:format => {:with => /\A[^[:cntrl:]\\<>]*\z/, :message => "avoid non-printing characters and \\&gt;&lt;/ please."}, :length => {:maximum => 63}, :has_if? => true},
+  validations :name => { :format => { :with => NO_CONTROL_CHARS_REGEX, :message => NO_CONTROL_CHARS_ERROR_MSG }, :length => {:maximum => 63}, :has_if? => true},
+              :safe_text => { :safe_text => true, :has_if? => true},
               :username => {:length => {:within => 5..127}, :format => {:with => /\A\w[\w\.\-_@]+\z/, :message => "use only letters, numbers, and .-_@ please."}, :uniqueness => true},
               :rails_name => {:format => {:with => /\A[a-zA-Z\_]*?\z/u, :message => "should only include underscores and letters."}},
               :email => {:length => {:maximum => 63}, :format => {:with => /\A[\w\.%\+\-’']+@(?:[A-Z0-9\-]+\.)+(?:[A-Z]{2}|com|org|net|edu|gov|mil|biz|info|pro|mobi|name|aero|jobs|museum)\z/i, :message => "should look like an email address."}},

data/lib/version.rb

@@ -1,3 +1,3 @@
 module HasValidatedAttributes
-  VERSION = "0.0.6"
+  VERSION = "0.0.8"
 end

data/spec/db/schema.rb

@@ -3,6 +3,7 @@ ActiveRecord::Schema.define(:version => 0) do
   create_table "resources", :force => true do |t|
     t.string   "username_attr"
     t.string   "name_attr"
+    t.string   "safe_text_attr"
     t.string   "domain_attr"
     t.string   "email_attr"
     t.string   "phone_number_attr"

data/spec/has_validate_fields_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 class Resource < ActiveRecord::Base
-  has_validated_attributes :name_attr => {:format => :name, :maximum_length => 10}, :username_attr => {:format => :username}, :email_attr => {:format => :email},
+  has_validated_attributes :name_attr => {:format => :name, :maximum_length => 10}, :safe_text_attr => { :format => :safe_text }, :username_attr => {:format => :username}, :email_attr => {:format => :email},
                            :phone_number_attr => {:format => :phone_number}, :phone_extension_attr => {:format => :phone_extension},
                            :domain_attr => {:format => :domain}, :zipcode_attr => {:format => :zipcode},
                            :middle_initial_attr => {:format => :middle_initial}, :dollar_attr => {:format => :dollar},
@@ -51,24 +51,48 @@ describe "HasValidatedAttributes" do
   end
 
   describe "#name" do
-    it "should return error" do
-      [">*", "< test"].each do |value|
+    [">*", "< test"].each do |value|
+      it "should return error setting name to \"#{ value }\"" do
         @resource.name_attr = value
-        @resource.valid?.should be_falsey
-        @resource.errors.full_messages.should == ["Name attr avoid non-printing characters and \\&gt;&lt;/ please."]
+        expect(@resource.valid?).to be_truthy
+      end
+    end
+
+    ["Hello\nWorld", "\eHey", "Oh\cFNo, it's a control char!"].each do |value|
+      it "should return error setting name to \"#{ value }\"" do
+        @resource.name_attr = value
+        expect(@resource.valid?).to be_falsey
+        expect(@resource.errors.full_messages).to include("Name attr avoid non-printing characters")
       end
     end
 
     it "should return error with more than 10 chars" do
       @resource.name_attr = "test" * 6
-      @resource.valid?.should be_falsey
-      @resource.errors.full_messages.should == ["Name attr is too long (maximum is 10 characters)"]
+      expect(@resource.valid?).to be_falsey
+      expect(@resource.errors.full_messages).to include("Name attr is too long (maximum is 10 characters)")
     end
 
-    it "should return ok" do
-      ["k c", "- H-", " t", "& u", "21 ", "brok", nil].each do |value|
+    ["k c", "- H-", " t", "& u", "21 ", "brok", nil].each do |value|
+      it "should return ok setting name to \"#{ value }\"" do
         @resource.name_attr = value
-        @resource.valid?.should be_truthy
+        expect(@resource.valid?).to be_truthy
+      end
+    end
+  end
+
+  describe "#safe_text" do
+    [">*", "< test", "Hey\tWorld", "new\nline", "new\r\nline"].each do |value|
+      it "should allow value to be set to \"#{ value.gsub("\r", "\\r").gsub("\n", "\\n") }\"" do
+        @resource.safe_text_attr = value
+        expect(@resource.valid?).to be_truthy
+      end
+    end
+
+    ["\eHey", "Oh\cFNo, it's a control char!"].each do |value|
+      it "should return error setting value to \"#{ value }\"" do
+        @resource.safe_text_attr = value
+        expect(@resource.valid?).to be_falsey
+        expect(@resource.errors.full_messages).to include("Safe text attr avoid non-printing characters")
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_validated_attributes
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Kyle Ginavan