shoulda-context 1.0.0.beta1 → 1.0.0

data/Gemfile

@@ -1,5 +1,3 @@
 source 'http://rubygems.org'
 
-gem 'mocha'
-gem 'ruby-debug'
-
+gemspec

data/Gemfile.lock

@@ -1,20 +1,20 @@
+PATH
+  remote: .
+  specs:
+    shoulda-context (1.0.0.beta1)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    columnize (0.3.2)
-    linecache (0.43)
-    mocha (0.9.10)
-      rake
-    rake (0.8.7)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
+    mocha (0.9.12)
+    rake (0.9.2.2)
+    test-unit (2.4.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  mocha
-  ruby-debug
+  mocha (~> 0.9.10)
+  rake
+  shoulda-context!
+  test-unit (~> 2.0)

data/init.rb

@@ -0,0 +1 @@
+require File.join(File.dirname(__FILE__), 'rails', 'init')

data/lib/shoulda-context.rb

@@ -1,12 +1 @@
-require 'test/unit'
-require 'shoulda/context/version'
-require 'shoulda/context/proc_extensions'
-require 'shoulda/context/assertions'
-require 'shoulda/context/context'
-require 'shoulda/context/autoload_macros'
-
-class Test::Unit::TestCase
-  include Shoulda::Context::Assertions
-  include Shoulda::Context::InstanceMethods
-  extend Shoulda::Context::ClassMethods
-end
+require "shoulda/context"

data/lib/shoulda/context.rb

@@ -0,0 +1,12 @@
+require 'test/unit'
+require 'shoulda/context/version'
+require 'shoulda/context/proc_extensions'
+require 'shoulda/context/assertions'
+require 'shoulda/context/context'
+require 'shoulda/context/autoload_macros'
+
+class Test::Unit::TestCase
+  include Shoulda::Context::Assertions
+  include Shoulda::Context::InstanceMethods
+  extend Shoulda::Context::ClassMethods
+end

data/lib/shoulda/context/assertions.rb

@@ -9,8 +9,8 @@ module Shoulda # :nodoc:
           [a1, a2].each {|a| assert_respond_to(a, m, "Are you sure that #{a.inspect} is an array?  It doesn't respond to #{m}.") }
         end
 
-        assert a1h = a1.inject({}) { |h,e| h[e] = a1.select { |i| i == e }.size; h }
-        assert a2h = a2.inject({}) { |h,e| h[e] = a2.select { |i| i == e }.size; h }
+        assert a1h = a1.inject({}) { |h,e| h[e] ||= a1.select { |i| i == e }.size; h }
+        assert a2h = a2.inject({}) { |h,e| h[e] ||= a2.select { |i| i == e }.size; h }
 
         assert_equal(a1h, a2h, msg)
       end
@@ -22,7 +22,7 @@ module Shoulda # :nodoc:
       #   assert_contains(['a', '1'], 'a') => passes
       #   assert_contains(['a', '1'], /not there/) => fails
       def assert_contains(collection, x, extra_msg = "")
-        collection = [collection] unless collection.is_a?(Array)
+        collection = Array(collection)
         msg = "#{x.inspect} not found in #{collection.to_a.inspect} #{extra_msg}"
         case x
         when Regexp
@@ -35,7 +35,7 @@ module Shoulda # :nodoc:
       # Asserts that the given collection does not contain item x.  If x is a regular expression, ensure that
       # none of the elements from the collection match x.
       def assert_does_not_contain(collection, x, extra_msg = "")
-        collection = [collection] unless collection.is_a?(Array)
+        collection = Array(collection)
         msg = "#{x.inspect} found in #{collection.to_a.inspect} " + extra_msg
         case x
         when Regexp
@@ -61,13 +61,16 @@ module Shoulda # :nodoc:
         end
       end
 
-      # Asserts that the given matcher returns false when +target+ is passed to #matches?
+      # Asserts that the given matcher returns true when +target+ is passed to #does_not_match?
+      # or false when +target+ is passed to #matches? if #does_not_match? is not implemented
       def assert_rejects(matcher, target, options = {})
         if matcher.respond_to?(:in_context)
           matcher.in_context(self)
         end
 
-        unless matcher.matches?(target)
+        not_match = matcher.respond_to?(:does_not_match?) ? matcher.does_not_match?(target) : !matcher.matches?(target)
+
+        if not_match
           assert_block { true }
           if options[:message]
             assert_match options[:message], matcher.failure_message

data/lib/shoulda/context/context.rb

@@ -73,7 +73,7 @@ module Shoulda
         if Shoulda::Context.current_context
           Shoulda::Context.current_context.should(name_or_matcher, options, &blk)
         else
-          context_name = self.name.gsub(/Test/, "")
+          context_name = self.name.gsub(/Test/, "") if self.name
           context = Shoulda::Context::Context.new(context_name, self) do
             should(name_or_matcher, options, &blk)
           end
@@ -92,7 +92,7 @@ module Shoulda
         if Shoulda::Context.current_context
           Shoulda::Context.current_context.should_not(matcher)
         else
-          context_name = self.name.gsub(/Test/, "")
+          context_name = self.name.gsub(/Test/, "") if self.name
           context = Shoulda::Context::Context.new(context_name, self) do
             should_not(matcher)
           end
@@ -302,7 +302,11 @@ module Shoulda
         self.should_eventuallys = []
         self.subcontexts        = []
 
-        merge_block(&blk)
+        if block_given?
+          merge_block(&blk)
+        else
+          merge_block { warn "  * WARNING: Block missing for context '#{full_name}'" }
+        end
         Shoulda::Context.remove_context
       end
 

data/lib/shoulda/context/version.rb

@@ -1,5 +1,5 @@
 module Shoulda
   module Context
-    VERSION = '1.0.0.beta1'.freeze
+    VERSION = '1.0.0'.freeze
   end
 end

data/rails/init.rb

@@ -1,4 +1,4 @@
 if RAILS_ENV == 'test'
-  require 'shoulda-context'
+  require "shoulda/context"
   Shoulda.autoload_macros RAILS_ROOT, File.join("vendor", "{plugins,gems}", "*")
 end

data/test/shoulda/context_test.rb

@@ -209,8 +209,8 @@ class ShouldMatcherTest < Test::Unit::TestCase
     end
   end
 
-  def run_test
-    @test_suite.run(@test_result) { |event, name |}
+  def run_test_suite
+    @test_suite.run(@test_result) { |event, name| }
   end
 
   def setup
@@ -249,19 +249,19 @@ class ShouldMatcherTest < Test::Unit::TestCase
 
     should "pass with a passing matcher" do
       @matcher.fail = false
-      run_test
+      run_test_suite
       assert_passed @test_result
     end
 
     should "fail with a failing matcher" do
       @matcher.fail = true
-      run_test
+      run_test_suite
       assert_failed_with @matcher.failure_message, @test_result
     end
 
     should "provide the subject" do
       @matcher.fail = false
-      run_test
+      run_test_suite
       assert_equal 'a subject', @matcher.subject
     end
   end
@@ -273,19 +273,19 @@ class ShouldMatcherTest < Test::Unit::TestCase
 
     should "pass with a failing matcher" do
       @matcher.fail = true
-      run_test
+      run_test_suite
       assert_passed @test_result
     end
 
     should "fail with a passing matcher" do
       @matcher.fail = false
-      run_test
+      run_test_suite
       assert_failed_with @matcher.negative_failure_message, @test_result
     end
 
     should "provide the subject" do
       @matcher.fail = false
-      run_test
+      run_test_suite
       assert_equal 'a subject', @matcher.subject
     end
   end

data/test/shoulda/helpers_test.rb

@@ -26,10 +26,17 @@ class HelpersTest < Test::Unit::TestCase # :nodoc:
       assert_raises(Test::Unit::AssertionFailedError) do
         assert_same_elements(@a, [3, 3, "def", "abc"])
       end
+      assert_same_elements([@a, "abc"].flatten, ["abc", 3, "def", "abc"])
       assert_raises(Test::Unit::AssertionFailedError) do
         assert_same_elements([@a, "abc"].flatten, [3, 3, "def", "abc"])
       end
     end
+
+    should "only count the number of occurrences once for each unique value" do
+      a1 = [@a, "abc"].flatten
+      a1.expects(:select).times(3).returns(["abc", "abc"], ["def"], [3])
+      assert_same_elements(a1, ["abc", 3, "def", "abc"])
+    end
   end
 
   context "a matching matcher" do
@@ -54,19 +61,36 @@ class HelpersTest < Test::Unit::TestCase # :nodoc:
     end
 
     context "when given to assert_rejects" do
-      setup do
-        begin
-          assert_rejects @matcher, 'target'
-        rescue Test::Unit::AssertionFailedError => @error
+      context "and matcher has :does_not_match?" do
+        setup do
+          begin
+            @matcher.stubs(:matches?).returns(false)
+            @matcher.stubs(:does_not_match?).returns(true)
+            assert_rejects @matcher, 'target'
+          rescue Test::Unit::AssertionFailedError => @error
+          end
         end
-      end
 
-      should "fail" do
-        assert_not_nil @error
+        should "pass" do
+          assert_nil @error
+        end
       end
 
-      should "use the error message from the matcher" do
-        assert_equal 'big time failure', @error.message
+      context "and matcher does not have :does_not_match?" do
+        setup do
+          begin
+            assert_rejects @matcher, 'target'
+          rescue Test::Unit::AssertionFailedError => @error
+          end
+        end
+
+        should "fail" do
+          assert_not_nil @error
+        end
+
+        should "use the error message from the matcher" do
+          assert_equal 'big time failure', @error.message
+        end
       end
     end
   end

data/test/shoulda/should_test.rb

@@ -128,6 +128,15 @@ class ShouldTest < Test::Unit::TestCase # :nodoc:
     end
   end
 
+  def test_should_create_a_new_context_even_if_block_is_omitted
+    old_verbose, $VERBOSE = $VERBOSE, nil
+    assert_nothing_raised do
+      Shoulda::Context::Context.new("context without a block", self)
+    end
+  ensure
+    $VERBOSE = old_verbose
+  end
+
   def test_should_create_a_nested_context
     assert_nothing_raised do
       parent = Shoulda::Context::Context.new("Parent", self) do; end

data/test/test_helper.rb

@@ -4,7 +4,7 @@ require 'mocha'
 
 shoulda_path = File.join(File.dirname(__FILE__), '..', 'lib')
 $LOAD_PATH << shoulda_path
-require 'shoulda-context'
+require "shoulda/context"
 
 Shoulda.autoload_macros File.join(File.dirname(__FILE__), 'fake_rails_root'),
                         File.join("vendor", "{plugins,gems}", "*")

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shoulda-context
 version: !ruby/object:Gem::Version 
-  hash: 299253597
-  prerelease: true
+  hash: 23
+  prerelease: 
   segments: 
   - 1
   - 0
   - 0
-  - beta1
-  version: 1.0.0.beta1
+  version: 1.0.0
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -21,10 +20,53 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 -05:00
-default_executable: convert_to_should_syntax
-dependencies: []
-
+date: 2011-11-02 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 0
+        - 9
+        - 10
+        version: 0.9.10
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  type: :development
+  version_requirements: *id003
 description: Context framework extracted from Shoulda
 email: support@thoughtbot.com
 executables: 
@@ -50,6 +92,7 @@ files:
 - lib/shoulda/context/tasks/yaml_to_shoulda.rake
 - lib/shoulda/context/tasks.rb
 - lib/shoulda/context/version.rb
+- lib/shoulda/context.rb
 - lib/shoulda-context.rb
 - rails/init.rb
 - test/fake_rails_root/test/shoulda_macros/custom_macro.rb
@@ -61,7 +104,7 @@ files:
 - test/shoulda/helpers_test.rb
 - test/shoulda/should_test.rb
 - test/test_helper.rb
-has_rdoc: true
+- init.rb
 homepage: http://thoughtbot.com/community/
 licenses: []
 
@@ -93,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Context framework extracted from Shoulda