client_side_validations 0.6.0 → 0.8.0

data/README.rdoc

@@ -1,16 +1,6 @@
-= ar_client_side_validations
+= client_side_validations
 
-ActiveRecord Client Side Validations
-
-== Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
+Client Side Validations
 
 == Copyright
 

data/Rakefile

@@ -4,15 +4,14 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = "client_side_validations"
-    gem.summary = %Q{Client Side Validations}
+    gem.name        = "client_side_validations"
+    gem.summary     = %Q{Client Side Validations}
     gem.description = %Q{ORM and Framework agnostic Client Side Validations}
-    gem.email = "cardarellab@dnc.org"
-    gem.homepage = "http://github.com/dnclabs/client_side_validations"
-    gem.authors = ["Brian Cardarella"]
+    gem.email       = "cardarellab@dnc.org"
+    gem.homepage    = "http://github.com/dnclabs/client_side_validations"
+    gem.authors     = ["Brian Cardarella"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_dependency 'validation_reflection', '>= 0.3.6'
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -28,7 +27,7 @@ end
 Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+  spec.rcov    = true
 end
 
 task :spec => :check_dependencies
@@ -39,7 +38,7 @@ Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "ar_client_side_validations #{version}"
+  rdoc.title    = "client_side_validations #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/TODO

@@ -1,2 +1,2 @@
 - Add Rails Generators
-- Check ActionView code against Rails 3
+- Accept options in helper to extend the given validation plugin

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.8.0

data/client_side_validations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{client_side_validations}
-  s.version = "0.6.0"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Cardarella"]
-  s.date = %q{2010-06-07}
+  s.date = %q{2010-06-08}
   s.description = %q{ORM and Framework agnostic Client Side Validations}
   s.email = %q{cardarellab@dnc.org}
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "TODO",
      "VERSION",
      "client_side_validations.gemspec",
+     "generators/client_side_validations/client_side_validations_generator.rb",
      "javascript/jspec/commands/example_command.rb",
      "javascript/jspec/rhino.js",
      "javascript/jspec/unit/jquery.validate.spec.js",

data/generators/client_side_validations/client_side_validations_generator.rb

@@ -0,0 +1,16 @@
+class ClientSideValidationsGenerator < Rails::Generator::Base
+  
+  def initialize(runtime_args, runtime_options = {})
+    runtime_options[:source] = File.join(spec.path, '../../javascript/lib')
+    super
+  end
+  
+  
+  def manifest
+    record do |c|
+      c.directory('public/javascripts')
+      c.file('client_side_validations.js', 'public/javascripts/client_side_validations.js')
+    end
+  end
+  
+end

data/lib/adapters/action_view.rb

@@ -8,13 +8,12 @@ module DNCLabs
             url     = options.delete(:url)
             raise "No URL Specified!" unless url
             adapter = options.delete(:adapter) || 'jquery.validate'
-    <<-JS
-      <script type="text/javascript">
-        $(document).ready(function() {
-          $('##{dom_id(options[:object])}').clientSideValidations('#{url}', '#{adapter}');
-        })
-      </script>
-    JS
+            js = %{<script type="text/javascript">$(document).ready(function(){$('##{dom_id(options[:object])}').clientSideValidations('#{url}','#{adapter}');});</script>}
+            if js.respond_to?(:html_safe)
+              js.html_safe
+            else
+              js
+            end
           end
           
         end # BaseMethods

data/spec/action_view_2_spec.rb

@@ -10,15 +10,9 @@ describe 'ActionView 2.x Form Helper' do
     
     context 'only the url' do
       before do
-        @object_name = 'object'
-        @url         = '/objects/new.json'
-        @expected_javascript = <<-JS
-      <script type="text/javascript">
-        $(document).ready(function() {
-          $('##{@object_name}').clientSideValidations('#{@url}', 'jquery.validate');
-        })
-      </script>
-    JS
+        @object_name         = 'object'
+        @url                 = '/objects/new.json'
+        @expected_javascript = %{<script type="text/javascript">$(document).ready(function(){$('##{@object_name}').clientSideValidations('#{@url}','jquery.validate');});</script>}
         subject.should_receive(:dom_id).and_return(@object_name)
       end
       
@@ -30,16 +24,10 @@ describe 'ActionView 2.x Form Helper' do
     
     context 'a different adapter' do
       before do
-        @object_name = 'object'
-        @url         = '/objects/new.json'
-        @adapter     = 'some.other.adapter'
-        @expected_javascript = <<-JS
-      <script type="text/javascript">
-        $(document).ready(function() {
-          $('##{@object_name}').clientSideValidations('#{@url}', '#{@adapter}');
-        })
-      </script>
-    JS
+        @object_name         = 'object'
+        @url                 = '/objects/new.json'
+        @adapter             = 'some.other.adapter'
+        @expected_javascript = %{<script type="text/javascript">$(document).ready(function(){$('##{@object_name}').clientSideValidations('#{@url}','#{@adapter}');});</script>}
         subject.should_receive(:dom_id).and_return(@object_name)
       end
       
@@ -53,13 +41,6 @@ describe 'ActionView 2.x Form Helper' do
       before do
         @object_name = 'object'
         @adapter     = 'some.other.adapter'
-        @expected_javascript = <<-JS
-      <script type="text/javascript">
-        $(document).ready(function() {
-          $('##{@object_name}').clientSideValidations('#{@url}', '#{@some_other_adapter}');
-        })
-      </script>
-    JS
       end
       
       it 'should raise an error' do

data/spec/action_view_3_spec.rb

@@ -4,71 +4,52 @@ require 'action_pack'
 require 'action_view'
 require 'client_side_validations'
 
-describe 'ActionView 2.x Form Helper' do
-  context 'ActionView::Base' do
-    subject { ActionView::Base.new }
-    
-    context 'only the url' do
-      before do
-        @object_name = 'object'
-        @url         = '/objects/new.json'
-        @expected_javascript = <<-JS
-      <script type="text/javascript">
-        $(document).ready(function() {
-          $('##{@object_name}').clientSideValidations('#{@url}', 'jquery.validate');
-        })
-      </script>
-    JS
-        subject.should_receive(:dom_id).and_return(@object_name)
-      end
-      
-      it 'should generate the proper javascript' do
-        subject.client_side_validations(@object_name, 
-          :url => @url).should == @expected_javascript
-      end
-    end
-    
-    context 'a different adapter' do
-      before do
-        @object_name = 'object'
-        @url         = '/objects/new.json'
-        @adapter     = 'some.other.adapter'
-        @expected_javascript = <<-JS
-      <script type="text/javascript">
-        $(document).ready(function() {
-          $('##{@object_name}').clientSideValidations('#{@url}', '#{@adapter}');
-        })
-      </script>
-    JS
-        subject.should_receive(:dom_id).and_return(@object_name)
-      end
-      
-      it 'should generate the proper javascript' do
-        subject.client_side_validations(@object_name, 
-          :url => @url, :adapter => @adapter).should == @expected_javascript
-      end
-    end
+describe 'ActionView 3.x Form Helper' do
+    context 'ActionView::Base' do
+      subject { ActionView::Base.new }
+
+      context 'only the url' do
+        before do
+          @object_name         = 'object'
+          @url                 = '/objects/new.json'
+          @expected_javascript = %{<script type="text/javascript">$(document).ready(function(){$('##{@object_name}').clientSideValidations('#{@url}','jquery.validate');});</script>}
+          subject.should_receive(:dom_id).and_return(@object_name)
+        end
 
-    context 'not including the :url' do
-      before do
-        @object_name = 'object'
-        @adapter     = 'some.other.adapter'
-        @expected_javascript = <<-JS
-      <script type="text/javascript">
-        $(document).ready(function() {
-          $('##{@object_name}').clientSideValidations('#{@url}', '#{@some_other_adapter}');
-        })
-      </script>
-    JS
+        it 'should generate the proper javascript' do
+          subject.client_side_validations(@object_name, 
+            :url => @url).should == @expected_javascript
+        end
       end
-      
-      it 'should raise an error' do
-        expect {
+
+      context 'a different adapter' do
+        before do
+          @object_name         = 'object'
+          @url                 = '/objects/new.json'
+          @adapter             = 'some.other.adapter'
+          @expected_javascript = %{<script type="text/javascript">$(document).ready(function(){$('##{@object_name}').clientSideValidations('#{@url}','#{@adapter}');});</script>}
+          subject.should_receive(:dom_id).and_return(@object_name)
+        end
+
+        it 'should generate the proper javascript' do
           subject.client_side_validations(@object_name, 
-            :adapter => @some_other_adapter)
-        }.to raise_error
+            :url => @url, :adapter => @adapter).should == @expected_javascript
+        end
       end
+
+      context 'not including the :url' do
+        before do
+          @object_name = 'object'
+          @adapter     = 'some.other.adapter'
+        end
+
+        it 'should raise an error' do
+          expect {
+            subject.client_side_validations(@object_name, 
+              :adapter => @some_other_adapter)
+          }.to raise_error
+        end
+      end
+
     end
-    
-  end
-end
+  end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
+  - 8
   - 0
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Brian Cardarella
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-07 00:00:00 -04:00
+date: 2010-06-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,6 +64,7 @@ files:
 - TODO
 - VERSION
 - client_side_validations.gemspec
+- generators/client_side_validations/client_side_validations_generator.rb
 - javascript/jspec/commands/example_command.rb
 - javascript/jspec/rhino.js
 - javascript/jspec/unit/jquery.validate.spec.js