validation_group 0.1.3 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 47f7835f9402eb199565f9cd015632f06be3475948d1285622cd5a01e448b8d3
+  data.tar.gz: 9a39c8e6f204161ec9ee46b60107471228cd098e1796dbbc9f22e1c00935dcd0
+SHA512:
+  metadata.gz: ddd1477d6edd88470a83b84a2cf6ae2f3623a4d762514d1923beefe3e2897b19f970a08f8c6594ef7c257665876521673ed2a81fa467dbad84778c4cc29e462a
+  data.tar.gz: a76406ba099896c80b99fd6a536e5b31035a3ad35cf88598c9cd490712c98c29c2bc3e5854a40ff1a8ccec66287e225a7fb7ddb77ce6a60a5dc25167dbec345e

data/Rakefile

@@ -12,7 +12,6 @@ spec = Gem::Specification.new do |s|
   
   s.files = FileList['{lib,test,tasks}/**/*'] + %w(CHANGELOG.rdoc init.rb install.rb uninstall.rb MIT-LICENSE Rakefile README .gitignore) - FileList['**/*.log']
   s.require_path = 'lib'
-  s.has_rdoc = true
   s.test_files = Dir['test/*_test.rb']
   
   s.author = 'Alex Kira'

data/lib/validation_group.rb

@@ -7,7 +7,7 @@ module ValidationGroup
         base.class_eval do
           cattr_accessor :validation_group_classes
           self.validation_group_classes = {}
-					
+
           def self.validation_group_order; @validation_group_order; end
           def self.validation_groups(all_classes = false)
             return (self.validation_group_classes[self] || {}) unless all_classes
@@ -33,14 +33,17 @@ module ValidationGroup
           # jeffp: added reader for current_validation_fields
           attr_reader :current_validation_group, :current_validation_fields
           include InstanceMethods
-          # jeffp: add valid?(group = nil), see definition below
-          alias_method_chain :valid?, :validation_group
         end
       end
     end
 
     module InstanceMethods # included in every model which calls validation_group
-			
+
+      def self.included(base)
+        # jeffp: add valid?(group = nil), see definition below
+        base.prepend ValidWithValidationGroup
+      end
+
       def enable_validation_group(group)
         # Check if given validation group is defined for current class or one of
         # its ancestors
@@ -63,7 +66,7 @@ module ValidationGroup
         # jeffp: delete fields
         @current_validation_fields = nil
       end
-			
+
       # jeffp: optimizer for someone writing custom :validate method -- no need
       # to validate fields outside the current validation group note: could also
       # use in validation modules to improve performance
@@ -74,28 +77,21 @@ module ValidationGroup
       def validation_group_enabled?
         respond_to?(:current_validation_group) && !current_validation_group.nil?
       end
-			
+    end
+
+    module ValidWithValidationGroup
       # eliminates need to use :enable_validation_group before :valid? call --
-      # nice
-      def valid_with_validation_group?(group=nil)
+      def valid?(group=nil)
         self.enable_validation_group(group) if group
-        valid_without_validation_group?
+        super
       end
     end
 
     module Errors # included in ActiveRecord::Errors
-      def add_with_validation_group(attribute,
-          msg = nil, *args,
-          &block)
+      def add(attribute, msg = nil, *args, &block)
         # jeffp: setting @current_validation_fields and use of should_validate? optimizes code
         add_error = @base.respond_to?(:should_validate?) ? @base.should_validate?(attribute.to_sym) : true
-        add_without_validation_group(attribute, msg, *args, &block) if add_error
-      end
-			
-      def self.included(base) #:nodoc:
-        base.class_eval do
-          alias_method_chain :add, :validation_group
-        end
+        super if add_error
       end
     end
   end
@@ -116,7 +112,7 @@ module ValidationGroup
   end
 end
 
-# jeffp:  moved from init.rb for gemification purposes -- 
+# jeffp:  moved from init.rb for gemification purposes --
 # require 'validation_group' loads everything now, init.rb requires 'validation_group' only
 ActiveRecord::Base.send(:extend, ValidationGroup::ActiveRecord::ActsMethods)
-ActiveModel::Errors.send :include, ValidationGroup::ActiveRecord::Errors
+ActiveModel::Errors.prepend ValidationGroup::ActiveRecord::Errors

data/test/test_helper.rb

@@ -11,21 +11,9 @@ require 'validation_group'
 # jeffp: removed environment.rb reference for gemification purposes 
 # jeffp: added code to test in sqlite memory database - speedy tests
 
-db_adapter = ENV['DB'] || begin
-  require 'rubygems'
-  require 'sqlite'
-  'sqlite'
-rescue MissingSourceFile
-  begin
-    require 'sqlite3'
-    'sqlite3'
-  rescue MissingSourceFile
-  end
-end
-
-if db_adapter.nil?
-  raise "No DB Adapter selected. Pass the DB= to pick one, or install Sqlite or Sqlite3."
-end
+db_adapter = 'sqlite3'
+require 'rubygems'
+require 'sqlite3'
 
 ActiveRecord::Base.establish_connection({'adapter' => db_adapter, 'database' => ':memory:'})
 #ActiveRecord::Base.logger = Logger.new("#{File.dirname(__FILE__)}/active_record.log")
@@ -51,4 +39,4 @@ class User < ActiveRecord::Base
   validation_group :step1, :fields=>[:first_name, :last_name]
   validation_group :step2, :fields=>[:username]
 end
- 
+ 

metadata

@@ -1,67 +1,131 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: validation_group
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.3
+version: !ruby/object:Gem::Version
+  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Alex Kira
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-06 00:00:00 Z
-dependencies: []
-
+date: 2012-02-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '1.17'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '1.17'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !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: Validation groups for ActiveRecord
-email: ""
+email: ''
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- ".gitignore"
+- CHANGELOG.rdoc
+- MIT-LICENSE
+- Rakefile
+- init.rb
+- install.rb
 - lib/validation_group.rb
+- tasks/validation_group_tasks.rake
 - test/database.yml
 - test/schema.rb
 - test/test_helper.rb
 - test/validation_group_test.rb
-- tasks/validation_group_tasks.rake
-- CHANGELOG.rdoc
-- init.rb
-- install.rb
 - uninstall.rb
-- MIT-LICENSE
-- Rakefile
-- README
-- .gitignore
 homepage: http://github.com/akira/validationgroup/tree/master
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 3.0.3.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Validation groups for ActiveRecord
-test_files: 
+test_files:
 - test/validation_group_test.rb

data/README

@@ -1,33 +0,0 @@
-ValidationGroup
-===============
-
-When doing multipage forms that spread a models fields over several pages, validation becomes more difficult.  We would like to validate each step of the form, however, the rails validation run validation on all the fields.  This plugin enables you to define validation groups with certain fields, and then only run validation on those groups.
-
-Version:  Rails 3.  To use on Rails 2.x versions, use forked copy from https://github.com/jeffp/validationgroup
-
-To install:
-
-  Add to your Gemfile:  
-
-    gem 'validation_group', :git=>'git://github.com/akira/validationgroup.git'
-
-Example
-=======
-
-class User < ActiveRecord::Base
-  validates_presence_of :name, :description, :address, :email
-  
-  validation_group :step1, :fields=>[:name, :description]
-  validation_group :step2, :fields=>[:address]     
-end
-
-This will run validation on :step1 fields
-@user = User.new
-@user.enable_validation_group :step1
-@user.valid?
-
-You can later disable validation groups by calling:
-@user.disable_validation_group
-
-
-Copyright (c) 2007 Alex Kira, released under the MIT license