whyvalidationssuckin96 1.1.0 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/whyvalidationssuckin96/constants.rb

@@ -1,3 +1,2 @@
 module WhyValidationsSuckIn96
-  
 end

data/lib/whyvalidationssuckin96/rails/active_record/association_validation.rb

@@ -0,0 +1,38 @@
+require 'active_record/autosave_association'
+
+module WhyValidationsSuckIn96  
+  module ActiveRecord
+    module AssociationValidation
+      
+      def self.included(klass_or_mod)
+        klass_or_mod.module_eval do
+          extend ClassMethods
+        end
+      end
+      
+      module ClassMethods
+        def self.extended(klass_or_mod)
+          (class << klass_or_mod; self; end).instance_eval do 
+            # FIXME - alias method chain my ass
+            alias_method_chain :add_autosave_association_callbacks, :validation_hooks
+          end
+        end
+        
+        def add_autosave_association_callbacks_with_validation_hooks(reflection)
+          add_autosave_association_callbacks_without_validation_hooks(reflection)
+          setup_validations_for_association_reflection(reflection)
+        end
+        
+      private
+      
+        def setup_validations_for_association_reflection(reflection)
+          return false unless reflection.options[:validate] || reflection.options[:autosave]
+          setup_validations { validates_associated reflection.name.to_sym, :on => :save }
+        end
+        
+      end # ClassMethods
+    end   # AssociationValidation
+  end     # ActiveRecord
+end       # WhyValidationsSuckIn96
+
+ActiveRecord::Base.instance_eval { include WhyValidationsSuckIn96::ActiveRecord::AssociationValidation }

data/lib/whyvalidationssuckin96/rails/active_record/base_validation_overrides.rb

@@ -0,0 +1,124 @@
+require 'active_record/base'
+require 'active_record/callbacks'
+
+module WhyValidationsSuckIn96    
+  module ActiveRecord
+    class << self
+      attr_accessor :warn_on_deprecation
+    end
+    self.warn_on_deprecation = true
+    
+    RemovableInstanceMethods = %w[invalid? validate_on_create validate_on_update validate errors]
+    RemovableClassMethods = %w[validate validate_on_create validate_on_update validates_format_of validates_each
+                               validates_inclusion_of validates_size_of validates_confirmation_of validates_exclusion_of
+                               validates_uniqueness_of validates_associated validates_acceptance_of
+                               validates_numericality_of validates_presence_of validates_length_of]
+    
+    def self.included(klass_or_mod)
+      remove_active_record_validation_related_methods_from(klass_or_mod)
+      klass_or_mod.instance_eval do
+        include WhyValidationsSuckIn96::ValidationSupport
+        include WhyValidationsSuckIn96::ActiveRecord::InstanceMethods
+        extend WhyValidationsSuckIn96::ActiveRecord::ClassMethods
+      end
+    end
+    
+  private
+  
+    # FIXME - holy mother of god is this a nasty method
+    def self.remove_active_record_validation_related_methods_from(klass_or_mod)
+      method_map = {klass_or_mod => RemovableInstanceMethods, (class<<klass_or_mod;self;end) => RemovableClassMethods}
+      method_map.each do |context, removable_methods|
+        context.instance_eval do 
+          removable_methods.each do |removable_method|
+            begin
+              remove_method removable_method
+            rescue => e
+              undef_method removable_method
+            end
+          end # removable_methods.each
+        end   # context.instance_eval
+      end     # method_map.each
+    end
+    
+    module ClassMethods
+      
+      # FIXME - this is a seedy hack and i blame the entire contents of active_record/autosave_association.rb
+      # for it being necessary.
+      def validate(*args)
+        return false unless WhyValidationsSuckIn96::ActiveRecord.warn_on_deprecation
+        callstack = caller
+        warn(<<-EOW.gsub(/^\s{10}/, ""))
+          This is a friendly message from WhyValidationsSuckIn96. #{self.inspect} called 'validate' which is a
+          deprecated method. The arguments given were:
+          
+            #{args.inspect} - #{block_given? ? 'block given' : 'no block given'}
+            
+          and the caller was:
+          
+            #{callstack.first}
+          
+          If these warnings are coming from a call to 'add_autosave_association_callbacks', do not be alarmed, as
+          WhyValidationsSuckIn96 has implemented its own versions of the necessary validation callbacks.
+            
+          These warnings can be silenced by setting 'WhyValidationsSuckIn96::ActiveRecord.warn_on_deprecation' to false.
+          You will now be returned to your regularly scheduled programming.
+        EOW
+        false
+      end
+      
+    end # ClassMethods
+    
+    module InstanceMethods    
+      
+      def self.included(klass_or_mod)
+        klass_or_mod.module_eval do
+          alias_method :valid_without_callbacks?, :valid_with_lifecycle_checking?
+        end
+      end
+
+    private
+    
+      def validations_for_current_lifecycle
+        validations_for_save + (new_record? ? validations_for_create : validations_for_update)
+      end
+      
+      def valid_with_lifecycle_checking?
+        validations_for_current_lifecycle.collect do |validation|
+          validation.validates?
+        end.all?
+      end
+      
+      def validations_for_update
+        all_validations.select do |validation|
+          validation.options[:on] == :update
+        end
+      end
+      
+      def validations_for_create
+        all_validations.select do |validation|
+          validation.options[:on] == :create
+        end
+      end
+      
+      def validations_for_save
+        all_validations.select do |validation|
+          validation.options[:on].nil? || validation.options[:on] == :save
+        end
+      end
+      
+    end # InstanceMethods
+  end   # ActiveRecord
+end     # WhyValidationsSuckIn96
+
+module ActiveRecord
+  class RecordInvalid < ActiveRecordError
+    attr_reader :record
+    def initialize(record)
+      @record = record
+      super
+    end
+  end # RecordInvalid
+end   # ActiveRecord
+
+ActiveRecord::Base.instance_eval { include WhyValidationsSuckIn96::ActiveRecord }

