rspec-core 2.0.0.beta.18 → 2.0.0.beta.19

data/Gemfile

@@ -15,8 +15,9 @@ gem "syntax"
 gem "rspec-core", :path => "."
 gem "rspec-expectations", :path => "../rspec-expectations"
 gem "rspec-mocks", :path => "../rspec-mocks"
-if RUBY_VERSION.to_s =~ /1.9/
+case RUBY_VERSION
+when /^1.9.1/
   gem "ruby-debug19"
-else
+when /^1.8/
   gem "ruby-debug"
 end

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.18
+2.0.0.beta.19

data/features/subject/attribute_of_subject.feature

@@ -0,0 +1,44 @@
+Feature: attribute of subject
+
+  Scenario: simple attribute
+    Given a file named "example_spec.rb" with:
+      """
+      describe Array do
+        its(:size) { should == 0 }
+      end
+      """
+    When I run "rspec example_spec.rb --format documentation"
+    Then the output should contain:
+      """
+      Array
+        size
+          should == 0
+      """
+
+  Scenario: nested attribute
+    Given a file named "example_spec.rb" with:
+      """
+      class Person
+        attr_reader :phone_numbers
+        def initialize
+          @phone_numbers = []
+        end
+      end
+
+      describe Person do
+        subject do
+          person = Person.new
+          person.phone_numbers << "555-1212"
+          person
+        end
+
+        its("phone_numbers.first") { should == "555-1212" }
+      end
+      """
+    When I run "rspec example_spec.rb --format documentation"
+    Then the output should contain:
+      """
+      Person
+        phone_numbers.first
+          should == "555-1212"
+      """

data/features/subject/implicit_subject.feature

@@ -3,7 +3,7 @@ Feature: implicit subject
   The first argument to the outermost example group block is
   made available to each example as an implicit subject of
   that example.
-  
+
   Scenario: subject in top level group
     Given a file named "top_level_subject_spec.rb" with:
       """

data/lib/rspec/core/example_group.rb

@@ -54,7 +54,6 @@ module RSpec
       end
 
       alias_example_to :it
-      alias_example_to :its, :attribute_of_subject => true
       alias_example_to :specify
       alias_example_to :focused, :focused => true
       alias_example_to :pending, :pending => true
@@ -156,23 +155,22 @@ module RSpec
         @before_all_ivars ||= {}
       end
 
-      def self.eval_before_alls(example)
-        return if descendant_filtered_examples.empty?
-        superclass.before_all_ivars.each { |ivar, val| example.instance_variable_set(ivar, val) }
-        world.run_hook_filtered(:before, :all, self, example) if top_level?
-
-        run_hook!(:before, :all, example)
-        example.instance_variables.each { |ivar| before_all_ivars[ivar] = example.instance_variable_get(ivar) }
+      def self.store_before_all_ivars(example_group_instance)
+        example_group_instance.instance_variables.each { |ivar| 
+          before_all_ivars[ivar] = example_group_instance.instance_variable_get(ivar)
+        }
       end
 
-      def self.eval_before_eachs(example)
-        world.run_hook_filtered(:before, :each, self, example)
-        ancestors.reverse.each { |ancestor| ancestor.run_hook(:before, :each, example) }
+      def self.assign_before_all_ivars(ivars, example_group_instance)
+        ivars.each { |ivar, val| example_group_instance.instance_variable_set(ivar, val) }
       end
 
-      def self.eval_after_eachs(example)
-        ancestors.each { |ancestor| ancestor.run_hook(:after, :each, example) }
-        world.run_hook_filtered(:after, :each, self, example)
+      def self.eval_before_alls(example_group_instance)
+        return if descendant_filtered_examples.empty?
+        assign_before_all_ivars(superclass.before_all_ivars, example_group_instance)
+        world.run_hook_filtered(:before, :all, self, example_group_instance) if top_level?
+        run_hook!(:before, :all, example_group_instance)
+        store_before_all_ivars(example_group_instance)
       end
 
       def self.eval_around_eachs(example_group_instance, wrapped_example)
@@ -182,15 +180,25 @@ module RSpec
         end
       end
 
-      def self.around_hooks
-        (world.find_hook(:around, :each, self) + ancestors.reverse.map{|a| a.find_hook(:around, :each, self)}).flatten
+      def self.eval_before_eachs(example_group_instance)
+        world.run_hook_filtered(:before, :each, self, example_group_instance)
+        ancestors.reverse.each { |ancestor| ancestor.run_hook(:before, :each, example_group_instance) }
+      end
+
+      def self.eval_after_eachs(example_group_instance)
+        ancestors.each { |ancestor| ancestor.run_hook(:after, :each, example_group_instance) }
+        world.run_hook_filtered(:after, :each, self, example_group_instance)
       end
 
-      def self.eval_after_alls(example)
+      def self.eval_after_alls(example_group_instance)
         return if descendant_filtered_examples.empty?
-        before_all_ivars.each { |ivar, val| example.instance_variable_set(ivar, val) }
-        run_hook!(:after, :all, example)
-        world.run_hook_filtered(:after, :all, self, example) if top_level?
+        assign_before_all_ivars(before_all_ivars, example_group_instance)
+        run_hook!(:after, :all, example_group_instance)
+        world.run_hook_filtered(:after, :all, self, example_group_instance) if top_level?
+      end
+
+      def self.around_hooks
+        (world.find_hook(:around, :each, self) + ancestors.reverse.map{|a| a.find_hook(:around, :each, self)}).flatten
       end
 
       def self.run(reporter)
@@ -253,6 +261,14 @@ module RSpec
         self.class.describes
       end
 
+      def instance_eval_with_rescue(&hook)
+        begin
+          instance_eval(&hook)
+        rescue Exception => e
+          example.set_exception(e)
+        end
+      end
+
     private
 
       def self.extended_modules #:nodoc:

data/lib/rspec/core/formatters/base_formatter.rb

@@ -138,11 +138,11 @@ module RSpec
 
         def read_failed_line(exception, example)
           original_file = example.file_path.to_s.downcase
-          matching_line = exception.backtrace.detect { |line| line.split(':').first.downcase == original_file.downcase }
+          matching_line = exception.backtrace.detect { |line| line.match(/(.+?):(\d+)(|:\d+)/)[1].downcase == original_file.downcase }
 
           return "Unable to find matching line from backtrace" if matching_line.nil?
 
-          file_path, line_number = matching_line.split(':')
+          file_path, line_number = matching_line.match(/(.+?):(\d+)(|:\d+)/)[1..2]
           if File.exist?(file_path)
             open(file_path, 'r') { |f| f.readlines[line_number.to_i - 1] }
           else

data/lib/rspec/core/hooks.rb

@@ -24,21 +24,19 @@ module RSpec
       end
 
       class BeforeHook < Hook
-        def run_in(example)
-          example ? example.instance_eval(&self) : call
+        def run_in(example_group_instance)
+          if example_group_instance
+            example_group_instance.instance_eval(&self)
+          else
+            call
+          end
         end
       end
 
       class AfterHook < Hook
-        def run_in(example)
-          if example
-            begin
-              example.instance_eval(&self)
-            rescue Exception => e
-              if example.respond_to?(:example)
-                example.example.set_exception(e)
-              end
-            end
+        def run_in(example_group_instance)
+          if example_group_instance
+            example_group_instance.instance_eval_with_rescue(&self)
           else
             call
           end
@@ -58,22 +56,22 @@ module RSpec
       end
 
       class BeforeHooks < HookCollection
-        def run_all(example)
-          each {|h| h.run_in(example) }
+        def run_all(example_group_instance)
+          each {|h| h.run_in(example_group_instance) }
         end
 
-        def run_all!(example)
-          shift.run_in(example) until empty?
+        def run_all!(example_group_instance)
+          shift.run_in(example_group_instance) until empty?
         end
       end
 
       class AfterHooks < HookCollection
-        def run_all(example)
-          reverse.each {|h| h.run_in(example) }
+        def run_all(example_group_instance)
+          reverse.each {|h| h.run_in(example_group_instance) }
         end
 
-        def run_all!(example)
-          pop.run_in(example) until empty?
+        def run_all!(example_group_instance)
+          pop.run_in(example_group_instance) until empty?
         end
       end
 
@@ -101,22 +99,22 @@ module RSpec
 
       # Runs all of the blocks stored with the hook in the context of the
       # example. If no example is provided, just calls the hook directly.
-      def run_hook(hook, scope, example=nil)
-        hooks[hook][scope].run_all(example)
+      def run_hook(hook, scope, example_group_instance=nil)
+        hooks[hook][scope].run_all(example_group_instance)
       end
 
       # Just like run_hook, except it removes the blocks as it evalutes them,
       # ensuring that they will only be run once.
-      def run_hook!(hook, scope, example)
-        hooks[hook][scope].run_all!(example)
+      def run_hook!(hook, scope, example_group_instance)
+        hooks[hook][scope].run_all!(example_group_instance)
       end
 
-      def run_hook_filtered(hook, scope, group, example)
-        find_hook(hook, scope, group).run_all(example)
+      def run_hook_filtered(hook, scope, group, example_group_instance)
+        find_hook(hook, scope, group).run_all(example_group_instance)
       end
 
-      def find_hook(hook, scope, group)
-        hooks[hook][scope].find_hooks_for(group)
+      def find_hook(hook, scope, example_group_class)
+        hooks[hook][scope].find_hooks_for(example_group_class)
       end
     end
   end

data/lib/rspec/core/metadata.rb

@@ -164,7 +164,7 @@ EOM
 
       def file_and_line_number(metadata)
         entry = candidate_entries_from_caller(metadata).first
-        entry && entry.split(":")
+        entry && entry.match(/(.+?):(\d+)(|:\d+)/)[1..2]
       end
 
       def candidate_entries_from_caller(metadata)

data/lib/rspec/core/subject.rb

@@ -10,8 +10,32 @@ module RSpec
         end
       end
 
+      # Returns the subject defined by the example group. The subject block is
+      # only executed once per example, the result of which is cached and
+      # returned by any subsequent calls to +subject+.
+      #
+      # If a class is passed to +describe+ and no subject is explicitly
+      # declared in the example group, then +subject+ will return a new
+      # instance of that class.
+      #
+      # == Examples
+      #
+      #   # explicit subject defined by the subject method
+      #   describe Person do
+      #     subject { Person.new(:birthdate => 19.years.ago) }
+      #     it "should be eligible to vote" do
+      #       subject.should be_eligible_to_vote
+      #     end
+      #   end
+      #
+      #   # implicit subject => { Person.new }
+      #   describe Person do
+      #     it "should be eligible to vote" do
+      #       subject.should be_eligible_to_vote
+      #     end
+      #   end
       def subject
-        using_attribute? ? attribute_of_subject : original_subject
+        @original_subject ||= instance_eval(&self.class.subject)
       end
 
       # When +should+ is called with no explicit receiver, the call is
@@ -41,6 +65,50 @@ module RSpec
       end
 
       module ClassMethods
+        # Creates a nested example group named by the submitted +attribute+,
+        # and then generates an example using the submitted block.
+        #
+        #   # This ...
+        #   describe Array do
+        #     its(:size) { should == 0 }
+        #   end
+        #
+        #   # ... generates the same runtime structure as this:
+        #   describe Array do
+        #     describe "size" do
+        #       it "should == 0" do
+        #         subject.size.should == 0
+        #       end
+        #     end
+        #   end
+        #
+        # The attribute can be a +Symbol+ or a +String+. Given a +String+
+        # with dots, the result is as though you concatenated that +String+
+        # onto the subject in an expression.
+        #   
+        #   describe Person 
+        #     let(:person) do
+        #       person = Person.new
+        #       person.phone_numbers << "555-1212"
+        #     end
+        #
+        #     its("phone_numbers.first") { should == "555-1212" }
+        #   end
+        def its(attribute, &block)
+          describe(attribute) do
+            example do
+              self.class.class_eval do
+                define_method(:subject) do
+                  attribute.to_s.split('.').inject(super) do |target, method|
+                    target.send(method)
+                  end
+                end
+              end
+              instance_eval(&block)
+            end
+          end
+        end
+
         # Defines an explicit subject for an example group which can then be the
         # implicit receiver (through delegation) of calls to +should+.
         #
@@ -75,25 +143,6 @@ module RSpec
         end
       end
 
-    private
-
-      def original_subject
-        @original_subject ||= instance_eval(&self.class.subject)
-      end
-
-      def attribute_of_subject
-        if using_attribute?
-          example.description.split('.').inject(original_subject) do |target, method|
-            target.send(method)
-          end
-        end
-      end
-
-      def using_attribute?
-        example.in_block? &&
-        example.metadata[:attribute_of_subject]
-      end
-
     end
   end
 end

data/rspec-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-core}
-  s.version = "2.0.0.beta.18"
+  s.version = "2.0.0.beta.19"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chad Humphries", "David Chelimsky"]
-  s.date = %q{2010-07-21}
+  s.date = %q{2010-07-25}
   s.default_executable = %q{rspec}
   s.description = %q{RSpec runner and example groups}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
@@ -53,6 +53,7 @@ Gem::Specification.new do |s|
      "features/mock_framework_integration/use_rr.feature",
      "features/mock_framework_integration/use_rspec.feature",
      "features/pending/pending_examples.feature",
+     "features/subject/attribute_of_subject.feature",
      "features/subject/explicit_subject.feature",
      "features/subject/implicit_subject.feature",
      "features/support/env.rb",
@@ -153,7 +154,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/rspec-core}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-core-2.0.0.beta.18
+  Thank you for installing rspec-core-2.0.0.beta.19
 
   Please be sure to look at Upgrade.markdown to see what might have changed
   since the last release.
@@ -164,7 +165,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{rspec-core-2.0.0.beta.18}
+  s.summary = %q{rspec-core-2.0.0.beta.19}
   s.test_files = [
     "spec/autotest/failed_results_re_spec.rb",
      "spec/autotest/rspec_spec.rb",
@@ -212,19 +213,19 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.18"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.18"])
+      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.19"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.19"])
       s.add_development_dependency(%q<cucumber>, [">= 0.5.3"])
       s.add_development_dependency(%q<autotest>, [">= 4.2.9"])
     else
-      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.18"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.18"])
+      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.19"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.19"])
       s.add_dependency(%q<cucumber>, [">= 0.5.3"])
       s.add_dependency(%q<autotest>, [">= 4.2.9"])
     end
   else
-    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.18"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.18"])
+    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.19"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.19"])
     s.add_dependency(%q<cucumber>, [">= 0.5.3"])
     s.add_dependency(%q<autotest>, [">= 4.2.9"])
   end

data/spec/rspec/core/example_group_spec.rb

@@ -374,12 +374,6 @@ module RSpec::Core
         group.examples.size.should == 1
       end
 
-      it "allows adding an example using 'its'" do
-        group = ExampleGroup.describe
-        group.its(:some_method) { }
-        group.examples.size.should == 1
-      end
-
       it "exposes all examples at examples" do
         group = ExampleGroup.describe
         group.it("should do something 1") { }
@@ -547,6 +541,24 @@ module RSpec::Core
         its("name.size") { should == 4 }
         its("name.size.class") { should == Fixnum }
       end
+
+      context "calling and overriding super" do
+        it "calls to the subject defined in the parent group" do
+          group = ExampleGroup.describe(Array) do
+            subject { [1, 'a'] }
+
+            its(:last) { should == 'a' }
+
+            describe '.first' do
+              def subject; super.first; end
+
+              its(:next) { should == 2 }
+            end
+          end
+
+          group.run_all.should be_true
+        end
+      end
     end
 
     describe "#top_level_description" do

data/spec/rspec/core/metadata_spec.rb

@@ -131,6 +131,18 @@ module RSpec
           ])
           m[:example_group][:file_path].should == __FILE__
         end
+
+        it "finds the first spec file in the caller array with drive letter" do
+          m = Metadata.new
+          m.process(:caller => [
+            "foo",
+            "C:/path/file_spec.rb:#{__LINE__}",
+            "bar_spec.rb:23",
+            "baz"
+          ])
+          m[:example_group][:file_path].should == "C:/path/file_spec.rb"
+        end
+
         it "is nil if there are no spec files found", :full_backtrace => true do
           m = Metadata.new
           m.process(:caller => [
@@ -153,6 +165,16 @@ module RSpec
           ])
           m[:example_group][:line_number].should == __LINE__ - 4
         end
+        it "finds the line number with the first spec file with drive letter" do
+          m = Metadata.new
+          m.process(:caller => [
+            "foo",
+            "C:/path/to/file_spec.rb:#{__LINE__}",
+            "bar_spec.rb:23",
+            "baz"
+          ])
+          m[:example_group][:line_number].should == __LINE__ - 4
+        end
         it "uses the number after the first : for ruby 1.9" do
           m = Metadata.new
           m.process(:caller => [

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-core
 version: !ruby/object:Gem::Version 
-  hash: 62196423
+  hash: 62196421
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
   - beta
-  - 18
-  version: 2.0.0.beta.18
+  - 19
+  version: 2.0.0.beta.19
 platform: ruby
 authors: 
 - Chad Humphries
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 -05:00
+date: 2010-07-25 00:00:00 -05:00
 default_executable: rspec
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,14 +30,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196423
+        hash: 62196421
         segments: 
         - 2
         - 0
         - 0
         - beta
-        - 18
-        version: 2.0.0.beta.18
+        - 19
+        version: 2.0.0.beta.19
   requirement: *id001
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -48,14 +48,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196423
+        hash: 62196421
         segments: 
         - 2
         - 0
         - 0
         - beta
-        - 18
-        version: 2.0.0.beta.18
+        - 19
+        version: 2.0.0.beta.19
   requirement: *id002
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -133,6 +133,7 @@ files:
 - features/mock_framework_integration/use_rr.feature
 - features/mock_framework_integration/use_rspec.feature
 - features/pending/pending_examples.feature
+- features/subject/attribute_of_subject.feature
 - features/subject/explicit_subject.feature
 - features/subject/implicit_subject.feature
 - features/support/env.rb
@@ -236,7 +237,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-core-2.0.0.beta.18
+    Thank you for installing rspec-core-2.0.0.beta.19
   
     Please be sure to look at Upgrade.markdown to see what might have changed
     since the last release.
@@ -273,7 +274,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.0.0.beta.18
+summary: rspec-core-2.0.0.beta.19
 test_files: 
 - spec/autotest/failed_results_re_spec.rb
 - spec/autotest/rspec_spec.rb