midas-g_live_validator 1.0.4 → 1.0.5

data/History.txt

@@ -1,3 +1,8 @@
+== 1.0.4 2009-06-03
+
+* Added the g_live_dynamic_validations view helper that works with dynamic validations gem
+
+
 == 1.0.4 2009-04-03
 
 * Added support for InacvtiveRecord (http://github.com/midas/inactive_record/tree/master) validations

data/Manifest.txt

@@ -6,6 +6,7 @@ Rakefile
 g_live_validator.gemspec
 lib/g_live_validator.rb
 lib/g_live_validator/active_record_extensions.rb
+lib/g_live_validator/validation_definition.rb
 lib/g_live_validator/view_helpers.rb
 live_validator.gemspec
 rails_generators/live_validator_assets/live_validator_assets_generator.rb

data/README.rdoc

@@ -29,19 +29,19 @@ valdiations.
 
 == INSTALL:
 
-  sudo gem install midas-live_validator
-
-
-== USE:
+  sudo gem install midas-g_live_validator
 
 Add gem requirement to your environment.rb file:
 
-  config.gem 'midas-live_validator', :version => '1.0.3', :lib => 'live_validator', :source => 'http://gems.github.com'
+  config.gem 'midas-g_live_validator', :version => '1.0.4', :lib => 'g_live_validator', :source => 'http://gems.github.com'
 
-Generate the assets for live validator:
+Generate:
 
   script/generate live_validator_assets
 
+
+== USE:
+
 Make a call to the view_helper within a form:
 
   <%= g_live_validator f %> # where f is the form variable passed into the form_for block
@@ -58,6 +58,7 @@ symbol or an array of string or sybmols.
 * Guilded >= 0.1.3 (http://github.com/midas/guilded/tree/master)
 * Rails >= 2.0
 
+
 == LICENSE:
 
 (The MIT License)

data/g_live_validator.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{g_live_validator}
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["C. Jason Harrelson (midas)"]
-  s.date = %q{2009-04-03}
+  s.date = %q{2009-06-03}
   s.description = %q{Live validator is a Rails Guilded (http://github.com/midas/guilded/tree/master) component that will reflect ActiveRecord validations  and use them to live validate forms.  Live validator uses the Live Validation (http://www.livevalidation.com) JavaScript library to  accomplish this task.  It also uses an ActiveRecord extension authored by Michael Schuerig to mre easily reflect on the ActiveRecord valdiations.}
   s.email = ["jason@lookforwardenterprises.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc"]
-  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "g_live_validator.gemspec", "lib/g_live_validator.rb", "lib/g_live_validator/active_record_extensions.rb", "lib/g_live_validator/view_helpers.rb", "live_validator.gemspec", "rails_generators/live_validator_assets/live_validator_assets_generator.rb", "rails_generators/live_validator_assets/templates/default.css", "rails_generators/live_validator_assets/templates/guilded.live_validator.js", "rails_generators/live_validator_assets/templates/guilded.live_validator.min.js", "rails_generators/live_validator_assets/templates/livevalidation-1.3.js", "rails_generators/live_validator_assets/templates/livevalidation-1.3.min.js", "script/console", "script/destroy", "script/generate", "spec/live_validator_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "tasks/rspec.rake"]
+  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "g_live_validator.gemspec", "lib/g_live_validator.rb", "lib/g_live_validator/active_record_extensions.rb", "lib/g_live_validator/validation_definition.rb", "lib/g_live_validator/view_helpers.rb", "live_validator.gemspec", "rails_generators/live_validator_assets/live_validator_assets_generator.rb", "rails_generators/live_validator_assets/templates/default.css", "rails_generators/live_validator_assets/templates/guilded.live_validator.js", "rails_generators/live_validator_assets/templates/guilded.live_validator.min.js", "rails_generators/live_validator_assets/templates/livevalidation-1.3.js", "rails_generators/live_validator_assets/templates/livevalidation-1.3.min.js", "script/console", "script/destroy", "script/generate", "spec/live_validator_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "tasks/rspec.rake"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/midas/live_validator/tree/master}
   s.post_install_message = %q{PostInstall.txt}
@@ -25,18 +25,18 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<newgem>, [">= 1.2.3"])
+      s.add_development_dependency(%q<newgem>, [">= 1.3.0"])
       s.add_development_dependency(%q<rails>, [">= 2.2.0"])
       s.add_development_dependency(%q<midas-guilded>, [">= 0.1.4"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
     else
-      s.add_dependency(%q<newgem>, [">= 1.2.3"])
+      s.add_dependency(%q<newgem>, [">= 1.3.0"])
       s.add_dependency(%q<rails>, [">= 2.2.0"])
       s.add_dependency(%q<midas-guilded>, [">= 0.1.4"])
       s.add_dependency(%q<hoe>, [">= 1.8.0"])
     end
   else
-    s.add_dependency(%q<newgem>, [">= 1.2.3"])
+    s.add_dependency(%q<newgem>, [">= 1.3.0"])
     s.add_dependency(%q<rails>, [">= 2.2.0"])
     s.add_dependency(%q<midas-guilded>, [">= 0.1.4"])
     s.add_dependency(%q<hoe>, [">= 1.8.0"])

data/lib/g_live_validator/validation_definition.rb

@@ -0,0 +1,21 @@
+module GLiveValidator
+  
+  class ValidationDefinition
+    attr_accessor :active_record, :macro, :name, :options
+    
+    def initialize( validation )
+      if validation.is_a?(ActiveRecord::Reflection::MacroReflection )
+        self.active_record = validation.active_record
+        self.macro = validation.macro
+        self.name = validation.name
+        self.options = validation.options
+      elsif validation.is_a?( ValidationRule )
+        self.active_record = validation.entity_type.constantize
+        self.macro = "validates_#{validation.validation}_of"
+        self.name = validation.attribute
+        self.options = YAML.load( validation.description ) unless validation.description.nil?
+      end
+    end
+  end
+  
+end

data/lib/g_live_validator/view_helpers.rb

@@ -51,38 +51,24 @@ module GLiveValidator
       #options.merge! :human_names => form.object
       
       validations = g_map_validations( klass.reflect_on_all_validations )
+      validations = apply_options( form, validations, options )
       
-      # Remove any foreign keys as they will not be present on the form
-      validations.reject! { |field, validation| field.include?( "_id" ) }
+      options.merge! :validations => validations
+      Guilded::Guilder.instance.add( :live_validator, options, [ 'livevalidation-1.3.min.js' ] )
+      return ""
+    end
+    
+    def g_live_dynamic_validator( form, validation_rules, *args )
+      options = args.extract_options!
+      klass = form.object.class
+      class_name = klass.to_s.downcase
+      options.merge! :id => "live-validator-#{class_name}"
+      ar_obj_name = form.object.class.to_s.underscore
       
-      # Remove any excepts, if necessary
-      if options[:except]
-        if options[:except].is_a?( Array )
-          excepts = options[:except]
-        elsif options[:except].is_a?( String ) || options[:except].is_a?( Symbol )
-          excepts = Array.new << options[:except]          
-        else
-          throw "'Except' option must be a string symbol or arry of strings or symbols"
-        end
-
-        # Add the AR object name to the field name, as Rails does this on forms
-        excepts.map! { |except| "#{ar_obj_name}_#{except.to_s}" }
-        
-        excepts.each do |except|
-          validations.reject! { |field, validation| field == except }
-        end
-      end
+      validation_defs = validation_rules.map { |validation_rule| ValidationDefinition.new( validation_rule ) }
       
-      # Handle nested form namings, if necessary
-      if form.object.class.to_s.underscore != form.object_name
-        #field_precursor = form.object_name.gsub( /\[/, '_' ).gsub( /\]/, '_' )
-        field_precursor = form.object_name[0...form.object_name.index( "[" )] + '_'
-        nested_validations = Hash.new
-        validations.each do |key, value|
-          nested_validations[ "#{field_precursor}#{key}".to_sym ] = value
-        end
-        validations = nested_validations
-      end
+      validations = g_map_validations( validation_defs )
+      validations = apply_options( form, validations, options )
       
       options.merge! :validations => validations
       Guilded::Guilder.instance.add( :live_validator, options, [ 'livevalidation-1.3.min.js' ] )
@@ -177,5 +163,40 @@ module GLiveValidator
       return validations
     end
     
+    def apply_options( form, validations, options )
+      # Remove any foreign keys as they will not be present on the form
+      validations.reject! { |field, validation| field.include?( "_id" ) }
+      
+      # Remove any excepts, if necessary
+      if options[:except]
+        if options[:except].is_a?( Array )
+          excepts = options[:except]
+        elsif options[:except].is_a?( String ) || options[:except].is_a?( Symbol )
+          excepts = Array.new << options[:except]          
+        else
+          throw "'Except' option must be a string symbol or arry of strings or symbols"
+        end
+
+        # Add the AR object name to the field name, as Rails does this on forms
+        excepts.map! { |except| "#{ar_obj_name}_#{except.to_s}" }
+        
+        excepts.each do |except|
+          validations.reject! { |field, validation| field == except }
+        end
+      end
+      
+      # Handle nested form namings, if necessary
+      if form.object.class.to_s.underscore != form.object_name
+        #field_precursor = form.object_name.gsub( /\[/, '_' ).gsub( /\]/, '_' )
+        field_precursor = form.object_name[0...form.object_name.index( "[" )] + '_'
+        nested_validations = Hash.new
+        validations.each do |key, value|
+          nested_validations[ "#{field_precursor}#{key}".to_sym ] = value
+        end
+        validations = nested_validations
+      end
+      
+      validations
+    end
   end
 end

data/lib/g_live_validator.rb

@@ -2,10 +2,11 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 require 'g_live_validator/view_helpers'
+require 'g_live_validator/validation_definition'
 require 'g_live_validator/active_record_extensions'
 
 module GLiveValidator
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end
 
 if defined?( ActiveRecord::Base )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: midas-g_live_validator
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - C. Jason Harrelson (midas)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-03 00:00:00 -07:00
+date: 2009-06-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: 1.3.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -73,6 +73,7 @@ files:
 - g_live_validator.gemspec
 - lib/g_live_validator.rb
 - lib/g_live_validator/active_record_extensions.rb
+- lib/g_live_validator/validation_definition.rb
 - lib/g_live_validator/view_helpers.rb
 - live_validator.gemspec
 - rails_generators/live_validator_assets/live_validator_assets_generator.rb