enforce_schema_rules 0.0.17 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2a1d83f9252628116c2859454e08bf48e11085d
-  data.tar.gz: 4f5bf1d8b25690b6e9ad5e23f7ac8264130e09e4
+  metadata.gz: 5c173ca802197b5ae0e7d9eebbcf1490dc4c9b07
+  data.tar.gz: 973c060193c583aaa837e63883d893293bc2fbaa
 SHA512:
-  metadata.gz: aaaba5d5afb50945bb160d65b431a6743c6b62f265217492fe1910fc1e098edde211270fedd84148f4517189d8153ae85344ebfe6e9bff6035eb544f9db16ece
-  data.tar.gz: 4bb07639e23b6cf0afb44496ce4601e6d14e9ed67ffdf52097375b3ce1260e425359ae94d2ee8c578f4640834736117d71d6b86cd4a987218f31b0ebc42d4682
+  metadata.gz: da1b3f98f2b17b9572286ff3a4317e1566023d0dcbea359375633a731e8d3f02d8566846c8c3c3f61f264f785aec8b485646593c337f9d3592dcdda174fd45c6
+  data.tar.gz: ed6229f742815bd36c603b9c685b59dc2de59533a84fef54a599adf854b8a944d40b4f8ece0fc4587a690b209bc5309be4140ba233567de717742e881eefdefe

data/README.rdoc

@@ -0,0 +1,61 @@
+= Enforce Schema Rules
+
+This plugin provides a way to validate your model against database rules 
+you've already created in your schema, including column lengths for
+strings,  "not null" designations, unique index constraints, and
+ensuring integer input  for integer columns.
+
+The four methods currently supported are: 
+
+    enforce_column_limits
+    enforce_integer_columns
+    enforce_not_null
+    enforce_unique_indexes
+
+You can also just call <tt>enforce_schema_rules</tt> to enforce all the
+above.
+
+Accepts the relevant validates_length_of options (i.e. :on and :message)
+and these assume the usual defaults.
+
+In addition to the regular options, you can also have an
+<tt>:except</tt> list enumerating the column that you don't want to
+validate. 
+
+By default, magic columns (_at, _on, _id, id, position, etc) are
+skipped. If  you'd like to override that behavior, you can define your
+own  <tt>:exclusion_regexp</tt>
+
+Examples:
+
+    class Person < ActiveRecord::Base
+      enforce_schema_rules :except => :dhh
+    end
+
+    class Book < ActiveRecord::Base
+      enforce_column_limits :message => "exceeds the %d character limit", :on => :update
+      enforce_unique_indexes
+      enforce_not_null :exclusion_regexp => /$fk_/
+    end
+
+
+== Download
+
+Development is done at:
+
+    http://github.com/twinge/enforce_schema_rules
+
+You can install as a gem with:
+
+    gem install enforce_schema_rules
+
+== Bugs & feedback
+
+Please send bug reports, patches and feedback to the GitHub project.
+
+== Credit
+
+The plugin was written by Josh Starcher <josh.starcher@gmail.com>. It
+was updated to Rails 3 by Eric Anderson <eric@pixelwareinc.com>. This
+plugin is basically an extension of David Easley's enforce-limits
+plugin. Michael Schuerig provided contributed a patch and a style lesson.

data/lib/enforce_schema_rules.rb

@@ -18,7 +18,7 @@ module Jls
           enforce_not_null(options.dup)
           enforce_unique_indexes(options.dup)
         end
-        
+
         # Enforce string column limits
         def enforce_column_limits(options = {})
           args = build_validation_args(options, :string, :too_long)
@@ -27,12 +27,15 @@ module Jls
           validates_each(*args) do |record, attr, value|
             limit = record.class.columns_hash[attr.to_s].limit
             if limit
-              message = options[:message] % {:count => limit}
+              message = case
+              when options[:message].is_a?(String) then options[:message] % {count: limit}
+              when limit == 1 then options[:message][:one]
+              else options[:message][:other] % {:count => limit} end
               record.errors.add(attr, message) unless value.nil? || value.size <= limit
             end
           end
         end
-        
+
         # Enforce numericality of integer columns
         def enforce_integer_columns(options = {})
           # first get the non-integers
@@ -44,14 +47,14 @@ module Jls
           args = build_validation_args(options, :integer, :not_a_number)
           validates_numericality_of(*args) unless args.first.is_a? Hash
         end
-        
+
         # Enfore "not null" columns settings
         def enforce_not_null(options = {})
           args = build_validation_args(options, :not_null, :blank)
           return if args.first.is_a?(Hash)
           validates_presence_of(*args)
        end
