schema_validations 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57990870ff9defa81491b9a1ddfeb8070ce0f4da
-  data.tar.gz: 3553e2c896fbde23dc9458ebc4b4c0ddefa67594
+  metadata.gz: 06905897e2968a424dd329db0dd07bfdc32625aa
+  data.tar.gz: 351f0900d4f03138c76a3f19a4e83c4a02cf522d
 SHA512:
-  metadata.gz: 09d958820120ccb7a284996ca3308ed3ecee9971ff194c5c9a8de67f4a4d311cd53ae3fc4e9d0ff51c802e8f607da2343e9f1f07dbd2a6161e25e5b366f26d8b
-  data.tar.gz: 32906f059b3b7ae7eac3ba36b0b400d6edf3ec39bd43d8555f7ce024c983106c3551f83c887dfceee48526305c44645a6ad77f61222fd665473db4f6a1922529
+  metadata.gz: 84c4bae6e9d3931f74a817c05c272a82be472c41a147a579c3ea5bd80b53b76f7287afe2f8a7eff909d1d59c667c3fd38fb147c3031ec8c74c1ab9f460dcfdd5
+  data.tar.gz: 3d39c05c232dd621b8ea04c80c018c108844cd5817725088b9ee300682863444ed7eb8b1c1fb7231116c62b6bbcaf32c487a537e14fec877c8bacec5b21ae0ab

data/README.md

@@ -17,24 +17,30 @@ columns, keeping your model class definitions simple and DRY.  That's great
 for simple data columns, but where it falls down is when your table contains
 constraints.
 
-    create_table :users do |t|
-      t.string :email, :null => false, :limit => 30
-      t.boolean :confirmed, :null => false
-    end
+```ruby
+create_table :users do |t|
+    t.string :email, null: false, limit: 30
+    t.boolean :confirmed, null: false
+end
+```
 
-In that case the constraints `:null => false`, `:limit => 30` and `:boolean` must be validated on the model level, to avoid ugly database exceptions:
+In that case the constraints `null: false`, `limit: 30` and `:boolean` must be validated on the model level, to avoid ugly database exceptions:
 
-    class User < ActiveRecord::Base
-      validates :email, :presence => true, :length => { :maximum => 30 }
-      validates :confirmed, :presence => true, :inclusion => { :in => [true, false] }
-    end
+```ruby
+class User < ActiveRecord::Base
+    validates :email, presence: true, length: { maximum: 30 }
+    validates :confirmed, presence: true, inclusion: { in: [true, false] }
+end
+```
 
 ...which isn't the most DRY approach.
 
 SchemaValidations aims to DRY up your models, doing that boring work for you. It inspects the database and automatically creates validations based on the schema. After installing it your model is as simple as it can be.
 
-    class User < ActiveRecord::Base
-    end
+```ruby
+class User < ActiveRecord::Base
+end
+```
 
 Validations are there but they are created by schema_validations under the
 hood.
@@ -43,26 +49,28 @@ hood.
 
 Simply add schema_validations to your Gemfile.
 
-    gem "schema_validations"
+```ruby
+gem "schema_validations"
+```
     
 ## Which validations are covered?
 
 Constraints:
 
-|      Constraint     |                     Validation                           |
-|---------------------|----------------------------------------------------------|
-| `:null => false      | validates ... :presence => true                          |
-| :limit => 100       | validates ... :length => { :maximum => 100 }             |
-| :unique => true     | validates ... :uniqueness => true                        |
-| :unique => true, :case_sensitive => false <br>(If [schema_plus_pg_indexes](https://github.com/SchemaPlus/schema_plus_pg_indexes) is also in use) | validates ... :uniqueness => { :case_sensitive => false } |
+|      Constraint     |                     Validation                    |
+|---------------------|---------------------------------------------------|
+| `null: false`    | `validates ... presence: true`                       |
+| `limit: 100`     | `validates ... length: { maximum: 100 }`             |
+| `unique: true`   | `validates ... uniqueness: true`                     |
+| `unique: true, case_sensitive: false` <br>(If [schema_plus_pg_indexes](https://github.com/SchemaPlus/schema_plus_pg_indexes) is also in use) | `validates ... uniqueness: { case_sensitive: false }` |
 
 Data types:
 
-|         Type       |                      Validation                                                                                |
-|--------------------|----------------------------------------------------------------------------------------------------------------|
-| :boolean           | :validates ... :inclusion => { :in => [true, false] }                                                          |
-| :float             | :validates ... :numericality => true                                                                           |
-| :integer           | :validates ... :numericality => { :only_integer => true, :greater_than_or_equal_to => ..., :less_than => ... } |
+|         Type       |                      Validation                                                                      |
+|--------------------|------------------------------------------------------------------------------------------------------|
+| `:boolean`         | `:validates ... inclusion: { in: [true, false] }`                                                    |
+| `:float`           | `:validates ... numericality: true`                                                                  |
+| `:integer`         | `:validates ... numericality: { only_integer: true, greater_than_or_equal_to: ..., less_than: ... }` |
 
 
 ## What if I want something special?
@@ -117,25 +125,25 @@ You can override the global configuration per-model, using the `schema_validatio
 
 ##### Disable per model:
 ```ruby
-    class User < ActiveRecord::Base
-      schema_validations auto_create: false
-    end
+class User < ActiveRecord::Base
+    schema_validations auto_create: false
+end
 ```
 
 ##### Use a custom validation rather than schema_validations automatic default:
 ```ruby
-    class User < ActiveRecord::Base
-      schema_validations except: :email  # don't create default validation for email
-      validates :email, presence: true, length: { in: 5..30 }
-    end
+class User < ActiveRecord::Base
+    schema_validations except: :email  # don't create default validation for email
+    validates :email, presence: true, length: { in: 5..30 }
+end
 ```
 
 ##### Include validations every field, without a whitelist:
 
 ```ruby
-    class User < ActiveRecord::Base
-      schema_validations :whitelist => nil
-    end
+class User < ActiveRecord::Base
+    schema_validations whitelist: nil
+end
 ```
 
 
