dchelimsky-rspec-rails 1.1.99.8 → 1.1.99.9

data/History.txt

@@ -35,6 +35,7 @@ IMPORTANT: This release includes the following backwards-compatibility-breaking
   * rspec_scaffold generator generates layout and stylesheet (per Rails-2.3)
   * add bypass_rescue for controller specs
   * infer template path from the first arg passed to describe in view specs
+  * separate routing specs (in spec/routing)
   
 * bug fixes
 
@@ -47,6 +48,7 @@ IMPORTANT: This release includes the following backwards-compatibility-breaking
   * rake spec:server:start doesn't choke if there is no tmp directory
   * force cache_classes = false when running with spec_server. Closes #287.
   * keep spec_server working against edge rails (Jonathan Tron). Closes #685.
+  * create lib/tasks if not present when running script/generate rspec. Closes #687.
 
 === Version 1.1.12 / 2009-01-11
 

data/Rakefile

@@ -20,7 +20,7 @@ Hoe.new('rspec-rails', Spec::Rails::VERSION::STRING) do |p|
   p.description = "Behaviour Driven Development for Ruby on Rails."
   p.rubyforge_name = 'rspec'
   p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
-  p.extra_deps = [["rspec","1.1.99.8"],["rack",">=0.4.0"]]
+  p.extra_deps = [["dchelimsky-rspec","1.1.99.9"],["rack",">=0.4.0"]]
   p.extra_dev_deps = [["cucumber",">= 0.1.13"]]
   p.remote_rdoc_dir = "rspec-rails/#{Spec::Rails::VERSION::STRING}"
 end

data/generators/rspec/rspec_generator.rb

@@ -14,6 +14,7 @@ class RspecGenerator < Rails::Generator::Base
     record do |m|
       script_options     = { :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang] }
 
+      m.directory 'lib/tasks'
       m.file      'rspec.rake',                    'lib/tasks/rspec.rake'
 
       m.file      'script/autospec',               'script/autospec',    script_options

data/generators/rspec/templates/script/spec

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/rspec/lib"))
-require 'rubygems'
 require 'spec'
 exit ::Spec::Runner::CommandLine.run

data/generators/rspec/templates/script/spec_server

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../vendor/plugins/rspec-rails/lib' # For rspec installed as plugin
-require 'rubygems'
 require 'optparse'
 require 'spec/rails/spec_server'
 

data/generators/rspec_scaffold/rspec_scaffold_generator.rb

@@ -30,7 +30,6 @@ class RspecScaffoldGenerator < Rails::Generator::NamedBase
       @controller_class_name = "#{@controller_class_nesting}::#{@controller_class_name_without_nesting}"
     end
     
-    @resource_generator = "scaffold"
     @default_file_extension = "html.erb"
   end
 
@@ -50,34 +49,35 @@ class RspecScaffoldGenerator < Rails::Generator::NamedBase
       m.directory(File.join('public/stylesheets', class_path))
 
       m.directory(File.join('spec/controllers', controller_class_path))
+      m.directory(File.join('spec/routing', controller_class_path))
       m.directory(File.join('spec/models', class_path))
       m.directory(File.join('spec/helpers', class_path))
       m.directory File.join('spec/fixtures', class_path)
       m.directory File.join('spec/views', controller_class_path, controller_file_name)
       
       # Layout and stylesheet.
-      m.template("#{@resource_generator}:layout.html.erb", File.join('app/views/layouts', controller_class_path, "#{controller_file_name}.html.erb"))
-      m.template("#{@resource_generator}:style.css", 'public/stylesheets/scaffold.css')
+      m.template("scaffold:layout.html.erb", File.join('app/views/layouts', controller_class_path, "#{controller_file_name}.html.erb"))
+      m.template("scaffold:style.css", 'public/stylesheets/scaffold.css')
 
       # Controller spec, class, and helper.
       m.template 'rspec_scaffold:routing_spec.rb',
-        File.join('spec/controllers', controller_class_path, "#{controller_file_name}_routing_spec.rb")
+        File.join('spec/routing', controller_class_path, "#{controller_file_name}_routing_spec.rb")
 
       m.template 'rspec_scaffold:controller_spec.rb',
         File.join('spec/controllers', controller_class_path, "#{controller_file_name}_controller_spec.rb")
 
