merb-core 0.9.3 → 0.9.4

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

@@ -1,7 +1,6 @@
 module Merb::Test::Rspec::ControllerMatchers
 
   class BeRedirect
-
     # ==== Parameters
     # target<Fixnum, ~status>::
     #   Either the status code or a controller with a status code.
@@ -36,8 +35,10 @@ module Merb::Test::Rspec::ControllerMatchers
 
     # === Parameters
     # String:: The expected location
-    def initialize(expected)
+    # Hash:: Optional hash of options (currently only :message)
+    def initialize(expected, options = {})
       @expected = expected
+      @options  = options
     end
 
     # ==== Parameters
@@ -49,6 +50,12 @@ module Merb::Test::Rspec::ControllerMatchers
     def matches?(target)
       @target, @location = target, target.headers['Location']
       @redirected = BeRedirect.new.matches?(target.status)
+
+      if @options[:message]
+        msg = Merb::Request.escape([Marshal.dump(@options[:message])].pack("m"))
+        @expected << "?_message=#{msg}"
+      end
+      
       @location == @expected && @redirected
     end
 
@@ -158,6 +165,27 @@ module Merb::Test::Rspec::ControllerMatchers
     end
   end
 
+  class BeError
+    def initialize(expected)
+      @expected = expected
+    end
+    
+    def matches?(target)
+      @target = target
+      @target.request.exceptions &&
+        @target.request.exceptions.first.is_a?(@expected)
+    end
+    
+    def failure_message
+      "expected #{@target} to be a #{@expected} error, but it was " << 
+        @target.request.exceptions.first.inspect
+    end
+    
+    def negative_failure_message
+      "expected #{@target} not to be a #{@expected} error, but it was"
+    end
+  end
+
   class Provide
 
     # === Parameters
@@ -232,8 +260,8 @@ module Merb::Test::Rspec::ControllerMatchers
   # ==== Examples
   #   # Passes if the controller was redirected to http://example.com/
   #   controller.should redirect_to('http://example.com/')
-  def redirect_to(expected)
-    RedirectTo.new(expected)
+  def redirect_to(expected, options = {})
+    RedirectTo.new(expected, options)
   end
 
   alias_method :be_redirection_to, :redirect_to
@@ -302,6 +330,10 @@ module Merb::Test::Rspec::ControllerMatchers
   def be_missing
     BeMissing.new
   end
+  
+  def be_error(expected)
+    BeError.new(expected)
+  end
 
   alias_method :be_client_error, :be_missing
 

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

@@ -48,7 +48,7 @@ module Merb::Test::Rspec::RouteMatchers
     # If parameters is an object, then a new expected hash will be constructed
     # with the key :id set to parameters.to_param.
     def with(parameters)
-      @paramter_matcher = ParameterMatcher.new(parameters)
+      @parameter_matcher = ParameterMatcher.new(parameters)
 
       self
     end
@@ -56,17 +56,26 @@ module Merb::Test::Rspec::RouteMatchers
     # ==== Returns
     # String:: The failure message.
     def failure_message
-      "expected the request to route to #{@expected_controller.camel_case}##{@expected_action}, but was #{@target_controller.camel_case}##{@target_action}"
+      "expected the request to route to #{@expected_controller.camel_case}##{@expected_action}#{expected_parameters_message}, but was #{@target_controller.camel_case}##{@target_action}#{actual_parameters_message}"
     end
 
     # ==== Returns
     # String:: The failure message to be displayed in negative matches.
     def negative_failure_message
-      "expected the request not to route to #{@expected_controller.camel_case}##{@expected_action}, but it did"
+      "expected the request not to route to #{@expected_controller.camel_case}##{@expected_action}#{expected_parameters_message}, but it did"
+    end
+
+    def expected_parameters_message
+      " with #{@parameter_matcher.expected.inspect}" if @parameter_matcher
+    end
+
+    def actual_parameters_message
+      " with #{(@parameter_matcher.actual || {}).inspect}" if @parameter_matcher
     end
   end
 
   class ParameterMatcher
