shoulda-matchers 1.0.0.beta3 → 1.0.0

data/Appraisals

@@ -1,12 +1,11 @@
-appraise "3.0.3" do
-  gem "rails", "3.0.3"
-  gem "rake", "~> 0.8.7"
+appraise "3.0" do
+  gem "rails", "3.0.10"
 end
 
-appraise "3.1.0.rc1" do
-  gem "rails", "3.1.0.rc1"
-  gem 'sass'
-  gem 'coffee-script'
+appraise "3.1" do
+  gem "rails", "3.1.0"
   gem 'uglifier'
   gem 'jquery-rails'
+  gem 'coffee-rails'
+  gem 'sass-rails'
 end

data/Gemfile

@@ -1,5 +1,12 @@
 source 'http://rubygems.org'
 
 gemspec
-gem 'rake', '~> 0.8.7'
+gem 'rake', '~> 0.9.2'
 
+# For test Rails application
+gem 'sqlite3', :platform => :ruby
+gem 'activerecord-jdbc-adapter', :platform => :jruby
+gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+gem 'jdbc-sqlite3', :platform => :jruby
+gem 'jruby-openssl', :platform => :jruby
+gem 'shoulda-context', '~> 1.0.0.beta1'

data/Gemfile.lock

@@ -0,0 +1,115 @@
+PATH
+  remote: .
+  specs:
+    shoulda-matchers (1.0.0.beta3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionpack (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.2)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    appraisal (0.3.8)
+      bundler
+      rake
+    aruba (0.4.5)
+      bcat (>= 0.6.1)
+      childprocess (>= 0.1.9)
+      cucumber (>= 0.10.7)
+      rdiscount (>= 1.6.8)
+      rspec (>= 2.6.0)
+    bcat (0.6.2)
+      rack (~> 1.0)
+    builder (3.0.0)
+    childprocess (0.2.2)
+      ffi (~> 1.0.6)
+    cucumber (0.10.7)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.4.0)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    ffi (1.0.10)
+    gherkin (2.4.21)
+      json (>= 1.4.6)
+    hike (1.2.1)
+    i18n (0.6.0)
+    json (1.6.1)
+    mocha (0.9.12)
+    multi_json (1.0.3)
+    rack (1.3.5)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    railties (3.1.1)
+      actionpack (= 3.1.1)
+      activesupport (= 3.1.1)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdiscount (1.6.8)
+    rdoc (3.11)
+      json (~> 1.4)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    rspec-rails (2.6.1)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.6.0)
+    shoulda-context (1.0.0.beta1)
+    sprockets (2.0.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.4)
+    term-ansicolor (1.0.7)
+    thor (0.14.6)
+    tilt (1.3.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord-jdbc-adapter
+  activerecord-jdbcsqlite3-adapter
+  appraisal (~> 0.3.4)
+  aruba
+  cucumber (~> 0.10.0)
+  jdbc-sqlite3
+  jruby-openssl
+  mocha (~> 0.9.10)
+  rake (~> 0.9.2)
+  rspec-rails (~> 2.6.1.beta1)
+  shoulda-context (~> 1.0.0.beta1)
+  shoulda-matchers!
+  sqlite3

data/README.rdoc

@@ -8,6 +8,8 @@ These tests would otherwise be much longer, more complex, and error-prone.
 Refer to the {shoulda}[https://github.com/thoughtbot/shoulda] gem if you want to know more
 about using shoulda with Test::Unit.
 
+Please report bugs on the {shoulda issue tracker}[https://github.com/thoughtbot/shoulda/issues].
+
 === ActiveRecord Matchers
 
 Matchers to test associations:

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'bundler/setup'
 require 'rake'
 require 'rake/rdoctask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
 require 'appraisal'
@@ -33,7 +33,7 @@ RSpec::Core::RakeTask.new(:coverage) do |t|
 end
 
 eval("$specification = begin; #{IO.read('shoulda-matchers.gemspec')}; end")
-Rake::GemPackageTask.new $specification do |pkg|
+Gem::PackageTask.new $specification do |pkg|
   pkg.need_tar = true
   pkg.need_zip = true
 end

data/lib/shoulda/matchers/action_controller/render_template_matcher.rb

@@ -7,14 +7,25 @@ module Shoulda # :nodoc:
       # Example:
       #
       #   it { should render_template(:show)  }
-      def render_template(template)
-        RenderTemplateMatcher.new(template, self)
+      #
+      #   assert that the "_customer" partial was rendered
+      #   it { should render_template(:partial => '_customer')  }
+      #
+      #   assert that the "_customer" partial was rendered twice
+      #   it { should render_template(:partial => '_customer', :count => 2)  }
+      #
+      #   assert that no partials were rendered
+      #   it { should render_template(:partial => false)  }
+      def render_template(options = {}, message = nil)
+        RenderTemplateMatcher.new(options, message, self)
       end
 
       class RenderTemplateMatcher # :nodoc:
 
-        def initialize(template, context)
-          @template = template.to_s
+        def initialize(options, message, context)
+          @options = options
+          @message = message
+          @template = options.is_a?(Hash) ? options[:partial] : options
           @context  = context
         end
 
@@ -38,7 +49,7 @@ module Shoulda # :nodoc:
 
         def renders_template?
           begin
-            @context.send(:assert_template, @template)
+            @context.send(:assert_template, @options, @message)
             @negative_failure_message = "Didn't expect to render #{@template}"
             true
           rescue Shoulda::Matchers::AssertionError => error

data/lib/shoulda/matchers/action_controller/route_matcher.rb

@@ -16,7 +16,7 @@ module Shoulda # :nodoc:
       #   it { should route(:get, "/posts/new").to(:action => :new) }
       #   it { should route(:post, "/posts").to(:action => :create) }
       #   it { should route(:get, "/posts/1").to(:action => :show, :id => 1) }
-      #   it { should route(:edit, "/posts/1").to(:action => :show, :id => 1) }
+      #   it { should route(:get, "/posts/1/edit").to(:action => :edit, :id => 1) }
       #   it { should route(:put, "/posts/1").to(:action => :update, :id => 1) }
       #   it { should route(:delete, "/posts/1").
       #                 to(:action => :destroy, :id => 1) }

data/lib/shoulda/matchers/action_controller/set_the_flash_matcher.rb

@@ -68,6 +68,7 @@ module Shoulda # :nodoc:
         def flash
           return @flash if @flash
           @flash = @controller.flash.dup
+          @flash.instance_variable_set(:@used, @controller.flash.instance_variable_get(:@used).dup)
           @flash.sweep unless @now
           @flash
         end

data/lib/shoulda/matchers/active_model.rb

@@ -3,6 +3,7 @@ require 'shoulda/matchers/active_model/validation_matcher'
 require 'shoulda/matchers/active_model/allow_value_matcher'
 require 'shoulda/matchers/active_model/ensure_length_of_matcher'
 require 'shoulda/matchers/active_model/ensure_inclusion_of_matcher'
+require 'shoulda/matchers/active_model/ensure_exclusion_of_matcher'
 require 'shoulda/matchers/active_model/validate_presence_of_matcher'
 require 'shoulda/matchers/active_model/validate_format_of_matcher'
 require 'shoulda/matchers/active_model/validate_uniqueness_of_matcher'

data/lib/shoulda/matchers/active_model/ensure_exclusion_of_matcher.rb

@@ -0,0 +1,70 @@
+module Shoulda # :nodoc:
+  module Matchers
+    module ActiveModel # :nodoc:
+
+      # Ensure that the attribute's value is not in the range specified
+      #
+      # Options:
+      # * <tt>in_range</tt> - the range of not allowed values for this attribute
+      # * <tt>with_message</tt> - value the test expects to find in
+      #   <tt>errors.on(:attribute)</tt>. Regexp or string. Defaults to the
+      #   translation for :exclusion.
+      #
+      # Example:
+      #   it { should ensure_exclusion_of(:age).in_range(30..60) }
+      #
+      def ensure_exclusion_of(attr)
+        EnsureExclusionOfMatcher.new(attr)
+      end
+
+      class EnsureExclusionOfMatcher < ValidationMatcher # :nodoc:
+
+        def in_range(range)
+          @range = range
+          @minimum = range.first
+          @maximum = range.last
+          self
+        end
+
+        def with_message(message)
+          @expected_message = message if message
+          self
+        end
+
+        def description
+          "ensure exclusion of #{@attribute} in #{@range.inspect}"
+        end
+
+        def matches?(subject)
+          super(subject)
+
+          @expected_message ||= :exclusion
+
+          allows_lower_value &&
+            disallows_minimum_value &&
+            allows_higher_value &&
+            disallows_maximum_value
+        end
+
+        private
+
+        def allows_lower_value
+          @minimum == 0 || allows_value_of(@minimum - 1, @expected_message)
+        end
+
+        def allows_higher_value
+          allows_value_of(@maximum + 1, @expected_message)
+        end
+
+        def disallows_minimum_value
+          disallows_value_of(@minimum, @expected_message)
+        end
+
+        def disallows_maximum_value
+          disallows_value_of(@maximum, @expected_message)
+        end
+      end
+
+    end
+  end
+end

data/lib/shoulda/matchers/active_model/validate_uniqueness_of_matcher.rb

@@ -116,7 +116,11 @@ module Shoulda # :nodoc:
               # Assume the scope is a foreign key if the field is nil
               previous_value ||= 0
 
-              next_value = previous_value.next
+              next_value = if previous_value.respond_to?(:next)
+                previous_value.next
+              else
+                previous_value.to_s.next
+              end
 
               @subject.send("#{scope}=", next_value)
 

data/lib/shoulda/matchers/active_record/association_matcher.rb

@@ -18,6 +18,7 @@ module Shoulda # :nodoc:
       # * <tt>through</tt> - association name for <tt>has_many :through</tt>
       # * <tt>dependent</tt> - tests that the association makes use of the
       #   dependent option.
+      # * <tt>:class_name</tt> - tests that the association makes use of the class_name option.
       #
       # Example:
       #   it { should have_many(:friends) }
@@ -35,6 +36,7 @@ module Shoulda # :nodoc:
       # Options:
       # * <tt>:dependent</tt> - tests that the association makes use of the
       #   dependent option.
+      # * <tt>:class_name</tt> - tests that the association makes use of the class_name option.
       #
       # Example:
       #   it { should have_one(:god) } # unless hindu
@@ -71,7 +73,17 @@ module Shoulda # :nodoc:
         def order(order)
           @order = order
           self
-        end        
+        end
+
+        def conditions(conditions)
+          @conditions = conditions
+          self
+        end
+
+        def class_name(class_name)
+          @class_name = class_name
+          self
+        end
 
         def matches?(subject)
           @subject = subject
@@ -80,7 +92,9 @@ module Shoulda # :nodoc:
             foreign_key_exists? &&
             through_association_valid? &&
             dependent_correct? &&
+            class_name_correct? &&
             order_correct? &&
+            conditions_correct? &&
             join_table_exists?
         end
 
@@ -96,6 +110,7 @@ module Shoulda # :nodoc:
           description = "#{macro_description} #{@name}"
           description += " through #{@through}" if @through
           description += " dependent => #{@dependent}" if @dependent
+          description += " class_name => #{@class_name}" if @class_name
           description += " order => #{@order}" if @order
           description
         end
@@ -166,6 +181,15 @@ module Shoulda # :nodoc:
           end
         end
 
+        def class_name_correct?
+          if @class_name.nil? || @class_name.to_s == reflection.options[:class_name].to_s
+            true
+          else
+            @missing = "#{@name} should have #{@class_name} as class_name"
+            false
+          end
+        end
+
         def order_correct?
           if @order.nil? || @order.to_s == reflection.options[:order].to_s
             true
@@ -173,7 +197,16 @@ module Shoulda # :nodoc:
             @missing = "#{@name} should be ordered by #{@order}"
             false
           end
-        end        
+        end
+
+        def conditions_correct?
+          if @conditions.nil? || @conditions.to_s == reflection.options[:conditions].to_s
+            true
+          else
+            @missing = "#{@name} should have the following conditions: #{@conditions}"
+            false
+          end
+        end
 
         def join_table_exists?
           if @macro != :has_and_belongs_to_many ||

data/lib/shoulda/matchers/active_record/have_db_index_matcher.rb

@@ -58,11 +58,11 @@ module Shoulda # :nodoc:
 
         def correct_unique?
           return true if @unique.nil?
-          if matched_index.unique == @unique
+          if !!matched_index.unique == @unique
             true
           else
             @missing = "#{table_name} has an index named #{matched_index.name} " <<
-                       "of unique #{matched_index.unique}, not #{@unique}."
+                       "of unique #{!!matched_index.unique}, not #{@unique}."
             false
           end
         end

data/lib/shoulda/matchers/active_record/have_readonly_attribute_matcher.rb

@@ -5,7 +5,7 @@ module Shoulda # :nodoc:
       # Ensures that the attribute cannot be changed once the record has been
       # created.
       #
-      #   it { should have_readonly_attributes(:password) }
+      #   it { should have_readonly_attribute(:password) }
       #
       def have_readonly_attribute(value)
         HaveReadonlyAttributeMatcher.new(value)

data/lib/shoulda/matchers/version.rb

@@ -1,5 +1,5 @@
 module Shoulda
   module Matchers
-    VERSION = "1.0.0.beta3".dup
+    VERSION = "1.0.0".dup
   end
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shoulda-matchers
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 1.0.0.beta3
+  hash: 23
+  prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Tammer Saleh
@@ -15,75 +20,89 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 -04:00
+date: 2011-11-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  name: mocha
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.3.2
+        hash: 47
+        segments: 
+        - 0
+        - 9
+        - 10
+        version: 0.9.10
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: rspec-rails
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.10
+        hash: 62196361
+        segments: 
+        - 2
+        - 6
+        - 1
+        - beta
+        - 1
+        version: 2.6.1.beta1
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
+  name: cucumber
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.6.1.beta1
+        hash: 55
+        segments: 
+        - 0
+        - 10
+        - 0
+        version: 0.10.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: appraisal
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.10.0
+        hash: 27
+        segments: 
+        - 0
+        - 3
+        - 4
+        version: 0.3.4
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: appraisal
+  name: aruba
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.4
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug19
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.11.6
-  type: :development
-  version_requirements: *id006
 description: Making tests easy on the fingers and eyes
 email: support@thoughtbot.com
 executables: []
@@ -97,6 +116,7 @@ files:
 - Appraisals
 - CONTRIBUTION_GUIDELINES.rdoc
 - Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
@@ -115,6 +135,7 @@ files:
 - lib/shoulda/matchers/action_mailer.rb
 - lib/shoulda/matchers/active_model/allow_mass_assignment_of_matcher.rb
 - lib/shoulda/matchers/active_model/allow_value_matcher.rb
+- lib/shoulda/matchers/active_model/ensure_exclusion_of_matcher.rb
 - lib/shoulda/matchers/active_model/ensure_inclusion_of_matcher.rb
 - lib/shoulda/matchers/active_model/ensure_length_of_matcher.rb
 - lib/shoulda/matchers/active_model/helpers.rb
@@ -152,12 +173,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []