validates_lengths_from_database 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ee05414f5d7aef3fb39a4e692b6616259d20db11
-  data.tar.gz: '096b57b2a49d98450f1127f27dfd135c34556d86'
+SHA256:
+  metadata.gz: c8969981a23f54edfe7d597ad648c841c7beb9e7e296bb1bd050ca30b50ae18e
+  data.tar.gz: 55e92318175af1685a1665d9cb30c456a62b93701ee6e9e358a85f5b4159908c
 SHA512:
-  metadata.gz: dd35abc81106fe376476a747e78a89aeedaf2828a9aeff2e1f30181a486efc7da88474e5914b82a5df3706bb6f2dd8c0995ea5c05d8a9986ebc234ea40f3cb2c
-  data.tar.gz: d637ae88ae7aa3e2a738e095981270d0228817ab660f8e98214bc0f0bfc23b09e463bb8ab62be5221a6191a9c9504e089d3ceb62d96b23f5d95f9530437a6714
+  metadata.gz: b4584e27e3758ceabeecf85f56263b0579be4ea190ecfe730cfe3aca2fac0e17208ad52fdbaf3afdd4dcd6aa0afa239bc496146f2c55784c003af83205f081eb
+  data.tar.gz: 6bb72ca778ab3aaae981f03bbf9e8bf9e73dacca4b96dd6dd30252d2bcd8a7a2fe53f080f0dc0d37732fde0eca80827355fe83aba4af67d941c39c0386a173cf

data/Appraisals

@@ -1,23 +1,11 @@
-appraise "3.0" do
-  gem "rails", "~> 3.0.12"
-end
-
-appraise "3.1" do
-  gem "rails", "~> 3.1.4"
-end
-
-appraise "3.2" do
-  gem "rails", "~> 3.2.2"
-end
-
-appraise "4.0" do
-  gem "rails", "~> 4.0.12"
+appraise "4.2" do
+  gem "rails", "~> 4.2"
 end
 
-appraise "4.1" do
-  gem "rails", "~> 4.1.8"
+appraise "5.1" do
+  gem "rails", "~> 5.1"
 end
 
-appraise "4.2" do
-  gem "rails", "~> 4.2.0"
+appraise "5.2" do
+  gem "rails", "~> 5.2"
 end

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== v0.8.0 (2019-10-30)
+
+* Enforce validation length on TEXT columns via bytes instead of characters (#25)
+* Drop support for ruby 1.9 (#26)
+
 == v0.7.0 (2017-10-09)
 
 * Drop hard reliance on rails (can use with just activerecord) - thanks @grosser

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    validates_lengths_from_database (0.6.0)
-      activerecord (>= 3)
+    validates_lengths_from_database (0.7.0)
+      activerecord (>= 4)
 
 GEM
   remote: http://rubygems.org/
@@ -53,18 +53,19 @@ GEM
 
 PLATFORMS
   ruby
+  x86_64-darwin-18
 
 DEPENDENCIES
-  activesupport (>= 3)
+  activesupport (>= 4)
   appraisal (~> 1.0.2)
   i18n
   iconv (~> 1.0.4)
   pg (~> 0.17.1)
-  rake
+  rake (< 11)
   rdoc (~> 3.12)
   rspec (~> 2.0)
   sqlite3 (~> 1.3.4)
   validates_lengths_from_database!
 
 BUNDLED WITH
-   1.15.4
+   1.17.3

data/README.rdoc

@@ -9,10 +9,8 @@ This gem introspects your table schema for maximum lengths on string and text fi
 
 == Requirements
 
-As of v0.5.0, validates_lengths_from_database lazily loads column information and requires Rails 3+. If you are using Rails 2, please use the v0.4.0 release.
-
-Due to issues maintaining backwards compatibility, as of v0.4.0 validates_lengths_from_database requires ruby 1.9.3 or higher. 
-If you are still using 1.8.7 or 1.9.2, please use the v0.3.0 release.
+Due to issues maintaining backwards compatibility, as of v0.8.0 validates_lengths_from_database requires ruby 2 or higher.
+If you are still using 1.9, please use the v0.7.0 release.
 
 == Installation
 

data/lib/validates_lengths_from_database/core.rb

@@ -4,6 +4,14 @@ module ValidatesLengthsFromDatabase
     base.send(:include, InstanceMethods)
   end
 
+  class BytesizeValidator < ActiveModel::Validations::LengthValidator
+    def validate_each(record, attribute, value)
+      value_for_validation = value.is_a?(String) ? value.bytes : value
+
+      super(record, attribute, value_for_validation)
+    end
+  end
+
   module ClassMethods
     def validates_lengths_from_database(options = {})
       options.symbolize_keys!
@@ -49,22 +57,67 @@ module ValidatesLengthsFromDatabase
 
       columns_to_validate.each do |column|
         column_schema = self.class.columns.find {|c| c.name == column }
+
         next if column_schema.nil?
         next if column_schema.respond_to?(:array) && column_schema.array
         next unless [:string, :text, :decimal].include?(column_schema.type)
+
         case column_schema.type
-        when :string, :text
-          column_limit = options[:limit][column_schema.type] || column_schema.limit
-          if column_limit
-            ActiveModel::Validations::LengthValidator.new(:maximum => column_limit, :allow_blank => true, :attributes => [column]).validate(self)
+        when :string
+          if column_limit = options[:limit][column_schema.type] || column_schema.limit
+            validate_length_by_characters(column, column_limit)
+          end
+        when :text
+          if column_limit = options[:limit][column_schema.type] || column_schema.limit
+            validate_length_by_bytesize(column, column_limit)
           end
         when :decimal
           if column_schema.precision && column_schema.scale
-            max_val = (10 ** column_schema.precision)/(10 ** column_schema.scale)
-            ActiveModel::Validations::NumericalityValidator.new(:less_than => max_val, :allow_blank => true, :attributes => [column]).validate(self)
+            validate_numericality_with_precision(column, column_schema)
           end
         end
       end
     end
+
+    private
+
+    def validate_length_by_characters(column, column_limit)
+      ActiveModel::Validations::LengthValidator.new(
+        :allow_blank => true,
+        :attributes => [column],
+        :maximum => column_limit
+      ).validate(self)
+    end
+
+    def validate_length_by_bytesize(column, column_limit)
+      validator =
+        if ActiveModel::Validations::LengthValidator::RESERVED_OPTIONS.include?(:tokenizer)
+          ActiveModel::Validations::LengthValidator.new(
+            :allow_blank => true,
+            :attributes => [column],
+            :maximum => column_limit,
+            :tokenizer => ->(string) { string.bytes }
+          )
+        else
+          BytesizeValidator.new(
+            :allow_blank => true,
+            :attributes => [column],
+            :maximum => column_limit,
+            :too_long => "is too long (maximum is %{count} bytes)"
+          )
+        end
+
+      validator.validate(self)
+    end
+
+    def validate_numericality_with_precision(column, column_schema)
+      max_val = (10 ** column_schema.precision)/(10 ** column_schema.scale)
+
+      ActiveModel::Validations::NumericalityValidator.new(
+        :allow_blank => true,
+        :attributes => [column],
+        :less_than => max_val
+      ).validate(self)
+    end
   end
 end

data/lib/validates_lengths_from_database/version.rb

@@ -1,3 +1,3 @@
 module ValidatesLengthsFromDatabase
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/spec/validates_lengths_from_database_spec.rb

@@ -222,7 +222,7 @@ describe ValidatesLengthsFromDatabase do
       end
     end
 
-    context "an article with overloaded attributes" do
+    context "an article with string_1 that is too many characters" do
       before { @article = ArticleValidateSpecificLimit.new(LONG_ATTRIBUTES); @article.valid? }
 
       it "should not be valid" do
@@ -236,6 +236,73 @@ describe ValidatesLengthsFromDatabase do
         @article.errors["decimal_1"].should_not be_present
       end
     end
+
+    context "an article with string_1 that is too many bytes, but few enough characters" do
+      before do
+        @article = ArticleValidateSpecificLimit.new(
+          LONG_ATTRIBUTES.merge(:string_1 => "😎😎😎😎", :string_2 => "👍👍👍👍")
+        )
+
+        @article.valid?
+      end
+
+      it "should be valid" do
+        @article.should be_valid
+      end
+    end
+
+    context "an article with text_1 that is too many characters" do
+      before do
+        @article = ArticleValidateSpecificLimit.new(LONG_ATTRIBUTES.merge(:text_1 => "a"*101))
+        @article.valid?
+      end
+
+      it "should not be valid" do
+        @article.should_not be_valid
+      end
+
+      it "should have errors on all string/text attributes" do
+        @article.errors["string_1"].join.should =~ /too long/
+        @article.errors["string_2"].join.should =~ /too long/
+        @article.errors["text_1"].join.should =~ /too long/
+        @article.errors["decimal_1"].should_not be_present
+      end
+    end
+
+    context "an article with text_1 that is too many bytes, but few enough characters" do
+      before do
+        @article = ArticleValidateSpecificLimit.new(LONG_ATTRIBUTES.merge(:text_1 => "👍"*99))
+        @article.valid?
+      end
+
+      it "should not be valid" do
+        @article.should_not be_valid
+      end
+
+      it "should have errors on all string/text attributes" do
+        @article.errors["string_1"].join.should =~ /too long/
+        @article.errors["string_2"].join.should =~ /too long/
+        @article.errors["text_1"].join.should =~ /too long/
+        @article.errors["decimal_1"].should_not be_present
+      end
+    end
+  end
+
+  context "Model with validates_lengths_from_database :only => [:text_1], :limit => {:text => 10}" do
+    before do
+      class ArticleValidateOnlyText < ActiveRecord::Base
+        self.table_name = "articles_high_limit"
+        validates_lengths_from_database :only => [:text_1], :limit => {:text => 10}
+      end
+    end
+
+    context "an article with a length equal to max, but a bytesize greater than" do
+      before { @article = ArticleValidateOnlyText.new(:text_1 => "😎"*10); @article.valid? }
+
+      it "should not be valid" do
+        @article.should_not be_valid
+      end
+    end
   end
 
   context "Model with validates_lengths_from_database :only => [:string_1, :text_1]" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validates_lengths_from_database
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Ben Hughes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +112,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.4
 requirements: []
 rubyforge_project: validates_lengths_from_database
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Automatic maximum-length validations.