verbs 2.0.1 → 2.0.3

data/README.rdoc

@@ -2,18 +2,13 @@
 
 Conjugates most common english verbs for all persons in present and past tense (active diathesis, indicative mood). Standard and exceptional spelling rules are obeyed.
 
-  >> Verbs::Conjugator.conjugate :be, :tense => :past, :person => :second, :plurality => :singular
+  >> Verbs::Conjugator.conjugate :be, :tense => :past, :person => :second, :plurality => :singular, :aspect => :perfective
   => :were
-  >> Verbs::Conjugator.conjugate :break, :tense => :past, :person => :second, :plurality => :singular
-  => :broke
-  >> Verbs::Conjugator.conjugate :fly, :tense => :present, :person => :third, :plurality => :singular
-  => :flies
-  >> Verbs::Conjugator.conjugate :ship, :tense => :past, :person => :second, :plurality => :singular
-  => :shipped
-  >> Verbs::Conjugator.conjugate :hoe, :tense => :past, :person => :second, :plurality => :singular
-  => :hoed
-  >> Verbs::Conjugator.conjugate :coax, :tense => :present, :person => :second, :plurality => :singular
-  => :coax
+  >> 'be nice'.verb.conjugate :subject => 'Matz'
+  => "Matz is nice"
+  >> :sleep.verb.conjugate :tense => :future, :person => :first, :plurality => :singular, :aspect => :progressive, :subject => true
+  => :"I will be sleeping"
+
   
 == Installation
 
@@ -21,6 +16,32 @@ The gem is hosted at http://gemcutter.org/gems/verbs
 
   gem install verbs
   
+== Options
+
+This library takes a rather strict view of English verb conjugation.
+
+=== <tt>:tense</tt>
+
+One of <tt>:past</tt>, <tt>:present</tt>, or <tt>:future</tt>. Defaults to <tt>:present</tt>.
+
+=== <tt>:person</tt>
+
+One of <tt>:first</tt>, <tt>:second</tt>, or <tt>:third</tt>. Defaults to <tt>:third</tt>.
+
+=== <tt>:plurality</tt>
+
+Either <tt>:singular</tt> or <tt>:plural</tt>. Defaults to <tt>:singular</tt>.
+
+=== <tt>:aspect</tt>
+
+One of <tt>:habitual</tt>, <tt>:perfect</tt>, <tt>:perfective</tt>, <tt>:progressive</tt>, or <tt>:prospective</tt>. Defaults to <tt>:habitual</tt>.
+
+See below for a guide to verb aspect.
+
+=== <tt>:subject</tt>
+
+Set this to a string to prepend the conjugated verb with it. When set to <tt>true</tt>, a standard personal pronoun will be used.
+
 == Tense/aspect quick reference
 
   EXAMPLE                   TENSE    ASPECT

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.3

data/lib/verbs/conjugator.rb

@@ -46,7 +46,8 @@ module Verbs
       
       conjugation = form.map { |e| resolve e, infinitive, tense, person, plurality }.join(' ').strip
       
-      if actor = options.delete(:subject)
+      if options[:subject]
+        actor = options.delete(:subject)
         actor = subject(options).humanize if actor.is_a?(TrueClass)
       end
       
@@ -106,8 +107,8 @@ module Verbs
     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
+      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
       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$/)

data/test/test_verbs.rb

@@ -70,6 +70,9 @@ class TestVerbs < Test::Unit::TestCase
     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_conjugation_with_false_subject
+    assert_equal 'accepts', Verbs::Conjugator.conjugate(:accept, :subject => false)
+  end
   def test_core_access
     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)

data/verbs.gemspec

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