verbs 2.1.2 → 2.1.3

data/README.rdoc

@@ -70,7 +70,8 @@ Set this to a string to prepend the conjugated verb with it. When set to <tt>tru
 * {Lingua::Conjugate}[http://cpansearch.perl.org/src/RWG/Lingua-EN-Conjugate-0.308/lib/Lingua/EN/Conjugate.pm]
 * {Pat Byrd and Tom McKlin}[http://www2.gsu.edu/~wwwesl/egw/pluralsv.htm]
 * {Rick Harrison}[http://www.rickharrison.com/language/aspect.html]
+* {Anatoli Makarevich}[https://github.com/makaroni4] for {#6}[https://github.com/rossmeissl/verbs/pull/6]
 
 == Copyright
 
-Copyright (c) 2009 Andy Rossmeissl. See LICENSE for details.
+Copyright (c) 2012 Andy Rossmeissl. See LICENSE for details.

data/lib/verbs/conjugator.rb

@@ -152,28 +152,20 @@ module Verbs
     end
 
     def present_third_person_singular_form_for(verb)
-      infinitive = case verb
-      when Verb
-        verb.infinitive
-      when String, Symbol
-        verb.to_sym
-      end
-      if infinitive.to_s.match(/#{CONSONANT_PATTERN}y$/)
-        infinitive.to_s.gsub(/y$/, 'ies').to_sym
-      elsif infinitive.to_s.match(/[szx]$/) or infinitive.to_s.match(/[sc]h$/)
-        infinitive.to_s.concat('es').to_sym
+      infinitive = verb.is_a?(Verb) ? verb.infinitive.to_s : verb.to_s
+
+      if infinitive =~ /[a-z&&#{CONSONANT_PATTERN}]y$/i
+        infinitive[0..-2] + 'ies'
+      elsif infinitive =~ /(ss|sh|t?ch|zz|x|#{CONSONANT_PATTERN}o)$/i
+        infinitive + 'es'
       else
-        infinitive.to_s.concat('s').to_sym
+        infinitive + 's'
       end
     end
 
     def regular_preterite_for(verb)
-      infinitive = case verb
-      when Verb
-        verb.infinitive
-      when String, Symbol
-        verb.to_sym
-      end
+      infinitive = verb.is_a?(Verb) ? verb.infinitive.to_s : verb.to_s
+      
       if verb.to_s.match(/#{CONSONANT_PATTERN}#{VOWEL_PATTERN}#{DOUBLED_CONSONANT_PATTERN}$/) and !conjugations.single_terminal_consonants.include?(verb)
         regular_preterite_with_doubled_terminal_consonant_for verb
       elsif verb.to_s.match(/#{CONSONANT_PATTERN}e$/) or verb.to_s.match(/ye$/) or verb.to_s.match(/oe$/) or verb.to_s.match(/nge$/) or verb.to_s.match(/ie$/) or verb.to_s.match(/ee$/)

data/lib/verbs/version.rb

@@ -1,3 +1,3 @@
 module Verbs
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
 end

data/test/test_verbs.rb

@@ -123,4 +123,22 @@ class TestVerbs < Test::Unit::TestCase
       Verbs::Conjugator.conjugate(:accept, :mood => :imperative)
     end
   end
+
+  def test_s_forms
+    Verbs::Conjugator.with_options :person => :third, :tense => :present do |standard|
+      assert_equal 'does', standard.conjugate('do')
+      assert_equal 'flies', standard.conjugate('fly')
+      assert_equal 'assesses', standard.conjugate('assess')
+      assert_equal 'blushes', standard.conjugate('blush')
+      assert_equal 'catches', standard.conjugate('catch')
+      assert_equal 'fizzes', standard.conjugate('fizz')
+      assert_equal 'relaxes', standard.conjugate('relax')
+      assert_equal 'bakes', standard.conjugate('bake')
+      assert_equal 'calls', standard.conjugate('call')
+      assert_equal 'dies', standard.conjugate('die')
+      assert_equal 'glues', standard.conjugate('glue')
+      assert_equal 'moos', standard.conjugate('moo')
+      assert_equal 'changes', standard.conjugate('change')
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: verbs
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2013-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bueller
@@ -98,7 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -499867661
+      hash: -427894591
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -499867661
+      hash: -427894591
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24