validation_reflection 0.3.3 → 0.3.4

data/.gitignore

@@ -0,0 +1,4 @@
+.DS_STORE
+*~
+pkg*
+validation_reflection*.gem

data/CHANGELOG

@@ -1,3 +1,6 @@
+== 0.3.3, 2009-09-12
+* version bump
+
 == 0.3.2, 2009-09-12
 * gemified by Christopher Redinger
 

data/Rakefile

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
@@ -22,7 +23,12 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
 end
 
 begin
-  require 'jeweler'
+  begin
+    require 'jeweler'
+  rescue LoadError
+    gem 'technicalpickles-jeweler', '>= 1.0.0'
+    require 'jeweler'
+  end
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "validation_reflection"
     gemspec.summary = "Adds reflective access to validations"

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
+:major: 0
 :minor: 3
-:patch: 3
-:major: 0
+:patch: 4

data/lib/validation_reflection.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 #--
 # Copyright (c) 2006-2008, Michael Schuerig, michael@schuerig.de
 #
@@ -20,59 +21,70 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
-
-
 require 'active_record/reflection'
 require 'ostruct'
 
 # Based on code by Sebastian Kanthak
 # See http://dev.rubyonrails.org/ticket/861
+#
 module ActiveRecordExtensions # :nodoc:
   module ValidationReflection # :nodoc:
-    CONFIG_PATH = File.join(RAILS_ROOT, 'config', 'plugins', 'validation_reflection.rb')
-    
-    mattr_accessor :reflected_validations
-    ActiveRecordExtensions::ValidationReflection.reflected_validations = %w(
-       validates_acceptance_of
-       validates_associated
-       validates_confirmation_of
-       validates_exclusion_of
-       validates_format_of
-       validates_inclusion_of
-       validates_length_of
-       validates_numericality_of
-       validates_presence_of
-       validates_uniqueness_of
-    )
-
-    mattr_accessor :in_ignored_subvalidation
-    ActiveRecordExtensions::ValidationReflection.in_ignored_subvalidation = false
-    
-    def self.included(base)
-      return if base.kind_of?(ActiveRecordExtensions::ValidationReflection::ClassMethods)
+
+    extend self
+
+    # Look for config/initalizer here in:
+    CONFIG_PATH = ::Dir.glob((::File.join(RAILS_ROOT, 'config', '**', 'validation_reflection.rb').to_s rescue '')).first || ''
+    CORE_VALIDATONS = [
+       :validates_acceptance_of,
+       :validates_associated,
+       :validates_confirmation_of,
+       :validates_exclusion_of,
+       :validates_format_of,
+       :validates_inclusion_of,
+       :validates_length_of,
+       :validates_numericality_of,
+       :validates_presence_of,
+       :validates_uniqueness_of,
+     ].freeze
+     
+    @@reflected_validations = CORE_VALIDATONS.dup
+    @@in_ignored_subvalidation = false
+
+    mattr_accessor  :reflected_validations,
+                    :in_ignored_subvalidation
+
+    def included(base) # :nodoc:
+      return if base.kind_of?(::ActiveRecordExtensions::ValidationReflection::ClassMethods)
       base.extend(ClassMethods)
     end
 
-    def self.load_config
-      if File.file?(CONFIG_PATH)
-        config = OpenStruct.new
-        config.reflected_validations = reflected_validations
+    # Load config/initializer on load, where ValidationReflection defaults
+    # (such as which validations to reflect upon) cane be overridden/extended.
+    #
+    def load_config
+      if ::File.file?(CONFIG_PATH)
+        config = ::OpenStruct.new
+        config.reflected_validations = @@reflected_validations
         silence_warnings do
-          eval(IO.read(CONFIG_PATH), binding, CONFIG_PATH)
+          eval(::IO.read(CONFIG_PATH), binding, CONFIG_PATH)
         end
       end
     end
 
-    def self.install(base)
-      reflected_validations.freeze
-      reflected_validations.each do |validation_type|
-        next if base.respond_to?("#{validation_type}_with_reflection")
+    # Iterate through all validations and store/cache the info
+    # for later easy access.
+    #
+    def install(base)
+      @@reflected_validations.each do |validation_type|
+        next if base.respond_to?(:"#{validation_type}_with_reflection")
         ignore_subvalidations = false
-        if validation_type.kind_of?(Hash)
+        
+        if validation_type.kind_of?(::Hash)
           ignore_subvalidations = validation_type[:ignore_subvalidations]
           validation_type = validation_type[:method]
         end
