verbs 1.0.3 → 1.0.4

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/lib/verbs/conjugations.rb

@@ -15,6 +15,21 @@ Verbs::Conjugator.conjugations do |conjugate|
     verb.form :been,  :tense => :past,    :derivative => :participle
   end
 
+  conjugate.irregular :have do |verb| 
+    verb.form :have,   :tense => :present, :person => :first,  :plurality => :singular
+    verb.form :has,    :tense => :present, :person => :third,  :plurality => :singular
+    verb.form :have,   :tense => :present, :person => :second, :plurality => :singular
+    verb.form :have,   :tense => :present, :person => :first,  :plurality => :plural
+    verb.form :have,   :tense => :present, :person => :third,  :plurality => :plural
+    verb.form :had,    :tense => :past,    :person => :first,  :plurality => :singular
+    verb.form :had,    :tense => :past,    :person => :third,  :plurality => :singular
+    verb.form :had,    :tense => :past,    :person => :second, :plurality => :singular
+    verb.form :had,    :tense => :past,    :person => :first,  :plurality => :plural
+    verb.form :had,    :tense => :past,    :person => :third,  :plurality => :plural
+    verb.form :having, :tense => :present, :derivative => :participle
+    verb.form :had,    :tense => :past,    :derivative => :participle
+  end
+
   # http://cpansearch.perl.org/src/RWG/Lingua-EN-Conjugate-0.308/lib/Lingua/EN/Conjugate.pm
   conjugate.irregular :awake, :awoke, :awoken
   conjugate.irregular :bear, :bore, :born
@@ -76,7 +91,6 @@ Verbs::Conjugator.conjugations do |conjugate|
   conjugate.irregular :grind, :ground, :ground
   conjugate.irregular :grow, :grew, :grown
   conjugate.irregular :hang, :hung, :hung
-  conjugate.irregular :have, :had, :had
   conjugate.irregular :hear, :heard, :heard
   conjugate.irregular :hide, :hid, :hidden
   conjugate.irregular :hit, :hit, :hit

data/lib/verbs/conjugator.rb

@@ -35,11 +35,12 @@ module Verbs
     end
     
     def conjugate(infinitive, options = {})
-      tense = options[:tense] ||         :present
-      person = options[:person] ||       :third
-      plurality = options[:plurality] || :singular
-      diathesis = options[:diathesis] || :active
-      mood = options[:mood] ||           :indicative
+      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 
       
       if verb = conjugations.irregulars[infinitive]
         verb[options] || conjugate_irregular(verb, options)

data/test/test_verbs.rb

@@ -24,6 +24,7 @@ class TestVerbs < Test::Unit::TestCase
     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) 
   end
   def test_irregular_conjugation_with_terminal_y
     assert_equal :flies, Verbs::Conjugator.conjugate(:fly, :tense => :present, :person => :third, :plurality => :singular) 

data/verbs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{verbs}
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Rossmeissl"]
-  s.date = %q{2009-11-25}
+  s.date = %q{2009-12-03}
   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.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-25 00:00:00 -05:00
+date: 2009-12-03 00:00:00 -05:00
 default_executable: 
 dependencies: []