-      m.template "#{@resource_generator}:controller.rb",
+      m.template "scaffold:controller.rb",
         File.join('app/controllers', controller_class_path, "#{controller_file_name}_controller.rb")
 
       m.template 'rspec_scaffold:helper_spec.rb',
         File.join('spec/helpers', class_path, "#{controller_file_name}_helper_spec.rb")
 
-      m.template "#{@resource_generator}:helper.rb",
+      m.template "scaffold:helper.rb",
         File.join('app/helpers', controller_class_path, "#{controller_file_name}_helper.rb")
 
       for action in scaffold_views
         m.template(
-          "#{@resource_generator}:view_#{action}.#{@default_file_extension}",
+          "scaffold:view_#{action}.#{@default_file_extension}",
           File.join('app/views', controller_class_path, controller_file_name, "#{action}.#{default_file_extension}")
         )
       end

data/lib/spec/rails/example/controller_example_group.rb

@@ -89,8 +89,6 @@ module Spec
           end
         end
         
-        include ::Spec::Rails::Example::RoutingHelpers
-        
         before(:each) do
           # Some Rails apps explicitly disable ActionMailer in environment.rb
           if defined?(ActionMailer)
@@ -149,10 +147,6 @@ MESSAGE
         end
 
       private
-
-        def ensure_that_routes_are_loaded
-          ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty?
-        end
         
         module TemplateIsolationExtensions
           def file_exists?(ignore); true; end

data/lib/spec/rails/example/routing_helpers.rb

@@ -3,7 +3,19 @@ module Spec
     module Example
       module RoutingHelpers
         
+        module ParamsFromQueryString # :nodoc:
+          def params_from_querystring(querystring) # :nodoc:
+            params = {}
+            querystring.split('&').each do |piece|
+              key, value = piece.split('=')
+              params[key.to_sym] = value
+            end
+            params
+          end
+        end
+        
         class RouteFor
+          include ::Spec::Rails::Example::RoutingHelpers::ParamsFromQueryString
           def initialize(example, options)
             @example, @options = example, options
           end
@@ -42,13 +54,12 @@ module Spec
           querystring.blank? ? params : params.merge(params_from_querystring(querystring))
         end
 
-        def params_from_querystring(querystring) # :nodoc:
-          params = {}
-          querystring.split('&').each do |piece|
-            key, value = piece.split('=')
-            params[key.to_sym] = value
-          end
-          params
+      private
+
+        include ParamsFromQueryString
+
+        def ensure_that_routes_are_loaded
+          ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty?
         end
 
       end

data/lib/spec/rails/example.rb

@@ -8,6 +8,7 @@ require "spec/rails/example/functional_example_group"
 require "spec/rails/example/controller_example_group"
 require "spec/rails/example/helper_example_group"
 require "spec/rails/example/view_example_group"
+require "spec/rails/example/routing_example_group"
 require "spec/rails/example/cookies_proxy"
 
 module Spec

data/lib/spec/rails/extensions/action_controller/test_case.rb

@@ -1,5 +1,7 @@
 module ActionController
   class TestCase
+    include ::Spec::Rails::Example::RoutingHelpers
+
     if Rails::VERSION::STRING =~ /2\.0/
       # Introduced in Rails 2.1, but we need it for 2.0
       def rescue_action_in_public!

data/lib/spec/rails/extensions/active_support/test_case.rb

@@ -1,7 +1,7 @@
 module ActiveSupport
   class TestCase
-    include Spec::Rails::Matchers
-    include Spec::Rails::Mocks
+    include ::Spec::Rails::Matchers
+    include ::Spec::Rails::Mocks
   end
 end
 

data/lib/spec/rails/version.rb

@@ -5,7 +5,7 @@ module Spec
         MAJOR  = 1
         MINOR  = 1
         TINY   = 99
-        MINESCULE = 8
+        MINESCULE = 9
 
         STRING = [MAJOR, MINOR, TINY, MINESCULE].compact.join('.')
 

data/rspec-rails.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "1.1.99.8"
+  s.version = "1.1.99.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["RSpec Development Team"]
-  s.date = %q{2009-02-23}
+  s.date = %q{2009-02-24}
   s.description = %q{Behaviour Driven Development for Ruby on Rails.}
   s.email = ["rspec-devel@rubyforge.org"]
   s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "TODO.txt", "generators/rspec/templates/previous_failures.txt"]