-        
+
         # Enfore unique indexes
         def enforce_unique_indexes(options = {})
           attrs = build_validation_args(options, false, :taken)
@@ -61,7 +64,7 @@ module Jls
             validates_uniqueness_of(index.columns.first, options)
           end
         end
-        
+
         def build_validation_args(options, col_type, validation_option = :invalid)
           options[validation_option] = I18n.translate('errors.messages')[validation_option]
           options[:message] ||= options[validation_option]
@@ -71,10 +74,10 @@ module Jls
                       when :numeric
                         lambda { |col| col.name !~ exclusion_regexp && col.number? && col.type != :integer }
                       when :not_null
-                        # I have to exclude boolean types because of a "feature" of the way validates_presence_of 
+                        # I have to exclude boolean types because of a "feature" of the way validates_presence_of
                         # handles boolean fields
                         # See http://dev.rubyonrails.org/ticket/5090 and http://dev.rubyonrails.org/ticket/3334
-                        lambda { |col| (col.name !~ exclusion_regexp || col.name =~ /_id$/) && !col.null && col.type != :boolean }
+                        lambda { |col| col.name !~ exclusion_regexp && !col.null && col.type != :boolean }
                       else
                         lambda { |col| col.name !~ exclusion_regexp && col_type == col.type }
                       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enforce_schema_rules
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.20
 platform: ruby
 authors:
 - Josh Starcher
@@ -11,48 +11,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   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: test-unit
   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: |2
@@ -68,33 +68,34 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- README
+- README.rdoc
 files:
+- README.rdoc
 - lib/enforce_schema_rules.rb
-- README
 homepage: 
 licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
-- README
+- "--main"
+- README.rdoc
 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: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An ActiveRecord plugin to automatically enforce database contraints
 test_files: []
+has_rdoc: 

data/README

@@ -1,81 +0,0 @@
-Enforce Schema Rules
-=====================
-
-This plugin provides a way to validate your model against database rules 
-you've already created in your schema, including column lengths for
-strings,  "not null" designations, unique index constraints, and
-ensuring integer input  for integer columns.
-
-The four methods currently supported are: 
-
-	enforce_column_limits
-	enforce_integer_columns
-	enforce_not_null
-	enforce_unique_indexes
-
-You can also just call <tt>enforce_schema_rules</tt> to enforce all the
-above.
-
-Accepts the relevant validates_length_of options (i.e. :on and :message)
-and these assume the usual defaults.
-
-In addition to the regular options, you can also have an
-<tt>:except</tt> list enumerating the column that you don't want to
-validate. 
-
-By default, magic columns (_at, _on, _id, id, position, etc) are
-skipped. If  you'd like to override that behavior, you can define your
-own  <tt>:exclusion_regexp</tt>
-
-Examples:
-
-  class Person < ActiveRecord::Base
-    enforce_schema_rules :except => :dhh
-  end
-
-  class Book < ActiveRecord::Base
-    enforce_column_limits :message => "exceeds the %d character limit", :on => :update
-    enforce_unique_indexes
-    enforce_not_null :exclusion_regexp => /$fk_/
-  end
-
-
-Download
---------
-
-Development is done at:
-
-  http://github.com/twinge/enforce_schema_rules
-
-You can install as a gem with:
-
-  gem install enforce_schema_rules
-
-Bugs & feedback
----------------
-Please send bug reports, patches and feedback to the GitHub project.
-
-Todo
-----
-The main goal was recent updates was to get it to work in Rails 3. Some
-cleanup was just a side-effect. If anybody is interested, additional
-cleanup items include:
-
-  * Make sure we don't need better test coverage. The upgrades to
-    Rails 3 caused some test fixes but I am not sure we have coverage so
-    a good eye towards that would be good.
-  * The smallest number of changes were done to get things working under
-    Rails 3. This plugin was written a while back. It might could be
-    refactored using some new goodness that comes with a more recent
-    ActiveRecord/Rails implementation.
-  * I most likely dropped support for Rails 2.x. The old version works
-    fine for those still on Rails 2.x so I say we just drop Rails 2.x
-    support (there are some warnings but they can be fixed fairly easily
-    and don't need to be fixed).
-
-Credit
-------
-The plugin was written by Josh Starcher <josh.starcher@gmail.com>. It
-was updated to Rails 3 by Eric Anderson <eric@pixelwareinc.com>. This
-plugin is basically an extension of David Easley's enforce-limits
-plugin. Michael Schuerig provided contributed a patch and a syle lesson.