verbs 2.0.5 → 2.0.8

data/README.rdoc

@@ -1,6 +1,6 @@
 = verbs
 
-Conjugates most common english verbs for all persons in present and past tense (active diathesis, indicative mood). Standard and exceptional spelling rules are obeyed.
+Conjugates most common english verbs for all persons in all tenses and all standard aspects (with active diathesis and indicative mood). Standard and exceptional spelling rules are obeyed.
 
   >> Verbs::Conjugator.conjugate :be, :tense => :past, :person => :second, :plurality => :singular, :aspect => :perfective
   => :were

data/Rakefile

@@ -6,12 +6,12 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "verbs"
     gem.summary = %Q{English verb conjugation in Ruby}
-    gem.description = %Q{Conjugates most common english verbs for all persons in present and past tense (active diathesis, indicative mood). Standard and exceptional spelling rules are obeyed.}
+    gem.description = %Q{Conjugates most common english verbs for all persons in all tenses and all standard aspects (with active diathesis and indicative mood). Standard and exceptional spelling rules are obeyed.}
     gem.email = "andy@rossmeissl.net"
     gem.homepage = "http://github.com/rossmeissl/verbs"
     gem.authors = ["Andy Rossmeissl"]
-    gem.add_dependency 'andand'
-    gem.add_dependency 'activesupport'
+    gem.add_dependency 'andand', '>=1.3.1'
+    gem.add_dependency 'activesupport', '>=2.3.4'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-2.0.5
+2.0.8

data/lib/verbs.rb

@@ -4,11 +4,13 @@ require 'verbs/conjugator'
 require 'verbs/conjugations'
 require 'verbs/verblike'
 require 'andand'
-require 'activesupport'
+require 'active_support'
 
 module Verbs
   CONSONANTS = %w(b c d f g h j k l m n p q r s t v w x z)
   CONSONANT_PATTERN = "[#{CONSONANTS.join}]"
+  DOUBLED_CONSONANTS = %w(b c d f g h j k l m n p q r s t w z)
+  DOUBLED_CONSONANT_PATTERN = "[#{DOUBLED_CONSONANTS.join}]"
   VOWELS = %w(a e i o u y)
   VOWEL_PATTERN = "[#{VOWELS.join}]"
-end
+end

data/lib/verbs/conjugator.rb

@@ -1,16 +1,16 @@
 module Verbs
   module Conjugator
     extend self
-  
+
     class Conjugations
       include Singleton
-  
+
       attr_reader :irregulars, :single_terminal_consonants, :copulars
-  
+
       def initialize
         @irregulars, @single_terminal_consonants, @copulars = {}, [], {}
       end
-  
+
       def irregular(infinitive, preterite = nil, past_participle = nil, &blk)
         if block_given?
           irregular = ::Verbs::Verb.new infinitive, &blk
@@ -20,12 +20,12 @@ module Verbs
         end
         @irregulars[infinitive] = irregular
       end
-  
+
       def single_terminal_consonant(infinitive)
         @single_terminal_consonants << infinitive
       end
     end
-    
+
     def conjugations
       if block_given?
         yield Conjugations.instance
@@ -33,7 +33,7 @@ module Verbs
         Conjugations.instance
       end
     end
-    
+
     def conjugate(infinitive, options = {})
       tense = options[:tense] ||         :present    # present, past, future
       person = options[:person] ||       :third      # first, second, third
@@ -41,19 +41,19 @@ module Verbs
       diathesis = options[:diathesis] || :active     # active, passive
       mood = options[:mood] ||           :indicative # conditional, imperative, indicative, injunctive, optative, potential, subjunctive
       aspect = options[:aspect] ||       :habitual   # perfective, habitual, progressive, perfect, prospective
-      
+
       form = form_for(tense, aspect)
-      
+
       conjugation = form.map { |e| resolve e, infinitive, tense, person, plurality }.join(' ').strip
-      
+
       if options[:subject]
         actor = options.delete(:subject)
         actor = subject(options).humanize if actor.is_a?(TrueClass)
       end
-      
+
       "#{actor} #{conjugation}".strip
     end
-    
+
     def subject(options)
       case [options[:person], options[:plurality]]
       when [:first, :singular]
@@ -68,9 +68,9 @@ module Verbs
         'they'
       end
     end
-    
+
     private
-    
+
     def resolve(element, infinitive, tense, person, plurality)
       case element
       when String
