RubyGems - formtastic_validation - Versions diffs - 0.1.3 → 0.1.4 - Mend

formtastic_validation 0.1.3 → 0.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

data/Gemfile +13 -0
data/Gemfile.lock +106 -0
data/Rakefile +37 -31
data/VERSION +1 -1
data/formtastic_validation.gemspec +76 -46
data/{lib/generators/templates/public/javascripts → javascripts/build}/formtastic_validation-0.1.3.min.js +0 -0
data/javascripts/build/formtastic_validation-0.1.4.min.js +1 -0
data/lib/formtastic_validation.rb +5 -4
data/lib/generators/formtastic_validation_generator.rb +1 -1
data/lib/generators/templates/public/javascripts/formtastic_validation-0.1.4.min.js +1 -0
data/spec/formtastic_validation_spec.rb +21 -10
data/spec/spec_helper.rb +51 -18
metadata +192 -61
data/.gitignore +0 -21

data/Gemfile ADDED

@@ -0,0 +1,13 @@
+source "http://rubygems.org"
+gem 'formtastic'
+gem 'validation_reflection'
+gem 'rails'
+group :development do
+  gem 'jeweler'
+  gem 'rspec'
+  gem 'nokogiri'
+  gem 'rspec-rails'
+  gem 'rspec_tag_matchers'
+end

data/Gemfile.lock ADDED

@@ -0,0 +1,106 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.5)
+      actionpack (= 3.0.5)
+      mail (~> 2.2.15)
+    actionpack (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+    activesupport (3.0.5)
+    arel (2.0.9)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    formtastic (1.2.3)
+      actionpack (>= 2.3.7)
+      activesupport (>= 2.3.7)
+      i18n (~> 0.4)
+    git (1.2.5)
+    i18n (0.5.0)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    mail (2.2.15)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    nokogiri (1.4.4)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.5)
+      actionmailer (= 3.0.5)
+      actionpack (= 3.0.5)
+      activerecord (= 3.0.5)
+      activeresource (= 3.0.5)
+      activesupport (= 3.0.5)
+      bundler (~> 1.0)
+      railties (= 3.0.5)
+    railties (3.0.5)
+      actionpack (= 3.0.5)
+      activesupport (= 3.0.5)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    rspec-rails (2.5.0)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.5.0)
+    rspec_tag_matchers (1.0.0)
+      nokogiri (>= 1.4.0)
+      rspec-rails (>= 1.2.6)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.24)
+    validation_reflection (1.0.0)
+PLATFORMS
+  ruby
+DEPENDENCIES
+  formtastic
+  jeweler
+  nokogiri
+  rails
+  rspec
+  rspec-rails
+  rspec_tag_matchers
+  validation_reflection

data/Rakefile CHANGED

@@ -1,44 +1,50 @@
 require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 require 'rake'
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "formtastic_validation"
-    gem.summary = %Q{Client side validation with formtastic}
-    gem.description = %Q{A formtastic extension that does client side validation}
-    gem.email = "zan@liangzan.net"
-    gem.homepage = "http://github.com/liangzan/formtastic_validation"
-    gem.authors = ["Wong Liang Zan"]
-    gem.add_dependency "validation_reflection", "~> 1.0.0"
-    gem.add_dependency "formtastic", "~> 1.1.0"
-    gem.add_development_dependency "rspec", "= 1.3.0"
-    gem.add_development_dependency "rspec-rails", "= 1.3.2"
-    gem.add_development_dependency "rspec_tag_matchers", "= 1.0.0"
-    gem.add_development_dependency "nokogiri", "= 1.4.2"
-    gem.add_development_dependency "activesupport", "= 2.3.8"
-    gem.add_development_dependency "actionpack", "= 2.3.8"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "formtastic_validation"
+  gem.homepage = "http://github.com/liangzan/formtastic_validation"
+  gem.license = "MIT"
+  gem.summary = %Q{Formtastic extension that does form validation}
+  gem.description = %Q{Formtastic extension that does client side form validation}
+  gem.email = "zan@liangzan.net"
+  gem.authors = ["Wong Liang Zan"]
+  # Include your dependencies below. Runtime dependencies are required when using your gem,
+  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
+  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
+  gem.add_dependency "validation_reflection", "~> 1.0.0"
+  gem.add_dependency "formtastic", "~> 1.2.0"
+  gem.add_development_dependency "rails", "~> 3.0.0"
+  gem.add_development_dependency "rspec", "~> 2.5.0"
+  gem.add_development_dependency "rspec-rails", "~> 2.5.0"
+  gem.add_development_dependency "rspec_tag_matchers", "= 1.0.0"
+  gem.add_development_dependency "nokogiri", "~> 1.4.4"
+  gem.add_development_dependency "activesupport", "~> 3.0.0"
+  gem.add_development_dependency "actionpack", "~> 3.0.0"
 end
