jquery_on_rails 0.1.0 → 0.1.1

data/Rakefile

@@ -1,51 +1,49 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "jquery_on_rails"
-    gem.summary = %Q{JQuery on Rails - Replace prototype/scriptaculous with jquery}
-    gem.description = %Q{A complete replacement for Rails 3 javascript helpers and unobstrusive javacript (ujs) using JQuery instead of prototype/scriptaculous}
-    gem.email = "joe@ankhcraft.com"
-    gem.homepage = "http://github.com/joekhoobyar/jquery_on_rails"
-    gem.authors = ["Joe Khoobyar"]
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "jquery_on_rails"
+    gem.summary = %Q{JQuery on Rails - Replace prototype/scriptaculous with jquery}
+    gem.description = %Q{A complete replacement for Rails 3 javascript helpers and unobstrusive javacript (ujs) using JQuery instead of prototype/scriptaculous}
+    gem.email = "joe@ankhcraft.com"
+    gem.homepage = "http://github.com/joekhoobyar/jquery_on_rails"
+    gem.authors = ["Joe Khoobyar"]
     gem.files = Dir["{lib,public,spec}/**/*", "{bin}/*", "*"]
-    gem.rubyforge_project = "jquery_on_rails"
-    gem.add_dependency "actionpack", ">= 3.0.0.beta1"
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-  Jeweler::RubyforgeTasks.new do |rubyforge|
-    rubyforge.doc_task = "rdoc"
-  end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "jquery_on_rails #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+    gem.rubyforge_project = "jquery_on_rails"
+    gem.add_dependency "actionpack", ">= 3.0.0.beta1"
+    gem.add_development_dependency "rspec", ">= 2.0.0.beta.8"
+    # gem.add_development_dependency "rspec-rails", ">= 2.0.0.beta.8"
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+  Jeweler::GemcutterTasks.new
+  Jeweler::RubyforgeTasks.new do |rubyforge|
+    rubyforge.doc_task = "rdoc"
+  end
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end
+
+require 'rspec/core/rake_task'
+Rspec::Core::RakeTask.new(:rspec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
+Rspec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :rspec => :check_dependencies
+
+task :default => :rspec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "jquery_on_rails #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/jquery_on_rails.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jquery_on_rails}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joe Khoobyar"]
@@ -27,8 +27,16 @@ Gem::Specification.new do |s|
      "lib/jquery_on_rails/railtie.rb",
      "public/javascripts/jquery.js",
      "public/javascripts/rails.js",
+     "spec/dummy/app/controllers/dummy_controller.rb",
+     "spec/dummy/app/helpers/dummy_helper.rb",
+     "spec/dummy/config/application.rb",
+     "spec/dummy/config/boot.rb",
+     "spec/dummy/config/environment.rb",
+     "spec/dummy/config/environments/test.rb",
+     "spec/dummy/config/routes.rb",
+     "spec/dummy/log/test.log",
+     "spec/jquery_helper_spec.rb",
      "spec/jquery_on_rails_spec.rb",
-     "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/joekhoobyar/jquery_on_rails}
@@ -38,7 +46,15 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{JQuery on Rails - Replace prototype/scriptaculous with jquery}
   s.test_files = [
-    "spec/jquery_on_rails_spec.rb",
+    "spec/dummy/app/controllers/dummy_controller.rb",
+     "spec/dummy/app/helpers/dummy_helper.rb",
+     "spec/dummy/config/application.rb",
+     "spec/dummy/config/boot.rb",
+     "spec/dummy/config/environment.rb",
+     "spec/dummy/config/environments/test.rb",
+     "spec/dummy/config/routes.rb",
+     "spec/jquery_helper_spec.rb",
+     "spec/jquery_on_rails_spec.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -48,14 +64,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<actionpack>, [">= 3.0.0.beta1"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.8"])
     else
       s.add_dependency(%q<actionpack>, [">= 3.0.0.beta1"])
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.8"])
     end
   else
     s.add_dependency(%q<actionpack>, [">= 3.0.0.beta1"])
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.8"])
   end
 end
 

data/lib/jquery_on_rails/helpers/jquery_helper.rb

@@ -273,8 +273,8 @@ module JQueryOnRails
 													         "}"  
         end
 	    
-	      if !(FalseClass === options[:protect_against_forgery?]) or
-		        protect_against_forgery? or !options[:form] or !options[:submit]
+	      if !(FalseClass === options[:protect_against_forgery]) and
+          protect_against_forgery? and !options[:form]
 		    then
 	        if js_options['data']
 	          js_options['data'] << " + '&"

data/spec/dummy/app/controllers/dummy_controller.rb

@@ -0,0 +1,5 @@
+class DummyController < ActionController::Base
+
+  protect_from_forgery
+
+end

data/spec/dummy/app/helpers/dummy_helper.rb

@@ -0,0 +1,2 @@
+module DummyHelper
+end

data/spec/dummy/config/application.rb

@@ -0,0 +1,16 @@
+require File.expand_path('../boot', __FILE__)
+
+require "action_dispatch/railtie"
+require "action_controller/railtie"
+require "action_view/railtie"
+
+require 'jquery_on_rails'
+
+module Dummy
+  class Application < Rails::Application
+		config.root = File.expand_path '../../', __FILE__
+    config.secret_token = 'abcdefghijklmnopqrstuvwxyz0123456789'
+		config.session_store :cookie_store, :key => '_dummy_session'
+  end
+end
+

data/spec/dummy/config/boot.rb

@@ -0,0 +1,3 @@
+require 'rubygems'
+
+$:.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+Dummy::Application.initialize!

data/spec/dummy/config/routes.rb

@@ -0,0 +1,3 @@
+Dummy::Application.routes.draw do |map|
+  match ':controller(/:action(/:id(.:format)))'
+end

data/spec/jquery_helper_spec.rb

@@ -0,0 +1,79 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+require 'dummy_controller'
+
+describe JQueryOnRails::Helpers::JQueryHelper do
+  before(:each) do
+    @t = DummyController.new.tap do |c|
+	    c.request = ActionDispatch::Request.new Rack::MockRequest.env_for('/dummy')
+    end.view_context
+  end
+  
+  it "overrides all instance methods ActionView::Helpers::PrototypeHelper" do
+    (ActionView::Helpers::PrototypeHelper.instance_methods -
+      JQueryOnRails::Helpers::JQueryHelper.instance_methods).should == []
+  end
+  it "overrides all instance methods ActionView::Helpers::ScriptaculousHelper" do
+    return pending("not yet implemented")
+    (ActionView::Helpers::ScriptaculousHelper.instance_methods -
+      JQueryOnRails::Helpers::JQueryHelper.instance_methods).should == []
+  end
+  
+  describe '#options_for_javascript' do
+    before(:each) do
+	    @t.singleton_class.instance_eval{ public :options_for_javascript }
+	  end
+
+	  it "handles empty options" do
+	    @t.options_for_javascript({}).should == '{}' 
+	  end
+	  it "orders options deterministically" do
+	    @t.options_for_javascript(:b=>1,:c=>3,:a=>2).should == '{a:2, b:1, c:3}'
+	  end
+  end
+  
+  describe '#remote_function' do
+	  it "calls jQuery.ajax" do
+	    # jQuery.ajax({async:true,   ...   method:'GET', processData:false,  ...   })
+	    @t.remote_function(:url=>'/foo').should =~ /jQuery\.ajax\(.*.*\)/
+	  end
+	  it "is asynchronous by default" do
+	    @t.remote_function(:url=>'/foo').should =~ /async: *true/
+	  end
+	  it "can be explicitly synchronous" do
+	    @t.remote_function(:url=>'/foo', :type=>:synchronous).should =~ /async: *false/
+	  end
+	  
+	  describe 'request forgery protection' do
+	    before(:each) do
+	      @regex = /data: *'#{@t.request_forgery_protection_token}=' *\+ *encodeURIComponent/
+	    end
+
+		  it "is included by default" do
+		    @t.remote_function(:url=>'/foo').should =~ @regex
+		  end
+		  it "can be explicitly omitted" do
+		    @t.remote_function(:url=>'/foo', :protect_against_forgery=>false).should_not =~ @regex
+	    end
+		  it "is omitted when :form is given" do
+		    @t.remote_function(:url=>'/foo', :form=>true).should_not =~ @regex
+	    end
+	  end
+	  describe ':url' do
+		  it "accepts a string" do
+		    @t.remote_function(:url=>'/foo').should =~ /url: *'\/foo'/
+		  end
+		  it "accepts a hash" do
+		    @t.remote_function(:url=>{:controller=>'dummy', :action=>'index'}).should =~ /url: *'\/dummy'/
+		  end
+	  end
+	  describe ':method' do
+		  it "defaults to GET" do
+		    @t.remote_function(:url=>'/foo').should =~ /method: *'GET'/
+		  end
+		  it "is capitalized" do
+		    @t.remote_function(:url=>'/foo', :method=>:post).should =~ /method: *'POST'/
+		  end
+	  end
+  end
+end

