validates_lengths_from_database 0.1.3 → 0.2.0

data/Appraisals

@@ -0,0 +1,20 @@
+appraise "rails-2.3" do
+  gem "rails", "~> 2.3.2"
+  gem "validates_lengths_from_database", :path => "../"
+end
+
+appraise "rails-3.0" do
+  gem "rails", "~> 3.0.12"
+  gem "validates_lengths_from_database", :path => "../"
+end
+
+appraise "rails-3.1" do
+  gem "rails", "~> 3.1.4"
+  gem "validates_lengths_from_database", :path => "../"
+end
+
+appraise "rails-3.2" do
+  gem "rails", "~> 3.2.2"
+  gem "validates_lengths_from_database", :path => "../"
+end
+

data/Gemfile.lock

@@ -1,26 +1,35 @@
 PATH
   remote: .
   specs:
-    validates_lengths_from_database (0.1.2)
+    validates_lengths_from_database (0.1.3)
       activerecord (>= 2.3.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.6)
-      activesupport (= 3.0.6)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.6)
-      activemodel (= 3.0.6)
-      activesupport (= 3.0.6)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.6)
-    arel (2.0.9)
-    builder (2.1.2)
+    activemodel (3.2.2)
+      activesupport (= 3.2.2)
+      builder (~> 3.0.0)
+    activerecord (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.2)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    appraisal (0.4.1)
+      bundler
+      rake
+    arel (3.0.2)
+    builder (3.0.0)
     diff-lcs (1.1.2)
-    i18n (0.5.0)
+    i18n (0.6.0)
+    json (1.6.6)
+    multi_json (1.2.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
@@ -29,16 +38,17 @@ GEM
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
-    sqlite3 (1.3.3)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    tzinfo (0.3.26)
+    sqlite3 (1.3.5)
+    tzinfo (0.3.32)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (>= 2.3.2)
+  appraisal (~> 0.4.0)
+  i18n
+  rake
+  rdoc (~> 3.12)
   rspec (~> 2.0)
-  sqlite3-ruby (~> 1.3.1)
+  sqlite3 (~> 1.3.4)
   validates_lengths_from_database!

data/README.rdoc

@@ -1,3 +1,5 @@
+{<img src="https://secure.travis-ci.org/rubiety/validates_lengths_from_database.png?branch=master" alt="Build Status" />}[http://travis-ci.org/rubiety/validates_lengths_from_database]
+
 == Validates Lengths from Database
 
 Few people add length validations to fields in their database, and when saving such fields that have exhausted their length, an SQL error occurs.
@@ -27,4 +29,17 @@ It also supports filter-style :only and :except options:
     validates_lengths_from_database :except => [:other_field]
   end
 
-Note that this cannot be done at a global level directly against ActiveRecord::Base, since the +validates_length_from_database+ method requires the class to have a table name (with the ability to load the schema).
+If you'd rather specify the limits explicitly instead of pulling them from the database, you can set it:
+
+  class Post < ActiveRecord::Base
+    validates_lengths_from_database :limit => 255
+  end
+
+Or to set the limit differently for string (VARCHAR) and (TEXT) columns:
+
+  class Post < ActiveRecord::Base
+    validates_lengths_from_database :limit => {:string => 255, :text => 4092}
+  end
+
+Note that unfortunately this cannot be done at a global level directly against ActiveRecord::Base, since the +validates_length_from_database+ method requires the class to have a table name (with the ability to load the schema).
+

data/Rakefile

@@ -1,15 +1,31 @@
 require 'rubygems'
+require 'bundler/setup'
+
 require 'rake'
-require 'rake/rdoctask'
-
-desc "Generate documentation for the plugin."
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = "rdoc"
-  rdoc.title    = "validates_lengths_from_database"
-  rdoc.options << "--line-numbers" << "--inline-source"
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+require 'rspec/core/rake_task'
+require 'appraisal'
+
+Bundler::GemHelper.install_tasks
+
+desc 'Default: run unit tests.'
+task :default => [:clean, :all]
+
+desc "Run Specs against all Appraisals"
+task :all => :spec do
+  Rake::Task["appraisal:install"].execute
+  system("bundle exec rake -s appraisal spec")
 end
 
-Dir["#{File.dirname(__FILE__)}/lib/tasks/*.rake"].sort.each { |ext| load ext }
+desc "Run Specs"
+RSpec::Core::RakeTask.new(:spec) do |t|
+end
+
+task :test => :spec
+
+desc "Clean up files."
+task :clean do |t|
+  FileUtils.rm_rf "tmp"
+  Dir.glob("spec/db/*.sqlite3").each {|f| FileUtils.rm f }
+  Dir.glob("validates_lengths_from_database-*.gem").each {|f| FileUtils.rm f }
+end
 

data/lib/validates_lengths_from_database.rb

@@ -12,9 +12,13 @@ module ValidatesLengthsFromDatabase
       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] ||= {}
 
-      raise ArgumentError, "The :only option to validates_lengths_from_database must be an array." if options[:only] and !options[:only].is_a?(Array)
-      raise ArgumentError, "The :except option to validates_lengths_from_database must be an array." if options[:except] and !options[:except].is_a?(Array)
+      if options[:limit] and !options[:limit].is_a?(Hash)
+        options[:limit] = {:string => options[:limit], :text => options[:limit]}
+      end
 
       if options[:only]
         columns_to_validate = options[:only].map(&:to_s)
@@ -27,10 +31,12 @@ module ValidatesLengthsFromDatabase
         column_schema = columns.find {|c| c.name == column }
         next if column_schema.nil?
         next if ![:string, :text].include?(column_schema.type)
-        next if column_schema.limit.nil?
+        
+        column_limit = options[:limit][column_schema.type] || column_schema.limit
+        next unless column_limit
 
         class_eval do
-          validates_length_of column, :maximum => column_schema.limit, :allow_blank => true
+          validates_length_of column, :maximum => column_limit, :allow_blank => true
         end
       end
 

data/lib/validates_lengths_from_database/version.rb

@@ -1,3 +1,3 @@
 module ValidatesLengthsFromDatabase
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/spec/db/schema.rb

@@ -8,4 +8,12 @@ ActiveRecord::Schema.define(:version => 0) do
     t.integer :integer_1
   end
   
+  create_table :articles_high_limit, :force => true do |t|
+    t.string :string_1
+    t.string :string_2
+    t.text :text_1
+    t.date :date_1
+    t.integer :integer_1
+  end
+  
 end

data/spec/validates_lengths_from_database_spec.rb

@@ -18,6 +18,10 @@ describe ValidatesLengthsFromDatabase do
     :integer_1 => 123
   }
 
+  before(:all) do
+    ActiveSupport::Deprecation.silenced = true
+  end
+
   context "Model without associated table" do
     specify "defining validates_lengths_from_database should not raise an error" do
       lambda {
@@ -60,6 +64,60 @@ describe ValidatesLengthsFromDatabase do
     end
   end
   
+  context "Model with validates_lengths_from_database :limit => 10" do
+    before do
+      class ArticleValidateLimit < ActiveRecord::Base
+        set_table_name "articles_high_limit"
+        validates_lengths_from_database :limit => 5
+      end
+    end
+
+    context "an article with overloaded attributes" do
+      before { @article = ArticleValidateLimit.new(LONG_ATTRIBUTES); @article.valid? }
+
+      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/
+      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
+    before do
+      class ArticleValidateSpecificLimit < ActiveRecord::Base
+        set_table_name "articles_high_limit"
+        validates_lengths_from_database :limit => {:string => 5, :text => 100}
+      end
+    end
+
+    context "an article with overloaded attributes" do
+      before { @article = ArticleValidateSpecificLimit.new(LONG_ATTRIBUTES); @article.valid? }
+
+      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"].should_not be_present
+      end
+    end
+  end
+  
   context "Model with validates_lengths_from_database :only => [:string_1, :text_1]" do
     before do
       class ArticleValidateOnly < ActiveRecord::Base

metadata

@@ -1,79 +1,100 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: validates_lengths_from_database
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Ben Hughes
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-15 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-01 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70330927789240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 3
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70330927789240
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: &70330927787800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70330927787800
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70330927781040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: 1.3.4
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70330927781040
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: &70330927779540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 3
-        - 1
-        version: 1.3.1
+      - !ruby/object:Gem::Version
+        version: 0.4.0
   type: :development
-  version_requirements: *id003
-description: Introspects your database string field maximum lengths and automatically defines length validations.
+  prerelease: false
+  version_requirements: *70330927779540
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70330927777720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
+  type: :development
+  prerelease: false
+  version_requirements: *70330927777720
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70330927776440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70330927776440
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &70330927774820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70330927774820
+description: Introspects your database string field maximum lengths and automatically
+  defines length validations.
 email: ben@railsgarden.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/validates_lengths_from_database/railtie.rb
 - lib/validates_lengths_from_database/version.rb
 - lib/validates_lengths_from_database.rb
@@ -83,47 +104,35 @@ files:
 - spec/spec_helper.rb
 - spec/validates_lengths_from_database_spec.rb
 - rails/init.rb
+- Appraisals
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - Rakefile
 - README.rdoc
 - init.rb
-has_rdoc: true
 homepage: http://github.com/rubiety/validates_lengths_from_database
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 19
-      segments: 
-      - 1
-      - 3
-      - 4
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.4
 requirements: []
-
 rubyforge_project: validates_lengths_from_database
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Automatic maximum-length validations.
 test_files: []
-