validates_by_schema 0.2.2 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 06f3587225760fbc06becf503676ac6b6776d6da
+  data.tar.gz: 08c75f80da3052e73234d051e23fc76b0e4983a6
+SHA512:
+  metadata.gz: 5051f0bbdb313179827928f0da0fc89e14d19ad7f90f40a5d4208f212b5932707e202f3ed0a0241f4643045ac506e95a09527ed3a8a9ffed52bf4588a4a893c6
+  data.tar.gz: f971d6f9893639ed7e1964f7f8e2d6afb8a6bc7290dbf081565af35853fa44ebb94d0fab949c396ac579025ba3ada1b6cf0c629f57acad2407894c582e372a60

data/README.md

@@ -1,8 +1,9 @@
 # Validates By Schema (validates_by_schema)
-[![Build Status](https://secure.travis-ci.org/joshwlewis/validates_by_schema.png)](http://travis-ci.org/joshwlewis/validates_by_schema) 
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/joshwlewis/validates_by_schema)
-[![Dependency Status](https://gemnasium.com/joshwlewis/validates_by_schema.png)](https://gemnasium.com/joshwlewis/validates_by_schema)
-[![Gem Version](https://badge.fury.io/rb/validates_by_schema.png)](http://badge.fury.io/rb/validates_by_schema)
+[![Gem Version](http://img.shields.io/gem/v/validates_by_schema.svg?style=flat)](https://rubygems.org/gems/validates_by_schema)
+[![Build Status](http://img.shields.io/travis/joshwlewis/validates_by_schema.svg?style=flat)](https://travis-ci.org/joshwlewis/validates_by_schema)
+[![Dependency Status](http://img.shields.io/gemnasium/joshwlewis/validates_by_schema.svg?style=flat)](https://gemnasium.com/joshwlewis/validates_by_schema)
+[![Coverage Status](http://img.shields.io/coveralls/joshwlewis/validates_by_schema.svg?style=flat)](https://coveralls.io/r/joshwlewis/validates_by_schema)
+[![Code Climate](http://img.shields.io/codeclimate/github/joshwlewis/validates_by_schema.svg?style=flat)](https://codeclimate.com/github/joshwlewis/validates_by_schema)
 
 Automatic validation based on your database schema column types and limits. Keep your code DRY by inferring column validations from table properties!
 
@@ -11,21 +12,29 @@ Automatic validation based on your database schema column types and limits. Keep
 Say you had a table setup like this:
 
 ```ruby
-create_table "widgets", :force => true do |t|
-  t.integer  "quantity", :limit => 2
-  t.decimal  "thickness", :precision => 4, :scale => 4
-  t.string   "color", :null => false
+create_table "widgets", force: true do |t|
+  t.integer "quantity", limit: 2, null: false
+  t.decimal "thickness", precision: 4, scale: 4
+  t.string  "color", null: false
+  t.boolean "flagged", null: false, default: false
+  t.integer "other_id", null: false
 end
 ```
 
 Then these validations are inferred when you add `validates_by_schema` to your model:
 
 ```ruby
-validates :quantity, numericality: { allow_nil: true,
-  greater_than: -32768, less_than: 32768}
-validates :thickness, numericality: {allow_nil: true, 
-  less_than_or_equal_to: 0.999, greater_than_or_equal_to: -0.999}
-validates :color, presence: true, length: {allow_nil: false, maximum: 255}
+validates :quantity, presence: true,
+                     numericality: { allow_nil: true,
+                                     only_integer: true,
+                                     greater_than: -32768,
+                                     less_than: 32768}
+validates :thickness, numericality: { allow_nil: true,
+                                      less_than_or_equal_to: 0.999,
+                                      greater_than_or_equal_to: -0.999 }
+validates :color, presence: true, length: { allow_nil: true, maximum: 255 }
+validates :flagged, inclusion: { in: [true, false], allow_nil: false }
+validates :other, presence: true
 ```
 
 ## Installation
@@ -58,8 +67,10 @@ validates_by_schema only: [:body, :description]
 validates_by_schema except: [:name, :title]
 ```
 
+The primary key and timestamp columns are not validated.
+
 ## Notes
 
 Column properties are inferred by your database adapter (like pg, mysql2, sqlite3), and does not depend on migration files or schema.rb. As such, you could use this on projects where the database where Rails is not in control of the database configuration.
 
-This has been tested with mysql, postgresql, and sqlite3. It should work with any other database that has reliable adapter.
+This has been tested with mysql, postgresql, and sqlite3. It should work with any other database that has reliable adapter.

data/Rakefile

@@ -20,19 +20,25 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-
-
-
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
+require 'rspec/core/rake_task'
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = Dir.glob('spec/**/*_spec.rb')
+  t.rspec_opts = ['--backtrace']
 end
 
+task default: :spec
+
 
-task :default => :test
+namespace :db do
+  task :create do
+    case ENV['DB']
+    when'postgresql'
+      exec "psql -c 'create database validates_by_schema_test;' -U postgres"
+    when 'mysql'
+      exec "mysql -e 'create database validates_by_schema_test;'"
+    end
+  end
+end

data/lib/validates_by_schema.rb

@@ -4,27 +4,39 @@ module ValidatesBySchema
   extend ActiveSupport::Concern
 
   module ClassMethods
-    def validates_by_schema options={}
+
+    def validates_by_schema(options = {})
       return unless table_exists?
-      columns = schema_validateable_columns
 
-      # Allow user to specify :only or :except options
-      [:only => :select!, :except => :reject!].each do |k,v|
-        columns.send(v){|c| options[k].include? c.name} if options[k]
+      customized_columns(options).each do |c|
+        ValidationOption.new(self, c).define!
       end
+    end
+
+    private
 
-      columns.each do |c|
-        vo = ValidationOption.new(c).to_hash
-        validates c.name, vo if vo.present?
+    def customized_columns(options)
+      # Allow user to specify :only or :except options
+      schema_validateable_columns.tap do |columns|
+        { only: :select!, except: :reject! }.each do |k, v|
+          if options[k]
+            attrs = Array(options[k]).collect(&:to_s)
+            columns.send(v) { |c| attrs.include?(c.name) }
+          end
+        end
       end
     end
 
     def schema_validateable_columns
-      # Don't auto validate primary keys or timestamps
-      columns.reject do |c| 
-        c.primary || %w(updated_at created_at).include?(c.name)
+      columns.reject do |c|
+        ignored_columns_for_validates_by_schema.include?(c.name)
       end
     end
+
+    def ignored_columns_for_validates_by_schema
+      [primary_key.to_s, 'created_at', 'updated_at', 'deleted_at']
+    end
+
   end
 end
 

data/lib/validates_by_schema/validation_option.rb

@@ -1,12 +1,24 @@
 class ValidatesBySchema::ValidationOption
   # column here must be an ActiveRecord column
   # i.e. MyARModel.columns.first
-  attr_accessor :column
+  attr_accessor :klass, :column
 
-  def initialize(column)
+  def initialize(klass, column)
+    @klass = klass
     @column = column
   end
 
+  def define!
+    if association
+      klass.validates association.name, presence: true unless column.null
+    else
+      options = to_hash
+      klass.validates column.name, options if options.present?
+    end
+  end
+
+  private
+
   def presence?
     presence && column.type != :boolean
   end
@@ -15,8 +27,12 @@ class ValidatesBySchema::ValidationOption
     !column.null
   end
 
+  def enum?
+    klass.respond_to?(:defined_enums) && klass.defined_enums.has_key?(column.name)
+  end
+
   def numericality?
-    [:integer, :decimal, :float].include? column.type
+    [:integer, :decimal, :float].include?(column.type) && !enum?
   end
 
   def numericality
@@ -27,11 +43,11 @@ class ValidatesBySchema::ValidationOption
         numericality[:less_than] = integer_max
         numericality[:greater_than] = -integer_max
       end
-    elsif column.type == :decimal
+    elsif column.type == :decimal && decimal_max
       numericality[:less_than_or_equal_to] = decimal_max
       numericality[:greater_than_or_equal_to] = -decimal_max
     end
-    numericality[:allow_nil] = column.null
+    numericality[:allow_nil] = true
     numericality
   end
 
@@ -40,7 +56,7 @@ class ValidatesBySchema::ValidationOption
   end
 
   def length
-    {:maximum => column.limit, :allow_nil => column.null }
+    { maximum: column.limit, allow_nil: true }
   end
 
   def inclusion?
@@ -48,23 +64,25 @@ class ValidatesBySchema::ValidationOption
   end
 
   def inclusion
-    {:in => [true, false], :allow_nil => column.null}
+    { in: [true, false], allow_nil: column.null }
   end
 
   def integer_max
-    (2 ** (8 * column.limit)) / 2 if column.limit
+    (2**(8 * column.limit)) / 2 if column.limit
   end
 
   def decimal_max
-    10.0**(column.precision-column.scale) - 10.0**(-column.scale)
+    10.0**(column.precision - column.scale) - 10.0**(-column.scale) if column.precision && column.scale
   end
 
-  def string_max
-    column.limit
+  def association
+    @association ||= klass.reflect_on_all_associations(:belongs_to).find do |a|
+      a.foreign_key.to_s == column.name
+    end
   end
 
   def to_hash
-    [:presence, :numericality, :length, :inclusion].inject({}) do |h,k|
+    [:presence, :numericality, :length, :inclusion].inject({}) do |h, k|
       send(:"#{k}?") ? h.merge(k => send(k)) : h
     end
   end
@@ -72,5 +90,4 @@ class ValidatesBySchema::ValidationOption
   def to_s
     to_hash.inspect
   end
-
-end
+end

data/lib/validates_by_schema/version.rb

@@ -1,3 +1,3 @@
 module ValidatesBySchema
-  VERSION = "0.2.2"
+  VERSION = '0.3.0'
 end

metadata

@@ -1,110 +1,112 @@
 --- !ruby/object:Gem::Specification
 name: validates_by_schema
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Josh Lewis
+- Pascal Zumkehr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Keep your code DRY by inferring column validations from table properties!
@@ -112,40 +114,38 @@ description: Keep your code DRY by inferring column validations from table prope
   backed columns.
 email:
 - josh.w.lewis@gmail.com
+- pascal@codez.ch
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/tasks/validates_by_schema_tasks.rake
-- lib/validates_by_schema/validation_option.rb
-- lib/validates_by_schema/version.rb
-- lib/validates_by_schema.rb
 - MIT-LICENSE
-- Rakefile
 - README.md
+- Rakefile
+- lib/validates_by_schema.rb
+- lib/validates_by_schema/validation_option.rb
+- lib/validates_by_schema/version.rb
 homepage: http://github.com/joshwlewis/validates_by_schema
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Automatic validation based on your database schema column types and limits.
 test_files: []
-has_rdoc: 

data/lib/tasks/validates_by_schema_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :validates_by_schema do
-#   # Task goes here
-# end