+    attr_accessor :expected, :actual
 
     # ==== Parameters
     # hash_or_object<Hash, ~to_param>:: The parameters to match.

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

@@ -251,13 +251,13 @@ module Merb::Test::Rspec::ViewMatchers
     # ==== Returns
     # String:: The failure message.
     def failure_message
-      "expected the following element's content to #{content_message}:\n#{@element.inner_content}"
+      "expected the following element's content to #{content_message}:\n#{@element.inner_text}"
     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}"
+      "expected the following element's content to not #{content_message}:\n#{@element.inner_text}"
     end
     
     def content_message
@@ -332,4 +332,4 @@ module Merb::Test::Rspec::ViewMatchers
   def contain(content)
     HasContent.new(content)
   end
-end
+end

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

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'open3'
 require 'benchmark'
 

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

@@ -2,8 +2,15 @@ desc "Run specs, run a specific spec with TASK=spec/path_to_spec.rb"
 task :spec => [ "spec:default" ]
 
 namespace :spec do
+  OPTS_FILENAME = "./spec/spec.opts"
+  if File.exist?(OPTS_FILENAME)
+    SPEC_OPTS = ["--options", OPTS_FILENAME]
+  else
+    SPEC_OPTS = ["--color", "--format", "specdoc"]
+  end
+  
   Spec::Rake::SpecTask.new('default') do |t|
-      t.spec_opts = ["--format", "specdoc", "--colour"]
+      t.spec_opts = SPEC_OPTS
     if(ENV['TASK'])
       t.spec_files = [ENV['TASK']]
     else
@@ -13,7 +20,7 @@ namespace :spec do
 
   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"]
+    t.spec_opts = SPEC_OPTS
     if(ENV['MODEL'])
       t.spec_files = Dir["spec/models/**/#{ENV['MODEL']}_spec.rb"].sort
     else
@@ -23,7 +30,7 @@ namespace :spec do
 
   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"]
+    t.spec_opts = SPEC_OPTS
     if(ENV['CONTROLLER'])
       t.spec_files = Dir["spec/controllers/**/#{ENV['CONTROLLER']}_spec.rb"].sort
     else    
@@ -33,7 +40,7 @@ namespace :spec do
   
   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"]
+    t.spec_opts = SPEC_OPTS
     if(ENV['CONTROLLER'] and ENV['VIEW'])
       t.spec_files = Dir["spec/views/**/#{ENV['CONTROLLER']}/#{ENV['VIEW']}*_spec.rb"].sort
     elsif(ENV['CONTROLLER'])
@@ -52,9 +59,10 @@ namespace :spec do
 
   desc "Run specs and check coverage with rcov"
   Spec::Rake::SpecTask.new('coverage') do |t|
-    t.spec_opts = ["--format", "specdoc", "--colour"]
+    t.spec_opts = SPEC_OPTS
     t.spec_files = Dir['spec/**/*_spec.rb'].sort
     t.libs = ['lib', 'server/lib' ]
     t.rcov = true
+    t.rcov_opts = ["--exclude 'config,spec,#{Gem::path.join(',')}'"]    
   end
 end

data/lib/merb-core/test/test_ext/string.rb

@@ -0,0 +1,14 @@
+class String
+  def contain?(value)
+    self.include?(value)
+  end
+  
+  alias_method :contains?, :contain?
+
+  def match?(regex)
+    self.match(regex)
+  end
+  
+  alias_method :matches?, :match?
+  
+end

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

@@ -292,11 +292,11 @@ class Dictionary
   end
 
   def reject( &block )
-    self.dup.delete_if &block
+    self.dup.delete_if(&block)
   end
 
   def reject!( &block )
-    hsh2 = reject &block
+    hsh2 = reject(&block)
     self == hsh2 ? nil : hsh2
   end
 
@@ -321,7 +321,7 @@ class Dictionary
   end
 
   def <<(kv)
-    push *kv
+    push( *kv )
   end
 
   def push( k,v )

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

@@ -38,6 +38,20 @@ module English
         plural_word(singular, plural)
       end
 
+      def clear(type = :all)
+        if type == :singular || type == :all
+          @singular_of = {}
+          @singular_rules = []
+          @singularization_rules, @singularization_regex = nil, nil
+        end
+        if type == :plural || type == :all
+          @singular_of = {}
+          @singular_rules = []
+          @singularization_rules, @singularization_regex = nil, nil
+        end
+      end
+
+
       # Define a singularization exception.
       #
       # ==== Parameters
@@ -47,6 +61,7 @@ module English
       #   plural form of the word
       def singular_word(singular, plural)
         @singular_of[plural] = singular
+        @singular_of[plural.capitalize] = singular.capitalize
       end
 
       # Define a pluralization exception.
@@ -58,6 +73,7 @@ module English
       #   plural form of the word
       def plural_word(singular, plural)
         @plural_of[singular] = plural
+        @plural_of[singular.capitalize] = plural.capitalize
       end
 
       # Define a general rule.
@@ -67,7 +83,9 @@ module English
       #   ending of the word in singular form
       # plural<String>::
       #   ending of the word in plural form
-      #
+      # whole_word<Boolean>::
+      #   for capitalization, since words can be
+      #   capitalized (Man => Men)      #
       # ==== Examples
       # Once the following rule is defined:
       # Language::English::Inflector.rule 'y', 'ies'
@@ -77,9 +95,12 @@ module English
       # => flies
       # irb> "cry".plural
       # => cries
-      def rule(singular, plural)
+      # Define a general rule.
+
+      def rule(singular, plural, whole_word = false)
         singular_rule(singular, plural)
         plural_rule(singular, plural)
+        word(singular, plural) if whole_word
       end
 
       # Define a singularization rule.
@@ -122,31 +143,26 @@ module English
 
       # Read prepared singularization rules.
       def singularization_rules
-        return @singularization_rules if @singularization_rules
-        sorted = @singular_rules.sort_by{ |s, p| "#{p}".size }.reverse
-        @singularization_rules = sorted.collect do |s, p|
-          [ /#{p}$/, "#{s}" ]
+        if defined?(@singularization_regex) && @singularization_regex
+          return [@singularization_regex, @singularization_hash]
         end
+        # No sorting needed: Regexen match on longest string
+        @singularization_regex = Regexp.new("(" + @singular_rules.map {|s,p| p}.join("|") + ")$", "i")
+        @singularization_hash  = Hash[*@singular_rules.flatten].invert
+        [@singularization_regex, @singularization_hash]
       end
 
       # Read prepared pluralization rules.
       def pluralization_rules
-        return @pluralization_rules if @pluralization_rules
-        sorted = @plural_rules.sort_by{ |s, p| "#{s}".size }.reverse
-        @pluralization_rules = sorted.collect do |s, p|
-          [ /#{s}$/, "#{p}" ]
+        if defined?(@pluralization_regex) && @pluralization_regex
+          return [@pluralization_regex, @pluralization_hash]
         end
+        @pluralization_regex = Regexp.new("(" + @plural_rules.map {|s,p| s}.join("|") + ")$", "i")
+        @pluralization_hash  = Hash[*@plural_rules.flatten]
+        [@pluralization_regex, @pluralization_hash]
       end
 
-      #
-      def plural_of
-        @plural_of
-      end
-
-      #
-      def singular_of
-        @singular_of
-      end
+      attr_reader :singular_of, :plural_of
 
       # Convert an English word from plurel to singular.
       #
@@ -166,9 +182,9 @@ module English
           return result.dup
         end
         result = word.dup
-        singularization_rules.each do |(match, replacement)|
-          break if result.gsub!(match, replacement)
-        end
+        regex, hash = singularization_rules
+        result.sub!(regex) {|m| hash[m]}
+        singular_of[word] = result
         return result
       end
 
@@ -190,14 +206,15 @@ module English
       # ==== Notes
       # Aliased as pluralize (a Railism)
       def plural(word)
+        # special exceptions
+        return "" if word == ""
         if result = plural_of[word]
           return result.dup
         end
-        #return self.dup if /s$/ =~ self # ???
         result = word.dup
-        pluralization_rules.each do |(match, replacement)|
-          break if result.gsub!(match, replacement)
-        end
+        regex, hash = pluralization_rules
+        result.sub!(regex) {|m| hash[m]}
+        plural_of[word] = result
         return result
       end
 
@@ -216,6 +233,11 @@ module English
     word 'sheep'
     word 'moose'
     word 'hovercraft'
+    word 'grass'
+    word 'rain'
+    word 'milk'
+    word 'rice'
+    word 'plurals'
 
     # Two arguments defines a singular and plural exception.
 
@@ -229,15 +251,13 @@ module English
     word 'axis'      , 'axes'
     word 'crisis'    , 'crises'
     word 'testis'    , 'testes'
-    word 'child'     , 'children'
-    word 'person'    , 'people'
     word 'potato'    , 'potatoes'
     word 'tomato'    , 'tomatoes'
     word 'buffalo'   , 'buffaloes'
     word 'torpedo'   , 'torpedoes'
-    word 'quiz'      , 'quizes'
+    word 'quiz'      , 'quizzes'
     word 'matrix'    , 'matrices'
-    word 'vertex'    , 'vetices'
+    word 'vertex'    , 'vertices'
     word 'index'     , 'indices'
     word 'ox'        , 'oxen'
     word 'mouse'     , 'mice'
@@ -245,14 +265,29 @@ module English
     word 'thesis'    , 'theses'
     word 'thief'     , 'thieves'
     word 'analysis'  , 'analyses'
-
+    word 'erratum'   , 'errata'
+    word 'phenomenon', 'phenomena'
+    word 'octopus'   , 'octopi'
+    word 'thesaurus' , 'thesauri'
+    word 'movie'     , 'movies'
+    word 'cactus'    , 'cacti'
+    word 'plus'      , 'plusses'
+    word 'cross'     , 'crosses'
+    word 'medium'    , 'media'
+    word 'cow'       , 'kine'
+    word 'datum'     , 'data'
+    word 'basis'     , 'bases'
+    word 'diagnosis' , 'diagnoses'    
+    
     # One-way singularization exception (convert plural to singular).
 
-    singular_word 'cactus', 'cacti'
-
     # General rules.
-
-    rule 'hive' , 'hives'
+    rule 'person' , 'people', true
+    rule 'shoe'   , 'shoes', true
+    rule 'hive'   , 'hives', true
+    rule 'man'    , 'men', true
+    rule 'child'  , 'children', true
+    rule 'news'   , 'news', true
     rule 'rf'   , 'rves'
     rule 'af'   , 'aves'
     rule 'ero'  , 'eroes'
@@ -270,6 +305,13 @@ module English
     rule 'y'    , 'ies'
     rule 'x'    , 'xes'
     rule 'lf'   , 'lves'
+    rule 'ffe'  , 'ffes'
+    rule 'afe'  , 'aves'
+    rule 'ouse' , 'ouses'
+    # more cases of words ending in -oses not being singularized properly
+    # than cases of words ending in -osis
+#    rule 'osis' , 'oses'
+    rule 'ox'   , 'oxes'
     rule 'us'   , 'uses'
     rule ''     , 's'
 
@@ -281,8 +323,11 @@ module English
 
     # One-way plural rules.
 
-    plural_rule 'fe' , 'ves' # safe, wife
-    plural_rule 's'  , 'ses'
+    #plural_rule 'fe' , 'ves' # safe, wife
+    plural_rule 's'   , 'ses'
+    plural_rule 'ive' , 'ives' # don't want to snag wife
+    plural_rule 'fe'  , 'ves'  # don't want to snag perspectives  
+    
 
   end
 end