client_side_validations 3.0.10 → 3.1.0

data/client_side_validations.gemspec

@@ -17,14 +17,14 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency 'rails', '~> 3.0.0'
+  s.add_development_dependency 'rails', '3.1.0.rc4'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'bson_ext'
   s.add_development_dependency 'mongoid', '~> 2.0.0'
   s.add_development_dependency 'mongo_mapper','~>0.9.0'
   s.add_development_dependency 'mocha'
   s.add_development_dependency 'simple_form'
-  s.add_development_dependency 'formtastic'
+  s.add_development_dependency 'formtastic', '~> 2.0.0.rc3'
 
   # For QUnit testing
   s.add_development_dependency 'sinatra', '~> 1.0'

data/lib/client_side_validations/action_view.rb

@@ -3,9 +3,10 @@ module ClientSideValidations::ActionView
   end
 end
 
-require "client_side_validations/action_view/form_helper"
-require "client_side_validations/action_view/form_tag_helper"
-require "client_side_validations/action_view/form_builder"
+require 'client_side_validations/core_ext'
+require 'client_side_validations/action_view/form_helper'
+require 'client_side_validations/action_view/form_tag_helper'
+require 'client_side_validations/action_view/form_builder'
 
 ActionView::Base.send(:include, ClientSideValidations::ActionView::Helpers::FormHelper)
 ActionView::Base.send(:include, ClientSideValidations::ActionView::Helpers::FormTagHelper)

data/lib/client_side_validations/active_model.rb

@@ -5,8 +5,7 @@ module ClientSideValidations::ActiveModel
 
     def client_side_hash(model, attribute)
       options = self.options.dup
-      { :message => model.errors.generate_message(attribute, message_type, options) }.
-        merge(options.except(*::ActiveModel::Errors::CALLBACKS_OPTIONS - [:allow_blank, :if, :unless]))
+      { :message => model.errors.generate_message(attribute, message_type, options) }.merge(options.except(*::ActiveModel::Errors::CALLBACKS_OPTIONS - [:allow_blank, :if, :unless]))
     end
 
     private

data/lib/client_side_validations/engine.rb

@@ -0,0 +1,6 @@
+module ClientSideValidations
+  class Engine < ::Rails::Engine
+    config.app_middleware.use ClientSideValidations::Middleware::Validators
+  end
+end
+

data/lib/client_side_validations/files.rb

@@ -0,0 +1,8 @@
+# This is only used by dependant libraries that need to find the files
+
+module ClientSideValidations
+  module Files
+    Initializer = File.expand_path(File.dirname(__FILE__) + '/../generators/templates/client_side_validations/initializer.rb')
+    Javascript  = File.expand_path(File.dirname(__FILE__) + '/../../vendor/assets/javascripts/rails.validations.js')
+  end
+end

data/lib/client_side_validations/formtastic.rb

@@ -1,13 +1,13 @@
 module ClientSideValidations
   module Formtastic
-    module SemanticFormBuilder
+    module FormBuilder
 
       def self.included(base)
         base.class_eval do
           def self.client_side_form_settings(options, form_helper)
             {
               :type => self.to_s,
-              :inline_error_class => ::Formtastic::SemanticFormBuilder.default_inline_error_class
+              :inline_error_class => ::Formtastic::FormBuilder.default_inline_error_class
             }
           end
         end
@@ -17,5 +17,5 @@ module ClientSideValidations
   end
 end
 
-Formtastic::SemanticFormBuilder.send(:include, ClientSideValidations::Formtastic::SemanticFormBuilder)
+Formtastic::FormBuilder.send(:include, ClientSideValidations::Formtastic::FormBuilder)
 

data/lib/client_side_validations/middleware.rb

@@ -1,9 +1,10 @@
 # encoding: utf-8
 
+require 'client_side_validations/core_ext'
+
 module ClientSideValidations
 
   module Middleware
-
     class Validators
       def initialize(app)
         @app = app
@@ -11,7 +12,7 @@ module ClientSideValidations
 
       def call(env)
         case env['PATH_INFO']
-        when %r{\/validators\/(\w+)\.json}
+        when %r{\/validators\/(\w+)}
           "::ClientSideValidations::Middleware::#{$1.camelize}".constantize.new(env).response
         else
           @app.call(env)
@@ -74,11 +75,6 @@ module ClientSideValidations
         parent_key = (request.params.keys - IGNORE_PARAMS).first
       end
     end
-
-  end
-
-  class Engine < ::Rails::Engine
-    config.app_middleware.use ClientSideValidations::Middleware::Validators
   end
 
 end

data/lib/client_side_validations/version.rb

@@ -1,3 +1,3 @@
 module ClientSideValidations
-  VERSION = '3.0.10'
+  VERSION = '3.1.0'
 end

data/lib/client_side_validations.rb

@@ -1,10 +1,13 @@
 module ClientSideValidations
 end
 
