shoulda 3.0.0.beta2 → 3.0.1

data/.autotest

@@ -0,0 +1,13 @@
+Autotest.add_hook :initialize do |at|
+  at.add_mapping(%r{^lib/\w.*\.rb}) do
+    at.files_matching(%r{^test/*/\w.*_test\.rb})
+  end
+
+  at.add_mapping(%r{^test/rails_root/\w.*}) do
+    at.files_matching(%r{^test/*/\w.*_test\.rb})
+  end
+
+  at.add_exception(%r{.svn})
+  at.add_exception(%r{.log$})
+  at.add_exception(%r{^.autotest$})
+end

data/.gitignore

@@ -0,0 +1,11 @@
+test/*/log/*.log
+doc
+coverage
+.svn/
+pkg
+*.swp
+*.swo
+tags
+tmp
+.bundle
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,3 @@
+rvm:
+  - 1.8.7
+  - 1.9.2

data/Gemfile

@@ -1,9 +1,3 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.3'
-gem 'sqlite3-ruby', :require => 'sqlite3'
-gem 'rspec-rails', "~> 2.3.1"
-gem 'ruby-debug'
-gem 'cucumber'
-gem "aruba"
-
+gemspec

data/README.md

@@ -1,5 +1,4 @@
-shoulda
-===================================================
+# shoulda [![Build Status](http://travis-ci.org/thoughtbot/shoulda.png)](http://travis-ci.org/thoughtbot/shoulda)
 
 The shoulda gem is a meta gem with two dependencies:
 
@@ -18,39 +17,39 @@ rspec with shoulda-matchers
 
 This is what thoughtbot currently does. We write tests like:
 
-  describe Post do
-    it { should belong_to(:user) }
-    it { should validate_presence_of(:title) }
-  end
+    describe Post do
+      it { should belong_to(:user) }
+      it { should validate_presence_of(:title) }
+    end
 
 The belong_to and validate_presence_of methods are the matchers.
 All matchers are Rails 3-specific.
 
 Add rspec-rails and shoulda-matchers to the project's Gemfile:
 
-  only :test do
-    gem 'rspec-rails'
-    gem 'shoulda-matchers'
-  end
+    group :test do
+      gem 'rspec-rails'
+      gem 'shoulda-matchers'
+    end
 
 test/unit with shoulda
 ----------------------
 
 For the folks who prefer Test::Unit, they'd write tests like:
 
-  class UserTest < Test::Unit::TestCase
-    should have_many(:posts)
-    should_not allow_value("blah").for(:email)
-  end
+    class UserTest < Test::Unit::TestCase
+      should have_many(:posts)
+      should_not allow_value("blah").for(:email)
+    end
 
 The have_many and allow_value methods are the same kind of matchers
 seen in the RSpec example. They come from the shoulda-matchers gem.
 
 Add shoulda to the project's Gemfile:
 
-  only :test do
-    gem 'shoulda'
-  end
+    group :test do
+      gem 'shoulda'
+    end
 
 test/unit with shoulda-context
 ------------------------------
@@ -58,27 +57,27 @@ test/unit with shoulda-context
 If you're not testing a Rails project or don't want to use the matchers,
 you can use shoulda-context independently to write tests like:
 
-  class CalculatorTest < Test::Unit::TestCase
-    context "a calculator" do
-      setup do
-        @calculator = Calculator.new
-      end
+    class CalculatorTest < Test::Unit::TestCase
+      context "a calculator" do
+        setup do
+          @calculator = Calculator.new
+        end
 
-      should "add two numbers for the sum" do
-        assert_equal 4, @calculator.sum(2, 2)
-      end
+        should "add two numbers for the sum" do
+          assert_equal 4, @calculator.sum(2, 2)
+        end
 
-      should "multiply two numbers for the product" do
-        assert_equal 10, @calculator.product(2, 5)
+        should "multiply two numbers for the product" do
+          assert_equal 10, @calculator.product(2, 5)
+        end
       end
     end
-  end
 
 Add shoulda-context to the project's Gemfile:
 
-  only :test do
-    gem 'shoulda-context'
-  end
+    group :test do
+      gem 'shoulda-context'
+    end
 
 Credits
 -------
@@ -87,6 +86,8 @@ Credits
 
 Shoulda is maintained and funded by [thoughtbot, inc](http://thoughtbot.com/community)
 
+Thank you to all [the contributors](https://github.com/thoughtbot/shoulda/contributors)!
+
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 
 License

data/Rakefile

@@ -1,18 +1,8 @@
-require 'rubygems'
 require 'bundler/setup'
-require 'rake'
-require 'rake/gempackagetask'
+require 'rubygems'
+require 'bundler/gem_tasks'
 require 'cucumber/rake/task'
 
-$LOAD_PATH.unshift("lib")
-require 'shoulda/version'
-
-eval("$specification = begin; #{IO.read('shoulda.gemspec')}; end")
-Rake::GemPackageTask.new $specification do |pkg|
-  pkg.need_tar = true
-  pkg.need_zip = true
-end
-
 desc "Clean files generated by rake tasks"
 task :clobber => [:clobber_rdoc, :clobber_package]
 
@@ -23,4 +13,3 @@ end
 
 desc 'Default: run cucumber features'
 task :default => [:cucumber]
-

data/features/rails_integration.feature

@@ -0,0 +1,87 @@
+@disable-bundler
+Feature: integrate with Rails
+
+  Background:
+    When I generate a new rails application
+    And I write to "db/migrate/1_create_users.rb" with:
+      """
+      class CreateUsers < ActiveRecord::Migration
+        def self.up
+          create_table :users do |t|
+            t.string :name
+          end
+        end
+      end
+      """
+    When I successfully run "rake db:migrate --trace"
+    And I write to "app/models/user.rb" with:
+      """
+      class User < ActiveRecord::Base
+        validates_presence_of :name
+      end
+      """
+    When I write to "app/controllers/examples_controller.rb" with:
+      """
+      class ExamplesController < ApplicationController
+        def show
+          @example = 'hello'
+          render :nothing => true
+        end
+      end
+      """
+    When I configure a wildcard route
+
+  Scenario: generate a rails application and use matchers in Test::Unit
+    When I configure the application to use shoulda
+    And I write to "test/unit/user_test.rb" with:
+      """
+      require 'test_helper'
+
+      class UserTest < ActiveSupport::TestCase
+        should validate_presence_of(:name)
+      end
+      """
+    When I write to "test/functional/examples_controller_test.rb" with:
+      """
+      require 'test_helper'
+
+      class ExamplesControllerTest < ActionController::TestCase
+        def setup
+          get :show
+        end
+
+        should respond_with(:success)
+        should assign_to(:example)
+      end
+      """
+    When I successfully run "rake test TESTOPTS=-v --trace"
+    Then the output should contain "1 tests, 1 assertions, 0 failures, 0 errors"
+    And the output should contain "2 tests, 2 assertions, 0 failures, 0 errors"
+    And the output should contain "User should require name to be set"
+    And the output should contain "ExamplesController should assign @example"
+
+  Scenario: generate a rails application and use matchers in Rspec
+    When I configure the application to use rspec-rails
+    And I configure the application to use shoulda-matchers
+    And I run the rspec generator
+    And I write to "spec/models/user_spec.rb" with:
+      """
+      require 'spec_helper'
+
+      describe User do
+        it { should validate_presence_of(:name) }
+      end
+      """
+    When I write to "spec/controllers/examples_controller_spec.rb" with:
+      """
+      require 'spec_helper'
+
+      describe ExamplesController, "show" do
+        before { get :show }
+        it { should assign_to(:example) }
+      end
+      """
+    When I successfully run "rake spec SPEC_OPTS=-fs --trace"
+    Then the output should contain "2 examples, 0 failures"
+    And the output should contain "should require name to be set"
+    And the output should contain "should assign @example"

data/features/step_definitions/rails_steps.rb

@@ -0,0 +1,77 @@
+PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..')).freeze
+APP_NAME     = 'testapp'.freeze
+
+When /^I generate a new rails application$/ do
+  steps %{
+    When I run "rails _3.0.3_ new #{APP_NAME}"
+    And I cd to "#{APP_NAME}"
+    And I write to "Gemfile" with:
+      """
+      source "http://rubygems.org"
+      gem 'rails', '3.0.3'
+      gem 'sqlite3-ruby', :require => 'sqlite3'
+      """
+    And I successfully run "bundle install --local"
+  }
+end
+
+When /^I configure the application to use "([^\"]+)" from this project$/ do |name|
+  append_to_gemfile "gem '#{name}', :path => '#{PROJECT_ROOT}'"
+  steps %{And I run "bundle install --local"}
+end
+
+When /^I run the rspec generator$/ do
+  steps %{
+    When I successfully run "rails generate rspec:install"
+  }
+end
+
+When /^I configure the application to use rspec\-rails$/ do
+  append_to_gemfile "gem 'rspec-rails'"
+  steps %{And I run "bundle install --local"}
+end
+
+When /^I configure the application to use shoulda-context$/ do
+  append_to_gemfile "gem 'shoulda-context', :git => 'git@github.com:thoughtbot/shoulda-context.git'"
+  steps %{And I run "bundle install --local"}
+end
+
+When /^I configure the application to use shoulda$/ do
+  append_to_gemfile "gem 'shoulda-matchers', :git => 'git@github.com:thoughtbot/shoulda-matchers.git', :require => false"
+  append_to_gemfile "gem 'shoulda-context', :git => 'git@github.com:thoughtbot/shoulda-context.git', :require => false"
+  append_to_gemfile "gem 'shoulda', :path => '../../..'"
+  steps %{And I run "bundle install --local"}
+end
+
+When /^I configure the application to use shoulda-matchers$/ do
+  append_to_gemfile "gem 'shoulda-matchers', :git => 'git@github.com:thoughtbot/shoulda-matchers.git'"
+  steps %{And I run "bundle install --local"}
+end
+
+When /^I configure a wildcard route$/ do
+  steps %{
+    When I write to "config/routes.rb" with:
+    """
+    Rails.application.routes.draw do
+      match ':controller(/:action(/:id(.:format)))'
+    end
+    """
+  }
+end
+
+module AppendHelpers
+  def append_to(path, contents)
+    in_current_dir do
+      File.open(path, "a") do |file|
+        file.puts
+        file.puts contents
+      end
+    end
+  end
+
+  def append_to_gemfile(contents)
+    append_to('Gemfile', contents)
+  end
+end
+
+World(AppendHelpers)

data/features/support/env.rb

@@ -0,0 +1,5 @@
+require 'aruba/cucumber'
+
+Before do
+  @aruba_timeout_seconds = 15
+end

data/lib/shoulda/version.rb

@@ -1,4 +1,3 @@
 module Shoulda
-  VERSION = "3.0.0.beta2"
+  VERSION = "3.0.1"
 end
-

data/shoulda.gemspec

@@ -0,0 +1,28 @@
+$LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
+require 'shoulda/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'shoulda'
+  s.version     = Shoulda::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Tammer Saleh", "Joe Ferris", "Ryan McGeary", "Dan Croak",
+                   "Matt Jankowski"]
+  s.email       = %q{support@thoughtbot.com}
+  s.homepage    = %q{https://github.com/thoughtbot/shoulda}
+  s.summary     = %q{Making tests easy on the fingers and eyes}
+  s.description = %q{Making tests easy on the fingers and eyes}
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_dependency("shoulda-context", "~> 1.0.0")
+  s.add_dependency("shoulda-matchers", "~> 1.0.0")
+
+  s.add_development_dependency("rails", "3.0.3")
+  s.add_development_dependency("sqlite3", "~> 1.3.2")
+  s.add_development_dependency("rspec-rails", "~> 2.3.1")
+  s.add_development_dependency("cucumber", "~> 0.10.0")
+  s.add_development_dependency("aruba", "~> 0.2.7")
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shoulda
 version: !ruby/object:Gem::Version 
-  hash: 299253626
-  prerelease: true
+  hash: 5
+  prerelease: false
   segments: 
   - 3
   - 0
-  - 0
-  - beta2
-  version: 3.0.0.beta2
+  - 1
+  version: 3.0.1
 platform: ruby
 authors: 
 - Tammer Saleh
@@ -20,70 +19,151 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 -05:00
+date: 2012-03-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
   name: shoulda-context
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 299253597
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
-        - beta1
-        version: 1.0.0.beta1
-  requirement: *id001
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: shoulda-matchers
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rails
   prerelease: false
-  name: shoulda-matchers
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 3
+        - 0
+        - 3
+        version: 3.0.3
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
+        version: 1.3.2
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 299253597
+        hash: 1
         segments: 
+        - 2
+        - 3
         - 1
+        version: 2.3.1
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
         - 0
+        - 10
         - 0
-        - beta1
-        version: 1.0.0.beta1
-  requirement: *id002
+        version: 0.10.0
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: aruba
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 2
+        - 7
+        version: 0.2.7
+  type: :development
+  version_requirements: *id007
 description: Making tests easy on the fingers and eyes
 email: support@thoughtbot.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.md
-- CONTRIBUTION_GUIDELINES.rdoc
+extra_rdoc_files: []
+
 files: 
+- .autotest
+- .gitignore
+- .travis.yml
 - CONTRIBUTION_GUIDELINES.rdoc
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
-- Rakefile
 - README.md
-- lib/shoulda/version.rb
+- Rakefile
+- features/rails_integration.feature
+- features/step_definitions/rails_steps.rb
+- features/support/env.rb
 - lib/shoulda.rb
+- lib/shoulda/version.rb
+- shoulda.gemspec
 has_rdoc: true
-homepage: http://thoughtbot.com/community/
+homepage: https://github.com/thoughtbot/shoulda
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --main
-- README.md
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -106,10 +186,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: shoulda
+rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Making tests easy on the fingers and eyes
-test_files: []
-
+test_files: 
+- features/rails_integration.feature
+- features/step_definitions/rails_steps.rb
+- features/support/env.rb

data/Gemfile.lock

@@ -1,113 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    arel (2.0.6)
-    aruba (0.2.7)
-      background_process
-      cucumber (~> 0.10.0)
-    background_process (1.2)
-    builder (2.1.2)
-    columnize (0.3.2)
-    cucumber (0.10.0)
-      builder (>= 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.3.2)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    gherkin (2.3.2)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    i18n (0.5.0)
-    json (1.4.6)
-    linecache (0.43)
-    mail (2.2.12)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
-      rack (>= 1.0.0)
-    rack-test (0.5.6)
-      rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
-      bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
-      rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    rspec-rails (2.3.1)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.3.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    sqlite3-ruby (1.3.2)
-    term-ansicolor (1.0.5)
-    thor (0.14.6)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aruba
-  cucumber
-  rails (= 3.0.3)
-  rspec-rails (~> 2.3.1)
-  ruby-debug
-  sqlite3-ruby