ajax 1.1.3 → 1.1.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ./
   specs:
-    ajax (1.1.3)
+    ajax (1.1.4)
       json
       rack
 

data/README.rdoc

@@ -10,6 +10,7 @@ As of May 2010 Ajax is being used live in production on kazaa.com[http://www.kaz
 
 == Changelog
 
+* v1.1.4: Fix RSpec 2 integration
 * v1.1.3: Guard against possible nil values for the redirect_to url and the referrers
 * v1.1.2: Fix Rails 3 render hook so it doesn't break rendering with no layout e.g. <tt>render :json => ...</tt>
 * v1.1.1: Backwards compatibility fix for Rails < 3

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.1.4

data/lib/ajax/helpers/task_helper.rb

@@ -14,7 +14,9 @@ module Ajax
       UPDATE_JAVASCRIPT_FILES = %w[
         public/javascripts/ajax.js]
 
-      def copy_unless_exists(file, from_dir=Ajax.root, to_dir=Rails.root)
+      def copy_unless_exists(file, from_dir=nil, to_dir=nil)
+        to_dir ||= Rails.root.to_s
+        from_dir ||= Ajax.root.to_s
         from_file, to_file = File.join(from_dir, file), File.join(to_dir, file)
         if File.exist?(to_file)
           return false
@@ -27,7 +29,9 @@ module Ajax
         e
       end
 
-      def copy_and_overwrite(file, from_dir=Ajax.root, to_dir=Rails.root)
+      def copy_and_overwrite(file, from_dir=nil, to_dir=nil)
+        to_dir ||= Rails.root.to_s
+        from_dir ||= Ajax.root.to_s
         from_file, to_file = File.join(from_dir, file), File.join(to_dir, file)
         FileUtils.mkdir_p(File.dirname(to_file)) unless File.directory?(File.dirname(to_file))
         FileUtils.cp(from_file, to_file)
@@ -51,4 +55,4 @@ module Ajax
       end
     end
   end
-end
+end

data/lib/ajax/rspec.rb

@@ -1,2 +1,3 @@
 require 'ajax/rspec/extension'
-require 'ajax/rspec/helpers'
+require 'ajax/rspec/helpers'
+require 'ajax/rspec/integration'

data/lib/ajax/rspec/extension.rb

@@ -1,10 +1,6 @@
 module Ajax
   module RSpec
     module Extension
-      def included(base)
-        require 'ajax/rspec/integration'
-      end
-
       def integrate_ajax
         Ajax.enabled = true
       end

data/lib/ajax/rspec/helpers.rb

@@ -3,7 +3,6 @@ require 'uri'
 module Ajax
   module RSpec
     module Helpers
-
       def create_app
         @app = Class.new { def call(env); true; end }.new
       end
@@ -92,4 +91,4 @@ module Ajax
       end
     end
   end
-end
+end

data/lib/ajax/rspec/integration.rb

@@ -1,16 +1,17 @@
 # Only require integration module when extensions are included.
 # RSpec integration.  Add a before filter to disable Ajax before all tests.
 module Ajax::RSpec::Integration
-  if defined?(RSpec)
-    RSpec.configure do |c|
-      c.before do
-        ::Ajax.enabled = false
+  if defined?(::RSpec)
+    ::RSpec.configure do |c|
+      c.include(Ajax::RSpec::Extension)
+      c.before :all do
+        disable_ajax
       end
     end
-  elsif defined?(Spec)
-    Spec::Runner.configure do |c|
+  elsif defined?(::Spec)
+    ::Spec::Runner.configure do |c|
       c.before :all do
-        ::Ajax.enabled = false
+        disable_ajax
       end
     end
   end
@@ -21,4 +22,4 @@ module ActiveSupport
   class TestCase
     include Ajax::RSpec::Extension
   end
-end
+end

data/tasks/ajax_tasks.rake

@@ -42,12 +42,12 @@ END
   namespace :install do
     desc "Copy Ajax integration spec tests into spec/integration."
     task :specs do
-      file = Ajax.app.root + 'spec/integration/ajax_spec.rb'
+      file = (Ajax.app.root + 'spec/integration/ajax_spec.rb').to_s
       if File.exist?(file)
         puts "already exists: #{file}" if verbose
       else
         FileUtils.mkdir_p(File.dirname(file))
-        FileUtils.cp(file.sub(Ajax.app.root, Ajax.root), file)
+        FileUtils.cp(file.sub(Ajax.app.root.to_s, Ajax.root.to_s), file)
         puts "created: #{file}" if verbose
       end
     end
@@ -61,4 +61,4 @@ END
       end
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ajax
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 1
-  - 3
-  version: 1.1.3
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - Karl Varga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 -07:00
+date: 2011-05-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency