seanhussey-woulda 0.1.4 → 0.1.5

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 
 spec = Gem::Specification.new do |s|
   s.name              = "woulda"
-  s.version           = "0.1.4"
+  s.version           = "0.1.5"
   s.summary           = "woulda is a home for shoulda macros that don't belong in the main shoulda library"
   s.homepage          = "http://github.com/seanhussey/woulda"
   s.rubyforge_project = "woulda"
@@ -33,3 +33,11 @@ task :gemspec do
     f.write spec.to_ruby
   end
 end
+
+desc "Run all tests"
+Rake::TestTask.new(:test) do |t|
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+task :default => :test

data/lib/woulda.rb

@@ -1,10 +1,12 @@
-require 'woulda/acts_as_ferret' if defined? ActsAsFerret
-require 'woulda/acts_as_list' if defined? ActiveRecord::Acts::List
-require 'woulda/acts_as_paranoid' if defined? Caboose::Acts::Paranoid
-require 'woulda/acts_as_taggable_on_steroids' if defined? ActiveRecord::Acts::Taggable
-require 'woulda/attachment_fu' if defined? Technoweenie::AttachmentFu
-require 'woulda/enumerations_mixin' if defined? ActiveRecord::Acts::Enumerated
-require 'woulda/paperclip' if defined? Paperclip
-require 'woulda/will_paginate' if defined? WillPaginate
-require 'woulda/acts_as_solr' if defined? ActsAsSolr
-require 'woulda/acts_as_state_machine' if defined? ScottBarron::Acts::StateMachine
+woulda_dir = File.expand_path(File.dirname(__FILE__)) + '/woulda'
+require "#{woulda_dir}/should_raise"
+require "#{woulda_dir}/acts_as_ferret" if defined? ActsAsFerret
+require "#{woulda_dir}/acts_as_list" if defined? ActiveRecord::Acts::List
+require "#{woulda_dir}/acts_as_paranoid" if defined? Caboose::Acts::Paranoid
+require "#{woulda_dir}/acts_as_taggable_on_steroids" if defined? ActiveRecord::Acts::Taggable
+require "#{woulda_dir}/attachment_fu" if defined? Technoweenie::AttachmentFu
+require "#{woulda_dir}/enumerations_mixin" if defined? ActiveRecord::Acts::Enumerated
+require "#{woulda_dir}/paperclip" if defined? Paperclip
+require "#{woulda_dir}/will_paginate" if defined? WillPaginate
+require "#{woulda_dir}/acts_as_solr" if defined? ActsAsSolr
+require "#{woulda_dir}/acts_as_state_machine" if defined? ScottBarron::Acts::StateMachine

data/lib/woulda/acts_as_ferret.rb

@@ -1,5 +1,5 @@
 require 'shoulda'
-require 'woulda/acts_as_ferret/macros'
+require File.dirname(__FILE__) + '/acts_as_ferret/macros'
 
 Test::Unit::TestCase.class_eval do
   extend Woulda::ActsAsFerret::Macros

data/lib/woulda/acts_as_list.rb

@@ -1,5 +1,5 @@
 require 'shoulda'
-require 'woulda/acts_as_list/macros'
+require File.dirname(__FILE__) + '/acts_as_list/macros'
 
 Test::Unit::TestCase.class_eval do
   extend Woulda::ActsAsList::Macros

data/lib/woulda/acts_as_paranoid.rb

@@ -1,5 +1,5 @@
 require 'shoulda'
-require 'woulda/acts_as_paranoid/macros'
+require File.dirname(__FILE__) + '/acts_as_paranoid/macros'
 
 Test::Unit::TestCase.class_eval do
   extend Woulda::ActsAsParanoid::Macros

data/lib/woulda/acts_as_solr.rb

@@ -1,5 +1,5 @@
 require 'shoulda'
-require 'woulda/acts_as_solr/macros'
+require File.dirname(__FILE__) + '/acts_as_solr/macros'
 
 Test::Unit::TestCase.class_eval do
   extend Woulda::ActsAsSolr::Macros

data/lib/woulda/acts_as_solr/macros.rb

@@ -1,24 +1,43 @@
 module Woulda
   module ActsAsSolr
     module Macros
-      def self.should_act_as_solr(*included_associations)
+      def should_act_as_solr(opts={})
         klass = model_class
+        
+        associations = get_options!([opts], :associations)
+
+        associations ||= []
 
         context "A #{klass.name}" do
