merb-core 0.9.2 → 0.9.3

data/lib/merb-core/test/helpers/view_helper.rb

@@ -112,7 +112,7 @@ module Merb
           return @output unless @output.nil?
           return @output = DocumentOutput.new(@response_output) unless @response_output.nil?
           
-          raise "The response output was not in it's usual places, please provide the output" if @controller.nil? || @controller.body.empty?
+          raise "The response output was not in its usual places, please provide the output" if @controller.nil? || @controller.body.empty?
           @response_output = @controller.body
           @output = DocumentOutput.new(@controller.body)
         end

data/lib/merb-core/test/matchers/controller_matchers.rb

@@ -57,7 +57,7 @@ module Merb::Test::Rspec::ControllerMatchers
     def failure_message
       msg = "expected #{inspect_target} to redirect to <#{@expected}>, but "
       if @redirected
-        msg << "was <#{target_location}>" 
+        msg << "was <#{target_location}>"
       else
         msg << "there was no redirection"
       end
@@ -158,13 +158,51 @@ module Merb::Test::Rspec::ControllerMatchers
     end
   end
 
+  class Provide
+
+    # === Parameters
+    # expected<Symbol>:: A format to check
+    def initialize(expected)
+      @expected = expected
+    end
+
+    # ==== Parameters
+    # target<Symbol>::
+    #   A ControllerClass or controller_instance
+    #
+    # ==== Returns
+    # Boolean:: True if the formats provided by the target controller/class include the expected
+    def matches?(target)
+      @target = target
+      provided_formats.include?( @expected )
+    end
+
+    # ==== Returns
+    # String:: The failure message.
+    def failure_message
+      "expected #{@target.name} to provide #{@expected}, but it doesn't"
+    end
+
+    # ==== Returns
+    # String:: The failure message to be displayed in negative matches.
+    def negative_failure_message
+      "expected #{@target.name} not to provide #{@expected}, but it does"
+    end
+
+    # ==== Returns
+    # Array[Symbol]:: The formats the expected provides
+    def provided_formats
+      @target.class_provided_formats
+    end
+  end
+
   # Passes if the target was redirected, or the target is a redirection (300
   # level) response code.
   #
   # ==== Examples
   #   # Passes if the controller was redirected
   #   controller.should redirect
-  #   
+  #
   #   # Also works if the target is the response code
   #   controller.status.should redirect
   #
@@ -206,7 +244,7 @@ module Merb::Test::Rspec::ControllerMatchers
   # ==== Examples
   #   # Passes if the controller call was successful
   #   controller.should respond_successfully
-  #   
+  #
   #   # Also works if the target is the response code
   #   controller.status.should respond_successfully
   #
@@ -234,7 +272,7 @@ module Merb::Test::Rspec::ControllerMatchers
   # ==== Examples
   #   # Passes if the controller call was unknown or not understood
   #   controller.should be_missing
-  #   
+  #
   #   # Also passes if the target is a response code
   #   controller.status.should be_missing
   #
@@ -266,4 +304,16 @@ module Merb::Test::Rspec::ControllerMatchers
   end
 
   alias_method :be_client_error, :be_missing
-end
+
+  # Passes if the controller actually provides the target format
+  #
+  # === Parameters
+  # expected<Symbol>:: A format to check
+  #
+  # ==== Examples
+  #   ControllerClass.should provide( :html )
+  #   controller_instance.should provide( :xml )
+  def provide( expected )
+    Provide.new( expected )
+  end
+end

data/lib/merb-core/test/matchers/route_matchers.rb

@@ -19,9 +19,9 @@ module Merb::Test::Rspec::RouteMatchers
     def matches?(target)
       @target_env = target.dup
       @target_controller, @target_action = @target_env.delete(:controller).to_s, @target_env.delete(:action).to_s
-      
+
       @target_controller = "#{target.delete(:namespace)}::#{@target_controller}" if target.has_key?(:namespace)
-      
+
       @expected_controller.snake_case == @target_controller.snake_case && @expected_action == @target_action && match_parameters(@target_env)
     end
 