-require 'client_side_validations/active_model' if defined?(::ActiveModel)
+require 'client_side_validations/active_model'  if defined?(::ActiveModel)
 require 'client_side_validations/active_record' if defined?(::ActiveRecord)
-require 'client_side_validations/mongoid' if defined?(::Mongoid)
-require 'client_side_validations/mongo_mapper' if defined?(::MongoMapper)
-require 'client_side_validations/action_view'
-require 'client_side_validations/middleware' if defined?(::Rails)
+require 'client_side_validations/mongoid'       if defined?(::Mongoid)
+require 'client_side_validations/mongo_mapper'  if defined?(::MongoMapper)
+require 'client_side_validations/action_view'   if defined?(::ActionView)
+if defined?(::Rails)
+  require 'client_side_validations/middleware'
+  require 'client_side_validations/engine'
+end
 

data/lib/generators/client_side_validations/copy_asset_generator.rb

@@ -0,0 +1,23 @@
+module ClientSideValidations
+  module Generators
+    class CopyAssetGenerator < Rails::Generators::Base
+      source_root File.expand_path('../../../../vendor/assets/javascripts', __FILE__)
+      if Rails.version >= '3.1'
+        desc 'Creates a ClientSideValidations initializer and copies rails.validations.js to app/assets/javascripts.'
+      else
+        desc 'Creates a ClientSideValidations initializer and copies rails.validations.js to public/javascripts.'
+      end
+
+      def copy_javascript_asset
+        if Rails.version >= '3.1'
+          destination = 'app/assets/javascripts'
+        else
+          destination = 'public/javascripts'
+        end
+
+        copy_file 'rails.validations.js', "#{destination}/rails.validations.js"
+      end
+    end
+  end
+end
+

data/lib/generators/client_side_validations/install_generator.rb

@@ -1,20 +1,32 @@
 module ClientSideValidations
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path('../../templates', __FILE__)
+      source_root File.expand_path('../../templates/client_side_validations', __FILE__)
 
-      desc 'Creates a ClientSideValidations initializer and copies client-side-validations.js to public/javascripts.'
+      if Rails.version >= '3.1'
+        desc 'Creates a ClientSideValidations initializer.'
+      else
+        desc 'Creates a ClientSideValidations initializer and copies rails.validations.js to public/javascripts.'
+      end
 
       def copy_initializer
-        copy_file 'client_side_validations.rb', 'config/initializers/client_side_validations.rb'
+        copy_file 'initializer.rb', 'config/initializers/client_side_validations.rb'
       end
 
-      def copy_locale
-        copy_file '../../../vendor/assets/javascripts/rails.validations.js', 'public/javascripts/rails.validations.js'
+      def copy_javascript_asset
+        if Rails.version >= '3.0'
+          if Rails.version < '3.1'
+            copy_file '../../../../vendor/assets/javascripts/rails.validations.js', 'public/javascripts/rails.validations.js'
+          end
+        end
       end
 
       def show_readme
-        readme 'README' if behavior == :invoke
+        if Rails.version >= '3.1'
+          readme 'README.rails.3.1' if behavior == :invoke
+        else
+          readme 'README.rails.3.0' if behavior == :invoke
+        end
       end
     end
   end

data/lib/generators/templates/client_side_validations/README.rails.3.0

@@ -0,0 +1,6 @@
+*********************
+ClientSideValidations
+*********************
+
+Client Side Validations only works with jQuery.
+You'll need to include jQuery in your layout file before you include 'rails.validations.js'

data/lib/generators/templates/client_side_validations/README.rails.3.1

@@ -0,0 +1,7 @@
+*********************
+ClientSideValidations
+*********************
+
+In your app/assets/javascripts/application.js file add the following:
+
+//= require rails.validations

data/lib/generators/templates/{client_side_validations.rb → client_side_validations/initializer.rb}

@@ -1,7 +1,7 @@
 # ClientSideValidations Initializer
 
 require 'client_side_validations/simple_form' if defined?(::SimpleForm)
-require 'client_side_validations/formtastic' if defined?(::Formtastic)
+require 'client_side_validations/formtastic'  if defined?(::Formtastic)
 
 # Uncomment the following block if you want each input field to have the validation messages attached.
 # ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|

data/test/action_view/cases/helper.rb

@@ -1,8 +1,14 @@
 require 'base_helper'
 require 'action_view'
-require 'client_side_validations/action_view'
-require 'action_view/template/handlers/erb'
+require 'action_view/template'
 require 'action_view/models'
+require 'client_side_validations/action_view'
+
+module ActionController
+  class Base
+    include ActionDispatch::Routing::RouteSet.new.url_helpers
+  end
+end
 
 module ActionViewTestSetup
   include ::ClientSideValidations::ActionView::Helpers::FormHelper
@@ -12,6 +18,19 @@ module ActionViewTestSetup
     @output_buffer = super
   end
 
+  Routes = ActionDispatch::Routing::RouteSet.new
+  Routes.draw do
+    resources :posts do
+      resources :comments
+    end
+  end
+
+  def _routes
+    Routes
+  end
+
+  include Routes.url_helpers
+
   def setup
     super
 
@@ -68,15 +87,10 @@ module ActionViewTestSetup
     @post.secret      = 1
     @post.written_on  = Date.new(2004, 6, 15)
 
-    @_content_for     = Hash.new { |h,k| h[k] = ActiveSupport::SafeBuffer.new }
-  end
-
-  def url_for(object)
-    @url_for_options = object
-    if object.is_a?(Hash)
-      "http://www.example.com"
+    if defined?(ActionView::OutputFlow)
+      @view_flow        = ActionView::OutputFlow.new
     else
-      super
+      @_content_for     = Hash.new { |h,k| h[k] = ActiveSupport::SafeBuffer.new }
     end
   end
 
@@ -87,11 +101,12 @@ module ActionViewTestSetup
     txt << %{</div>}
   end
 
-  def form_text(action = "http://www.example.com", id = nil, html_class = nil, remote = nil, validators = nil)
+  def form_text(action = "http://www.example.com", id = nil, html_class = nil, remote = nil, validators = nil, file = nil)
     txt =  %{<form accept-charset="UTF-8" action="#{action}"}
     txt << %{ data-remote="true"} if remote
     txt << %{ class="#{html_class}"} if html_class
     txt << %{ data-validate="true"} if validators
+    txt << %{ enctype="multipart/form-data"} if file
     txt << %{ id="#{id}"} if id
     txt << %{ method="post"}
     txt << %{ novalidate="novalidate"} if validators
@@ -102,12 +117,12 @@ module ActionViewTestSetup
     contents = block_given? ? yield : ""
 
     if options.is_a?(Hash)
-      method, remote, validators = options.values_at(:method, :remote, :validators)
+      method, remote, validators, file = options.values_at(:method, :remote, :validators, :file)
     else
       method = options
     end
 
-    html = form_text(action, id, html_class, remote, validators) + snowman(method) + (contents || "") + "</form>"
+    html = form_text(action, id, html_class, remote, validators, file) + snowman(method) + (contents || "") + "</form>"
 
     if options.is_a?(Hash) && options[:validators]
       build_script_tag(html, id, options[:validators])
@@ -158,3 +173,4 @@ module ActionViewTestSetup
     end
 
 end
+

data/test/action_view/cases/test_helpers.rb

@@ -44,7 +44,7 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     end
 
     validators = {'post[cost]' => {:presence => {:message => "can't be blank"}}}
-    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators, :file => true) do
       %{<input data-validate="true" id="post_cost" name="post[cost]" type="file" />}
     end
     assert_equal expected, output_buffer

data/test/action_view/cases/test_legacy_helpers.rb

@@ -30,7 +30,7 @@ class ClientSideValidations::LegacyActionViewHelpersTest < ActionView::TestCase
       concat f.file_field(:cost)
     end
 
-    expected = whole_form("/posts/123", "edit_post_123", "edit_post", "put") do
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => :put, :file => true) do
       %{<input id="post_cost" name="post[cost]" type="file" />}
     end
     assert_equal expected, output_buffer

data/test/active_record/cases/test_middleware.rb

@@ -30,7 +30,7 @@ class ClientSideValidationsActiveRecordMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_resource_exists
     User.create(:email => 'user@test.com')
-    get '/validators/uniqueness.json', { 'user[email]' => 'user@test.com', 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'user[email]' => 'user@test.com', 'case_sensitive' => true }
 
     assert_equal 'false', last_response.body
     assert last_response.ok?
@@ -38,14 +38,14 @@ class ClientSideValidationsActiveRecordMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_resource_exists_and_param_order_is_backwards
     User.create(:email => 'user@test.com')
-    get '/validators/uniqueness.json', { 'case_sensitive' => true, 'user[email]' => 'user@test.com' }
+    get '/validators/uniqueness', { 'case_sensitive' => true, 'user[email]' => 'user@test.com' }
 
     assert_equal 'false', last_response.body
     assert last_response.ok?
   end
 
   def test_uniqueness_when_resource_does_not_exist
-    get '/validators/uniqueness.json', { 'user[email]' => 'user@test.com', 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'user[email]' => 'user@test.com', 'case_sensitive' => true }
 
     assert_equal 'true', last_response.body
     assert last_response.not_found?
@@ -53,7 +53,7 @@ class ClientSideValidationsActiveRecordMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_id_is_given
     user = User.create(:email => 'user@test.com')
-    get '/validators/uniqueness.json', { 'user[email]' => 'user@test.com', 'id' => user.id, 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'user[email]' => 'user@test.com', 'id' => user.id, 'case_sensitive' => true }
 
     assert_equal 'true', last_response.body
     assert last_response.not_found?
@@ -73,13 +73,13 @@ class ClientSideValidationsActiveRecordMiddlewareTest < Test::Unit::TestCase
     result = User.where(sql_without_binary)
     User.expects(:where).with(relation).returns(result)
 
-    get '/validators/uniqueness.json', { 'user[email]' => user.email, 'case_sensitive' => true, 'id' => user.id}
+    get '/validators/uniqueness', { 'user[email]' => user.email, 'case_sensitive' => true, 'id' => user.id}
     assert_equal 'true', last_response.body
   end
 
   def test_uniqueness_when_scope_is_given
     User.create(:email => 'user@test.com', :age => 25)
-    get '/validators/uniqueness.json', { 'user[email]' => 'user@test.com', 'scope' => { 'age' => 30 }, 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'user[email]' => 'user@test.com', 'scope' => { 'age' => 30 }, 'case_sensitive' => true }
 
     assert_equal 'true', last_response.body
     assert last_response.not_found?
@@ -87,7 +87,7 @@ class ClientSideValidationsActiveRecordMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_multiple_scopes_are_given
     User.create(:email => 'user@test.com', :age => 30, :name => 'Brian')
-    get '/validators/uniqueness.json', { 'user[email]' => 'user@test.com', 'scope' => { 'age' => 30, 'name' => 'Robert' }, 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'user[email]' => 'user@test.com', 'scope' => { 'age' => 30, 'name' => 'Robert' }, 'case_sensitive' => true }
 
     assert_equal 'true', last_response.body
     assert last_response.not_found?
@@ -95,7 +95,7 @@ class ClientSideValidationsActiveRecordMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_case_insensitive
     User.create(:name => 'Brian')
-    get '/validators/uniqueness.json', { 'user[name]' => 'BRIAN', 'case_sensitive' => false }
+    get '/validators/uniqueness', { 'user[name]' => 'BRIAN', 'case_sensitive' => false }
 
     assert_equal 'false', last_response.body
     assert last_response.ok?
@@ -103,7 +103,7 @@ class ClientSideValidationsActiveRecordMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_attribute_passes_as_an_integer
     User.create(:name => 123)
-    get '/validators/uniqueness.json', { 'user[name]' => 123, 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'user[name]' => 123, 'case_sensitive' => true }
 
     assert_equal 'false', last_response.body
     assert last_response.ok?
@@ -111,7 +111,7 @@ class ClientSideValidationsActiveRecordMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_attribute_passes_as_an_integer
     User.create(:name => 123)
-    get '/validators/uniqueness.json', { 'user[name]' => 123, 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'user[name]' => 123, 'case_sensitive' => true }
 
     assert_equal 'false', last_response.body
     assert last_response.ok?
@@ -120,14 +120,14 @@ class ClientSideValidationsActiveRecordMiddlewareTest < Test::Unit::TestCase
   def test_uniqueness_with_columns_which_are_sql_keywords
     Guid.validates_uniqueness_of :key
     assert_nothing_raised do
-      get '/validators/uniqueness.json', { 'guid[key]' => 'test', 'case_sensitive' => true }
+      get '/validators/uniqueness', { 'guid[key]' => 'test', 'case_sensitive' => true }
     end
   end
 
   def test_uniqueness_with_limit
     # User.title is limited to 5 characters
     User.create(:title => "abcde")
-    get '/validators/uniqueness.json', { 'user[title]' => 'abcdefgh', 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'user[title]' => 'abcdefgh', 'case_sensitive' => true }
 
     assert_equal 'false', last_response.body
     assert last_response.ok?
@@ -137,7 +137,7 @@ class ClientSideValidationsActiveRecordMiddlewareTest < Test::Unit::TestCase
     with_kcode('UTF8') do
       # User.title is limited to 5 characters
       User.create(:title => "一二三四五")
-      get '/validators/uniqueness.json', { 'user[title]' => '一二三四五六七八', 'case_sensitive' => true }
+      get '/validators/uniqueness', { 'user[title]' => '一二三四五六七八', 'case_sensitive' => true }
 
       assert_equal 'false', last_response.body
     assert last_response.ok?
@@ -145,28 +145,28 @@ class ClientSideValidationsActiveRecordMiddlewareTest < Test::Unit::TestCase
   end
 
   def test_validate_straight_inheritance_uniqueness
-    get '/validators/uniqueness.json', { 'inept_wizard[name]' => 'Rincewind', 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'inept_wizard[name]' => 'Rincewind', 'case_sensitive' => true }
     assert_equal 'true', last_response.body
     assert last_response.not_found?
 
     IneptWizard.create(:name => 'Rincewind')
-    get '/validators/uniqueness.json', { 'inept_wizard[name]' => 'Rincewind', 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'inept_wizard[name]' => 'Rincewind', 'case_sensitive' => true }
     assert_equal 'false', last_response.body
     assert last_response.ok?
 
-    get '/validators/uniqueness.json', { 'conjurer[name]' => 'Rincewind', 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'conjurer[name]' => 'Rincewind', 'case_sensitive' => true }
     assert_equal 'false', last_response.body
     assert last_response.ok?
 
     Conjurer.create(:name => 'The Amazing Bonko')
-    get '/validators/uniqueness.json', { 'thaumaturgist[name]' => 'The Amazing Bonko', 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'thaumaturgist[name]' => 'The Amazing Bonko', 'case_sensitive' => true }
     assert_equal 'false', last_response.body
     assert last_response.ok?
   end
 
   def test_uniqueness_when_resource_is_a_nested_module
     ActiveRecordTestModule::User2.create(:email => 'user@test.com')
-    get '/validators/uniqueness.json', { 'active_record_test_module/user2[email]' => 'user@test.com', 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'active_record_test_module/user2[email]' => 'user@test.com', 'case_sensitive' => true }
 
     assert_equal 'false', last_response.body
     assert last_response.ok?

data/test/core_ext/cases/test_core_ext.rb

@@ -1,3 +1,4 @@
+require 'base_helper'
 require 'client_side_validations/core_ext'
 
 class CoreExtTest < Test::Unit::TestCase

data/test/formtastic/cases/helper.rb

@@ -1,2 +1,7 @@
+# encoding: utf-8
+require 'active_support'
+require 'formtastic/railtie' if defined?(::Rails)
+require 'formtastic/engine' if defined?(::Rails)
 require 'formtastic'
 require 'client_side_validations/formtastic'
+

data/test/formtastic/cases/test_form_builder.rb

@@ -1,11 +1,11 @@
 require 'formtastic/cases/helper'
 
-class ClientSideValidations::Formtastic::SemanticFormBuilderTest < Test::Unit::TestCase
+class ClientSideValidations::Formtastic::FormBuilderTest < Test::Unit::TestCase
   def test_client_side_form_js_hash
     expected = {
-      :type => 'Formtastic::SemanticFormBuilder',
+      :type => 'Formtastic::FormBuilder',
       :inline_error_class => 'inline-errors'
     }
-    assert_equal expected, Formtastic::SemanticFormBuilder.client_side_form_settings(nil, nil)
+    assert_equal expected, Formtastic::FormBuilder.client_side_form_settings(nil, nil)
   end
 end

data/test/formtastic/cases/test_form_helper.rb

@@ -3,7 +3,7 @@ require 'formtastic/cases/helper'
 
 class ClientSideValidations::Formtastic::FormHelperTest < ActionView::TestCase
   include ActionViewTestSetup
-  include Formtastic::SemanticFormHelper
+  include Formtastic::Helpers::FormHelper
 
   def client_side_form_settings_helper
     ""
@@ -14,9 +14,8 @@ class ClientSideValidations::Formtastic::FormHelperTest < ActionView::TestCase
       concat f.input(:cost)
     end
 
-    expected = %{<form accept-charset="UTF-8" action="/posts/123" class="formtastic post" data-validate="true" id="edit_post_123" method="post" novalidate="novalidate"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /><input name="_method" type="hidden" value="put" /></div><li class="string required" id="post_cost_input"><label for="post_cost">Cost<abbr title="required">*</abbr></label><input data-validate="true" id="post_cost" name="post[cost]" type="text" /></li></form><script>window['edit_post_123'] = {"type":"Formtastic::SemanticFormBuilder","inline_error_class":"inline-errors","validators":{"post[cost]":{"presence":{"message":"can't be blank"}}}};</script>}
+    expected = %{<form accept-charset="UTF-8" action="/posts/123" class="formtastic post" data-validate="true" id="edit_post_123" method="post" novalidate="novalidate"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /><input name="_method" type="hidden" value="put" /></div><li class="string input required stringish" id="post_cost_input"><label class=\" label\" for="post_cost">Cost<abbr title="required">*</abbr></label><input data-validate="true" id="post_cost" name="post[cost]" required=\"required\" type="text" />\n\n</li></form><script>window['edit_post_123'] = {"type":"Formtastic::FormBuilder","inline_error_class":"inline-errors","validators":{"post[cost]":{"presence":{"message":"can't be blank"}}}};</script>}
     assert_equal expected, output_buffer, "\n\n *** If you're running Ruby 1.8 and this test fails is is most likely due to 1.8's lack of insertion order persistence with Hashes ***\n"
   end
 
-end
-
+end

data/test/generators/cases/test_generators.rb

@@ -0,0 +1,31 @@
+require 'rails/generators/test_case'
+require 'generators/client_side_validations/install_generator'
+require 'generators/client_side_validations/copy_asset_generator'
+
+class InstallGeneratorTest < Rails::Generators::TestCase
+  tests ClientSideValidations::Generators::InstallGenerator
+  destination File.expand_path('../../tmp', __FILE__)
+  setup :prepare_destination
+
+  test 'Assert all files are properly created' do
+    run_generator
+    assert_file 'config/initializers/client_side_validations.rb'
+    assert_file 'public/javascripts/rails.validations.js' if Rails.version > '3.0' && Rails.version < '3.1'
+  end
+end
+
+class CopyAssetGeneratorTest < Rails::Generators::TestCase
+  tests ClientSideValidations::Generators::CopyAssetGenerator
+  destination File.expand_path('../../tmp', __FILE__)
+  setup :prepare_destination
+
+  test 'Assert file is properly created' do
+    run_generator
+    if Rails.version >= '3.1'
+      assert_file 'app/assets/javascripts/rails.validations.js'
+    else
+      assert_file 'public/javascripts/rails.validations.js'
+    end
+  end
+end
+

data/test/javascript/public/test/form_builders/validateFormtastic.js

@@ -1,7 +1,7 @@
 module('Validate Formtastic', {
   setup: function() {
     window['new_user'] = {
-      type: 'Formtastic::SemanticFormBuilder',
+      type: 'Formtastic::FormBuilder',
       inline_error_class: 'inline-errors',
       validators: {
         "user[name]":{"presence":{"message": "must be present"}, "format":{"message":"is invalid","with":/\d+/}}

data/test/javascript/server.rb

@@ -43,7 +43,7 @@ get '/' do
   erb :index
 end
 
-get '/validators/uniqueness.json' do
+get '/validators/uniqueness' do
   content_type 'application/json'
 
   if user = params[:user2]

data/test/middleware/cases/helper.rb

@@ -1,4 +1,6 @@
 require 'base_helper'
+require 'action_controller'
+require 'action_controller/railtie'
 require 'rails'
 
 # Pulled from railties/test/abstract_unit in Rails 3.1
@@ -11,5 +13,6 @@ module TestApp
 end
 
 require 'client_side_validations/middleware'
+require 'client_side_validations/engine'
 
 TestApp::Application.initialize!

data/test/mongo_mapper/cases/test_middleware.rb

@@ -21,14 +21,14 @@ class ClientSideValidationsMongoMapperMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_resource_exists
     Magazine.create(:author_email => 'magazine@test.com')
-    get '/validators/uniqueness.json', { 'magazine[author_email]' => 'magazine@test.com' }
+    get '/validators/uniqueness', { 'magazine[author_email]' => 'magazine@test.com' }
 
     assert_equal 'false', last_response.body
     assert last_response.ok?
   end
 
   def test_uniqueness_when_resource_does_not_exist
-    get '/validators/uniqueness.json', { 'magazine[author_email]' => 'magazine@test.com' }
+    get '/validators/uniqueness', { 'magazine[author_email]' => 'magazine@test.com' }
 
     assert_equal 'true', last_response.body
     assert last_response.not_found?
@@ -36,7 +36,7 @@ class ClientSideValidationsMongoMapperMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_id_is_given
     magazine = Magazine.create(:author_email => 'magazine@test.com')
-    get '/validators/uniqueness.json', { 'magazine[author_email]' => 'magazine@test.com', 'id' => magazine.id }
+    get '/validators/uniqueness', { 'magazine[author_email]' => 'magazine@test.com', 'id' => magazine.id }
 
     assert_equal 'true', last_response.body
     assert last_response.not_found?
@@ -44,7 +44,7 @@ class ClientSideValidationsMongoMapperMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_scope_is_given
     Magazine.create(:author_email => 'magazine@test.com', :age => 25)
-    get '/validators/uniqueness.json', { 'magazine[author_email]' => 'magazine@test.com', 'scope' => { 'age' => 30 } }
+    get '/validators/uniqueness', { 'magazine[author_email]' => 'magazine@test.com', 'scope' => { 'age' => 30 } }
 
     assert_equal 'true', last_response.body
     assert last_response.not_found?
@@ -52,7 +52,7 @@ class ClientSideValidationsMongoMapperMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_multiple_scopes_are_given
     Magazine.create(:author_email => 'magazine@test.com', :age => 30, :author_name => 'Brian')
-    get '/validators/uniqueness.json', { 'magazine[author_email]' => 'magazine@test.com', 'scope' => { 'age' => 30, 'author_name' => 'Robert' } }
+    get '/validators/uniqueness', { 'magazine[author_email]' => 'magazine@test.com', 'scope' => { 'age' => 30, 'author_name' => 'Robert' } }
 
     assert_equal 'true', last_response.body
     assert last_response.not_found?
@@ -60,7 +60,7 @@ class ClientSideValidationsMongoMapperMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_case_insensitive
     Magazine.create(:author_name => 'Brian')
-    get '/validators/uniqueness.json', { 'magazine[author_name]' => 'BRIAN', 'case_sensitive' => false }
+    get '/validators/uniqueness', { 'magazine[author_name]' => 'BRIAN', 'case_sensitive' => false }
 
     assert_equal 'false', last_response.body
     assert last_response.ok?
@@ -68,7 +68,7 @@ class ClientSideValidationsMongoMapperMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_resource_exists
     MongoMapperTestModule::Magazine2.create(:author_email => 'magazine@test.com')
-    get '/validators/uniqueness.json', { 'mongo_mapper_test_module/magazine2[author_email]' => 'magazine@test.com' }
+    get '/validators/uniqueness', { 'mongo_mapper_test_module/magazine2[author_email]' => 'magazine@test.com' }
 
     assert_equal 'false', last_response.body
     assert last_response.ok?

data/test/mongoid/cases/test_middleware.rb

@@ -21,14 +21,14 @@ class ClientSideValidationsMongoidMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_resource_exists
     Book.create(:author_email => 'book@test.com')
-    get '/validators/uniqueness.json', { 'book[author_email]' => 'book@test.com' }
+    get '/validators/uniqueness', { 'book[author_email]' => 'book@test.com' }
 
     assert_equal 'false', last_response.body
     assert last_response.ok?
   end
 
   def test_uniqueness_when_resource_does_not_exist
-    get '/validators/uniqueness.json', { 'book[author_email]' => 'book@test.com' }
+    get '/validators/uniqueness', { 'book[author_email]' => 'book@test.com' }
 
     assert_equal 'true', last_response.body
     assert last_response.not_found?
@@ -36,7 +36,7 @@ class ClientSideValidationsMongoidMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_id_is_given
     book = Book.create(:author_email => 'book@test.com')
-    get '/validators/uniqueness.json', { 'book[author_email]' => 'book@test.com', 'id' => book.id }
+    get '/validators/uniqueness', { 'book[author_email]' => 'book@test.com', 'id' => book.id }
 
     assert_equal 'true', last_response.body
     assert last_response.not_found?
@@ -44,7 +44,7 @@ class ClientSideValidationsMongoidMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_scope_is_given
     Book.create(:author_email => 'book@test.com', :age => 25)
-    get '/validators/uniqueness.json', { 'book[author_email]' => 'book@test.com', 'scope' => { 'age' => 30 } }
+    get '/validators/uniqueness', { 'book[author_email]' => 'book@test.com', 'scope' => { 'age' => 30 } }
 
     assert_equal 'true', last_response.body
     assert last_response.not_found?
@@ -52,7 +52,7 @@ class ClientSideValidationsMongoidMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_multiple_scopes_are_given
     Book.create(:author_email => 'book@test.com', :age => 30, :author_name => 'Brian')
-    get '/validators/uniqueness.json', { 'book[author_email]' => 'book@test.com', 'scope' => { 'age' => 30, 'author_name' => 'Robert' } }
+    get '/validators/uniqueness', { 'book[author_email]' => 'book@test.com', 'scope' => { 'age' => 30, 'author_name' => 'Robert' } }
 
     assert_equal 'true', last_response.body
     assert last_response.not_found?
@@ -60,7 +60,7 @@ class ClientSideValidationsMongoidMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_case_insensitive
     Book.create(:author_name => 'Brian')
-    get '/validators/uniqueness.json', { 'book[author_name]' => 'BRIAN', 'case_sensitive' => false }
+    get '/validators/uniqueness', { 'book[author_name]' => 'BRIAN', 'case_sensitive' => false }
 
     assert_equal 'false', last_response.body
     assert last_response.ok?
@@ -68,7 +68,7 @@ class ClientSideValidationsMongoidMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_resource_is_a_nested_module
     MongoidTestModule::Book2.create(:author_email => 'book@test.com')
-    get '/validators/uniqueness.json', { 'mongoid_test_module/book2[author_email]' => 'book@test.com' }
+    get '/validators/uniqueness', { 'mongoid_test_module/book2[author_email]' => 'book@test.com' }
 
     assert_equal 'false', last_response.body
     assert last_response.ok?

data/test/simple_form/cases/helper.rb

@@ -1,2 +1,5 @@
+require 'action_view'
+require 'action_controller/railtie'
+require 'rails'
 require 'simple_form'
 require 'client_side_validations/simple_form'

data/test/simple_form/cases/test_form_helper.rb

@@ -1,4 +1,5 @@
 require 'action_view/cases/helper'
+require 'middleware/cases/helper'
 require 'simple_form/cases/helper'
 
 class ClientSideValidations::SimpleForm::FormHelperTest < ActionView::TestCase
@@ -10,6 +11,7 @@ class ClientSideValidations::SimpleForm::FormHelperTest < ActionView::TestCase
   end
 
   def test_simple_form_for
+    ActionView::TestCase::TestController.any_instance.stubs(:action_name).returns('edit')
     simple_form_for(@post, :validate => true) do |f|
       concat f.input(:cost)
     end

data/test/test_loader.rb

@@ -0,0 +1,6 @@
+# Sanity check to make sure the entire library loads OK
+
+require 'base_helper'
+require 'client_side_validations'
+require 'client_side_validations/files'
+require 'client_side_validations/version'

data/vendor/assets/javascripts/rails.validations.js

@@ -1,5 +1,5 @@
 /*!
- * Rails 3 Client Side Validations - v3.0.10
+ * Rails 3 Client Side Validations - v3.1.0
  * https://github.com/bcardarlela/client_side_validations
  *
  * Copyright (c) 2011 Brian Cardarella
@@ -300,7 +300,7 @@ var clientSideValidations = {
         data[name] = element.val();
 
         if (jQuery.ajax({
-          url: '/validators/uniqueness.json',
+          url: '/validators/uniqueness',
           data: data,
           async: false
         }).status == 200) {
@@ -360,7 +360,7 @@ var clientSideValidations = {
       }
 
     },
-    'Formtastic::SemanticFormBuilder': {
+    'Formtastic::FormBuilder': {
       add: function(element, settings, message) {
         if (element.data('valid') !== false) {
           var wrapper = element.closest('li');
@@ -401,4 +401,4 @@ var clientSideValidations = {
       pass:   function(form, eventData) { }
     }
   }
-}
+};

metadata

@@ -2,7 +2,7 @@
 name: client_side_validations
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.0.10
+  version: 3.1.0
 platform: ruby
 authors: 
 - Brian Cardarella
@@ -19,9 +19,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 3.0.0
+        version: 3.1.0.rc4
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -96,9 +96,9 @@ dependencies:
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.0.0.rc3
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -186,6 +186,8 @@ files:
 - lib/client_side_validations/core_ext.rb
 - lib/client_side_validations/core_ext/range.rb
 - lib/client_side_validations/core_ext/regexp.rb
+- lib/client_side_validations/engine.rb
+- lib/client_side_validations/files.rb
 - lib/client_side_validations/formtastic.rb
 - lib/client_side_validations/middleware.rb
 - lib/client_side_validations/mongo_mapper.rb
@@ -196,9 +198,11 @@ files:
 - lib/client_side_validations/mongoid/uniqueness.rb
 - lib/client_side_validations/simple_form.rb
 - lib/client_side_validations/version.rb
+- lib/generators/client_side_validations/copy_asset_generator.rb
 - lib/generators/client_side_validations/install_generator.rb
-- lib/generators/templates/README
-- lib/generators/templates/client_side_validations.rb
+- lib/generators/templates/client_side_validations/README.rails.3.0
+- lib/generators/templates/client_side_validations/README.rails.3.1
+- lib/generators/templates/client_side_validations/initializer.rb
 - vendor/assets/javascripts/rails.validations.js
 - test/action_view/cases/helper.rb
 - test/action_view/cases/test_helpers.rb
@@ -229,7 +233,7 @@ files:
 - test/formtastic/cases/helper.rb
 - test/formtastic/cases/test_form_builder.rb
 - test/formtastic/cases/test_form_helper.rb
-- test/generators/cases/test_install_generator.rb
+- test/generators/cases/test_generators.rb
 - test/javascript/config.ru
 - test/javascript/public/test/callbacks/elementAfter.js
 - test/javascript/public/test/callbacks/elementBefore.js
@@ -275,6 +279,7 @@ files:
 - test/simple_form/cases/helper.rb
 - test/simple_form/cases/test_form_builder.rb
 - test/simple_form/cases/test_form_helper.rb
+- test/test_loader.rb
 has_rdoc: true
 homepage: https://github.com/bcardarella/client_side_validations
 licenses: []
@@ -333,7 +338,7 @@ test_files:
 - test/formtastic/cases/helper.rb
 - test/formtastic/cases/test_form_builder.rb
 - test/formtastic/cases/test_form_helper.rb
-- test/generators/cases/test_install_generator.rb
+- test/generators/cases/test_generators.rb
 - test/javascript/config.ru
 - test/javascript/public/test/callbacks/elementAfter.js
 - test/javascript/public/test/callbacks/elementBefore.js
@@ -379,3 +384,4 @@ test_files:
 - test/simple_form/cases/helper.rb
 - test/simple_form/cases/test_form_builder.rb
 - test/simple_form/cases/test_form_helper.rb
+- test/test_loader.rb

data/lib/generators/templates/README

@@ -1,7 +0,0 @@
-**************************************
-Client Side Validations
-
-Currently Client Side Validations only
-works with jQuery. You'll need to require
-jQuery in your layout file before you 
-require 'rails.validations.js'

data/test/generators/cases/test_install_generator.rb

@@ -1,15 +0,0 @@
-require 'rails/generators/test_case'
-require 'generators/client_side_validations/install_generator'
-
-class InstallGeneratorTest < Rails::Generators::TestCase
-  tests ClientSideValidations::Generators::InstallGenerator
-  destination File.expand_path('../../tmp', __FILE__)
-  setup :prepare_destination
-
-  test 'Assert all files are properly created' do
-    run_generator
-    assert_file 'config/initializers/client_side_validations.rb'
-    assert_file 'public/javascripts/rails.validations.js'
-  end
-end
-