data/lib/whyvalidationssuckin96/rails/active_record.rb

@@ -1,94 +1,5 @@
 require 'whyvalidationssuckin96'
 require 'active_record'
-require 'active_record/base'
-require 'active_record/callbacks'
-require 'whyvalidationssuckin96/rails/macros'
-
-module WhyValidationsSuckIn96
-  
-  module ActiveRecord
-    RemovableInstanceMethods = %w[invalid? validate_on_create validate_on_update validate errors]
-    RemovableClassMethods = %w[validate validate_on_create validate_on_update validates_format_of validates_each
-                               validates_inclusion_of validates_size_of validates_confirmation_of validates_exclusion_of
-                               validates_uniqueness_of validates_associated validates_acceptance_of
-                               validates_numericality_of validates_presence_of validates_length_of]
-    
-    def self.included(klass_or_mod)
-      remove_active_record_validation_related_methods_from(klass_or_mod)
-      klass_or_mod.instance_eval do
-        include WhyValidationsSuckIn96::ValidationSupport
-        include WhyValidationsSuckIn96::ActiveRecord::InstanceMethods
-      end
-    end
-    
-  private
-  
-    # FIXME - holy mother of god is this a nasty method
-    def self.remove_active_record_validation_related_methods_from(klass_or_mod)
-      method_map = {klass_or_mod => RemovableInstanceMethods, (class<<klass_or_mod;self;end) => RemovableClassMethods}
-      method_map.each do |context, removable_methods|
-        context.instance_eval do 
-          removable_methods.each do |removable_method|
-            begin
-              remove_method removable_method
-            rescue => e
-              undef_method removable_method
-            end
-          end # removable_methods.each
-        end   # context.instance_eval
-      end     # method_map.each
-    end
-    
-    module InstanceMethods    
-      
-      def self.included(klass_or_mod)
-        klass_or_mod.module_eval do
-          alias_method :valid_without_callbacks?, :valid_with_lifecycle_checking?
-        end
-      end
-
-    private
-    
-      def validations_for_current_lifecycle
-        validations_for_save + (new_record? ? validations_for_create : validations_for_update)
-      end
-      
-      def valid_with_lifecycle_checking?
-        validations_for_current_lifecycle.collect do |validation|
-          validation.validates?
-        end.all?
-      end
-      
-      def validations_for_update
-        all_validations.select do |validation|
-          validation.options[:on] == :update
-        end
-      end
-      
-      def validations_for_create
-        all_validations.select do |validation|
-          validation.options[:on] == :create
-        end
-      end
-      
-      def validations_for_save
-        all_validations.select do |validation|
-          validation.options[:on].nil? || validation.options[:on] == :save
-        end
-      end
-      
-    end # InstanceMethods
-  end   # ActiveRecord
-end     # WhyValidationsSuckIn96
-
-module ActiveRecord
-  class RecordInvalid < ActiveRecordError
-    attr_reader :record
-    def initialize(record)
-      @record = record
-      super
-    end
-  end # RecordInvalid
-end   # ActiveRecord
-
-ActiveRecord::Base.instance_eval { include WhyValidationsSuckIn96::ActiveRecord }
+require 'whyvalidationssuckin96/rails/active_record/base_validation_overrides'
+require 'whyvalidationssuckin96/rails/active_record/association_validation'
+require 'whyvalidationssuckin96/rails/macros'

