schema_validations 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf56fe0be502dcf9f95a0f67c2a8b03a8c51040e
-  data.tar.gz: add46e41c04f6a0beb6ab4281ba0c5b6d28560be
+  metadata.gz: a393a0d55876bd8f8e7564c4697d49e39192a253
+  data.tar.gz: da40a15493d7ee658427ad9b8fa84d55b18cf1c5
 SHA512:
-  metadata.gz: 0759bedcb1a79fb0005837fd6554d946ce8125ad2eee50bbb000b74775213bb3fe943ef2cfeb26fce60a29315d29b8c68b92661e7cc94c05ec5a6393e46baaf8
-  data.tar.gz: 61cd1032954a0b865b916884a44dcdbb88f04129bbde467b311506b802a0ee1feb9aa895ca33122bae07c50f3273b2c1ccce3529d681db3e14c760b4ad16573b
+  metadata.gz: 46e9332822a7060a8815c85607a5879299b69626ceffa5cf5702d28272557f62341ae0e6af197841bbf398e985c8726d0eac7d5a7645adeaf75658d7d28e5644
+  data.tar.gz: ff590cab2b092c7cc5cdfb75bfe0a5acfc5235a6e8ef787a807550cc1b1fb2072d804447bedbe67df08cd2c2005ba316e18278fa0e8d8adc7a2dbc83fbc9c974

data/.gitignore

@@ -21,7 +21,7 @@ pkg
 ## PROJECT::SPECIFIC
 .rvmrc
 *.log
-*.sqlite3
+tmp/
 Gemfile.lock
 gemfiles/*.lock
 gemfiles/**/*.lock

data/.travis.yml

@@ -3,9 +3,12 @@
 # Please do not edit this file; any changes will be overwritten next time
 # schema_dev gets run.
 ---
+sudo: false
 rvm:
 - 1.9.3
-- 2.1.3
+- 2.1.5
 gemfile:
 - gemfiles/rails-3.2/Gemfile.sqlite3
 - gemfiles/rails-4.1/Gemfile.sqlite3
+- gemfiles/rails-4.2/Gemfile.sqlite3
+script: bundle exec rake travis

data/README.md

@@ -4,9 +4,11 @@ SchemaValidations is an ActiveRecord extension that keeps your model class
 definitions simpler and more DRY, by automatically defining validations based
 on the database schema.
 
-[![Gem Version](https://badge.fury.io/rb/schema_validations.png)](http://badge.fury.io/rb/schema_validations)
-[![Build Status](https://secure.travis-ci.org/SchemaPlus/schema_validations.png)](http://travis-ci.org/SchemaPlus/schema_validations)
-[![Dependency Status](https://gemnasium.com/SchemaPlus/schema_validations.png)](https://gemnasium.com/SchemaPlus/schema_validations)
+[![Gem Version](https://badge.fury.io/rb/schema_validations.svg)](http://badge.fury.io/rb/schema_validations)
+[![Build Status](https://secure.travis-ci.org/SchemaPlus/schema_validations.svg)](http://travis-ci.org/SchemaPlus/schema_validations)
+[![Coverage Status](https://img.shields.io/coveralls/SchemaPlus/schema_validations.svg)](https://coveralls.io/r/SchemaPlus/schema_validations)
+[![Dependency Status](https://gemnasium.com/lomba/schema_validations.svg)](https://gemnasium.com/lomba/schema_validations)
+
 
 ## Overview
 
@@ -41,11 +43,19 @@ installing it your model is as simple as it can be.
 Validations are there but they are created by schema_validations under the
 hood.
 
+## Compatibility
+
+SchemaValidations is tested on all combinations of:
+
+*   rails 3.2, 4.1, and 4.2
+*   MRI ruby 1.9.3 and 2.1.5)'s
+config.
+
 ## Installation
 
 Simply add schema_validations to your Gemfile.
 
-    gem "schema_validations"
+    gem "schema_validations"            
 
 ### What if I want something special?
 
@@ -100,15 +110,9 @@ Data types:
 SchemaValidations uses the [schema_plus](http://rubygems.org/gems/schema_plus)
 gem for its schema queries.  That gem will by default auto-create foreign key
 constraints that you probably want -- but if you don't want them, you can
-disable them using [schema_plus](http://rubygems.org/gems/schema_plus)'s
-config.
-
-## Compatibility
+disable them using [schema_plus](http://rubygems.org/gems/schema_plus
 
-SchemaValidations is tested on all combinations of:
 
-*   rails 3.2 or 4.1
-*   MRI ruby 1.9.3 and 2.1.3
 
 ## How do I know what it did?
 If you're curious (or dubious) about what validations SchemaValidations
@@ -129,9 +133,13 @@ use case.
 
 ## Release Notes
 
+### 1.1.0
+
+* Works with Rails 4.2.
+
 ### 1.0.1
 
-* Fix enums in Rails 4.1.  [@lowjoel](https://github.com/lowjoel)
+* Fix enums in Rails 4.1.  Thanks to [@lowjoel](https://github.com/lowjoel)
 
 ### 1.0.0
 

data/gemfiles/Gemfile.base

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 gemspec :path => File.expand_path('..', __FILE__)
 
-gem "byebug" if RUBY_VERSION > "2"
+platform :ruby do
+    gem "byebug" if RUBY_VERSION > "2"
+end

data/gemfiles/rails-3.2/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

data/gemfiles/rails-4.1/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

data/gemfiles/rails-4.2/Gemfile.base

@@ -0,0 +1,3 @@
+eval File.read File.expand_path('../../Gemfile.base', __FILE__)
+
+gem "rails", "~> 4.2.0"

data/gemfiles/rails-4.2/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

data/lib/schema_validations/active_record/validations.rb

@@ -96,17 +96,27 @@ module SchemaValidations
           name = column.name.to_sym
 
           # Data-type validation
-          if column.type == :integer
-            load_integer_column_validations(name, column)
-          elsif column.number?
-            load_numeric_column_validations(name, column)
-          elsif column.text? && column.limit
-            load_string_column_validations(name, column)
+          datatype = case
+                     when respond_to?(:defined_enums) && defined_enums.has_key?(column.name) then :enum
+                     when column.type == :integer then :integer
+                     when column.number? then :numeric
+                     when column.respond_to?(:text?) && column.text? then :text
+                     when [:string, :text].include?(column.type) then :text
+                     when column.type == :boolean then :boolean
+                     end
+
+          case datatype
+          when :integer
+            validate_logged :validates_numericality_of, name, :allow_nil => true, :only_integer => true
+          when :numeric
+            validate_logged :validates_numericality_of, name, :allow_nil => true
+          when :text
+            validate_logged :validates_length_of, name, :allow_nil => true, :maximum => column.limit if column.limit
           end
 
           # NOT NULL constraints
           if column.required_on
-            if column.type == :boolean
+            if datatype == :boolean
               validate_logged :validates_inclusion_of, name, :in => [true, false], :message => :blank
             else
               validate_logged :validates_presence_of, name
@@ -118,21 +128,6 @@ module SchemaValidations
         end
       end
 
-      def load_integer_column_validations(name, column)
-        is_enum_column = respond_to?(:defined_enums) && defined_enums.has_key?(column.name)
-        unless is_enum_column
-          validate_logged :validates_numericality_of, name, :allow_nil => true, :only_integer => true
-        end
-      end
-
-      def load_numeric_column_validations(name, _)
-        validate_logged :validates_numericality_of, name, :allow_nil => true
-      end
-
-      def load_string_column_validations(name, column)
-        validate_logged :validates_length_of, name, :allow_nil => true, :maximum => column.limit
-      end
-
       def load_association_validations #:nodoc:
         reflect_on_all_associations(:belongs_to).each do |association|
           # :primary_key_name was deprecated (noisily) in rails 3.1

data/lib/schema_validations/version.rb

@@ -1,3 +1,3 @@
 module SchemaValidations
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/schema_dev.yml

@@ -1,7 +1,8 @@
 ruby:
   - 1.9.3
-  - 2.1.3
+  - 2.1.5
 rails:
   - 3.2
   - 4.1
+  - 4.2
 db: sqlite3

data/schema_validations.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency("schema_plus")
       
-  s.add_development_dependency("schema_dev", "~> 1.0")
+  s.add_development_dependency("schema_dev", "~> 1.2")
   s.add_development_dependency("rake")
   s.add_development_dependency("rdoc")
   s.add_development_dependency("rspec")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_validations
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2015-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: schema_plus
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -142,7 +142,11 @@ files:
 - Rakefile
 - gemfiles/Gemfile.base
 - gemfiles/rails-3.2/Gemfile.base
+- gemfiles/rails-3.2/Gemfile.sqlite3
 - gemfiles/rails-4.1/Gemfile.base
+- gemfiles/rails-4.1/Gemfile.sqlite3
+- gemfiles/rails-4.2/Gemfile.base
+- gemfiles/rails-4.2/Gemfile.sqlite3
 - init.rb
 - lib/schema_validations.rb
 - lib/schema_validations/active_record/validations.rb
@@ -150,6 +154,7 @@ files:
 - lib/schema_validations/version.rb
 - schema_dev.yml
 - schema_validations.gemspec
+- spec/schema_validations.sqlite3
 - spec/spec_helper.rb
 - spec/support/active_model.rb
 - spec/validations_spec.rb
@@ -178,6 +183,7 @@ signing_key:
 specification_version: 4
 summary: Automatically creates validations basing on the database schema.
 test_files:
+- spec/schema_validations.sqlite3
 - spec/spec_helper.rb
 - spec/support/active_model.rb
 - spec/validations_spec.rb