activerecord_mysql_strict 0.1 → 0.1.1

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+
+rvm:
+  - 2.0.0
+  - 1.9.3
+
+gemfile:
+  - gemfiles/Gemfile.activerecord-4.0
+  - gemfiles/Gemfile.activerecord-3.2.x
+
+script: "echo 'DO IT' && bundle exec rake spec"

data/README.md

@@ -1,6 +1,7 @@
 # ActiveRecord::MySQL::Strict
 
 [![Gem Version](https://badge.fury.io/rb/activerecord_mysql_strict.png)](https://rubygems.org/gems/activerecord_mysql_strict)
+[![Build Status](https://travis-ci.org/mirego/activerecord_mysql_strict.png?branch=master)](https://travis-ci.org/mirego/activerecord_mysql_strict)
 
 `ActiveRecord::MySQL::Strict` adds validations to ActiveRecord models to make sure they do not trigger errors in MySQL strict mode.
 
@@ -17,6 +18,7 @@ gem 'activerecord_mysql_strict'
 ```ruby
 create_table "events" do |t|
   t.string   "name"
+  t.string   "email", limit: 128
   t.text     "description"
   t.integer  "people_count"
 end
@@ -33,6 +35,12 @@ event.valid? # => false
 event = Event.new(name: '.' * 255)
 event.valid? # => true
 
+event = Event.new(email: '.' * 200)
+event.valid? # => false
+
+event = Event.new(email: '.' * 100)
+event.valid? # => true
+
 # Text columns
 
 event = Event.new(description: '.' * 70000)
@@ -64,6 +72,10 @@ class Event < ActiveRecord::Base
 end
 ```
 
+## Todo
+
+* Support other MySQL column types that raise a `Mysql2::Error` exception when given a wrong value.
+
 ## License
 
 `ActiveRecord::MySQL::Strict` is © 2013 [Mirego](http://www.mirego.com) and may be freely distributed under the [New BSD license](http://opensource.org/licenses/BSD-3-Clause).  See the [`LICENSE.md`](https://github.com/mirego/activerecord_mysql_strict/blob/master/LICENSE.md) file.

data/activerecord_mysql_strict.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'activerecord', '>= 3.0.0'
+  spec.add_dependency 'activemodel', '>= 3.0.0'
   spec.add_dependency 'activesupport', '>= 3.0.0'
 
   spec.add_development_dependency 'bundler', '~> 1.3'

data/gemfiles/Gemfile.activerecord-3.2.x

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 3.2.0'

data/gemfiles/Gemfile.activerecord-4.0

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 4.0.0'

data/lib/active_record/mysql/strict/mixin.rb

@@ -1,6 +1,11 @@
 module ActiveRecord
   module MySQL
     module Strict
+      # Constants
+      MYSQL_STRICT_STRING_LIMIT = 255
+      MYSQL_STRICT_TEXT_LIMIT = 65535
+      MYSQL_STRICT_INTEGER_LIMIT = 2147483647
+
       module Mixin
         extend ActiveSupport::Concern
 
@@ -17,17 +22,22 @@ module ActiveRecord
               model_columns = model_columns.select { |c| only.include?(c.name.to_sym) }
             end
 
-            model_columns.select { |c| c.type == :string }.each do |field|
-              validates field.name, length: { in: 0..(field.limit || 255) }, allow_blank: true
+            model_columns.each do |field|
+              method = :"define_mysql_strict_#{field.type}_validation"
+              send(method, field) if respond_to?(method)
             end
+          end
 
-            model_columns.select { |c| c.type == :text }.each do |field|
-              validates field.name, length: { in: 0..(field.limit || 65535) }, allow_blank: true
-            end
+          def define_mysql_strict_string_validation(field)
+            validates field.name, 'ActiveRecord::MySQL::Strict::StrictLength' => { in: 0..(field.limit || MYSQL_STRICT_STRING_LIMIT) }, allow_blank: true
+          end
 
-            model_columns.select { |c| c.type == :integer }.each do |field|
-              validates field.name, numericality: { greather_than_or_equal_to: -2147483647, less_than_or_equal_to: 2147483647 }, allow_blank: true
-            end
+          def define_mysql_strict_text_validation(field)
+            validates field.name, 'ActiveRecord::MySQL::Strict::StrictLength' => { in: 0..(field.limit || MYSQL_STRICT_TEXT_LIMIT) }, allow_blank: true
+          end
+
+          def define_mysql_strict_integer_validation(field)
+            validates field.name, numericality: { greather_than_or_equal_to: -MYSQL_STRICT_INTEGER_LIMIT, less_than_or_equal_to: MYSQL_STRICT_INTEGER_LIMIT }, allow_blank: true
           end
         end
       end

data/lib/active_record/mysql/strict/strict_length_validator.rb

@@ -0,0 +1,28 @@
+module ActiveRecord
+  module MySQL
+    module Strict
+      class StrictLengthValidator < ActiveModel::Validations::LengthValidator
+        def validate_each(record, attribute, value)
+          value = record.send(:read_attribute, attribute)
+          value_length = value.respond_to?(:length) ? value.length : value.to_s.length
+          errors_options = options.except(*RESERVED_OPTIONS)
+
+          CHECKS.each do |key, validity_check|
+            next unless check_value = options[key]
+
+            if !value.nil? || skip_nil_check?(key)
+              next if value_length.send(validity_check, check_value)
+            end
+
+            errors_options[:count] = check_value
+
+            default_message = options[MESSAGES[key]]
+            errors_options[:message] ||= default_message if default_message
+
+            record.errors.add(attribute, MESSAGES[key], errors_options)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_record/mysql/strict/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module MySQL
     module Strict
-      VERSION = '0.1'
+      VERSION = '0.1.1'
     end
   end
 end

data/lib/activerecord_mysql_strict.rb

@@ -1,8 +1,10 @@
 require 'active_record/mysql/strict/version'
 
 require 'active_record'
+require 'active_model'
 require 'active_support'
 
+require 'active_record/mysql/strict/strict_length_validator'
 require 'active_record/mysql/strict/mixin'
 
 class ActiveRecord::Base

data/spec/activerecord_mysql_strict/mixin_spec.rb

@@ -115,9 +115,7 @@ describe ActiveRecord::MySQL::Strict::Mixin do
     context 'for model with related validations' do
       context 'for presence validation' do
         let(:model) do
-          strict_model 'User' do
-            validates :name, presence: true
-          end
+          strict_model('User') { validates :name, presence: true }
         end
 
         before do
@@ -130,5 +128,31 @@ describe ActiveRecord::MySQL::Strict::Mixin do
         it { expect(subject.errors.full_messages).to eql ["Name can't be blank"] }
       end
     end
+
+    context 'for model with accessor that returns an invalid string' do
+      let(:model) do
+        strict_model 'User' do
+          attr_reader :long_name
+
+          # When we call `#long_name` it will return an invalid string but
+          # we want the attribute to store the real, valid value because we
+          # want to actually make sure that the real attribute value does
+          # not exceed the limit, not what the accessor returns.
+          define_method :long_name= do |value|
+            @long_name = '*' * 400
+            write_attribute(:long_name, value)
+          end
+        end
+      end
+
+      before do
+        run_migration do
+          create_table(:users, force: true) { |t| t.string :long_name }
+        end
+      end
+
+      subject { model.new(long_name: '*' * 10) }
+      it { should be_valid }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_mysql_strict
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -117,11 +133,15 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
 - activerecord_mysql_strict.gemspec
+- gemfiles/Gemfile.activerecord-3.2.x
+- gemfiles/Gemfile.activerecord-4.0
 - lib/active_record/mysql/strict/mixin.rb
+- lib/active_record/mysql/strict/strict_length_validator.rb
 - lib/active_record/mysql/strict/version.rb
 - lib/activerecord_mysql_strict.rb
 - spec/activerecord_mysql_strict/mixin_spec.rb
@@ -143,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -412845040514754438
+      hash: -369873074256560002
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -152,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -412845040514754438
+      hash: -369873074256560002
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23