data/spec/jquery_on_rails_spec.rb

@@ -1,7 +1,12 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "JqueryOnRails" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
+describe "JQueryOnRails" do
+
+  it "should not screw up the VERSION" do
+    JQueryOnRails.constants.should be_include('VERSION')
+    version_file = File.expand_path '../../VERSION', __FILE__
+    File.should be_exists(version_file)
+    JQueryOnRails::VERSION.should == File.read(version_file).strip
   end
+
 end

data/spec/spec_helper.rb

@@ -1,9 +1,19 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'jquery_on_rails'
-require 'spec'
-require 'spec/autorun'
-
-Spec::Runner.configure do |config|
-  
+ENV["RAILS_ENV"] = "test"
+
+require 'pp'
+begin require 'win32console' and include Win32::Console::ANSI
+rescue LoadError
+end if RUBY_PLATFORM =~ /msvc|mingw|cygwin|win32/
+
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require "rails/test_help"
+require "rspec"
+#require "rspec/rails"
+
+Rails.backtrace_cleaner.remove_silencers!
+
+Rspec.configure do |config|
+  require 'rspec/expectations'
+  config.include Rspec::Matchers
+  config.mock_with :rspec
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Joe Khoobyar
@@ -40,10 +40,12 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
         - 2
-        - 9
-        version: 1.2.9
+        - 0
+        - 0
+        - beta
+        - 8
+        version: 2.0.0.beta.8
   type: :development
   version_requirements: *id002
 description: A complete replacement for Rails 3 javascript helpers and unobstrusive javacript (ujs) using JQuery instead of prototype/scriptaculous
@@ -66,8 +68,16 @@ files:
 - lib/jquery_on_rails/railtie.rb
 - public/javascripts/jquery.js
 - public/javascripts/rails.js
+- spec/dummy/app/controllers/dummy_controller.rb
+- spec/dummy/app/helpers/dummy_helper.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/routes.rb
+- spec/dummy/log/test.log
+- spec/jquery_helper_spec.rb
 - spec/jquery_on_rails_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/joekhoobyar/jquery_on_rails
@@ -100,5 +110,13 @@ signing_key:
 specification_version: 3
 summary: JQuery on Rails - Replace prototype/scriptaculous with jquery
 test_files: 
+- spec/dummy/app/controllers/dummy_controller.rb
+- spec/dummy/app/helpers/dummy_helper.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/routes.rb
+- spec/jquery_helper_spec.rb
 - spec/jquery_on_rails_spec.rb
 - spec/spec_helper.rb

data/spec/spec.opts

@@ -1 +0,0 @@
---color