+Jeweler::RubygemsDotOrgTasks.new
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end
-task :spec => :check_dependencies
 task :default => :spec
 require 'rake/rdoctask'
@@ -46,7 +52,7 @@ Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "formtastic_validation #{version}"
+  rdoc.title = "test #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 0.1.3
1	+ 0.1.4

data/formtastic_validation.gemspec CHANGED

@@ -1,52 +1,55 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name = %q{formtastic_validation}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wong Liang Zan"]
-  s.date = %q{2010-11-08}
-  s.description = %q{A formtastic extension that does client side validation}
+  s.date = %q{2011-03-17}
+  s.description = %q{Formtastic extension that does client side form validation}
   s.email = %q{zan@liangzan.net}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.textile"
+    "README.textile"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.textile",
-     "Rakefile",
-     "VERSION",
-     "formtastic_validation.gemspec",
-     "javascripts/README.textile",
-     "javascripts/build/formtastic_validation-0.1.0.min.js",
-     "javascripts/build/formtastic_validation-0.1.1.min.js",
-     "javascripts/build/formtastic_validation-0.1.2.min.js",
-     "javascripts/lib/livevalidation-1.3.min.js",
-     "javascripts/src/formtastic_validation.js",
-     "lib/formtastic_validation.rb",
-     "lib/generators/formtastic_validation_generator.rb",
-     "lib/generators/templates/config/initializers/formtastic_validation.rb",
-     "lib/generators/templates/public/javascripts/formtastic_validation-0.1.3.min.js",
-     "lib/generators/templates/public/javascripts/livevalidation-1.3.min.js",
-     "spec/formtastic_validation_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.textile",
+    "Rakefile",
+    "VERSION",
+    "formtastic_validation.gemspec",
+    "javascripts/README.textile",
+    "javascripts/build/formtastic_validation-0.1.0.min.js",
+    "javascripts/build/formtastic_validation-0.1.1.min.js",
+    "javascripts/build/formtastic_validation-0.1.2.min.js",
+    "javascripts/build/formtastic_validation-0.1.3.min.js",
+    "javascripts/build/formtastic_validation-0.1.4.min.js",
+    "javascripts/lib/livevalidation-1.3.min.js",
+    "javascripts/src/formtastic_validation.js",
+    "lib/formtastic_validation.rb",
+    "lib/generators/formtastic_validation_generator.rb",
+    "lib/generators/templates/config/initializers/formtastic_validation.rb",
+    "lib/generators/templates/public/javascripts/formtastic_validation-0.1.4.min.js",
+    "lib/generators/templates/public/javascripts/livevalidation-1.3.min.js",
+    "spec/formtastic_validation_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/liangzan/formtastic_validation}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Client side validation with formtastic}
+  s.summary = %q{Formtastic extension that does form validation}
   s.test_files = [
     "spec/formtastic_validation_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/spec_helper.rb"
   ]
   if s.respond_to? :specification_version then
