validation_reflection 0.3.8 → 1.0.0.beta4

data/CHANGELOG

@@ -1,3 +1,6 @@
+== 1.0.0-beta4 2010-06-12
+* Changed initialization to reflect new initialization in Rails 3.
+
 == 0.3.7 2010-06-11
 * Enhancement from Sutto:
   ** Use Rails.root if available over RAILS_ROOT

data/README

@@ -1,7 +1,7 @@
 Validation Reflection
 =====================
 
-Version 0.3.7, 2010-06-11
+Version 1.0.0-beta4, 2010-06-12
 
 This plugin adds reflective access to validations
 
@@ -31,9 +31,9 @@ ActiveRecord::Reflection::MacroReflection. For example
 
 Usually, all the standard Rails validations are reflected.
 You can change this -- add or remove validations -- in an
-application-specific configuration file, 
+application-specific initializer, 
 
-  config/plugins/validation_reflection.rb
+  config/initializers/validation_reflection.rb
 
 In that file change config.reflected_validations to suit your
 needs. Say, you have a custom validation for email addresses,

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:major: 0
-:minor: 3
-:build: 
-:patch: 8
+:major: 1
+:minor: 0
+:build: "beta4"
+:patch: 0

data/lib/validation_reflection.rb

@@ -1,126 +1,104 @@
-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:
-
-    extend self
-
-    require_path = ::File.join((defined?(Rails) ? Rails.root : RAILS_ROOT), 'config', '**', 'validation_reflection.rb').to_s rescue ''
-
-    # Look for config/initializer here in:
-    CONFIG_PATH = ::Dir.glob(require_path).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
+module ValidationReflection # :nodoc:
+
+  extend self
+
+  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?(::ValidationReflection::ClassMethods)
+    base.extend(ClassMethods)
+  end
 
-    # 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)
-        end
+  # 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)
+        ignore_subvalidations = validation_type[:ignore_subvalidations]
+        validation_type = validation_type[:method]
       end
-    end
-
-    # 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)
-          ignore_subvalidations = validation_type[:ignore_subvalidations]
-          validation_type = validation_type[:method]
-        end
-        
-        base.class_eval %{
-          class << self
-            def #{validation_type}_with_reflection(*attr_names)
-              ignoring_subvalidations(#{ignore_subvalidations}) do
-                #{validation_type}_without_reflection(*attr_names)
-                remember_validation_metadata(:#{validation_type}, *attr_names)
-              end
+      
+      base.class_eval %{
+        class << self
+          def #{validation_type}_with_reflection(*attr_names)
+            ignoring_subvalidations(#{ignore_subvalidations}) do
+              #{validation_type}_without_reflection(*attr_names)
+              remember_validation_metadata(:#{validation_type}, *attr_names)
             end
-            alias_method_chain :#{validation_type}, :reflection
           end
-        }, __FILE__, __LINE__
-      end
+          alias_method_chain :#{validation_type}, :reflection
+        end
+      }, __FILE__, __LINE__
     end
+  end
+  alias :reload :install
 
-    module ClassMethods
+  module ClassMethods
 
-      include ::ActiveRecordExtensions::ValidationReflection
+    include ::ValidationReflection
 
-      # Returns an array of MacroReflection objects for all validations in the class
-      def reflect_on_all_validations
-        self.read_inheritable_attribute(:validations) || []
-      end
+    # Returns an array of MacroReflection objects for all validations in the class
+    def reflect_on_all_validations
+      self.read_inheritable_attribute(:reflected_validations) || []
+    end
 
-      # Returns an array of MacroReflection objects for all validations defined for the field +attr_name+.
-      def reflect_on_validations_for(attr_name)
-        self.reflect_on_all_validations.select do |reflection|
-          reflection.name == attr_name.to_sym
-        end
+    # Returns an array of MacroReflection objects for all validations defined for the field +attr_name+.
+    def reflect_on_validations_for(attr_name)
+      self.reflect_on_all_validations.select do |reflection|
+        reflection.name == attr_name.to_sym
       end
+    end
 
-      private
+    private
 
-        # 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.flatten.each do |attr_name|
-            self.write_inheritable_array :validations,
-              [::ActiveRecord::Reflection::MacroReflection.new(validation_type, attr_name.to_sym, configuration, self)]
-          end
+      # 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.flatten.each do |attr_name|
+          self.write_inheritable_array :reflected_validations,
+            [::ActiveRecord::Reflection::MacroReflection.new(validation_type, attr_name.to_sym, configuration, self)]
         end
+      end
 
-        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
+      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
 
-    end
   end
 end
 
-ActiveRecord::Base.class_eval do
-  include ::ActiveRecordExtensions::ValidationReflection
-  ::ActiveRecordExtensions::ValidationReflection.load_config
-  ::ActiveRecordExtensions::ValidationReflection.install(self)
+ActiveSupport.on_load(:active_record) do
+  include ValidationReflection
+  ::ValidationReflection.install(self)
 end

data/test/validation_reflection_test.rb

@@ -17,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 << {
+  include ValidationReflection
+  ::ValidationReflection.reflected_validations << :validates_something_weird
+  ::ValidationReflection.reflected_validations << {
       :method => :validates_something_selfcontained,
       :ignore_subvalidations => true
     }
-  ::ActiveRecordExtensions::ValidationReflection.install(self)
+  ::ValidationReflection.install(self)
 end
 
 

data/validation_reflection.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{validation_reflection}
-  s.version = "0.3.8"
+  s.version = "1.0.0.beta4"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Christopher Redinger"]
-  s.date = %q{2010-07-30}
+  s.date = %q{2010-06-12}
   s.description = %q{Adds reflective access to validations}
   s.email = %q{redinger@gmail.com}
   s.extra_rdoc_files = [
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/redinger/validation_reflection}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Adds reflective access to validations}
   s.test_files = [
     "test/test_helper.rb",
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: validation_reflection
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: -1512032865
+  prerelease: true
   segments: 
+  - 1
   - 0
-  - 3
-  - 8
-  version: 0.3.8
+  - 0
+  - beta4
+  version: 1.0.0.beta4
 platform: ruby
 authors: 
 - Christopher Redinger
@@ -14,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 -04:00
+date: 2010-06-12 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -48,23 +50,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Adds reflective access to validations