rmm5t-shoulda 2.0.2 → 2.0.5

data/Rakefile

@@ -43,7 +43,7 @@ spec = Gem::Specification.new do |s|
   s.homepage          = "http://thoughtbot.com/projects/shoulda"
   s.rubyforge_project = "shoulda"
 
-  s.files       = FileList["[A-Z]*", "{bin,lib,test}/**/*"]
+  s.files       = FileList["[A-Z]*", "{bin,lib,rails,test}/**/*"]
   s.executables = s.files.grep(/^bin/) { |f| File.basename(f) }
 
   s.has_rdoc         = true
@@ -53,7 +53,7 @@ spec = Gem::Specification.new do |s|
   s.authors = ["Tammer Saleh"]
   s.email   = "tsaleh@thoughtbot.com"
 
-  s.add_dependency "activesupport", ">= 2.0"
+  s.add_dependency "activesupport", ">= 2.0.0"
 end
 
 Rake::GemPackageTask.new spec do |pkg|

data/lib/shoulda/active_record/assertions.rb

@@ -57,7 +57,7 @@ module ThoughtBot # :nodoc:
         #   @product = Product.new(:tangible => true)
         #   assert_bad_value(Product, :price, "0")
         def assert_bad_value(object_or_klass, attribute, value,
-                             error_message_to_expect = DEFAULT_ERROR_MESSAGES[:invalid])
+                             error_message_to_expect = self.class.default_error_message(:invalid))
           object = get_instance_of(object_or_klass)
           object.send("#{attribute}=", value)
           assert !object.valid?, "#{object.class} allowed #{value.inspect} as a value for #{attribute}"
@@ -66,7 +66,10 @@ module ThoughtBot # :nodoc:
         end
 
         def pretty_error_messages(obj)
-          obj.errors.map { |a, m| "#{a} #{m} (#{obj.send(a).inspect})" }
+          obj.errors.map do |a, m| 
+            msg = "#{a} #{m}" 
+            msg << " (#{obj.send(a).inspect})" unless a.to_sym == :base
+          end
         end
 
         private

data/lib/shoulda/active_record/macros.rb

@@ -1,12 +1,22 @@
 module ThoughtBot # :nodoc:
   module Shoulda # :nodoc:
     module ActiveRecord # :nodoc:
-      DEFAULT_ERROR_MESSAGES =
-        if Object.const_defined?(:I18n)
-          I18n.translate('activerecord.errors.messages')
-        else
-          ::ActiveRecord::Errors.default_error_messages
+      module MacroHelpers # :nodoc:
+        # Helper method that determines the default error message used by Active
+        # Record.  Works for both existing Rails 2.1 and Rails 2.2 with the newly
+        # introduced I18n module used for localization.
+        #
+        #   default_error_message(:blank)
+        #   default_error_message(:too_short, :count => 5)
+        #   default_error_message(:too_long, :count => 60)
+        def default_error_message(key, values = {})
+          if Object.const_defined?(:I18n) # Rails >= 2.2
+            I18n.translate("activerecord.errors.messages.#{key}", values)
+          else # Rails <= 2.1.x
+            ::ActiveRecord::Errors.default_error_messages[key] % values[:count]
+          end
         end
+      end
 
       # = Macro test helpers for your active record models
       #
@@ -28,6 +38,8 @@ module ThoughtBot # :nodoc:
       # For all of these helpers, the last parameter may be a hash of options.
       #
       module Macros
+        include MacroHelpers
+
         # <b>DEPRECATED:</b> Use <tt>fixtures :all</tt> instead
         #
         # Loads all fixture files (<tt>test/fixtures/*.yml</tt>)
@@ -44,14 +56,14 @@ module ThoughtBot # :nodoc:
         #
         # Options:
         # * <tt>:message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
-        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages')[:blank]</tt>
+        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages.blank')</tt>
         #
         # Example:
         #   should_require_attributes :name, :phone_number
         #
         def should_require_attributes(*attributes)
           message = get_options!(attributes, :message)
-          message ||= DEFAULT_ERROR_MESSAGES[:blank]
+          message ||= default_error_message(:blank)
           klass = model_class
 
           attributes.each do |attribute|
@@ -66,7 +78,7 @@ module ThoughtBot # :nodoc:
         #
         # Options:
         # * <tt>:message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
-        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages')[:taken]</tt>
+        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages.taken')</tt>
         # * <tt>:scoped_to</tt> - field(s) to scope the uniqueness to.
         #
         # Examples:
