validates_lengths_from_database 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11cac7bb47bda407a7ef1ed3c928d7a364c9522c
-  data.tar.gz: eb71d89711455e1c869155f98694fc1029a9f68c
+  metadata.gz: f73da6eb753b718d07fa7eb50a117bbdd51e6d96
+  data.tar.gz: d5a31be0048cea9e7960487582b75d3becc4fd65
 SHA512:
-  metadata.gz: e4ebd4890711a54a80410beccff3ac20e7e20ee9ca8626c46c40b553d6b0f9e028d0b6a227f28f763ca6f3c8c1f6eb5b09d83d0a5d70c956c233ed336e533be7
-  data.tar.gz: 2c82869d46cea0bcbdc51485b8b7f2e0c579a3060580eff52c82538d294849110d5bceaa726512a95ac9e11a90b5bfa8b37da87e9ac6519bec4d6c676b31f2aa
+  metadata.gz: 351f1fcf3f3e9f2c674050775f1ef6150f07a952aa341e4702c67b5411f8abdc33a38b373deb2ca65774a1ea3c8c6f6876f39a4939c5dec05df9a4aa71956731
+  data.tar.gz: 0211d47b6bf46d5cfba5baea54d57ab872e963c8d9a66e1da7f023f423084f5cfc9e691981e7166106aa92bd937841500fec398377d5b4bb0efae258f44e2d7b

data/CHANGELOG.rdoc

@@ -1,3 +1,12 @@
+== v0.5.1 (2017-04-27)
+
+* Fix sharing options between models - thanks @iNecas
+
+== v0.5.0 (2016-01-28)
+
+* Drop support for rails 2
+* Implement lazy-evaluation of column information for better compatibility with early load orders - thanks @domcleal.
+
 == v0.4.0 (2015-01-03)
 
 * Drop support for ruby 1.8.7 and 1.9.2 - too many issues with backwards-compatibility

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    validates_lengths_from_database (0.4.0)
-      activerecord (>= 2.3.2)
+    validates_lengths_from_database (0.5.0)
+      activerecord (>= 3)
 
 GEM
   remote: http://rubygems.org/
@@ -15,7 +15,7 @@ GEM
       activerecord-deprecated_finders (~> 1.0.2)
       activesupport (= 4.0.12)
       arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
+    activerecord-deprecated_finders (1.0.4)
     activesupport (4.0.12)
       i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
@@ -55,7 +55,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 2.3.2)
+  activesupport (>= 3)
   appraisal (~> 1.0.2)
   i18n
   iconv (~> 1.0.4)
@@ -67,4 +67,4 @@ DEPENDENCIES
   validates_lengths_from_database!
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/lib/validates_lengths_from_database.rb

@@ -16,9 +16,9 @@ module ValidatesLengthsFromDatabase
       options[:limit] ||= {}
 
       if options[:limit] and !options[:limit].is_a?(Hash)
-        options[:limit] = {:string => options[:limit], :text => options[:limit]}
+        options[:limit] = {:string => options[:limit], :text => options[:limit], :decimal => options[:limit], :integer => options[:limit], :float => options[:limit]}
       end
-      @@validate_lengths_from_database_options = options
+      @validate_lengths_from_database_options = options
 
       validate :validate_lengths_from_database
 
@@ -26,7 +26,7 @@ module ValidatesLengthsFromDatabase
     end
 
     def validate_lengths_from_database_options
-      @@validate_lengths_from_database_options
+      @validate_lengths_from_database_options
     end
   end
 
@@ -44,13 +44,21 @@ 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 ![:string, :text].include?(column_schema.type)
         next if column_schema.respond_to?(:array) && column_schema.array
 
-        column_limit = options[:limit][column_schema.type] || column_schema.limit
-        next unless column_limit
+        if [:string, :text, :integer, :decimal, :float].include?(column_schema.type)      
+          column_limit = options[:limit][column_schema.type] || column_schema.limit          
+
+          ActiveModel::Validations::LengthValidator.new(:maximum => column_limit, :allow_blank => true, :attributes => [column]).validate(self) if column_limit
+
+          if column_schema.type == :decimal && 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)
+          end
+        end
 
-        ActiveModel::Validations::LengthValidator.new(:maximum => column_limit, :allow_blank => true, :attributes => [column]).validate(self)
       end
     end
   end

data/lib/validates_lengths_from_database/version.rb

@@ -1,3 +1,3 @@
 module ValidatesLengthsFromDatabase
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/db/schema.rb

@@ -11,7 +11,10 @@ ActiveRecord::Schema.define(:version => 0) do
     end
 
     t.date :date_1
-    t.integer :integer_1
+  
+    t.integer :integer_1, :limit => 5
+    t.decimal :decimal_1, :precision => 5, :scale => 2
+    t.float :float_1, :limit => 5
 
     if database_supports_arrays?
       t.string :array_1, :array => true, :limit => 5
@@ -24,6 +27,8 @@ ActiveRecord::Schema.define(:version => 0) do
     t.text :text_1
     t.date :date_1
     t.integer :integer_1
+    t.decimal :decimal_1, :precision => 11, :scale => 2
+    t.float :float_1
 
     if database_supports_arrays?
       t.string :array_1, :array => true

data/spec/validates_lengths_from_database_spec.rb

@@ -7,7 +7,9 @@ describe ValidatesLengthsFromDatabase do
     :string_2 => "123456789",
     :text_1 => "123456789",
     :date_1 => Date.today,
-    :integer_1 => 123
+    :integer_1 => 123456789,
+    :decimal_1 => 123456789.01,
+    :float_1 => 123456789.01
   }
 
   SHORT_ATTRIBUTES = {
@@ -15,7 +17,9 @@ describe ValidatesLengthsFromDatabase do
     :string_2 => "12",
     :text_1 => "12",
     :date_1 => Date.today,
-    :integer_1 => 123
+    :integer_1 => 123,
+    :decimal_1 => 12.34,
+    :float_1 => 12.34
   }
 
   before(:all) do
@@ -102,6 +106,11 @@ describe ValidatesLengthsFromDatabase do
         self.table_name = "articles"
         validates_lengths_from_database
       end
+
+      class ArticleValidateText < ActiveRecord::Base
+        self.table_name = "articles"
+        validates_lengths_from_database :only => [:text_1]
+      end
     end
 
     context "an article with overloaded attributes" do
@@ -115,6 +124,9 @@ describe ValidatesLengthsFromDatabase 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/  unless postgresql?  # PostgreSQL doesn't support limits on text columns
+        @article.errors["decimal_1"].join.should =~ /less than/
+        @article.errors["integer_1"].join.should =~ /too long/  
+        @article.errors["float_1"].join.should =~ /too long/
       end
     end
 
@@ -156,23 +168,27 @@ describe ValidatesLengthsFromDatabase 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"].join.should =~ /too long/ 
+        @article.errors["integer_1"].join.should =~ /too long/
+        @article.errors["float_1"].join.should =~ /too long/
       end
     end
 
     context "an article with short attributes" do
       before { @article = ArticleValidateLimit.new(SHORT_ATTRIBUTES); @article.valid? }
 
+
       it "should be valid" do
         @article.should be_valid
       end
     end
   end
 
-  context "Model with validates_lengths_from_database :limit => {:string => 5, :text => 100}" do
+  context "Model with validates_lengths_from_database :limit => {:string => 5, :text => 100, :integer => 100, :decimal => 100, :float => 100}" do
     before do
       class ArticleValidateSpecificLimit < ActiveRecord::Base
         self.table_name = "articles_high_limit"
-        validates_lengths_from_database :limit => {:string => 5, :text => 100}
+        validates_lengths_from_database :limit => {:string => 5, :text => 100, :integer => 100, :decimal => 100, :float => 100}
       end
     end
 
@@ -187,6 +203,9 @@ describe ValidatesLengthsFromDatabase do
         @article.errors["string_1"].join.should =~ /too long/
         @article.errors["string_2"].join.should =~ /too long/
         @article.errors["text_1"].should_not be_present
+        @article.errors["decimal_1"].should_not be_present
+        @article.errors["integer_1"].should_not be_present
+        @article.errors["float_1"].should_not be_present
       end
     end
   end
@@ -210,6 +229,9 @@ describe ValidatesLengthsFromDatabase do
         @article.errors["string_1"].join.should =~ /too long/
         (@article.errors["string_2"] || []).should be_empty
         @article.errors["text_1"].join.should =~ /too long/ unless postgresql?  # PostgreSQL doesn't support limits on text columns
+        (@article.errors["decimal_1"] || []).should be_empty
+        (@article.errors["integer_1"] || []).should be_empty
+        (@article.errors["float_1"] || []).should be_empty
       end
     end
 
@@ -240,7 +262,10 @@ describe ValidatesLengthsFromDatabase do
       it "should have errors on columns other than string_1 and text_1 only" do
         (@article.errors["string_1"] || []).should be_empty
         (@article.errors["text_1"] || []).should be_empty
+        @article.errors["decimal_1"].join.should =~ /less than/
+        @article.errors["integer_1"].join.should =~ /too long/
         @article.errors["string_2"].join.should =~ /too long/
+        @article.errors["float_1"].join.should =~ /too long/
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validates_lengths_from_database
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Ben Hughes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -174,8 +174,6 @@ files:
 - spec/db/test.sqlite3
 - spec/spec_helper.rb
 - spec/validates_lengths_from_database_spec.rb
-- validates_lengths_from_database-0.4.0.gem
-- validates_lengths_from_database.gemspec
 homepage: http://github.com/rubiety/validates_lengths_from_database
 licenses: []
 metadata: {}
@@ -195,9 +193,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.4
 requirements: []
 rubyforge_project: validates_lengths_from_database
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Automatic maximum-length validations.
 test_files: []
-has_rdoc: 

data/validates_lengths_from_database.gemspec

@@ -1,37 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "validates_lengths_from_database/version"
-
-Gem::Specification.new do |s|
-  s.name        = "validates_lengths_from_database"
-  s.version     = ValidatesLengthsFromDatabase::VERSION
-  s.author      = "Ben Hughes"
-  s.email       = "ben@railsgarden.com"
-  s.homepage    = "http://github.com/rubiety/validates_lengths_from_database"
-  s.summary     = "Automatic maximum-length validations."
-  s.description = "Introspects your database string field maximum lengths and automatically defines length validations."
-
-  s.files        = Dir["{lib,spec,rails}/**/*", "[A-Z]*", "init.rb"]
-  s.require_path = "lib"
-
-  s.rubyforge_project = s.name
-  s.required_rubygems_version = ">= 1.3.4"
-  s.required_ruby_version = ">= 1.9.3"
-
-  s.add_dependency("activerecord", [">= 2.3.2"])
-  s.add_development_dependency("activesupport", [">= 2.3.2"])
-  s.add_development_dependency("rspec", ["~> 2.0"])
-  s.add_development_dependency("sqlite3", ["~> 1.3.4"])
-  s.add_development_dependency("appraisal", ["~> 1.0.2"])
-  s.add_development_dependency("pg", ["~> 0.17.1"])
-  s.add_development_dependency("rdoc", ["~> 3.12"])
-  s.add_development_dependency "rake"
-
-  # I'm not sure why this isn't installed along with activesupport,
-  # but for whatever reason running `bundle install` doesn't install
-  # i18n so I'm adding it here for now.
-  # https://github.com/rails/rails/blob/master/activesupport/activesupport.gemspec#L19 ?
-  s.add_development_dependency("i18n")
-  s.add_development_dependency("iconv", "~> 1.0.4")
-end
-