@@ -145,7 +153,9 @@ If you're curious (or dubious) about what validations SchemaValidations
 defines, you can check the log file.  For every assocation that
 SchemaValidations defines, it generates a debug entry in the log such as
 
-    [schema_validations] Article.validates_length_of :title, :allow_nil=>true, :maximum=>50
+```
+[schema_validations] Article.validates_length_of :title, :allow_nil=>true, :maximum=>50
+```
 
 which shows the exact validation definition call.
 
@@ -175,6 +185,10 @@ Earlier versions of SchemaValidations supported:
 
 ## Release Notes
 
+### 2.0.1
+
+* Bug fix: Don't crash when optimistic locking is in use (#8)
+
 ### 2.0.0
 
 This major version is backwards compatible for most uses.  Only those who specified a per-model `:except` clause would be affected.

data/lib/schema_validations.rb

@@ -3,6 +3,7 @@ require 'valuable'
 require 'schema_plus_columns'
 require 'schema_validations/version'
 require 'schema_validations/active_record/validations'
+require 'schema_validations/active_record/type'
 require 'schema_validations/railtie' if defined?(Rails::Railtie)
 
 module SchemaValidations
@@ -112,6 +113,7 @@ module SchemaValidations
     return if @inserted
     @inserted = true
     ::ActiveRecord::Base.extend SchemaValidations::ActiveRecord::Validations
+    ::ActiveRecord::Type::Integer.prepend SchemaValidations::ActiveRecord::Type::Integer
   end
 
 end

data/lib/schema_validations/active_record/type.rb

@@ -0,0 +1,14 @@
+module SchemaValidations
+  module ActiveRecord
+    module Type
+
+      module Integer
+        def self.prepended(base)
+          base.class_eval do
+            public :range
+          end
+        end
+      end
+    end
+  end
+end

data/lib/schema_validations/active_record/validations.rb

@@ -130,12 +130,13 @@ module SchemaValidations
       def load_integer_column_validations(name, column) # :nodoc:
         options = { :allow_nil => true, :only_integer => true }
 
-        range = column.cast_type.send(:range)
-        options[:greater_than_or_equal_to] = range.begin
-        if range.exclude_end?
-          options[:less_than] = range.end
-        else
-          options[:less_than_or_equal_to] = range.end
+        if range = column.cast_type.try(:range)
+          options[:greater_than_or_equal_to] = range.begin
+          if range.exclude_end?
+            options[:less_than] = range.end
+          else
+            options[:less_than_or_equal_to] = range.end
+          end
         end
 
         validate_logged :validates_numericality_of, name, options

data/lib/schema_validations/version.rb

@@ -1,3 +1,3 @@
 module SchemaValidations
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/spec/validations_spec.rb

@@ -391,6 +391,22 @@ describe "Validations" do
     end
   end
 
+  context 'with optimistic locking' do
+    before do
+      ActiveRecord::Schema.define do
+        create_table :optimistics, :force => true do |t|
+          t.integer :lock_version
+        end
+      end
+      with_auto_validations do
+        class Optimistic < ActiveRecord::Base; end
+      end
+    end
+    it 'should not crash' do
+      expect(Optimistic.new).to be_valid
+    end
+  end
+
   protected
   def with_auto_validations(value = true)
     old_value = SchemaValidations.config.auto_create

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_validations
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-18 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: schema_plus_columns
@@ -181,6 +181,7 @@ files:
 - gemfiles/activerecord-4.2/Gemfile.sqlite3
 - init.rb
 - lib/schema_validations.rb
+- lib/schema_validations/active_record/type.rb
 - lib/schema_validations/active_record/validations.rb
 - lib/schema_validations/railtie.rb
 - lib/schema_validations/version.rb