codez-validates_by_schema 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NmU4ZTkyMzRhOWI4MWQxMGFhZGE1NTZlOWQyM2VmODA2ZDkwYzY4Nw==
-  data.tar.gz: !binary |-
-    MjZhMWQ2ZDYxM2I4NmNmYTc5NDEzYWZkYjE4NjZjYzE2ODM2ZGQwYw==
+SHA1:
+  metadata.gz: e47e9a036c44ff2019dd4ad7ee301b0156cfd981
+  data.tar.gz: ad21446a8bdf496492e49347c0ffa3c0137d941f
 SHA512:
-  metadata.gz: !binary |-
-    YWJjM2FmYTEyZmE5Yzc4M2FjMjQzMjA3ZTU3N2RhMDc0ZGRmMzI3OWQyY2Fl
-    ZjQzYTEwZDgxOWI0MTA4MDJjNTgzMTA4NGVhMGFkM2YxZjk1ZGY3ZjE1Y2Nm
-    YWI4ZWUxNWM3YmVjZjg1ZmY0YTdlYjJmZGViNjM5MjY5NjhmNWY=
-  data.tar.gz: !binary |-
-    MTMyNGQwYWEwNTM2Y2M5ZTVlZmE2NDBjNTA5OWY2NjdlYzU0MDgzYjFmMjE3
-    OTg3ZDI3MWE5NGM2ODg4YjdhYTNjMDFkOTg4MjlkOGQ1ODY4MTg3NGUwN2Q4
-    ZjkyNTM2YTY4Y2VkYWM3Yjg0MmI4YmY5YWQ3NzI0NDg0YjIxZjY=
+  metadata.gz: 54572f5a17cf304d29fce71b9cc253ff030cb1ed0a8c3be086a0a071dbaee678a8ed703c514d3ae66ff91bef9c96070a8acf7d5efdf47c8cd31bf41dec33ad37
+  data.tar.gz: 3f68e9c4f5fc9cb66759bc13a0a967b755c441c1fdbcc455cbd212fc4e9230585ffda4ee7cad6d892256b8c8194fc17dbdc3f4feee0ed9219748b0e75cc63cd5

data/README.md

@@ -1,5 +1,5 @@
 # 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) 
+[![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)
@@ -23,7 +23,7 @@ Then these validations are inferred when you add `validates_by_schema` to your m
 ```ruby
 validates :quantity, numericality: { allow_nil: true,
   greater_than: -32768, less_than: 32768}
-validates :thickness, numericality: {allow_nil: true, 
+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}
 ```
@@ -58,6 +58,8 @@ 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.

data/lib/validates_by_schema.rb

@@ -4,55 +4,39 @@ module ValidatesBySchema
   extend ActiveSupport::Concern
 
   module ClassMethods
+
     def validates_by_schema(options = {})
       return unless table_exists?
 
-      columns = schema_validateable_columns
-      customize_columns(columns, options)
-      define_validations(columns)
-      define_association_validations
-    end
-
-    def schema_validateable_columns
-      # Don't auto validate primary, foreign keys or timestamps
-      foreign_keys = all_foreign_keys
-      columns.reject do |c|
-        c.name == primary_key.to_s ||
-        %w(updated_at created_at).include?(c.name) ||
-        foreign_keys.include?(c.name)
+      customized_columns(options).each do |c|
+        ValidationOption.new(self, c).define!
       end
     end
 
-    def customize_columns(columns, options)
+    private
+
+    def customized_columns(options)
       # Allow user to specify :only or :except options
-      { 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) }
+      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 define_validations(columns)
-      columns.each do |c|
-        vo = ValidationOption.new(c).to_hash
-        validates c.name, vo if vo.present?
+    def schema_validateable_columns
+      columns.reject do |c|
+        ignored_columns_for_validates_by_schema.include?(c.name)
       end
     end
 
-    def define_association_validations
-      reflect_on_all_associations(:belongs_to).each do |association|
-        column = columns_hash[association.foreign_key.to_s]
-        next unless column
-        validates association.name, presence: true unless column.null
-      end
+    def ignored_columns_for_validates_by_schema
+      [primary_key.to_s, 'created_at', 'updated_at', 'deleted_at']
     end
 
-    def all_foreign_keys
-      reflect_on_all_associations(:belongs_to).collect do |association|
-        association.foreign_key.to_s
-      end
-    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,7 +43,7 @@ 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
@@ -56,7 +72,13 @@ class ValidatesBySchema::ValidationOption
   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 association
+    @association ||= klass.reflect_on_all_associations(:belongs_to).find do |a|
+      a.foreign_key.to_s == column.name
+    end
   end
 
   def to_hash

data/lib/validates_by_schema/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codez-validates_by_schema
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Josh Lewis
@@ -9,104 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     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
     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: shoulda-matchers
   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: sqlite3
   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: pg
   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: mysql2
   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'
 description: Keep your code DRY by inferring column validations from table properties!
@@ -134,12 +134,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []