verbs 1.1.2 → 2.0.0

data/README.rdoc

@@ -21,10 +21,38 @@ The gem is hosted at http://gemcutter.org/gems/verbs
 
   gem install verbs
   
+== Tense/aspect quick reference
+
+<table>
+  <tr>
+    <th>Example</th>
+    <th>Tense</th>
+    <th>Aspect</th>
+  </tr>
+
+  <tr><td>I usually accepted</td><td>past</td><td>habitual</td></tr>
+  <tr><td>I had accepted</td><td>past</td><td>perfect</td></tr>
+  <tr><td>I accepted</td><td>past</td><td>perfective</td></tr>
+  <tr><td>I was accepting</td><td>past</td><td>progressive</td></tr>
+  <tr><td>I was about to accept</td><td>past</td><td>prospective</td></tr>
+  <tr><td>I accept</td><td>present</td><td>habitual</td></tr>
+  <tr><td>I have accepted</td><td>present</td><td>perfect</td></tr>
+  <tr><td>I am having accepted</td><td>present</td><td>perfective</td></tr>
+  <tr><td>I am accepting</td><td>present</td><td>progressive</td></tr>
+  <tr><td>I am about to accept</td><td>present</td><td>prospective</td></tr>
+  <tr><td>I will accept</td><td>future</td><td>habitual</td></tr>
+  <tr><td>I will have accepted</td><td>future</td><td>perfect</td></tr>
+  <tr><td>I will be having accepted future</td><td>perfective</td></tr>
+  <tr><td>I will be accepting</td><td>future</td><td>progressive</td></tr>
+  <tr><td>I will be about to accept future</td><td>prospective</td></tr>
+
+</table>
+  
 == Acknowledgements
 
 * {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]
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-1.1.2
+2.0.0

data/lib/verbs/conjugator.rb

@@ -35,28 +35,22 @@ module Verbs
     end
     
     def conjugate(infinitive, options = {})
-      # tense = options[:tense] ||         :present    # present, past, future
-      # person = options[:person] ||       :third      # first, second, third
-      # plurality = options[:plurality] || :singular   # singular, plural
-      # 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
+      tense = options[:tense] ||         :present    # present, past, future
+      person = options[:person] ||       :third      # first, second, third
+      plurality = options[:plurality] || :singular   # singular, plural
+      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 actor = options.delete(:subject)
         actor = subject(options).humanize if actor.is_a?(TrueClass)
       end
       
-      if verb = conjugations.irregulars[infinitive]
-        conjugation = verb[options] || conjugate_irregular(verb, options)
-      else
-        conjugation = conjugate_regular(infinitive, options)
-      end
-      
-      if actor
-        "#{actor} #{conjugation}"
-      else
-        conjugation
-      end
+      "#{actor} #{conjugation}".strip
     end
     
     def subject(options)
@@ -76,29 +70,79 @@ module Verbs
     
     private
     
-    def conjugate_irregular(verb, options)
-      tense = options[:tense]
-      person = options[:person]
-      plurality = options[:plurality]
-      if [tense, person, plurality] == [:present, :third, :singular]
-        present_third_person_singular_form_for verb
-      elsif tense == :present
-        verb.infinitive
-      elsif tense == :past
-        verb.preterite
+    def resolve(element, infinitive, tense, person, plurality)
+      case element
+      when String
+        element
+      when :infinitive
+        infinitive
+      when :present, :past, :present_participle, :past_participle
+        inflect infinitive, element, person, plurality
+      when Symbol
+        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)
+      elsif person == :third and plurality == :singular
+        present_third_person_singular_form_for infinitive
+      else
+        infinitive
+      end
+    end
+    
+    def past(infinitive, person, plurality)
+      if verb = conjugations.irregulars[infinitive]
+        conjugate_irregular(verb, :tense => :past, :person => person, :plurality => plurality)
+      else
+        regular_preterite_for infinitive
+      end
+    end
+    
+    def present_participle(infinitive)
+      if infinitive.to_s.match(/#{VOWEL_PATTERN}#{CONSONANT_PATTERN}$/) and !conjugations.single_terminal_consonants.include?(infinitive)
+        present_participle_with_doubled_terminal_consonant_for verb
+      elsif infinitive.to_s.match(/c$/)
+        infinitive.to_s.concat('king').to_sym
+      elsif infinitive.to_s.match(/ye$/) or infinitive.to_s.match(/oe$/) or infinitive.to_s.match(/nge$/) or infinitive.to_s.match(/ee$/)
+        infinitive.to_s.concat('ing').to_sym
+      elsif infinitive.to_s.match(/ie$/)
+        infinitive.to_s[0..-2].concat('ying').to_sym
+      else
+        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)
+      else
+        regular_preterite_for infinitive
       end
     end
     
-    def conjugate_regular(verb, options)
+    def conjugate_irregular(verb, options)
+      return verb[options] if verb[options]
+      
       tense = options[:tense]
       person = options[:person]
       plurality = options[:plurality]
+      derivative = options[:derivative]
+
       if [tense, person, plurality] == [:present, :third, :singular]
         present_third_person_singular_form_for verb
+      elsif [tense, derivative] == [:past, :participle]
+        verb.past_participle
       elsif tense == :present
-        verb
+        verb.infinitive
       elsif tense == :past
-        regular_preterite_for verb
+        verb.preterite
       end
     end
     
@@ -140,5 +184,29 @@ module Verbs
       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
+        form << 'will'
+        form << :infinitive if aspect == :habitual
+        form.concat ['have', :past_participle] if aspect == :perfect
+        form.concat ['be having', :past_participle] if aspect == :perfective
+        form.concat ['be', :present_participle] if aspect == :progressive
+        form.concat ['be about to', :infinitive] if aspect == :prospective
+      else
+        form.concat ['usually', :past_participle] if [tense, aspect] == [:past, :habitual]
+        form.concat [:have, :past_participle] if aspect == :perfect
+        form << :past if [tense, aspect] == [:past, :perfective]
+        form.concat [:be, :present_participle] if aspect == :progressive
+        form.concat [:be, 'about to', :infinitive] if aspect == :prospective
+        form << :present if [tense, aspect] == [:present, :habitual]
+        form.concat [:be, 'having', :past_participle] if [tense, aspect] == [:present, :perfective]
+      end
+      form
+    end
   end
 end

data/lib/verbs/verb.rb

@@ -1,6 +1,6 @@
 module Verbs
   class Verb
-    attr_reader :infinitive, :preterite
+    attr_reader :infinitive, :preterite, :past_participle
     
     def initialize(infinitive, options = {}, &blk)
       @infinitive = infinitive

data/test/test_verbs.rb

@@ -2,88 +2,95 @@ require 'helper'
 
 class TestVerbs < Test::Unit::TestCase
   def test_copular_conjugation
-    assert_equal :am, Verbs::Conjugator.conjugate(:be, :tense => :present, :person => :first, :plurality => :singular)
-    assert_equal :are, Verbs::Conjugator.conjugate(:be, :tense => :present, :person => :second, :plurality => :singular)
-    assert_equal :is, Verbs::Conjugator.conjugate(:be, :tense => :present, :person => :third, :plurality => :singular)
-    assert_equal :are, Verbs::Conjugator.conjugate(:be, :tense => :present, :person => :first, :plurality => :plural)
-    assert_equal :are, Verbs::Conjugator.conjugate(:be, :tense => :present, :person => :third, :plurality => :plural)
-    assert_equal :was, Verbs::Conjugator.conjugate(:be, :tense => :past, :person => :first, :plurality => :singular)
-    assert_equal :were, Verbs::Conjugator.conjugate(:be, :tense => :past, :person => :second, :plurality => :singular)
-    assert_equal :was, Verbs::Conjugator.conjugate(:be, :tense => :past, :person => :third, :plurality => :singular)
-    assert_equal :were, Verbs::Conjugator.conjugate(:be, :tense => :past, :person => :first, :plurality => :plural)
-    assert_equal :were, Verbs::Conjugator.conjugate(:be, :tense => :past, :person => :third, :plurality => :plural)
+    assert_equal 'am', Verbs::Conjugator.conjugate(:be, :tense => :present, :person => :first, :plurality => :singular, :aspect => :habitual)
+    assert_equal 'are', Verbs::Conjugator.conjugate(:be, :tense => :present, :person => :second, :plurality => :singular, :aspect => :habitual)
+    assert_equal 'is', Verbs::Conjugator.conjugate(:be, :tense => :present, :person => :third, :plurality => :singular, :aspect => :habitual)
+    assert_equal 'are', Verbs::Conjugator.conjugate(:be, :tense => :present, :person => :first, :plurality => :plural, :aspect => :habitual)
+    assert_equal 'are', Verbs::Conjugator.conjugate(:be, :tense => :present, :person => :third, :plurality => :plural, :aspect => :habitual)
+    assert_equal 'was', Verbs::Conjugator.conjugate(:be, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
+    assert_equal 'were', Verbs::Conjugator.conjugate(:be, :tense => :past, :person => :second, :plurality => :singular, :aspect => :perfective)
+    assert_equal 'was', Verbs::Conjugator.conjugate(:be, :tense => :past, :person => :third, :plurality => :singular, :aspect => :perfective)
+    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) 
-    assert_equal :break, Verbs::Conjugator.conjugate(:break, :tense => :present, :person => :second, :plurality => :singular) 
-    assert_equal :breaks, Verbs::Conjugator.conjugate(:break, :tense => :present, :person => :third, :plurality => :singular) 
-    assert_equal :break, Verbs::Conjugator.conjugate(:break, :tense => :present, :person => :first, :plurality => :plural) 
-    assert_equal :break, Verbs::Conjugator.conjugate(:break, :tense => :present, :person => :third, :plurality => :plural) 
-    assert_equal :broke, Verbs::Conjugator.conjugate(:break, :tense => :past, :person => :first, :plurality => :singular) 
-    assert_equal :broke, Verbs::Conjugator.conjugate(:break, :tense => :past, :person => :first, :plurality => :singular) 
-    assert_equal :broke, Verbs::Conjugator.conjugate(:break, :tense => :past, :person => :first, :plurality => :singular) 
-    assert_equal :broke, Verbs::Conjugator.conjugate(:break, :tense => :past, :person => :first, :plurality => :singular) 
-    assert_equal :broke, Verbs::Conjugator.conjugate(:break, :tense => :past, :person => :first, :plurality => :singular) 
-    assert_equal :has, Verbs::Conjugator.conjugate(:have, :tense => :present, :person => :third, :plurality => :singular) 
+    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) 
-    assert_equal :carried, Verbs::Conjugator.conjugate(:carry, :tense => :past, :person => :third, :plurality => :singular) 
-    assert_equal :stayed, Verbs::Conjugator.conjugate(:stay, :tense => :past, :person => :third, :plurality => :singular) 
+    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) 
-    assert_equal :accept, Verbs::Conjugator.conjugate(:accept, :tense => :present, :person => :second, :plurality => :singular) 
-    assert_equal :accepts, Verbs::Conjugator.conjugate(:accept, :tense => :present, :person => :third, :plurality => :singular) 
-    assert_equal :accept, Verbs::Conjugator.conjugate(:accept, :tense => :present, :person => :first, :plurality => :plural) 
-    assert_equal :accept, Verbs::Conjugator.conjugate(:accept, :tense => :present, :person => :third, :plurality => :plural) 
-    assert_equal :accepted, Verbs::Conjugator.conjugate(:accept, :tense => :past, :person => :first, :plurality => :singular) 
-    assert_equal :accepted, Verbs::Conjugator.conjugate(:accept, :tense => :past, :person => :first, :plurality => :singular) 
-    assert_equal :accepted, Verbs::Conjugator.conjugate(:accept, :tense => :past, :person => :first, :plurality => :singular) 
-    assert_equal :accepted, Verbs::Conjugator.conjugate(:accept, :tense => :past, :person => :first, :plurality => :singular) 
-    assert_equal :accepted, Verbs::Conjugator.conjugate(:accept, :tense => :past, :person => :first, :plurality => :singular) 
+    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) 
-    assert_equal :shipped, Verbs::Conjugator.conjugate(:ship, :tense => :past, :person => :first, :plurality => :singular) 
-    assert_equal :shipped, Verbs::Conjugator.conjugate(:ship, :tense => :past, :person => :first, :plurality => :singular) 
-    assert_equal :shipped, Verbs::Conjugator.conjugate(:ship, :tense => :past, :person => :first, :plurality => :singular) 
-    assert_equal :shipped, Verbs::Conjugator.conjugate(:ship, :tense => :past, :person => :first, :plurality => :singular) 
+    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) 
-    assert_equal :abandoned, Verbs::Conjugator.conjugate(:abandon, :tense => :past, :person => :first, :plurality => :singular) 
-    assert_equal :abandoned, Verbs::Conjugator.conjugate(:abandon, :tense => :past, :person => :first, :plurality => :singular) 
-    assert_equal :abandoned, Verbs::Conjugator.conjugate(:abandon, :tense => :past, :person => :first, :plurality => :singular) 
-    assert_equal :abandoned, Verbs::Conjugator.conjugate(:abandon, :tense => :past, :person => :first, :plurality => :singular) 
+    assert_equal 'abandoned', Verbs::Conjugator.conjugate(:abandon, :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) 
-    assert_equal :created, Verbs::Conjugator.conjugate(:create, :tense => :past, :person => :first, :plurality => :singular) 
-    assert_equal :created, Verbs::Conjugator.conjugate(:create, :tense => :past, :person => :first, :plurality => :singular) 
-    assert_equal :created, Verbs::Conjugator.conjugate(:create, :tense => :past, :person => :first, :plurality => :singular) 
-    assert_equal :created, Verbs::Conjugator.conjugate(:create, :tense => :past, :person => :first, :plurality => :singular) 
+    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)
-    assert_equal :hoed, Verbs::Conjugator.conjugate(:hoe, :tense => :past, :person => :first, :plurality => :singular)
-    assert_equal :singed, Verbs::Conjugator.conjugate(:singe, :tense => :past, :person => :first, :plurality => :singular)
-    assert_equal :tied, Verbs::Conjugator.conjugate(:tie, :tense => :past, :person => :first, :plurality => :singular)
-    assert_equal :agreed, Verbs::Conjugator.conjugate(:agree, :tense => :past, :person => :first, :plurality => :singular)
+    assert_equal 'dyed', Verbs::Conjugator.conjugate(:dye, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
+    assert_equal 'hoed', Verbs::Conjugator.conjugate(:hoe, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
+    assert_equal 'singed', Verbs::Conjugator.conjugate(:singe, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
+    assert_equal 'tied', Verbs::Conjugator.conjugate(:tie, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
+    assert_equal 'agreed', Verbs::Conjugator.conjugate(:agree, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
   end
   def test_conjugation_with_terminal_sibilance
-    assert_equal :passes, Verbs::Conjugator.conjugate(:pass, :tense => :present, :person => :third, :plurality => :singular)
-    assert_equal :buzzes, Verbs::Conjugator.conjugate(:buzz, :tense => :present, :person => :third, :plurality => :singular)
-    assert_equal :coaxes, Verbs::Conjugator.conjugate(:coax, :tense => :present, :person => :third, :plurality => :singular)
-    assert_equal :washes, Verbs::Conjugator.conjugate(:wash, :tense => :present, :person => :third, :plurality => :singular)
-    assert_equal :watches, Verbs::Conjugator.conjugate(:watch, :tense => :present, :person => :third, :plurality => :singular)
+    assert_equal 'passes', Verbs::Conjugator.conjugate(:pass, :tense => :present, :person => :third, :plurality => :singular, :aspect => :habitual)
+    assert_equal 'buzzes', Verbs::Conjugator.conjugate(:buzz, :tense => :present, :person => :third, :plurality => :singular, :aspect => :habitual)
+    assert_equal 'coaxes', Verbs::Conjugator.conjugate(:coax, :tense => :present, :person => :third, :plurality => :singular, :aspect => :habitual)
+    assert_equal 'washes', Verbs::Conjugator.conjugate(:wash, :tense => :present, :person => :third, :plurality => :singular, :aspect => :habitual)
+    assert_equal 'watches', Verbs::Conjugator.conjugate(:watch, :tense => :present, :person => :third, :plurality => :singular, :aspect => :habitual)
   end
   def test_conjugation_with_subject
-    assert_equal 'Matz is', Verbs::Conjugator.conjugate(:be, :tense => :present, :person => :third, :plurality => :singular, :subject => 'Matz')
-    assert_equal 'We are', Verbs::Conjugator.conjugate(:be, :tense => :present, :person => :first, :plurality => :plural, :subject => true)
+    assert_equal 'Matz is', Verbs::Conjugator.conjugate(:be, :tense => :present, :person => :third, :plurality => :singular, :subject => 'Matz', :aspect => :habitual)
+    assert_equal 'We are', Verbs::Conjugator.conjugate(:be, :tense => :present, :person => :first, :plurality => :plural, :subject => true, :aspect => :habitual)
   end
   def test_core_access
-    assert_equal :accepts, :accept.verb.conjugate(:tense => :present, :person => :third, :plurality => :singular)
-    assert_equal 'accepts', 'accept'.verb.conjugate(:tense => :present, :person => :third, :plurality => :singular)
+    assert_equal :accepts, :accept.verb.conjugate(:tense => :present, :person => :third, :plurality => :singular, :aspect => :habitual)
+    assert_equal 'accepts', 'accept'.verb.conjugate(:tense => :present, :person => :third, :plurality => :singular, :aspect => :habitual)
+  end
+  def test_aspects
+    Verbs::Conjugator.with_options :person => :first, :plurality => :singular, :subject => true do |standard|
+      assert_equal 'I usually accepted',        standard.conjugate(:accept, :tense => :past, :aspect => :habitual)
+      assert_equal 'I had accepted',            standard.conjugate(:accept, :tense => :past, :aspect => :perfect)
+      assert_equal 'I accepted',                standard.conjugate(:accept, :tense => :past, :aspect => :perfective)
+      assert_equal 'I was accepting',           standard.conjugate(:accept, :tense => :past, :aspect => :progressive)
+      assert_equal 'I was about to accept',     standard.conjugate(:accept, :tense => :past, :aspect => :prospective)
+      assert_equal 'I accept',                  standard.conjugate(:accept, :tense => :present, :aspect => :habitual)
+      assert_equal 'I have accepted',           standard.conjugate(:accept, :tense => :present, :aspect => :perfect)
+      assert_equal 'I am having accepted',      standard.conjugate(:accept, :tense => :present, :aspect => :perfective)
+      assert_equal 'I am accepting',            standard.conjugate(:accept, :tense => :present, :aspect => :progressive)
+      assert_equal 'I am about to accept',      standard.conjugate(:accept, :tense => :present, :aspect => :prospective)
+      assert_equal 'I will accept',             standard.conjugate(:accept, :tense => :future, :aspect => :habitual)
+      assert_equal 'I will have accepted',      standard.conjugate(:accept, :tense => :future, :aspect => :perfect)
+      assert_equal 'I will be having accepted', standard.conjugate(:accept, :tense => :future, :aspect => :perfective)
+      assert_equal 'I will be accepting',       standard.conjugate(:accept, :tense => :future, :aspect => :progressive)
+      assert_equal 'I will be about to accept', standard.conjugate(:accept, :tense => :future, :aspect => :prospective)
+    end
   end
 end

data/verbs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{verbs}
-  s.version = "1.1.2"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Rossmeissl"]
-  s.date = %q{2009-12-07}
+  s.date = %q{2009-12-09}
   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.email = %q{andy@rossmeissl.net}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: verbs
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 2.0.0
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-07 00:00:00 -05:00
+date: 2009-12-09 00:00:00 -05:00
 default_executable: 
 dependencies: []