@@ -17,23 +17,23 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.1}
-  s.summary = %q{rspec-rails 1.1.99.8}
+  s.summary = %q{rspec-rails 1.1.99.9}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rspec>, ["= 1.1.99.8"])
+      s.add_runtime_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.9"])
       s.add_runtime_dependency(%q<rack>, [">= 0.4.0"])
       s.add_development_dependency(%q<cucumber>, [">= 0.1.13"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.3"])
     else
-      s.add_dependency(%q<rspec>, ["= 1.1.99.8"])
+      s.add_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.9"])
       s.add_dependency(%q<rack>, [">= 0.4.0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["= 1.1.99.8"])
+    s.add_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.9"])
     s.add_dependency(%q<rack>, [">= 0.4.0"])
   end
 end

data/spec/spec/rails/example/controller_example_group_spec.rb

@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 require 'controller_spec_controller'
+require File.join(File.dirname(__FILE__), "/shared_routing_example_group_examples.rb")
 
 ['integration', 'isolation'].each do |mode|
   describe "A controller example running in #{mode} mode", :type => :controller do
@@ -7,6 +8,7 @@ require 'controller_spec_controller'
     integrate_views if mode == 'integration'
 
     accesses_configured_helper_methods
+    include RoutingExampleGroupSpec
 
     describe "with an implicit subject" do
       it "uses the controller" do
@@ -158,49 +160,6 @@ require 'controller_spec_controller'
     
     end
     
-    class CustomRouteSpecController < ActionController::Base; end
-    class RspecOnRailsSpecsController < ActionController::Base; end
-
-    it "should support custom routes" do
-      route_for(:controller => "custom_route_spec", :action => "custom_route").
-        should == "/custom_route"
-    end
-
-    it "should support existing routes" do
-      route_for(:controller => "controller_spec", :action => "some_action").
-        should == "/controller_spec/some_action"
-    end
-
-    it "should support existing routes with additional parameters" do
-      route_for(:controller => "controller_spec", :action => "some_action", :param => '1').
-        should == "/controller_spec/some_action?param=1"
-    end
-    
-    it "recognizes routes with methods besides :get" do
-      route_for(:controller => "rspec_on_rails_specs", :action => "update", :id => "37").
-        should == {:path => "/rspec_on_rails_specs/37", :method => :put}
-    end
-
-    it "should generate params for custom routes" do
-      params_from(:get, '/custom_route').
-        should == {:controller => "custom_route_spec", :action => "custom_route"}
-    end
-
-    it "should generate params for existing routes" do
-      params_from(:get, '/controller_spec/some_action').
-        should == {:controller => "controller_spec", :action => "some_action"}
-    end
-
-    it "should generate params for an existing route with a query parameter" do
-      params_from(:get, '/controller_spec/some_action?param=1').
-        should == {:controller => "controller_spec", :action => "some_action", :param => '1'}
-    end
-
-    it "should generate params for an existing route with multiple query parameters" do
-      params_from(:get, '/controller_spec/some_action?param1=1&param2=2').
-        should == {:controller => "controller_spec", :action => "some_action", :param1 => '1', :param2 => '2' }
-    end
-
     it "should expose instance vars through the assigns hash" do
       get 'action_setting_the_assigns_hash'
       assigns[:indirect_assigns_key].should == :indirect_assigns_key_value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dchelimsky-rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 1.1.99.8
+  version: 1.1.99.9
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,18 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-23 00:00:00 -08:00
+date: 2009-02-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: dchelimsky-rspec
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.99.8
+        version: 1.1.99.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -257,6 +257,6 @@ rubyforge_project: rspec
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: rspec-rails 1.1.99.8
+summary: rspec-rails 1.1.99.9
 test_files: []
 

data/spec/spec/rails/example/shared_behaviour_spec.rb

@@ -1,16 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-describe "A shared view example_group", :shared => true do
-  it "should have some tag with some text" do
-    response.should have_tag('div', 'This is text from a method in the ViewSpecHelper')
-  end
-end
-
-describe "A view example_group", :type => :view do
-  it_should_behave_like "A shared view example_group"
-  
-  before(:each) do
-    render "view_spec/implicit_helper"
-  end
-end
-