data/test/rails/active_record_test_helper.rb

@@ -1,4 +1,5 @@
 require 'whyvalidationssuckin96/rails/active_record'
+WhyValidationsSuckIn96::ActiveRecord.warn_on_deprecation = false
 
 ActiveRecord::Base.establish_connection(:adapter  => "sqlite3", :database => ":memory:")
 ActiveRecord::Schema.define(:version => 1) do
@@ -11,8 +12,44 @@ ActiveRecord::Schema.define(:version => 1) do
     t.string :author
     t.string :type
   end
+  
+  create_table :books do |t|
+    t.string     :name
+    t.has_one    :glossary
+    t.has_many   :chapters
+  end
+  
+  create_table :glossaries do |t|
+    t.belongs_to :book
+  end
+  
+  create_table :chapters do |t|
+    t.string :name
+    t.belongs_to :book
+  end
+  
+  create_table :genres do |t|
+    t.string :name
+  end
+  
+  create_table :books_genres, :id => false do |t|
+    t.belongs_to :book
+    t.belongs_to :genre
+  end
 end 
 
+class Glossary < ActiveRecord::Base
+end
+
+class Book < ActiveRecord::Base
+end
+
+class Chapter < ActiveRecord::Base
+end
+
+class Genre < ActiveRecord::Base
+end
+
 class MusicalWork < ActiveRecord::Base
   attr_accessor :state, :callbacks_run, :validations_run 
 

data/test/rails/association_validation_test.rb

@@ -0,0 +1,114 @@
+require 'teststrap'
+require 'rails/active_record_test_helper'
+
+context "association validation" do
+  has_association_validation = lambda do |klass,assoc|
+    !klass.validation_collection.detect do |(validation_klass,opts)|
+      validation_klass == WhyValidationsSuckIn96::ValidatesAssociated && opts[:attribute] == assoc && opts[:on] == :save
+    end.nil?
+  end
+  
+  context "against has_many" do
+    context "with :validate set to true" do
+      setup do
+        Class.new(Book) do
+          has_many :chapters, :validate => true
+        end
+      end
+      
+      should "set up an association validation" do
+        has_association_validation[topic, :chapters]
+      end
+    end # with :validate set to true
+    
+    context "with :validate set to false" do
+      setup do
+        Class.new(Book) do
+          has_many :chapters, :validate => false
+        end
+      end
+      
+      should "not set up an association validation" do
+        has_association_validation[topic, :chapters]
+      end.equals(false)
+    end # with :validate set to false
+  end   # against has_many
+  
+  context "against has_and_belongs_to_many" do
+    context "with :validate set to true" do
+      setup do
+        Class.new(Genre) do
+          has_and_belongs_to_many :books, :validate => true
+        end
+      end
+      
+      should "set up an association validation" do
+        has_association_validation[topic, :books]
+      end
+    end # with :validate set to true
+    
+    context "with :validate set to false" do
+      setup do
+        Class.new(Genre) do
+          has_and_belongs_to_many :books, :validate => false
+        end
+      end
+      
+      should "not set up an association validation" do
+        has_association_validation[topic, :books]
+      end.equals(false)
+    end # with :validate set to false
+  end   # against has_and_belongs_to_many
+  
+  context "against has_one" do
+    context "with :validate set to true" do
+      setup do
+        Class.new(Book) do
+          has_one :glossary, :validate => true
+        end
+      end
+      
+      should "set up an association validation" do
+        has_association_validation[topic, :glossary]
+      end
+    end # with :validate set to true
+    
+    context "with :validate set to false" do
+      setup do
+        Class.new(Book) do
+          has_one :glossary, :validate => false
+        end
+      end
+      
+      should "not set up an association validation" do
+        has_association_validation[topic, :glossary]
+      end.equals(false)
+    end # with :validate set to false
+  end   # against has_one
+  
+  context "against belongs_to" do
+    context "with :validate set to true" do
+      setup do
+        Class.new(Chapter) do
+          belongs_to :book, :validate => true
+        end
+      end
+      
+      should "set up an association validation" do
+        has_association_validation[topic, :book]
+      end
+    end # with :validate set to true
+    
+    context "with :validate set to false" do
+      setup do
+        Class.new(Chapter) do
+          belongs_to :book, :validate => false
+        end
+      end
+      
+      should "not set up an association validation" do
+        has_association_validation[topic, :book]
+      end.equals(false)
+    end # with :validate set to false
+  end   # against belongs_to
+end     # association validation