@@ -54,33 +57,60 @@ Gem::Specification.new do |s|
     s.specification_version = 3
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<formtastic>, [">= 0"])
+      s.add_runtime_dependency(%q<validation_reflection>, [">= 0"])
+      s.add_runtime_dependency(%q<rails>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<nokogiri>, [">= 0"])
+      s.add_development_dependency(%q<rspec-rails>, [">= 0"])
+      s.add_development_dependency(%q<rspec_tag_matchers>, [">= 0"])
       s.add_runtime_dependency(%q<validation_reflection>, ["~> 1.0.0"])
-      s.add_runtime_dependency(%q<formtastic>, ["~> 1.1.0"])
-      s.add_development_dependency(%q<rspec>, ["= 1.3.0"])
-      s.add_development_dependency(%q<rspec-rails>, ["= 1.3.2"])
+      s.add_runtime_dependency(%q<formtastic>, ["~> 1.2.0"])
+      s.add_development_dependency(%q<rails>, ["~> 3.0.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.5.0"])
+      s.add_development_dependency(%q<rspec-rails>, ["~> 2.5.0"])
       s.add_development_dependency(%q<rspec_tag_matchers>, ["= 1.0.0"])
-      s.add_development_dependency(%q<nokogiri>, ["= 1.4.2"])
-      s.add_development_dependency(%q<activesupport>, ["= 2.3.8"])
-      s.add_development_dependency(%q<actionpack>, ["= 2.3.8"])
+      s.add_development_dependency(%q<nokogiri>, ["~> 1.4.4"])
+      s.add_development_dependency(%q<activesupport>, ["~> 3.0.0"])
+      s.add_development_dependency(%q<actionpack>, ["~> 3.0.0"])
     else
+      s.add_dependency(%q<formtastic>, [">= 0"])
+      s.add_dependency(%q<validation_reflection>, [">= 0"])
+      s.add_dependency(%q<rails>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<nokogiri>, [">= 0"])
+      s.add_dependency(%q<rspec-rails>, [">= 0"])
+      s.add_dependency(%q<rspec_tag_matchers>, [">= 0"])
       s.add_dependency(%q<validation_reflection>, ["~> 1.0.0"])
-      s.add_dependency(%q<formtastic>, ["~> 1.1.0"])
-      s.add_dependency(%q<rspec>, ["= 1.3.0"])
-      s.add_dependency(%q<rspec-rails>, ["= 1.3.2"])
+      s.add_dependency(%q<formtastic>, ["~> 1.2.0"])
+      s.add_dependency(%q<rails>, ["~> 3.0.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.5.0"])
+      s.add_dependency(%q<rspec-rails>, ["~> 2.5.0"])
       s.add_dependency(%q<rspec_tag_matchers>, ["= 1.0.0"])
-      s.add_dependency(%q<nokogiri>, ["= 1.4.2"])
-      s.add_dependency(%q<activesupport>, ["= 2.3.8"])
-      s.add_dependency(%q<actionpack>, ["= 2.3.8"])
+      s.add_dependency(%q<nokogiri>, ["~> 1.4.4"])
+      s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
+      s.add_dependency(%q<actionpack>, ["~> 3.0.0"])
     end
   else
+    s.add_dependency(%q<formtastic>, [">= 0"])
+    s.add_dependency(%q<validation_reflection>, [">= 0"])
+    s.add_dependency(%q<rails>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<nokogiri>, [">= 0"])
+    s.add_dependency(%q<rspec-rails>, [">= 0"])
+    s.add_dependency(%q<rspec_tag_matchers>, [">= 0"])
     s.add_dependency(%q<validation_reflection>, ["~> 1.0.0"])
-    s.add_dependency(%q<formtastic>, ["~> 1.1.0"])
-    s.add_dependency(%q<rspec>, ["= 1.3.0"])
-    s.add_dependency(%q<rspec-rails>, ["= 1.3.2"])
+    s.add_dependency(%q<formtastic>, ["~> 1.2.0"])
+    s.add_dependency(%q<rails>, ["~> 3.0.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.5.0"])
+    s.add_dependency(%q<rspec-rails>, ["~> 2.5.0"])
     s.add_dependency(%q<rspec_tag_matchers>, ["= 1.0.0"])
-    s.add_dependency(%q<nokogiri>, ["= 1.4.2"])
-    s.add_dependency(%q<activesupport>, ["= 2.3.8"])
-    s.add_dependency(%q<actionpack>, ["= 2.3.8"])
+    s.add_dependency(%q<nokogiri>, ["~> 1.4.4"])
+    s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
+    s.add_dependency(%q<actionpack>, ["~> 3.0.0"])
   end
 end

data/{lib/generators/templates/public/javascripts → javascripts/build}/formtastic_validation-0.1.3.min.js RENAMED

File without changes

data/javascripts/build/formtastic_validation-0.1.4.min.js ADDED

@@ -0,0 +1 @@

+ var FormtasticValidation=function(){this.VERSION="0.1.0";this.selectInputElements=function(){var d=document.getElementsByTagName("input");var e=new Array;for(var b=0;b<d.length;b++){var a=d[b];var c=a.getAttribute("type");if(this.isValidInputType(c)){e.push(d[b])}}return e};this.isValidInputType=function(a){switch(a){case"text":case"password":case"radio":case"checkbox":return true;default:return false}};this.getValidationAttributes=function(e){var b={};var f=e.attributes;var d,a;for(var c=0;c<f.length;c++){d=this.extractValidationKey(f[c].name);a=f[c].value;if(d!=null){b[d]=a}}return b};this.extractValidationKey=function(b){var c=/validation_(\w+)/;var a=b.match(c);return a!=null?a[1]:null};this.extractFormatRegex=function(b){var c=/^\/(.*)\/$/;var a=b.match(c);return a!=null?a[1]:null};this.confirmationID=function(b){var a=b.getAttribute("id");return a+"_confirmation"};this.bindInputElements=function(c,a,b){var e=new LiveValidation(c,{validMessage:b.valid_message});var f,d;switch(a){case"validates_acceptance_of":e.add(Validate.Acceptance,{failureMessage:b.message});break;case"validates_confirmation_of":d=new LiveValidation(this.confirmationID(c),{validMessage:b.valid_message});d.add(Validate.Confirmation,{match:c,failureMessage:b.message});break;case"validates_exclusion_of":e.add(Validate.Exclusion,{within:JSON.parse(b["in"]),allowNull:b.allow_nil,failureMessage:b.message});break;case"validates_format_of":f=this.extractFormatRegex(b["with"]);e.add(Validate.Format,{pattern:new RegExp(f),failureMessage:b.message});break;case"validates_inclusion_of":e.add(Validate.Inclusion,{within:JSON.parse(b["in"]),allowNull:b.allow_nil,failureMessage:b.message});break;case"validates_size_of":case"validates_length_of":e.add(Validate.Length,{is:b.is,minimum:b.minimum,maximum:b.maximum,wrongLengthMessage:b.wrong_length,tooShortMessage:b.too_short,tooLongMessage:b.too_long});break;case"validates_numericality_of":e.add(Validate.Numericality,{is:b.equal_to,minimum:b.greater_than_or_equal_to,maximum:b.less_than_or_equal_to,onlyinteger:b.only_integer,failureMessage:b.message});break;case"validates_presence_of":e.add(Validate.Presence,{failureMessage:b.message});break}}};FormtasticValidation.prototype.initialize=function(){var f=this.selectInputElements();var d,e,a;for(var c=0;c<f.length;c++){d=f[c].getAttribute("validation");if(d!=null){e=d.split(" ");for(var b=0;b<e.length;b++){a=this.getValidationAttributes(f[c]);this.bindInputElements(f[c],e[b],a)}}}};

data/lib/formtastic_validation.rb CHANGED

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'active_support'
 module FormtasticValidation
   NAMESPACE = 'validation'
@@ -81,7 +78,11 @@ module FormtasticValidation
   def serialise_options(opts_hash)
     serialised_hash = Hash.new
     opts_hash.each do |key, value|
-      serialised_value = value.class.eql?(String) ? value : value.to_json
+      serialised_value = case value.class.to_s
+                         when "String" then value
+                         when "Regexp" then value.inspect
+                         else value.to_json
+                         end
       serialised_hash[key] = serialised_value
     end
     serialised_hash