@@ -78,7 +90,7 @@ module ThoughtBot # :nodoc:
         def should_require_unique_attributes(*attributes)
           message, scope = get_options!(attributes, :message, :scoped_to)
           scope = [*scope].compact
-          message ||= DEFAULT_ERROR_MESSAGES[:taken]
+          message ||= default_error_message(:taken)
 
           klass = model_class
           attributes.each do |attribute|
@@ -164,14 +176,14 @@ module ThoughtBot # :nodoc:
         #
         # Options:
         # * <tt>:message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
-        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages')[:invalid]</tt>
+        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages.invalid')</tt>
         #
         # Example:
         #   should_not_allow_values_for :isbn, "bad 1", "bad 2"
         #
         def should_not_allow_values_for(attribute, *bad_values)
           message = get_options!(bad_values, :message)
-          message ||= DEFAULT_ERROR_MESSAGES[:invalid]
+          message ||= default_error_message(:invalid)
           klass = model_class
           bad_values.each do |v|
             should "not allow #{attribute} to be set to #{v.inspect}" do
@@ -207,17 +219,17 @@ module ThoughtBot # :nodoc:
         #
         # Options:
         # * <tt>:short_message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
-        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages')[:too_short] % range.first</tt>
+        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages.too_short') % range.first</tt>
         # * <tt>:long_message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
-        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages')[:too_long] % range.last</tt>
+        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages.too_long') % range.last</tt>
         #
         # Example:
         #   should_ensure_length_in_range :password, (6..20)
         #
         def should_ensure_length_in_range(attribute, range, opts = {})
           short_message, long_message = get_options!([opts], :short_message, :long_message)
-          short_message ||= DEFAULT_ERROR_MESSAGES[:too_short] % range.first
-          long_message  ||= DEFAULT_ERROR_MESSAGES[:too_long] % range.last
+          short_message ||= default_error_message(:too_short, :count => range.first)
+          long_message  ||= default_error_message(:too_long, :count => range.last)
 
           klass = model_class
           min_length = range.first
@@ -259,14 +271,14 @@ module ThoughtBot # :nodoc:
         #
         # Options:
         # * <tt>:short_message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
-        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages')[:too_short] % min_length</tt>
+        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages.too_short') % min_length</tt>
         #
         # Example:
         #   should_ensure_length_at_least :name, 3
         #
         def should_ensure_length_at_least(attribute, min_length, opts = {})
           short_message = get_options!([opts], :short_message)
-          short_message ||= DEFAULT_ERROR_MESSAGES[:too_short] % min_length
+          short_message ||= default_error_message(:too_short, :count => min_length)
 
           klass = model_class
 
@@ -290,14 +302,14 @@ module ThoughtBot # :nodoc:
         #
         # Options:
         # * <tt>:message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
-        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages')[:wrong_length] % length</tt>
+        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages.wrong_length') % length</tt>
         #
         # Example:
         #   should_ensure_length_is :ssn, 9
         #
         def should_ensure_length_is(attribute, length, opts = {})
           message = get_options!([opts], :message)
-          message ||= DEFAULT_ERROR_MESSAGES[:wrong_length] % length
+          message ||= default_error_message(:wrong_length, :count => length)
 
           klass = model_class
 
@@ -325,17 +337,17 @@ module ThoughtBot # :nodoc:
         #
         # Options:
         # * <tt>:low_message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
-        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages')[:inclusion]</tt>
+        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages.inclusion')</tt>
         # * <tt>:high_message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
-        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages')[:inclusion]</tt>
+        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages.inclusion')</tt>
         #
         # Example:
         #   should_ensure_value_in_range :age, (0..100)
         #
         def should_ensure_value_in_range(attribute, range, opts = {})
           low_message, high_message = get_options!([opts], :low_message, :high_message)
-          low_message  ||= DEFAULT_ERROR_MESSAGES[:inclusion]
-          high_message ||= DEFAULT_ERROR_MESSAGES[:inclusion]
+          low_message  ||= default_error_message(:inclusion)
+          high_message ||= default_error_message(:inclusion)
 
           klass = model_class
           min   = range.first
@@ -370,14 +382,14 @@ module ThoughtBot # :nodoc:
         #
         # Options:
         # * <tt>:message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
-        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages')[:not_a_number]</tt>
+        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages.not_a_number')</tt>
         #
         # Example:
         #   should_only_allow_numeric_values_for :age
         #
         def should_only_allow_numeric_values_for(*attributes)
           message = get_options!(attributes, :message)
-          message ||= DEFAULT_ERROR_MESSAGES[:not_a_number]
+          message ||= default_error_message(:not_a_number)
           klass = model_class
           attributes.each do |attribute|
             attribute = attribute.to_sym
@@ -624,14 +636,14 @@ module ThoughtBot # :nodoc:
         #
         # Options:
         # * <tt>:message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
-        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages')[:accepted]</tt>
+        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages.accepted')</tt>
         #
         # Example:
         #   should_require_acceptance_of :eula
         #
         def should_require_acceptance_of(*attributes)
           message = get_options!(attributes, :message)
-          message ||= DEFAULT_ERROR_MESSAGES[:accepted]
+          message ||= default_error_message(:accepted)
           klass = model_class
 
           attributes.each do |attribute|
@@ -697,7 +709,6 @@ module ThoughtBot # :nodoc:
             end
           end
         end
-
       end
     end
   end

data/lib/shoulda/assertions.rb

@@ -25,8 +25,10 @@ module ThoughtBot # :nodoc:
         collection = [collection] unless collection.is_a?(Array)
         msg = "#{x.inspect} not found in #{collection.to_a.inspect} #{extra_msg}"
         case x
-        when Regexp: assert(collection.detect { |e| e =~ x }, msg)
-        else         assert(collection.include?(x), msg)
+        when Regexp
+          assert(collection.detect { |e| e =~ x }, msg)
+        else         
+          assert(collection.include?(x), msg)
         end
       end
 
@@ -36,8 +38,10 @@ module ThoughtBot # :nodoc:
         collection = [collection] unless collection.is_a?(Array)
         msg = "#{x.inspect} found in #{collection.to_a.inspect} " + extra_msg
         case x
-        when Regexp: assert(!collection.detect { |e| e =~ x }, msg)
-        else         assert(!collection.include?(x), msg)
+        when Regexp
+          assert(!collection.detect { |e| e =~ x }, msg)
+        else         
+          assert(!collection.include?(x), msg)
         end
       end
     end

data/lib/shoulda/context.rb

@@ -1,6 +1,6 @@
 module Thoughtbot # :nodoc:
   module Shoulda
-    VERSION = '2.0.2'
+    VERSION = '2.0.5'
 
     class << self
       attr_accessor :contexts

data/lib/shoulda/controller/macros.rb

@@ -253,7 +253,8 @@ module ThoughtBot # :nodoc:
         # Example:
         #
         #   should_redirect_to '"/"'
-        #   should_redirect_to "users_url(@user)"
+        #   should_redirect_to "user_url(@user)"
+        #   should_redirect_to "users_url"
         def should_redirect_to(url)
           should "redirect to #{url.inspect}" do
             instantiate_variables_from_assigns do

data/lib/shoulda/macros.rb

@@ -26,8 +26,8 @@ module ThoughtBot # :nodoc:
       # Combinations of <tt>:by</tt>, <tt>:from</tt>, and <tt>:to</tt> are allowed:
       #
       #   should_change "@post.title"                # => assert the value changed in some way
-      #   should_change "@post.title" :from => "old" # => assert the value changed to anything other than "old"
-      #   should_change "@post.title" :to   => "new" # => assert the value changed from anything other than "new"
+      #   should_change "@post.title", :from => "old" # => assert the value changed to anything other than "old"
+      #   should_change "@post.title", :to   => "new" # => assert the value changed from anything other than "new"
       def should_change(expression, options = {})
         by, from, to = get_options!([options], :by, :from, :to)
         stmt = "change #{expression.inspect}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rmm5t-shoulda
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.0.5
 platform: ruby
 authors: 
 - Tammer Saleh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-20 00:00:00 -07:00
+date: 2008-10-15 00:00:00 -07:00
 default_executable: convert_to_should_syntax
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "2.0"
+        version: 2.0.0
     version: 
 description: 
 email: tsaleh@thoughtbot.com
@@ -64,7 +64,6 @@ files:
 - lib/shoulda/tasks/yaml_to_shoulda.rake
 - lib/shoulda/tasks.rb
 - lib/shoulda.rb
-- rails
 - rails/init.rb
 - test/fail_macros.rb
 - test/fixtures