rspec-rails 2.0.0.beta.3 → 2.0.0.beta.4

data/Rakefile

@@ -1,5 +1,3 @@
-require 'rubygems'
-gem 'jeweler', '>= 1.4.0'
 require 'rake'
 require 'yaml'
 
@@ -47,24 +45,22 @@ namespace :gem do
   end
 end
 
+namespace :rails do
+  desc "clone the rails repo"
+  task :clone do
+    mkdir 'tmp' unless File.directory?('tmp')
+    unless File.directory?('tmp/rails')
+      Dir.chdir('tmp') do
+        sh "git clone git://github.com/rails/rails"
+      end
+    end
+  end
+end
+
 namespace :generate do
   desc "generate a fresh app with rspec installed"
-  task :app => :clobber_app do |t|
-    if File.directory?('./tmp/rails')
-      ruby "./tmp/rails/railties/bin/rails tmp/example_app --dev -m example_app_template.rb"
-    else
-      puts <<-MESSAGE
-
-You need to install rails in ./tmp/rails before you can run the 
-#{t.name} task:
-  
-  git clone git://github.com/rails/rails tmp/rails
-
-(We'll automate this eventually, but running 'git clone' from rake in this
-project is mysteriously full of fail)
-
-MESSAGE
-    end
+  task :app => ["rails:clone", :clobber_app] do |t|
+    ruby "./tmp/rails/railties/bin/rails tmp/example_app --dev -m example_app_template.rb"
   end
 
   desc "generate a bunch of stuff with generators"

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.3
+2.0.0.beta.4

data/lib/generators/rspec/scaffold/scaffold_generator.rb

@@ -11,19 +11,20 @@ module Rspec
       class_option :template_engine, :desc => "Template engine to generate view files"
       class_option :singleton, :type => :boolean, :desc => "Supply to create a singleton controller"
 
-      class_option :controllers, :type => :boolean, :default => true
-      class_option :views,       :type => :boolean, :default => true
-      class_option :routes,      :type => :boolean, :default => false
+      class_option :controller_specs, :type => :boolean, :default => true,  :desc => "Generate controller specs"
+      class_option :view_specs,       :type => :boolean, :default => true,  :desc => "Generate view specs"
+      class_option :helper_specs,     :type => :boolean, :default => true,  :desc => "Generate helper specs"
+      class_option :routing_specs,    :type => :boolean, :default => false, :desc => "Generate routing specs"
 
       def copy_controller_files
-        return unless options[:controllers]
+        return unless options[:controller_specs]
 
         template 'controller_spec.rb',
                  File.join('spec/controllers', controller_class_path, "#{controller_file_name}_controller_spec.rb")
       end
 
       def copy_view_files
-        return unless options[:views]
+        return unless options[:view_specs]
 
         copy_view :edit
         copy_view :index unless options[:singleton]
@@ -32,7 +33,7 @@ module Rspec
       end
 
       def copy_routing_files
-        return unless options[:routes]
+        return unless options[:routing_specs]
 
         template 'routing_spec.rb',
                  File.join('spec/routing', controller_class_path, "#{controller_file_name}_routing_spec.rb")

data/lib/rspec/rails/matchers.rb

@@ -1,6 +1,5 @@
 require 'rspec/matchers'
 
-#try to fix load error for ruby1.9.1
 begin
   require 'test/unit/assertionfailederror'
 rescue LoadError
@@ -18,22 +17,29 @@ module Rspec
       include Rspec::Matchers
 
       def redirect_to(destination)
-        example = self
+        running_example = self
         Matcher.new :redirect_to, destination do |destination_|
           match_unless_raises Test::Unit::AssertionFailedError do |_|
-            example.assert_redirected_to destination_
+            running_example.assert_redirected_to destination_
           end
         end
       end
 
       def render_template(options={}, message=nil)
-        example = self
+        running_example = self
         Matcher.new :render_template, options, message do |options_, message_|
           match_unless_raises Test::Unit::AssertionFailedError do |_|
-            example.assert_template options_, message_
+            running_example.assert_template options_, message_
           end
         end
       end
+
     end
   end
 end
+
+Rspec::Matchers.define :be_a_new do |model_klass|
+  match do |actual|
+    model_klass === actual && actual.new_record?
+  end
+end

data/rspec-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "2.0.0.beta.3"
+  s.version = "2.0.0.beta.4"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Chelimsky", "Chad Humphries"]
-  s.date = %q{2010-03-08}
+  s.date = %q{2010-03-15}
   s.description = %q{Rspec-2 for Rails-3}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
@@ -69,7 +69,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/rspec-rails}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-rails-2.0.0.beta.3!
+  Thank you for installing rspec-rails-2.0.0.beta.4!
 
   This version of rspec-rails only works with 
   versions of rails >= 3.0.0.pre.
@@ -84,21 +84,21 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{rspec-rails-2.0.0.beta.3}
+  s.summary = %q{rspec-rails-2.0.0.beta.4}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rspec>, ["= 2.0.0.beta.3"])
+      s.add_runtime_dependency(%q<rspec>, ["= 2.0.0.beta.4"])
       s.add_runtime_dependency(%q<webrat>, [">= 0.7.0"])
     else
-      s.add_dependency(%q<rspec>, ["= 2.0.0.beta.3"])
+      s.add_dependency(%q<rspec>, ["= 2.0.0.beta.4"])
       s.add_dependency(%q<webrat>, [">= 0.7.0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["= 2.0.0.beta.3"])
+    s.add_dependency(%q<rspec>, ["= 2.0.0.beta.4"])
     s.add_dependency(%q<webrat>, [">= 0.7.0"])
   end
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 3
-  version: 2.0.0.beta.3
+  - 4
+  version: 2.0.0.beta.4
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 -06:00
+date: 2010-03-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,8 +32,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 3
-        version: 2.0.0.beta.3
+        - 4
+        version: 2.0.0.beta.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -115,7 +115,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-2.0.0.beta.3!
+    Thank you for installing rspec-rails-2.0.0.beta.4!
   
     This version of rspec-rails only works with 
     versions of rails >= 3.0.0.pre.
@@ -152,6 +152,6 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.0.0.beta.3
+summary: rspec-rails-2.0.0.beta.4
 test_files: []