data/lib/generators/formtastic_validation_generator.rb CHANGED

@@ -4,7 +4,7 @@ class FormtasticValidationGenerator < Rails::Generators::Base
   source_root File.expand_path("../templates", __FILE__)
   def install_formtastic_validations
-      copy_file 'public/javascripts/formtastic_validation-0.1.3.min.js', 'public/javascripts/formtastic_validation-0.1.3.min.js'
+      copy_file 'public/javascripts/formtastic_validation-0.1.4.min.js', 'public/javascripts/formtastic_validation-0.1.4.min.js'
       copy_file 'public/javascripts/livevalidation-1.3.min.js', 'public/javascripts/livevalidation-1.3.min.js'
       copy_file 'config/initializers/formtastic_validation.rb', 'config/initializers/formtastic_validation.rb'
   end

data/lib/generators/templates/public/javascripts/formtastic_validation-0.1.4.min.js ADDED

@@ -0,0 +1 @@

data/spec/formtastic_validation_spec.rb CHANGED

@@ -1,6 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "FormtasticValidation#input" do
   include FormtasticValidationSpecHelper
   before do
@@ -15,51 +16,57 @@ describe "FormtasticValidation#input" do
         it 'should add a validation tag' do
           @bob.class.should_receive(:reflect_on_validations_for).with(:name).any_number_of_times.and_return([mock('MacroReflection', :macro => :validates_whatever, :name => :name, :options => {})])
-          semantic_form_for(@bob) do |builder|
+          form = semantic_form_for(@bob) do |builder|
             concat(builder.input(:name))
           end
+          output_buffer.concat(form)
           output_buffer.should have_tag('input[@validation="validates_whatever"]')
         end
         it 'should add a valid message tag' do
           @bob.class.should_receive(:reflect_on_validations_for).with(:name).any_number_of_times.and_return([mock('MacroReflection', :macro => :validates_whatever, :name => :name, :options => {})])
-          semantic_form_for(@bob) do |builder|
+          form = semantic_form_for(@bob) do |builder|
             concat(builder.input(:name))
           end
+          output_buffer.concat(form)
           output_buffer.should have_tag('input[@validation_valid_message="Thank you!"]')
         end
         it 'should allow changes to the valid message tag' do
           @bob.class.should_receive(:reflect_on_validations_for).with(:name).any_number_of_times.and_return([mock('MacroReflection', :macro => :validates_whatever, :name => :name, :options => {})])
           FormtasticValidation.valid_message = "Its correct!"
-          semantic_form_for(@bob) do |builder|
+          form = semantic_form_for(@bob) do |builder|
             concat(builder.input(:name))
           end
+          output_buffer.concat(form)
           output_buffer.should have_tag('input[@validation_valid_message="Its correct!"]')
         end
         it "should add multiple validation tags separated by space" do
           @bob.class.should_receive(:reflect_on_validations_for).with(:name).any_number_of_times.and_return([mock('MacroReflection', :macro => :validates_whatever, :name => :name, :options => {}), mock('MacroReflection', :macro => :validates_anything, :name => :name, :options => {})])
-          semantic_form_for(@bob) do |builder|
+          form = semantic_form_for(@bob) do |builder|
             concat(builder.input(:name))
           end
+          output_buffer.concat(form)
           output_buffer.should have_tag('input[@validation="validates_whatever validates_anything"]')
         end
         it 'should add a single option as tag' do
           @bob.class.should_receive(:reflect_on_validations_for).with(:name).any_number_of_times.and_return([mock('MacroReflection', :macro => :validates_whatever, :name => :name, :options => {:one => 'one'})])
-          semantic_form_for(@bob) do |builder|
+          form = semantic_form_for(@bob) do |builder|
             concat(builder.input(:name))
           end
