validates_lengths_from_database 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36ab4fa806bb72ce68f69c1bfe9375ea5b8a72aa
-  data.tar.gz: 28f5c8941b6717983b9b0f7ba236695b36d2a551
+  metadata.gz: 11cac7bb47bda407a7ef1ed3c928d7a364c9522c
+  data.tar.gz: eb71d89711455e1c869155f98694fc1029a9f68c
 SHA512:
-  metadata.gz: 3d5895cc5180acdf4aa522e5350c6edadcec087fac8b882159748f2b063060a0e70a7b19b9e16e8211d64a1c0d5e88726fe0d5114f6ed6981cb58b885e53ec86
-  data.tar.gz: 6e445869d1cae0997f61ebb2cb43113acef46cf76f118242a9dad53bc7139f0851bb995a5216c7ea2b227c381135292c6157a39c0abed2de695a87437e095e39
+  metadata.gz: e4ebd4890711a54a80410beccff3ac20e7e20ee9ca8626c46c40b553d6b0f9e028d0b6a227f28f763ca6f3c8c1f6eb5b09d83d0a5d70c956c233ed336e533be7
+  data.tar.gz: 2c82869d46cea0bcbdc51485b8b7f2e0c579a3060580eff52c82538d294849110d5bceaa726512a95ac9e11a90b5bfa8b37da87e9ac6519bec4d6c676b31f2aa

data/Appraisals

@@ -1,7 +1,3 @@
-appraise "2.3" do
-  gem "rails", "~> 2.3.2"
-end
-
 appraise "3.0" do
   gem "rails", "~> 3.0.12"
 end

data/Gemfile.lock

@@ -31,7 +31,7 @@ GEM
     diff-lcs (1.1.2)
     i18n (0.7.0)
     iconv (1.0.4)
-    json (1.6.6)
+    json (1.8.3)
     minitest (4.7.5)
     multi_json (1.10.1)
     pg (0.17.1)
@@ -46,7 +46,7 @@ GEM
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
-    sqlite3 (1.3.5)
+    sqlite3 (1.3.11)
     thor (0.19.1)
     thread_safe (0.3.4)
     tzinfo (0.3.42)
@@ -65,3 +65,6 @@ DEPENDENCIES
   rspec (~> 2.0)
   sqlite3 (~> 1.3.4)
   validates_lengths_from_database!
+
+BUNDLED WITH
+   1.10.6

data/README.rdoc

@@ -9,6 +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.
 
@@ -58,5 +60,6 @@ This gem uses appraisal to test with different versions of the dependencies. See
   $ rake test
 
   # All of the Appraisals:
-  $ rake appraisal test
+  $ appraisal install
+  $ appraisal rake test
 

data/lib/validates_lengths_from_database.rb

@@ -11,7 +11,6 @@ module ValidatesLengthsFromDatabase
     def validates_lengths_from_database(options = {})
       options.symbolize_keys!
 
-      return false unless self.table_exists?
       options[:only]    = Array[options[:only]]   if options[:only] && !options[:only].is_a?(Array)
       options[:except]  = Array[options[:except]] if options[:except] && !options[:except].is_a?(Array)
       options[:limit] ||= {}
@@ -19,16 +18,31 @@ module ValidatesLengthsFromDatabase
       if options[:limit] and !options[:limit].is_a?(Hash)
         options[:limit] = {:string => options[:limit], :text => options[:limit]}
       end
+      @@validate_lengths_from_database_options = options
+
+      validate :validate_lengths_from_database
+
+      nil
+    end
+
+    def validate_lengths_from_database_options
+      @@validate_lengths_from_database_options
+    end
+  end
+
+  module InstanceMethods
+    def validate_lengths_from_database
+      options = self.class.validate_lengths_from_database_options
 
       if options[:only]
         columns_to_validate = options[:only].map(&:to_s)
       else
-        columns_to_validate = column_names.map(&:to_s)
+        columns_to_validate = self.class.column_names.map(&:to_s)
         columns_to_validate -= options[:except].map(&:to_s) if options[:except]
       end
 
       columns_to_validate.each do |column|
-        column_schema = columns.find {|c| c.name == 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
@@ -36,17 +50,9 @@ module ValidatesLengthsFromDatabase
         column_limit = options[:limit][column_schema.type] || column_schema.limit
         next unless column_limit
 
-        class_eval do
-          validates_length_of column, :maximum => column_limit, :allow_blank => true
-        end
+        ActiveModel::Validations::LengthValidator.new(:maximum => column_limit, :allow_blank => true, :attributes => [column]).validate(self)
       end
-
-      nil
     end
-
-  end
-
-  module InstanceMethods
   end
 end
 

data/lib/validates_lengths_from_database/version.rb

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

data/spec/validates_lengths_from_database_spec.rb

@@ -33,6 +33,69 @@ describe ValidatesLengthsFromDatabase do
     end
   end
 
+  context "Model without a table yet" do
+    before do
+      class LazyTableArticle < ActiveRecord::Base
+        self.table_name = "articles_lazy"
+        validates_lengths_from_database
+      end
+    end
+
+    context "before the table is created" do
+      specify "should fail to create records" do
+        lambda { LazyTableArticle.new }.should raise_error
+      end
+    end
+
+    context "after the table is created" do
+      before do
+        ActiveRecord::Schema.define do
+          create_table :articles_lazy, :force => false do |t|
+            t.string :string_1, :limit => 5
+          end
+        end
+      end
+
+      after do
+        ActiveRecord::Schema.define do
+          drop_table :articles_lazy
+        end
+      end
+
+      context "an article with long attributes" do
+        before { @article = LazyTableArticle.new(LONG_ATTRIBUTES.slice(:string_1)); @article.valid? }
+
+        specify "should not be valid" do
+          @article.should_not be_valid
+        end
+      end
+
+      context "an article with short attributes" do
+        before { @article = LazyTableArticle.new(SHORT_ATTRIBUTES.slice(:string_1)); @article.valid? }
+
+        specify "should be valid" do
+          @article.should be_valid
+        end
+      end
+    end
+  end
+
+  context "Model without validates_lengths_from_database" do
+    before do
+      class ArticleValidateAll < ActiveRecord::Base
+        self.table_name = "articles"
+      end
+    end
+
+    context "an article with overloaded attributes" do
+      before { @article = ArticleValidateAll.new(LONG_ATTRIBUTES); @article.valid? }
+
+      it "should be valid" do
+        @article.should be_valid
+      end
+    end
+  end
+
   context "Model with validates_lengths_from_database" do
     before do
       class ArticleValidateAll < ActiveRecord::Base

data/validates_lengths_from_database.gemspec

@@ -0,0 +1,37 @@
+# -*- 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
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validates_lengths_from_database
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Ben Hughes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-04 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -158,7 +158,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Appraisals
-- CHANGELOG
+- CHANGELOG.rdoc
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -174,6 +174,8 @@ 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: {}
@@ -193,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.4
 requirements: []
 rubyforge_project: validates_lengths_from_database
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Automatic maximum-length validations.