-          should "include the acts_as_solr modules" do
-            assert klass.included_modules.include?(ActsAsSolr::ParserMethods)
-            assert klass.included_modules.include?(ActsAsSolr::CommonMethods)
-            assert klass.included_modules.include?(ActsAsSolr::InstanceMethods)
-          end
-          
-          should "be extended by the acts_as_solr modules" do
-            assert klass.extended_by.include?(ActsAsSolr::ClassMethods)
-            assert klass.extended_by.include?(ActsAsSolr::ParserMethods)
-            assert klass.extended_by.include?(ActsAsSolr::CommonMethods)
-            assert klass.extended_by.include?(ActsAsSolr::PaginationExtension)
-          end
+          # should "include the ActsAsSolr::ParserMethods module" do
+          #   assert klass.included_modules.include?(ActsAsSolr::ParserMethods)
+          # end
+          # 
+          # should "include the ActsAsSolr::CommonMethods module" do
+          #   assert klass.included_modules.include?(ActsAsSolr::CommonMethods)
+          # end
+          # 
+          # should "include the ActsAsSolr::InstanceMethods module" do
+          #   assert klass.included_modules.include?(ActsAsSolr::InstanceMethods)
+          # end
+          # 
+          # should "be extended by the ActsAsSolr::ClassMethods module" do
+          #   assert klass.extended_by.include?(ActsAsSolr::ClassMethods)
+          # end
+          # 
+          # should "be extended by the ActsAsSolr::ParserMethods module" do
+          #   assert klass.extended_by.include?(ActsAsSolr::ParserMethods)
+          # end
+          # 
+          # should "be extended by the ActsAsSolr::CommonMethods module" do
+          #   assert klass.extended_by.include?(ActsAsSolr::CommonMethods)
+          # end
+          # 
+          # should "be extended by the ActsAsSolr::PaginationExtension module" do
+          #   assert klass.extended_by.include?(ActsAsSolr::PaginationExtension)
+          # end
 
-          included_associations.each do |association|
+          associations.each do |association|
             should "include the #{association.to_s} association in solr indexing" do
               klass.configuration[:include].include?(association)
             end
@@ -27,4 +46,4 @@ module Woulda
       end
     end
   end
-end
+end

data/lib/woulda/acts_as_state_machine.rb

@@ -1,5 +1,5 @@
 require 'shoulda'
-require 'woulda/acts_as_state_machine/macros'
+require File.dirname(__FILE__) + '/acts_as_state_machine/macros'
 
 Test::Unit::TestCase.class_eval do
   extend Woulda::ActsAsStateMachine::Macros

data/lib/woulda/acts_as_state_machine/macros.rb

@@ -69,12 +69,14 @@ module Woulda
               assert klass.transition_table.has_key?(event), "#{klass} does not define event #{event}"
             end
 
-            to = transition[:to]
-            from = transition[:from]
+            to   = transition[:to]
+            from = transition[:from].is_a?(Symbol) ? [transition[:from]] : transition[:from]
 
-            should "transition to #{to} from #{from} on event #{event}" do
-              assert_not_nil klass.transition_table[event].detect { |t| t.to == to && t.from == from }, "#{event} does not transition to #{to} from #{from}"
-            end            
+            from.each do |from_state|
+              should "transition to #{to} from #{from_state} on event #{event}" do
+                assert_not_nil klass.transition_table[event].detect { |t| t.to == to && t.from == from_state }, "#{event} does not transition to #{to} from #{from_state}"
+              end
+            end
 
           end
         end   

data/lib/woulda/acts_as_taggable_on_steroids.rb

@@ -1,5 +1,5 @@
 require 'shoulda'
-require 'woulda/acts_as_taggable_on_steroids'
+require File.dirname(__FILE__) + '/acts_as_taggable_on_steroids'
 
 Test::Unit::TestCase.class_eval do
   extend Woulda::ActsAsTaggableOnSteroids::Macros

data/lib/woulda/attachment_fu.rb

@@ -1,5 +1,5 @@
 require 'shoulda'
-require 'woulda/attachment_fu/macros'
+require File.dirname(__FILE__) + '/attachment_fu/macros'
 
 Test::Unit::TestCase.class_eval do
   extend Woulda::AttachmentFu::Macros

data/lib/woulda/enumerations_mixin.rb

@@ -1,5 +1,5 @@
 require 'shoulda'
-require 'woulda/enumerations_mixin/macros'
+require File.dirname(__FILE__) + '/enumerations_mixin/macros'
 
 Test::Unit::TestCase.class_eval do
   extend Woulda::EnumerationsMixin::Macros

data/lib/woulda/paperclip.rb

@@ -1,6 +1,6 @@
 require 'shoulda'
-require 'woulda/paperclip/macros'
+require File.dirname(__FILE__) + '/paperclip/macros'
 
-Tet::Unit::TestCase.class_eval do
+Test::Unit::TestCase.class_eval do
   extend Woulda::Paperclip::Macros
 end

data/lib/woulda/paperclip/macros.rb

@@ -14,7 +14,7 @@ module Woulda
         should "have a paperclip attachment named ##{attachment}" do
           assert klass.new.respond_to?(attachment.to_sym),
                  "@#{klass.name.underscore} doesn't have a paperclip field named #{attachment}"
-          assert_equal Paperclip::Attachment, klass.new.send(attachment.to_sym).class
+          assert_equal ::Paperclip::Attachment, klass.new.send(attachment.to_sym).class
         end
       end
     end

data/lib/woulda/should_raise.rb

@@ -0,0 +1,6 @@
+require 'shoulda'
+require File.dirname(__FILE__) + '/should_raise/macros'
+
+Test::Unit::TestCase.class_eval do
+  extend Woulda::ShouldRaise::Macros
+end

data/lib/woulda/should_raise/macros.rb

@@ -0,0 +1,102 @@
+# Copyright (c) 2008 Mathieu Martin
+# 
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+# TODO
+# - nest contexts/should differently so the message verifications don't clobber each other.
+#   Put exactly same message in last few tests for an example.
+
+module Woulda
+  module ShouldRaise
+    module Macros
+      # Make sure a block raises an exception.
+      # Call with optional arguments :instance_of/:kind_of and :message
+      # If :instance_of or :kind_of is specified, assert on the given type. 
+      #   Otherwise only assert that an exception is raised.
+      #   Note: The shorthand should_raise(LoadError) is equivalent to should_raise(:instance_of => LoadError)
+      # If :message is specified, will assert that exception.message =~ :message.
+      #
+      # Examples:
+      #   should_raise {a block}
+      #   should_raise(LoadError) {a block}
+      #   should_raise(:instance_of => LoadError) {a block}
+      #   should_raise(:kind_of => LoadError) {a block}
+      #   should_raise(:message => "no such file to load") {a block}
+      #   should_raise(:message => /load/) {a block}
+      #   should_raise(LoadError, :message => /load/) {a block}
+      #   should_raise(:kind_of => LoadError, :message => /load/) {a block}
+      #   should_raise(:instance_of => LoadError, :message => /load/) {a block}
+      def should_raise(*args, &block)
+        opts = args.last.is_a?(Hash) ? args.pop : {}
+
+        if args.first.is_a?(Class)
+          type  = args.first
+          exact = true
+        else
+          type  = opts[:instance_of] || opts[:kind_of]
+          exact = !!opts[:instance_of]
+        end
+        message = opts[:message]
+
+        # Make sure we don't have a false sense of security and bork if incorrect options are supplied.
+        [:message, :instance_of, :kind_of].each { |acceptable_arg| opts.delete(acceptable_arg) }
+        raise ArgumentError, "Unknown parameter(s): #{opts.keys.inspect}. Only :message, :instance_of and :kind_of are supported." if opts.size > 0
+
+        context "block #{block.inspect}" do # To avoid dupe test names. Any other ideas?
+          should_string  = "raise an exception"
+          should_string += " %s type #{type.inspect}" % (exact ? 'of' : 'descending from') if type
+          
+          should should_string do
+            begin
+              yield
+            rescue Exception => ex
+              @raised_exception = ex
+            end
+            if @raised_exception && type
+              if exact
+                assert_instance_of type, @raised_exception
+              else
+                assert_kind_of type, @raised_exception
+              end
+            else
+              assert @raised_exception, "The block was expected to raise an exception, but didn't"
+            end
+          end
+        end
+
+        if message
+          context "raising an exception" do
+            setup do
+              begin
+                yield
+              rescue Exception => ex
+                @raised_exception = ex
+              end
+            end
+
+            should "contain a message that matches #{message.inspect}" do
+              assert_match message, @raised_exception.message
+            end
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: seanhussey-woulda
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Sean Hussey
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-10 00:00:00 -07:00
+date: 2008-11-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,6 +65,9 @@ files:
 - lib/woulda/paperclip
 - lib/woulda/paperclip/macros.rb
 - lib/woulda/paperclip.rb
+- lib/woulda/should_raise
+- lib/woulda/should_raise/macros.rb
+- lib/woulda/should_raise.rb
 - lib/woulda/will_paginate
 - lib/woulda/will_paginate/macros.rb
 - lib/woulda/will_paginate.rb