@@ -83,11 +83,11 @@ module Verbs
         inflect element, tense, person, plurality
       end
     end
-    
+
     def inflect(infinitive, inflection, person, plurality)
       send(*([inflection, infinitive, person, plurality][0, method(inflection).arity + 1]))
     end
-    
+
     def present(infinitive, person, plurality)
       if verb = conjugations.irregulars[infinitive]
         conjugate_irregular(verb, :tense => :present, :person => person, :plurality => plurality)
@@ -97,7 +97,7 @@ module Verbs
         infinitive
       end
     end
-    
+
     def past(infinitive, person, plurality)
       if verb = conjugations.irregulars[infinitive]
         conjugate_irregular(verb, :tense => :past, :person => person, :plurality => plurality)
@@ -105,7 +105,7 @@ module Verbs
         regular_preterite_for infinitive
       end
     end
-    
+
     def present_participle(infinitive)
       if infinitive.to_s.match(/#{CONSONANT_PATTERN}#{VOWEL_PATTERN}#{CONSONANT_PATTERN}$/) and !conjugations.single_terminal_consonants.include?(infinitive)
         present_participle_with_doubled_terminal_consonant_for infinitive
@@ -119,7 +119,7 @@ module Verbs
         infinitive.to_s[0..-1].concat('ing').to_sym
       end
     end
-    
+
     def past_participle(infinitive)
       if verb = conjugations.irregulars[infinitive]
         conjugate_irregular(verb, :tense => :past, :derivative => :participle)
@@ -127,10 +127,10 @@ module Verbs
         regular_preterite_for infinitive
       end
     end
-    
+
     def conjugate_irregular(verb, options)
       return verb[options] if verb[options]
-      
+
       tense = options[:tense]
       person = options[:person]
       plurality = options[:plurality]
@@ -146,7 +146,7 @@ module Verbs
         verb.preterite
       end
     end
-    
+
     def present_third_person_singular_form_for(verb)
       infinitive = case verb
       when Verb
@@ -162,7 +162,7 @@ module Verbs
         infinitive.to_s.concat('s').to_sym
       end
     end
-    
+
     def regular_preterite_for(verb)
       infinitive = case verb
       when Verb
@@ -170,7 +170,7 @@ module Verbs
       when String, Symbol
         verb.to_sym
       end
-      if verb.to_s.match(/#{VOWEL_PATTERN}#{CONSONANT_PATTERN}$/) and !conjugations.single_terminal_consonants.include?(verb)
+      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$/)
         infinitive.to_s.concat('d').to_sym
@@ -180,15 +180,15 @@ module Verbs
         infinitive.to_s.concat('ed').to_sym
       end
     end
-    
+
     def regular_preterite_with_doubled_terminal_consonant_for(verb)
       regular_preterite_for verb.to_s.concat(verb.to_s[-1,1]).to_sym
     end
-    
+
     def present_participle_with_doubled_terminal_consonant_for(verb)
       present_participle verb.to_s.concat(verb.to_s[-1,1]).to_sym
     end
-    
+
     def form_for(tense, aspect)
       form = []
       if tense == :future

data/test/test_verbs.rb

@@ -13,44 +13,53 @@ class TestVerbs < Test::Unit::TestCase
     assert_equal 'were', Verbs::Conjugator.conjugate(:be, :tense => :past, :person => :first, :plurality => :plural, :aspect => :perfective)
     assert_equal 'were', Verbs::Conjugator.conjugate(:be, :tense => :past, :person => :third, :plurality => :plural, :aspect => :perfective)
   end
-  def test_irregular_conjugation 
-    assert_equal 'break', Verbs::Conjugator.conjugate(:break, :tense => :present, :person => :first, :plurality => :singular, :aspect => :habitual) 
-    assert_equal 'break', Verbs::Conjugator.conjugate(:break, :tense => :present, :person => :second, :plurality => :singular, :aspect => :habitual) 
-    assert_equal 'breaks', Verbs::Conjugator.conjugate(:break, :tense => :present, :person => :third, :plurality => :singular, :aspect => :habitual) 
-    assert_equal 'break', Verbs::Conjugator.conjugate(:break, :tense => :present, :person => :first, :plurality => :plural, :aspect => :habitual) 
-    assert_equal 'break', Verbs::Conjugator.conjugate(:break, :tense => :present, :person => :third, :plurality => :plural, :aspect => :habitual) 
-    assert_equal 'broke', Verbs::Conjugator.conjugate(:break, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective) 
-    assert_equal 'broke', Verbs::Conjugator.conjugate(:break, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective) 
-    assert_equal 'broke', Verbs::Conjugator.conjugate(:break, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective) 
-    assert_equal 'broke', Verbs::Conjugator.conjugate(:break, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective) 
-    assert_equal 'broke', Verbs::Conjugator.conjugate(:break, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective) 
-    assert_equal 'has', Verbs::Conjugator.conjugate(:have, :tense => :present, :person => :third, :plurality => :singular, :aspect => :habitual) 
+  def test_irregular_conjugation
+    assert_equal 'break', Verbs::Conjugator.conjugate(:break, :tense => :present, :person => :first, :plurality => :singular, :aspect => :habitual)
+    assert_equal 'break', Verbs::Conjugator.conjugate(:break, :tense => :present, :person => :second, :plurality => :singular, :aspect => :habitual)
+    assert_equal 'breaks', Verbs::Conjugator.conjugate(:break, :tense => :present, :person => :third, :plurality => :singular, :aspect => :habitual)
+    assert_equal 'break', Verbs::Conjugator.conjugate(:break, :tense => :present, :person => :first, :plurality => :plural, :aspect => :habitual)
+    assert_equal 'break', Verbs::Conjugator.conjugate(:break, :tense => :present, :person => :third, :plurality => :plural, :aspect => :habitual)
+    assert_equal 'broke', Verbs::Conjugator.conjugate(:break, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
+    assert_equal 'broke', Verbs::Conjugator.conjugate(:break, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
+    assert_equal 'broke', Verbs::Conjugator.conjugate(:break, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
+    assert_equal 'broke', Verbs::Conjugator.conjugate(:break, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
+    assert_equal 'broke', Verbs::Conjugator.conjugate(:break, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
+    assert_equal 'has', Verbs::Conjugator.conjugate(:have, :tense => :present, :person => :third, :plurality => :singular, :aspect => :habitual)
   end
   def test_irregular_conjugation_with_terminal_y
-    assert_equal 'flies', Verbs::Conjugator.conjugate(:fly, :tense => :present, :person => :third, :plurality => :singular, :aspect => :habitual) 
-    assert_equal 'carried', Verbs::Conjugator.conjugate(:carry, :tense => :past, :person => :third, :plurality => :singular, :aspect => :perfective) 
-    assert_equal 'stayed', Verbs::Conjugator.conjugate(:stay, :tense => :past, :person => :third, :plurality => :singular, :aspect => :perfective) 
+    assert_equal 'flies', Verbs::Conjugator.conjugate(:fly, :tense => :present, :person => :third, :plurality => :singular, :aspect => :habitual)
+    assert_equal 'carried', Verbs::Conjugator.conjugate(:carry, :tense => :past, :person => :third, :plurality => :singular, :aspect => :perfective)
+    assert_equal 'stayed', Verbs::Conjugator.conjugate(:stay, :tense => :past, :person => :third, :plurality => :singular, :aspect => :perfective)
   end
   def test_regular_conjugation
-    assert_equal 'accept', Verbs::Conjugator.conjugate(:accept, :tense => :present, :person => :first, :plurality => :singular, :aspect => :habitual) 
-    assert_equal 'accept', Verbs::Conjugator.conjugate(:accept, :tense => :present, :person => :second, :plurality => :singular, :aspect => :habitual) 
-    assert_equal 'accepts', Verbs::Conjugator.conjugate(:accept, :tense => :present, :person => :third, :plurality => :singular, :aspect => :habitual) 
-    assert_equal 'accept', Verbs::Conjugator.conjugate(:accept, :tense => :present, :person => :first, :plurality => :plural, :aspect => :habitual) 
-    assert_equal 'accept', Verbs::Conjugator.conjugate(:accept, :tense => :present, :person => :third, :plurality => :plural, :aspect => :habitual) 
-    assert_equal 'accepted', Verbs::Conjugator.conjugate(:accept, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective) 
-    assert_equal 'accepted', Verbs::Conjugator.conjugate(:accept, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective) 
-    assert_equal 'accepted', Verbs::Conjugator.conjugate(:accept, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective) 
-    assert_equal 'accepted', Verbs::Conjugator.conjugate(:accept, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective) 
-    assert_equal 'accepted', Verbs::Conjugator.conjugate(:accept, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective) 
+    assert_equal 'accept', Verbs::Conjugator.conjugate(:accept, :tense => :present, :person => :first, :plurality => :singular, :aspect => :habitual)
+    assert_equal 'accept', Verbs::Conjugator.conjugate(:accept, :tense => :present, :person => :second, :plurality => :singular, :aspect => :habitual)
+    assert_equal 'accepts', Verbs::Conjugator.conjugate(:accept, :tense => :present, :person => :third, :plurality => :singular, :aspect => :habitual)
+    assert_equal 'accept', Verbs::Conjugator.conjugate(:accept, :tense => :present, :person => :first, :plurality => :plural, :aspect => :habitual)
+    assert_equal 'accept', Verbs::Conjugator.conjugate(:accept, :tense => :present, :person => :third, :plurality => :plural, :aspect => :habitual)
+    assert_equal 'accepted', Verbs::Conjugator.conjugate(:accept, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
+    assert_equal 'accepted', Verbs::Conjugator.conjugate(:accept, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
+    assert_equal 'accepted', Verbs::Conjugator.conjugate(:accept, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
+    assert_equal 'accepted', Verbs::Conjugator.conjugate(:accept, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
+    assert_equal 'accepted', Verbs::Conjugator.conjugate(:accept, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
   end
   def test_regular_conjugation_with_terminal_single_consonant
-    assert_equal 'shipped', Verbs::Conjugator.conjugate(:ship, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective) 
+    assert_equal 'shipped', Verbs::Conjugator.conjugate(:ship, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
   end
   def test_regular_conjugation_with_irregular_terminal_consonant
-    assert_equal 'abandoned', Verbs::Conjugator.conjugate(:abandon, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective) 
+    assert_equal 'abandoned', Verbs::Conjugator.conjugate(:abandon, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
+  end
+  def test_regular_conjugation_with_ean_suffix
+    assert_equal 'cleaned',  Verbs::Conjugator.conjugate(:clean, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
+    assert_equal 'am cleaning', Verbs::Conjugator.conjugate(:clean, :tense => :present, :person => :first, :plurality => :singular, :aspect => :progressive)
+  end
+  def test_regular_non_doubled_ending_consonant
+    assert_equal 'fixes', Verbs::Conjugator.conjugate(:fix, :tense => :present, :person => :third, :plurality => :singular, :aspect => :habitual)
+    assert_equal 'fixed',  Verbs::Conjugator.conjugate(:fix, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
+    assert_equal 'faxed',  Verbs::Conjugator.conjugate(:fix, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
   end
   def test_regular_conjugation_with_terminal_e
-    assert_equal 'created', Verbs::Conjugator.conjugate(:create, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective) 
+    assert_equal 'created', Verbs::Conjugator.conjugate(:create, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
   end
   def test_regular_conjugation_with_unusual_terminal_e
     assert_equal 'dyed', Verbs::Conjugator.conjugate(:dye, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)

data/verbs.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{verbs}
-  s.version = "2.0.5"
+  s.version = "2.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Rossmeissl"]
-  s.date = %q{2009-12-10}
-  s.description = %q{Conjugates most common english verbs for all persons in present and past tense (active diathesis, indicative mood). Standard and exceptional spelling rules are obeyed.}
+  s.date = %q{2010-03-29}
+  s.description = %q{Conjugates most common english verbs for all persons in all tenses and all standard aspects (with active diathesis and indicative mood). Standard and exceptional spelling rules are obeyed.}
   s.email = %q{andy@rossmeissl.net}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -47,15 +47,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<andand>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<andand>, [">= 1.3.1"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
     else
-      s.add_dependency(%q<andand>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<andand>, [">= 1.3.1"])
+      s.add_dependency(%q<activesupport>, [">= 2.3.4"])
     end
   else
-    s.add_dependency(%q<andand>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<andand>, [">= 1.3.1"])
+    s.add_dependency(%q<activesupport>, [">= 2.3.4"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: verbs
 version: !ruby/object:Gem::Version 
-  version: 2.0.5
+  version: 2.0.8
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-10 00:00:00 -05:00
+date: 2010-03-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.3.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -30,9 +30,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.3.4
     version: 
-description: Conjugates most common english verbs for all persons in present and past tense (active diathesis, indicative mood). Standard and exceptional spelling rules are obeyed.
+description: Conjugates most common english verbs for all persons in all tenses and all standard aspects (with active diathesis and indicative mood). Standard and exceptional spelling rules are obeyed.
 email: andy@rossmeissl.net
 executables: []