data/whyvalidationssuckin96.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whyvalidationssuckin96}
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["gabrielg", "douglasmeyer"]
@@ -81,6 +81,8 @@ Gem::Specification.new do |s|
      "lib/whyvalidationssuckin96/macros/validates_presence.rb",
      "lib/whyvalidationssuckin96/macros/validates_url.rb",
      "lib/whyvalidationssuckin96/rails/active_record.rb",
+     "lib/whyvalidationssuckin96/rails/active_record/association_validation.rb",
+     "lib/whyvalidationssuckin96/rails/active_record/base_validation_overrides.rb",
      "lib/whyvalidationssuckin96/rails/macros.rb",
      "lib/whyvalidationssuckin96/rails/macros/validates_uniqueness.rb",
      "lib/whyvalidationssuckin96/skippable_validation.rb",
@@ -98,8 +100,9 @@ Gem::Specification.new do |s|
      "test/macros/validates_numericality_test.rb",
      "test/macros/validates_presence_test.rb",
      "test/macros/validates_url_test.rb",
-     "test/rails/active_record_test.rb",
      "test/rails/active_record_test_helper.rb",
+     "test/rails/association_validation_test.rb",
+     "test/rails/base_validation_overrides_test.rb",
      "test/rails/macros/validates_uniqueness_test.rb",
      "test/skippable_validation_test.rb",
      "test/teststrap.rb",
@@ -125,8 +128,9 @@ Gem::Specification.new do |s|
      "test/macros/validates_numericality_test.rb",
      "test/macros/validates_presence_test.rb",
      "test/macros/validates_url_test.rb",
-     "test/rails/active_record_test.rb",
      "test/rails/active_record_test_helper.rb",
+     "test/rails/association_validation_test.rb",
+     "test/rails/base_validation_overrides_test.rb",
      "test/rails/macros/validates_uniqueness_test.rb",
      "test/skippable_validation_test.rb",
      "test/teststrap.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: whyvalidationssuckin96
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - gabrielg
@@ -117,6 +117,8 @@ files:
 - lib/whyvalidationssuckin96/macros/validates_presence.rb
 - lib/whyvalidationssuckin96/macros/validates_url.rb
 - lib/whyvalidationssuckin96/rails/active_record.rb
+- lib/whyvalidationssuckin96/rails/active_record/association_validation.rb
+- lib/whyvalidationssuckin96/rails/active_record/base_validation_overrides.rb
 - lib/whyvalidationssuckin96/rails/macros.rb
 - lib/whyvalidationssuckin96/rails/macros/validates_uniqueness.rb
 - lib/whyvalidationssuckin96/skippable_validation.rb
@@ -134,8 +136,9 @@ files:
 - test/macros/validates_numericality_test.rb
 - test/macros/validates_presence_test.rb
 - test/macros/validates_url_test.rb
-- test/rails/active_record_test.rb
 - test/rails/active_record_test_helper.rb
+- test/rails/association_validation_test.rb
+- test/rails/base_validation_overrides_test.rb
 - test/rails/macros/validates_uniqueness_test.rb
 - test/skippable_validation_test.rb
 - test/teststrap.rb
@@ -183,8 +186,9 @@ test_files:
 - test/macros/validates_numericality_test.rb
 - test/macros/validates_presence_test.rb
 - test/macros/validates_url_test.rb
-- test/rails/active_record_test.rb
 - test/rails/active_record_test_helper.rb
+- test/rails/association_validation_test.rb
+- test/rails/base_validation_overrides_test.rb
 - test/rails/macros/validates_uniqueness_test.rb
 - test/skippable_validation_test.rb
 - test/teststrap.rb