-        base.class_eval <<-"end_eval"
+        
+        base.class_eval %{
           class << self
             def #{validation_type}_with_reflection(*attr_names)
               ignoring_subvalidations(#{ignore_subvalidations}) do
@@ -80,53 +92,57 @@ module ActiveRecordExtensions # :nodoc:
                 remember_validation_metadata(:#{validation_type}, *attr_names)
               end
             end
-
             alias_method_chain :#{validation_type}, :reflection
           end
-        end_eval
+        }, __FILE__, __LINE__
       end
     end
+    alias :reload :install
 
     module ClassMethods
 
+      include ::ActiveRecordExtensions::ValidationReflection
+
       # Returns an array of MacroReflection objects for all validations in the class
       def reflect_on_all_validations
-        read_inheritable_attribute(:validations) || []
+        self.read_inheritable_attribute(:validations) || []
       end
 
       # Returns an array of MacroReflection objects for all validations defined for the field +attr_name+.
       def reflect_on_validations_for(attr_name)
-        attr_name = attr_name.to_sym
-        reflect_on_all_validations.select do |reflection|
-          reflection.name == attr_name
+        self.reflect_on_all_validations.select do |reflection|
+          reflection.name == attr_name.to_sym
         end
       end
 
       private
-      
-      def remember_validation_metadata(validation_type, *attr_names)
-        configuration = attr_names.last.is_a?(Hash) ? attr_names.pop : {}
-        attr_names.each do |attr_name|
-          write_inheritable_array :validations,
-            [ ActiveRecord::Reflection::MacroReflection.new(validation_type, attr_name.to_sym, configuration, self) ]
+
+        # Store validation info for easy and fast access.
+        #
+        def remember_validation_metadata(validation_type, *attr_names)
+          configuration = attr_names.last.is_a?(::Hash) ? attr_names.pop : {}
+          attr_names.each do |attr_name|
+            self.write_inheritable_array :validations,
+              [::ActiveRecord::Reflection::MacroReflection.new(validation_type, attr_name.to_sym, configuration, self)]
+          end
         end
-      end
-      
-      def ignoring_subvalidations(ignore)
-        save_ignore = ActiveRecordExtensions::ValidationReflection.in_ignored_subvalidation
-        unless ActiveRecordExtensions::ValidationReflection.in_ignored_subvalidation
-          ActiveRecordExtensions::ValidationReflection.in_ignored_subvalidation = ignore
-          yield
+
+        def ignoring_subvalidations(ignore)
+          save_ignore = self.in_ignored_subvalidation
+          unless self.in_ignored_subvalidation
+            self.in_ignored_subvalidation = ignore
+            yield
+          end
+        ensure
+          self.in_ignored_subvalidation = save_ignore
         end
-      ensure
-        ActiveRecordExtensions::ValidationReflection.in_ignored_subvalidation = save_ignore
-      end
+
     end
   end
 end
 
 ActiveRecord::Base.class_eval do
-  include ActiveRecordExtensions::ValidationReflection
-  ActiveRecordExtensions::ValidationReflection.load_config
-  ActiveRecordExtensions::ValidationReflection.install(self)
+  include ::ActiveRecordExtensions::ValidationReflection
+  ::ActiveRecordExtensions::ValidationReflection.load_config
+  ::ActiveRecordExtensions::ValidationReflection.install(self)
 end

data/rails/init.rb

@@ -1 +1,2 @@
+# encoding: utf-8
 require 'validation_reflection'

data/test/test_helper.rb

@@ -1,6 +1,19 @@
-ENV["RAILS_ENV"] = "test"
+# encoding: utf-8
+ENV['RAILS_ENV'] = 'test'
 RAILS_ROOT = File.join(File.dirname(__FILE__))
 
 require 'rubygems'
-require 'test/unit'
-require 'active_record'
+
+begin
+  require 'active_record'
+rescue LoadError
+  gem 'activerecord', '>= 1.2.3'
+  require 'active_record'
+end
+
+begin
+  require 'test/unit'
+rescue LoadError
+  gem 'test-unit', '>= 1.2.3'
+  require 'test/unit'
+end

data/test/validation_reflection_test.rb

@@ -1,4 +1,5 @@
-require 'test_helper'
+# encoding: utf-8
+require File.join(File.dirname(__FILE__), 'test_helper')
 
 ActiveRecord::Base.class_eval do
   def self.validates_something_weird(*cols)
@@ -16,13 +17,13 @@ end
 require 'validation_reflection'
 
 ActiveRecord::Base.class_eval do
-  include ActiveRecordExtensions::ValidationReflection
-  ActiveRecordExtensions::ValidationReflection.reflected_validations << :validates_something_weird
-  ActiveRecordExtensions::ValidationReflection.reflected_validations << {
-    :method => :validates_something_selfcontained,
-    :ignore_subvalidations => true
-  }
-  ActiveRecordExtensions::ValidationReflection.install(self)
+  include ::ActiveRecordExtensions::ValidationReflection
+  ::ActiveRecordExtensions::ValidationReflection.reflected_validations << :validates_something_weird
+  ::ActiveRecordExtensions::ValidationReflection.reflected_validations << {
+      :method => :validates_something_selfcontained,
+      :ignore_subvalidations => true
+    }
+  ::ActiveRecordExtensions::ValidationReflection.install(self)
 end
 
 
@@ -30,13 +31,13 @@ class ValidationReflectionTest < Test::Unit::TestCase
 
   class Dummy < ActiveRecord::Base
     class << self
-  
+
       def create_fake_column(name, null = true, limit = nil)
         sql_type = limit ? "varchar (#{limit})" : nil
         col = ActiveRecord::ConnectionAdapters::Column.new(name, nil, sql_type, null)
         col
       end
-  
+
       def columns
         [
          create_fake_column('col0'),
@@ -50,9 +51,9 @@ class ValidationReflectionTest < Test::Unit::TestCase
         ]
       end
     end
-    
+
     has_one :nothing
-    
+
     validates_presence_of :col1
     validates_length_of :col2, :maximum => 100
     validates_format_of :col3, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
@@ -62,61 +63,61 @@ class ValidationReflectionTest < Test::Unit::TestCase
     validates_something_selfcontained :col7
   end
 
-
   def test_sanity
     assert_equal [], Dummy.reflect_on_validations_for(:col0)
   end
 
   def test_validates_presence_of_is_reflected
-    refls = Dummy.reflect_on_validations_for(:col1)
-    assert refls.all? { |r| r.name.to_s == 'col1' }
-    assert refls.find { |r| r.macro == :validates_presence_of }
+    reflections = Dummy.reflect_on_validations_for(:col1)
+    assert reflections.all? { |r| r.name.to_s == 'col1' }
+    assert reflections.find { |r| r.macro == :validates_presence_of }
   end
 
   def test_string_limit_is_reflected
-    refls = Dummy.reflect_on_validations_for(:col2)
-    assert refls.any? { |r| r.macro == :validates_length_of && r.options[:maximum] == 100 }
+    reflections = Dummy.reflect_on_validations_for(:col2)
+    assert reflections.any? { |r| r.macro == :validates_length_of && r.options[:maximum] == 100 }
   end
 
   def test_format_is_reflected
-    refls = Dummy.reflect_on_validations_for(:col3)
-    assert refls.any? { |r| r.macro == :validates_format_of && r.options[:with] == /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i }
+    reflections = Dummy.reflect_on_validations_for(:col3)
+    assert reflections.any? { |r| r.macro == :validates_format_of && r.options[:with] == /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i }
   end
 
   def test_numeric_integer_is_reflected
-    refls = Dummy.reflect_on_validations_for(:col4)
-    assert refls.any? { |r| r.macro == :validates_numericality_of && r.options[:only_integer] }
+    reflections = Dummy.reflect_on_validations_for(:col4)
+    assert reflections.any? { |r| r.macro == :validates_numericality_of && r.options[:only_integer] }
   end
-  
+
   def test_numeric_is_reflected
-    refls = Dummy.reflect_on_validations_for(:col5)
-    assert refls.any? { |r| r.macro == :validates_numericality_of }
+    reflections = Dummy.reflect_on_validations_for(:col5)
+    assert reflections.any? { |r| r.macro == :validates_numericality_of }
   end
-  
+
   def test_validation_options_are_reflected
-    refls = Dummy.reflect_on_validations_for(:col5)
-    refl = refls[0]
+    reflections = Dummy.reflect_on_validations_for(:col5)
+    refl = reflections[0]
     assert_equal 5, refl.options[:less_than]
   end
 
   def test_custom_validations_are_reflected
-    refls = Dummy.reflect_on_validations_for(:col6)
-    assert refls.any? { |r| r.macro == :validates_something_weird }
-    assert refls.any? { |r| r.macro == :validates_format_of }
+    reflections = Dummy.reflect_on_validations_for(:col6)
+    assert reflections.any? { |r| r.macro == :validates_something_weird }
+    assert reflections.any? { |r| r.macro == :validates_format_of }
   end
 
   def test_custom_validations_with_options_are_reflected
-    refls = Dummy.reflect_on_validations_for(:col7)
-    assert refls.any? { |r| r.macro == :validates_something_selfcontained }
+    reflections = Dummy.reflect_on_validations_for(:col7)
+    assert reflections.any? { |r| r.macro == :validates_something_selfcontained }
   end
 
   def test_subvalidations_are_reflected
-    refls = Dummy.reflect_on_validations_for(:col6)
-    assert_equal 2, refls.size
+    reflections = Dummy.reflect_on_validations_for(:col6)
+    assert_equal 2, reflections.size
   end
 
   def test_ignored_subvalidations_are_not_reflected
-    refls = Dummy.reflect_on_validations_for(:col7)
-    assert_equal 1, refls.size
+    reflections = Dummy.reflect_on_validations_for(:col7)
+    assert_equal 1, reflections.size
   end
+
 end

data/validation_reflection.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{validation_reflection}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Christopher Redinger"]
-  s.date = %q{2009-09-12}
+  s.date = %q{2009-10-09}
   s.description = %q{Adds reflective access to validations}
   s.email = %q{redinger@gmail.com}
   s.extra_rdoc_files = [
@@ -17,7 +17,8 @@ Gem::Specification.new do |s|
      "README"
   ]
   s.files = [
-    "CHANGELOG",
+    ".gitignore",
+     "CHANGELOG",
      "LICENSE",
      "README",
      "Rakefile",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: validation_reflection
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Christopher Redinger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-12 00:00:00 -04:00
+date: 2009-10-09 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -23,6 +23,7 @@ extra_rdoc_files:
 - LICENSE
 - README
 files: 
+- .gitignore
 - CHANGELOG
 - LICENSE
 - README