@@ -49,29 +49,20 @@ module Merb::Test::Rspec::RouteMatchers
     # with the key :id set to parameters.to_param.
     def with(parameters)
       @paramter_matcher = ParameterMatcher.new(parameters)
-      
+
       self
     end
 
     # ==== Returns
     # String:: The failure message.
     def failure_message
-      "expected the request to route to #{camelize(@expected_controller)}##{@expected_action}, but was #{camelize(@target_controller)}##{@target_action}"
+      "expected the request to route to #{@expected_controller.camel_case}##{@expected_action}, but was #{@target_controller.camel_case}##{@target_action}"
     end
-  
+
     # ==== Returns
     # String:: The failure message to be displayed in negative matches.
     def negative_failure_message
-      "expected the request not to route to #{camelize(@expected_controller)}##{@expected_action}, but it did"
-    end
-
-    # ==== Parameters
-    # word<~to_s>:: The word to camelize.
-    #
-    # ==== Returns
-    # String:: The word camelized.
-    def camelize(word)
-      word.to_s.gsub(/^[a-z]|(\_[a-z])/) { |a| a.upcase.gsub("_", "") }
+      "expected the request not to route to #{@expected_controller.camel_case}##{@expected_action}, but it did"
     end
   end
 
@@ -98,7 +89,7 @@ module Merb::Test::Rspec::RouteMatchers
     # Boolean:: True if the route parameters match the expected ones.
     def matches?(parameter_hash)
       @actual = parameter_hash.dup.except(:controller, :action)
-    
+
       @expected.all? {|(k, v)| @actual.has_key?(k) && @actual[k] == v}
     end
 
@@ -133,4 +124,4 @@ module Merb::Test::Rspec::RouteMatchers
   def route_to(klass_or_name, action)
     RouteToMatcher.new(klass_or_name, action)
   end
-end
+end

data/lib/merb-core/test/matchers/view_matchers.rb

@@ -115,15 +115,16 @@ module Merb::Test::Rspec::ViewMatchers
       @errors[0]
     end
   end
-
+  
   class HasTag
-
+    
     # ==== Parameters
     # tag<~to_s>:: The tag to look for.
     # attributes<Hash>:: Attributes for the tag (see below).
-    def initialize(tag, attributes = {})
+    def initialize(tag, attributes = {}, &blk)
       @tag, @attributes = tag, attributes
       @id, @class = @attributes.delete(:id), @attributes.delete(:class)
+      @blk = blk
     end
 
     # ==== Parameters
@@ -141,14 +142,13 @@ module Merb::Test::Rspec::ViewMatchers
       else
         Hpricot.parse(stringlike)
       end
+      
+      @blk = blk unless blk.nil?
 
-      if block_given?
+      unless @blk.nil?
         !@document.search(selector).select do |ele|
-          begin
-            blk.call(ele)
-          rescue Spec::Expectations::ExpectationNotMetError
-            false
-          end
+          @blk.call ele
+          true
         end.empty?
       else
         !@document.search(selector).empty?
@@ -232,6 +232,44 @@ module Merb::Test::Rspec::ViewMatchers
     end
   end
 
+  class HasContent
+    def initialize(content)
+      @content = content
+    end
+
+    def matches?(element)
+      @element = element
+      
+      case @content
+      when String
+        @element.contains?(@content)
+      when Regexp
+        @element.matches?(@content)
+      end
+    end
+    
+    # ==== Returns
+    # String:: The failure message.
+    def failure_message
+      "expected the following element's content to #{content_message}:\n#{@element.inner_content}"
+    end
+
+    # ==== Returns
+    # String:: The failure message to be displayed in negative matches.
+    def negative_failure_message
+      "expected the following element's content to not #{content_message}:\n#{@element.inner_content}"
+    end
+    
+    def content_message
+      case @content
+      when String
+        "include \"#{@content}\""
+      when Regexp
+        "match #{@content.inspect}"
+      end
+    end
+  end
+  
   # ==== Parameters
   # name<~to_s>:: The name of the tag to look for.
   # attrs<Hash>:: Attributes to look for in the tag (see below).
@@ -285,9 +323,13 @@ module Merb::Test::Rspec::ViewMatchers
   #
   #   # Check for <div attr="val">
   #   body.should have_tag(:div, :attr => :val)
-  def have_tag(tag, attributes = {})
-    HasTag.new(tag, attributes)
+  def have_tag(tag, attributes = {}, &blk)
+    HasTag.new(tag, attributes, &blk)
   end
 
   alias_method :with_tag, :have_tag
+  
+  def contain(content)
+    HasContent.new(content)
+  end
 end

data/lib/merb-core/test/run_specs.rb

@@ -1,31 +1,38 @@
 require 'open3'
+require 'benchmark'
 
 # Runs specs in all files matching the file pattern.
 #
 # ==== Parameters
 # globs<String, Array[String]>:: File patterns to look for.
 # spec_cmd<~to_s>:: The spec command. Defaults to "spec".
-def run_specs(globs, spec_cmd='spec')
+# run_opts<String>:: Options to pass to spec commands, for instance,
+#                    if you want to use profiling formatter.
+def run_specs(globs, spec_cmd='spec', run_opts = "-c -f s")
   require "optparse"
   require "spec"
   globs = globs.is_a?(Array) ? globs : [globs]
   examples, failures, errors, pending = 0, 0, 0, 0
-  globs.each do |glob|
-    Dir[glob].each do |spec|
-      response = Open3.popen3("#{spec_cmd} #{File.expand_path(spec)} -f s -c") do |i,o,e|
-        while out = o.gets
-          STDOUT.puts out
-          STDOUT.flush
-          if out =~ /\d+ example/
-            e, f, p = out.match(/(\d+) examples?, (\d+) failures?(?:, (\d+) pending?)?/)[1..-1]
-            examples += e.to_i; failures += f.to_i; pending += p.to_i          
+
+  time = Benchmark.measure do
+    globs.each do |glob|
+      Dir[glob].each do |spec|
+        response = Open3.popen3("#{spec_cmd} #{File.expand_path(spec)} #{run_opts}") do |i,o,e|
+          while out = o.gets
+            STDOUT.puts out
+            STDOUT.flush
+            if out =~ /\d+ example/
+              e, f, p = out.match(/(\d+) examples?, (\d+) failures?(?:, (\d+) pending?)?/)[1..-1]
+              examples += e.to_i; failures += f.to_i; pending += p.to_i
+            end
           end
+          errors += 1 if e.is_a?(IO)
+          STDOUT.puts e.read if e.is_a?(IO)
         end
-        errors += 1 if e.is_a?(IO)
-        STDOUT.puts e.read if e.is_a?(IO)
       end
     end
   end
+
   puts
   puts "*** TOTALS ***"
   if failures == 0
@@ -33,6 +40,7 @@ def run_specs(globs, spec_cmd='spec')
   else
     print "\e[31m"
   end
-  puts "#{examples} examples, #{failures} failures, #{errors} errors, #{pending} pending"
-  print "\e[0m"  
+  puts "#{examples} examples, #{failures} failures, #{errors} errors, #{pending} pending, #{sprintf("suite run in %3.3f seconds", time.real)}"
+  # TODO: we need to report pending examples all together
+  print "\e[0m"
 end

data/lib/merb-core/test/tasks/spectasks.rb

@@ -1,39 +1,60 @@
-desc "Run all specs"
-Spec::Rake::SpecTask.new('specs') do |t|
-  t.spec_opts = ["--format", "specdoc", "--colour"]
-  t.spec_files = Dir['spec/**/*_spec.rb'].sort
-end
+desc "Run specs, run a specific spec with TASK=spec/path_to_spec.rb"
+task :spec => [ "spec:default" ]
 