+          output_buffer.concat(form)
           output_buffer.should have_tag('input[@validation="validates_whatever"]')
           output_buffer.should have_tag('input[@validation_one="one"]')
         end
         it "should add multiple options as separate tags" do
           @bob.class.should_receive(:reflect_on_validations_for).with(:name).any_number_of_times.and_return([mock('MacroReflection', :macro => :validates_whatever, :name => :name, :options => {:one => 'one', :two => 'two'})])
-          semantic_form_for(@bob) do |builder|
+          form = semantic_form_for(@bob) do |builder|
             concat(builder.input(:name))
           end
+          output_buffer.concat(form)
           output_buffer.should have_tag('input[@validation="validates_whatever"]')
           output_buffer.should have_tag('input[@validation_one="one"]')
           output_buffer.should have_tag('input[@validation_two="two"]')
@@ -67,9 +74,10 @@ describe "FormtasticValidation#input" do
         it "should include the input_html" do
           @bob.class.should_receive(:reflect_on_validations_for).with(:name).any_number_of_times.and_return([mock('MacroReflection', :macro => :validates_whatever, :name => :name, :options => {:one => 'one', :two => 'two'})])
-          semantic_form_for(@bob) do |builder|
+          form = semantic_form_for(@bob) do |builder|
             concat(builder.input(:name, :input_html => {:three => 'three'}))
           end
+          output_buffer.concat(form)
           output_buffer.should have_tag('input[@validation="validates_whatever"]')
           output_buffer.should have_tag('input[@validation_one="one"]')
           output_buffer.should have_tag('input[@validation_two="two"]')
@@ -81,27 +89,30 @@ describe "FormtasticValidation#input" do
     describe "validation options" do
       it "should serialise regex as json strings" do
         @bob.class.should_receive(:reflect_on_validations_for).with(:name).any_number_of_times.and_return([mock('MacroReflection', :macro => :validates_format_of, :name => :name, :options => {:with => /^a garden$/})])
-        semantic_form_for(@bob) do |builder|
+        form = semantic_form_for(@bob) do |builder|
           concat(builder.input(:name))
         end
+        output_buffer.concat(form)
         output_buffer.should have_tag('input[@validation="validates_format_of"]')
         output_buffer.should have_tag('input[@validation_with="/^a garden$/"]')
       end
       it "should serialise array as json strings" do
         @bob.class.should_receive(:reflect_on_validations_for).with(:name).any_number_of_times.and_return([mock('MacroReflection', :macro => :validates_inclusion_of, :name => :name, :options => {:in => %w(one two three)})])
-        semantic_form_for(@bob) do |builder|
+        form = semantic_form_for(@bob) do |builder|
           concat(builder.input(:name))
         end
+        output_buffer.concat(form)
         output_buffer.should have_tag('input[@validation="validates_inclusion_of"]')
         output_buffer.should have_tag(%\input[@validation_in='["one","two","three"]']\)
       end
       it "should serialise range as array" do
         @bob.class.should_receive(:reflect_on_validations_for).with(:name).any_number_of_times.and_return([mock('MacroReflection', :macro => :validates_inclusion_of, :name => :name, :options => {:in => 1..3})])
-        semantic_form_for(@bob) do |builder|
+        form = semantic_form_for(@bob) do |builder|
           concat(builder.input(:name))
         end
+        output_buffer.concat(form)
         output_buffer.should have_tag('input[@validation="validates_inclusion_of"]')
         output_buffer.should have_tag(%\input[@validation_in='[1,2,3]']\)
       end

data/spec/spec_helper.rb CHANGED

@@ -1,58 +1,91 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'formtastic_validation'
 require 'rubygems'
-gem 'activesupport', '2.3.8'
-gem 'actionpack', '2.3.8'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 require 'active_support'
-require 'active_record'
 require 'action_pack'
 require 'action_view'
 require 'action_controller'
-gem 'rspec', '>= 1.3.0'
-gem 'rspec-rails', '>= 1.3.2'
-gem 'nokogiri', '>= 1.4.2'
-gem 'rspec_tag_matchers', '>= 1.0.0'
-gem 'validation_reflection', '>=0.3.8'
-gem 'formtastic', '>=1.0.0'
+require 'formtastic'
+require 'formtastic_validation'
 require 'rspec_tag_matchers'
+require 'action_controller/railtie'
+require 'active_resource/railtie'
+require 'active_model'
 require 'validation_reflection'
 require 'nokogiri'
-require 'rspec_tag_matchers'
-require 'formtastic'
-Spec::Runner.configure do |config|
+module FormtasticTest
+  class Application < Rails::Application
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+    config.active_support.deprecation = :stderr
+  end
+end
+FormtasticTest::Application.initialize!
+require 'rspec/rails'
+RSpec.configure do |config|
   config.include(RspecTagMatchers)
+  config.mock_with :rspec
+end
+module ActionView
+  class OutputBuffer < Formtastic::Util.rails_safe_buffer_class
+  end
 end
 module FormtasticValidationSpecHelper
+  include ActionPack
+  include ActionView::Context if defined?(ActionView::Context)
+  include ActionController::RecordIdentifier
   include ActionView::Helpers::FormHelper
   include ActionView::Helpers::FormTagHelper
   include ActionView::Helpers::FormOptionsHelper
   include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::TextHelper
-  include ActionView::Helpers::ActiveRecordHelper
-  include ActionView::Helpers::RecordIdentificationHelper
+  include ActionView::Helpers::ActiveRecordHelper if defined?(ActionView::Helpers::ActiveRecordHelper)
+  include ActionView::Helpers::ActiveModelHelper if defined?(ActionView::Helpers::ActiveModelHelper)
   include ActionView::Helpers::DateHelper
   include ActionView::Helpers::CaptureHelper
   include ActionView::Helpers::AssetTagHelper
   include ActiveSupport
-  include ActionController::PolymorphicRoutes
+  include ActionController::PolymorphicRoutes if defined?(ActionController::PolymorphicRoutes)
   include Formtastic::SemanticFormHelper
   Formtastic::SemanticFormBuilder.class_eval { include FormtasticValidation }
-  class ::User ; end
+  class ::User
+    extend ActiveModel::Naming if defined?(ActiveModel::Naming)
+    include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
+    def id
+    end
+    def persisted?
+    end
+  end
   def setup_mocks
     def user_path(o); "/users/1"; end
     def users_path; "/users"; end
     def new_user_path; "/users/new"; end
-    @bob = User.new
+    @bob = ::User.new
+    @bob.stub!(:class).and_return(::User)
     @bob.stub!(:name).and_return('Bob')
     @bob.stub!(:email).and_return('bob@mail.com')
     @bob.stub!(:mobile).and_return('123456')

metadata CHANGED

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: formtastic_validation
 version: !ruby/object:Gem::Version
-  hash: 29
+  hash: 19
   prerelease: false
   segments:
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors:
 - Wong Liang Zan
@@ -15,13 +15,125 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-11-08 00:00:00 +08:00
+date: 2011-03-17 00:00:00 +08:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  name: formtastic
+  version_requirements: &id001 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
+  requirement: *id001
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  prerelease: false
   name: validation_reflection
+  version_requirements: &id002 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
+  requirement: *id002
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  name: rails
+  version_requirements: &id003 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
+  requirement: *id003
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  name: jeweler
+  version_requirements: &id004 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
+  requirement: *id004
+  type: :development
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  name: rspec
+  version_requirements: &id005 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
+  requirement: *id005
+  type: :development
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  name: nokogiri
+  version_requirements: &id006 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
+  requirement: *id006
+  type: :development
+- !ruby/object:Gem::Dependency
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement
+  name: rspec-rails
+  version_requirements: &id007 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
+  requirement: *id007
+  type: :development
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  name: rspec_tag_matchers
+  version_requirements: &id008 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
+  requirement: *id008
+  type: :development
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  name: validation_reflection
+  version_requirements: &id009 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,60 +144,76 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  requirement: *id009
   type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency
-  name: formtastic
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement
+  name: formtastic
+  version_requirements: &id010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        hash: 19
+        hash: 31
         segments:
         - 1
-        - 1
+        - 2
         - 0
-        version: 1.1.0
+        version: 1.2.0
+  requirement: *id010
   type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement
+  name: rails
+  version_requirements: &id011 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version
-        hash: 27
+        hash: 7
         segments:
-        - 1
         - 3
         - 0
-        version: 1.3.0
+        - 0
+        version: 3.0.0
+  requirement: *id011
   type: :development
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement
+  name: rspec
+  version_requirements: &id012 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version
-        hash: 31
+        hash: 27
         segments:
-        - 1
-        - 3
         - 2
-        version: 1.3.2
+        - 5
+        - 0
+        version: 2.5.0
+  requirement: *id012
   type: :development
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency
-  name: rspec_tag_matchers
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement
+  name: rspec-rails
+  version_requirements: &id013 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        hash: 27
+        segments:
+        - 2
+        - 5
+        - 0
+        version: 2.5.0
+  requirement: *id013
+  type: :development
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  name: rspec_tag_matchers
+  version_requirements: &id014 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - "="
@@ -96,57 +224,57 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  requirement: *id014
   type: :development
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency
-  name: nokogiri
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement
+  name: nokogiri
+  version_requirements: &id015 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version
-        hash: 3
+        hash: 15
         segments:
         - 1
         - 4
-        - 2
-        version: 1.4.2
+        - 4
+        version: 1.4.4
+  requirement: *id015
   type: :development
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency
-  name: activesupport
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement
+  name: activesupport
+  version_requirements: &id016 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version
-        hash: 19
+        hash: 7
         segments:
-        - 2
         - 3
-        - 8
-        version: 2.3.8
+        - 0
+        - 0
+        version: 3.0.0
+  requirement: *id016
   type: :development
-  version_requirements: *id007
 - !ruby/object:Gem::Dependency
-  name: actionpack
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement
+  name: actionpack
+  version_requirements: &id017 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version
-        hash: 19
+        hash: 7
         segments:
-        - 2
         - 3
-        - 8
-        version: 2.3.8
+        - 0
+        - 0
+        version: 3.0.0
+  requirement: *id017
   type: :development
-  version_requirements: *id008
-description: A formtastic extension that does client side validation
+description: Formtastic extension that does client side form validation
 email: zan@liangzan.net
 executables: []
@@ -157,7 +285,8 @@ extra_rdoc_files:
 - README.textile
 files:
 - .document
-- .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.textile
 - Rakefile
@@ -167,23 +296,25 @@ files:
 - javascripts/build/formtastic_validation-0.1.0.min.js
 - javascripts/build/formtastic_validation-0.1.1.min.js
 - javascripts/build/formtastic_validation-0.1.2.min.js
+- javascripts/build/formtastic_validation-0.1.3.min.js
+- javascripts/build/formtastic_validation-0.1.4.min.js
 - javascripts/lib/livevalidation-1.3.min.js
 - javascripts/src/formtastic_validation.js
 - lib/formtastic_validation.rb
 - lib/generators/formtastic_validation_generator.rb
 - lib/generators/templates/config/initializers/formtastic_validation.rb
-- lib/generators/templates/public/javascripts/formtastic_validation-0.1.3.min.js
+- lib/generators/templates/public/javascripts/formtastic_validation-0.1.4.min.js
 - lib/generators/templates/public/javascripts/livevalidation-1.3.min.js
 - spec/formtastic_validation_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/liangzan/formtastic_validation
-licenses: []
+licenses:
+- MIT
 post_install_message:
-rdoc_options:
-- --charset=UTF-8
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -210,7 +341,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key:
 specification_version: 3
-summary: Client side validation with formtastic
+summary: Formtastic extension that does form validation
 test_files:
 - spec/formtastic_validation_spec.rb
 - spec/spec_helper.rb

data/.gitignore DELETED

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-## TEXTMATE
-*.tmproj
-tmtags
-## EMACS
-*~
-\#*
-.\#*
-## VIM
-*.swp
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-## PROJECT::SPECIFIC