-desc "Run all model specs"
-Spec::Rake::SpecTask.new('model_specs') do |t|
-  t.spec_opts = ["--format", "specdoc", "--colour"]
-  t.spec_files = Dir['spec/models/**/*_spec.rb'].sort
-end
+namespace :spec do
+  Spec::Rake::SpecTask.new('default') do |t|
+      t.spec_opts = ["--format", "specdoc", "--colour"]
+    if(ENV['TASK'])
+      t.spec_files = [ENV['TASK']]
+    else
+      t.spec_files = Dir['spec/**/*_spec.rb'].sort
+    end
+  end
 
-desc "Run all controller specs"
-Spec::Rake::SpecTask.new('controller_specs') do |t|
-  t.spec_opts = ["--format", "specdoc", "--colour"]
-  t.spec_files = Dir['spec/controllers/**/*_spec.rb'].sort
-end
+  desc "Run all model specs, run a spec for a specific Model with MODEL=MyModel"
+  Spec::Rake::SpecTask.new('model') do |t|
+    t.spec_opts = ["--format", "specdoc", "--colour"]
+    if(ENV['MODEL'])
+      t.spec_files = Dir["spec/models/**/#{ENV['MODEL']}_spec.rb"].sort
+    else
+      t.spec_files = Dir['spec/models/**/*_spec.rb'].sort
+    end
+  end
 
-desc "Run a specific spec with TASK=xxxx"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_opts = ["--format", "specdoc", "--colour"]
-  t.libs = ['lib', 'server/lib' ]
-  t.spec_files = ["spec/#{ENV['TASK']}_spec.rb"]
-end
+  desc "Run all controller specs, run a spec for a specific Controller with CONTROLLER=MyController"
+  Spec::Rake::SpecTask.new('controller') do |t|
+    t.spec_opts = ["--format", "specdoc", "--colour"]
+    if(ENV['CONTROLLER'])
+      t.spec_files = Dir["spec/controllers/**/#{ENV['CONTROLLER']}_spec.rb"].sort
+    else    
+      t.spec_files = Dir['spec/controllers/**/*_spec.rb'].sort
+    end
+  end
+  
+  desc "Run all view specs, run specs for a specific controller (and view) with CONTROLLER=MyController (VIEW=MyView)"
+  Spec::Rake::SpecTask.new('view') do |t|
+    t.spec_opts = ["--format", "specdoc", "--colour"]
+    if(ENV['CONTROLLER'] and ENV['VIEW'])
+      t.spec_files = Dir["spec/views/**/#{ENV['CONTROLLER']}/#{ENV['VIEW']}*_spec.rb"].sort
+    elsif(ENV['CONTROLLER'])
+      t.spec_files = Dir["spec/views/**/#{ENV['CONTROLLER']}/*_spec.rb"].sort
+    else
+      t.spec_files = Dir['spec/views/**/*_spec.rb'].sort
+    end
+  end
 
-desc "Run all specs output html"
-Spec::Rake::SpecTask.new('specs_html') do |t|
-  t.spec_opts = ["--format", "html"]
-  t.libs = ['lib', 'server/lib' ]
-  t.spec_files = Dir['spec/**/*_spec.rb'].sort
-end
+  desc "Run all specs and output the result in html"
+  Spec::Rake::SpecTask.new('html') do |t|
+    t.spec_opts = ["--format", "html"]
+    t.libs = ['lib', 'server/lib' ]
+    t.spec_files = Dir['spec/**/*_spec.rb'].sort
+  end
 
-desc "RCov"
-Spec::Rake::SpecTask.new('rcov') do |t|
-  t.spec_opts = ["--format", "specdoc", "--colour"]
-  t.spec_files = Dir['spec/**/*_spec.rb'].sort
-  t.libs = ['lib', 'server/lib' ]
-  t.rcov = true
+  desc "Run specs and check coverage with rcov"
+  Spec::Rake::SpecTask.new('coverage') do |t|
+    t.spec_opts = ["--format", "specdoc", "--colour"]
+    t.spec_files = Dir['spec/**/*_spec.rb'].sort
+    t.libs = ['lib', 'server/lib' ]
+    t.rcov = true
+  end
 end

data/lib/merb-core/vendor/facets/inflect.rb

@@ -14,7 +14,24 @@ module English
     @plural_rules = []
 
     class << self
-      # Define a general exception.
+      # Defines a general inflection exception case.
+      #
+      # ==== Parameters
+      # singular<String>::
+      #   singular form of the word
+      # plural<String>::
+      #   plural form of the word
+      #
+      # ==== Examples
+      #
+      # Here we define erratum/errata exception case:
+      #
+      # Language::English::Inflector.word "erratum", "errata"
+      #
+      # In case singular and plural forms are the same omit
+      # second argument on call:
+      #
+      # Language::English::Inflector.word 'information'
       def word(singular, plural=nil)
         plural = singular unless plural
         singular_word(singular, plural)
@@ -22,27 +39,83 @@ module English
       end
 
       # Define a singularization exception.
+      #
+      # ==== Parameters
+      # singular<String>::
+      #   singular form of the word
+      # plural<String>::
+      #   plural form of the word
       def singular_word(singular, plural)
         @singular_of[plural] = singular
       end
 
       # Define a pluralization exception.
+      #
+      # ==== Parameters
+      # singular<String>::
+      #   singular form of the word
+      # plural<String>::
+      #   plural form of the word
       def plural_word(singular, plural)
         @plural_of[singular] = plural
       end
 
       # Define a general rule.
+      #
+      # ==== Parameters
+      # singular<String>::
+      #   ending of the word in singular form
+      # plural<String>::
+      #   ending of the word in plural form
+      #
+      # ==== Examples
+      # Once the following rule is defined:
+      # Language::English::Inflector.rule 'y', 'ies'
+      #
+      # You can see the following results:
+      # irb> "fly".plural
+      # => flies
+      # irb> "cry".plural
+      # => cries
       def rule(singular, plural)
         singular_rule(singular, plural)
         plural_rule(singular, plural)
       end
 
       # Define a singularization rule.
+      #
+      # ==== Parameters
+      # singular<String>::
+      #   ending of the word in singular form
+      # plural<String>::
+      #   ending of the word in plural form
+      #
+      # ==== Examples
+      # Once the following rule is defined:
+      # Language::English::Inflector.singular_rule 'o', 'oes'
+      #
+      # You can see the following results:
+      # irb> "heroes".singular
+      # => hero
       def singular_rule(singular, plural)
         @singular_rules << [singular, plural]
       end
 
       # Define a plurualization rule.
+      #
+      # ==== Parameters
+      # singular<String>::
+      #   ending of the word in singular form
+      # plural<String>::
+      #   ending of the word in plural form
+      #
+      # ==== Examples
+      # Once the following rule is defined:
+      # Language::English::Inflector.singular_rule 'fe', 'ves'
+      #
+      # You can see the following results:
+      # irb> "wife".plural
+      # => wives
       def plural_rule(singular, plural)
         @plural_rules << [singular, plural]
       end
@@ -80,6 +153,14 @@ module English
       #   "boys".singular      #=> boy
       #   "tomatoes".singular  #=> tomato
       #
+      # ==== Parameters
+      # word<String>:: word to singularize
+      #
+      # ==== Returns
+      # <String>:: singularized form of word
+      #
+      # ==== Notes
+      # Aliased as singularize (a Railism)
       def singular(word)
         if result = singular_of[word]
           return result.dup
@@ -100,6 +181,14 @@ module English
       #   "boy".plural     #=> boys
       #   "tomato".plural  #=> tomatoes
       #
+      # ==== Parameters
+      # word<String>:: word to pluralize
+      #
+      # ==== Returns
+      # <String>:: pluralized form of word
+      #
+      # ==== Notes
+      # Aliased as pluralize (a Railism)
       def plural(word)
         if result = plural_of[word]
           return result.dup
@@ -208,4 +297,4 @@ class String
     Language::English::Inflect.plural(self)
   end
   alias_method(:pluralize, :plural)
-end
+end