verbs 2.3.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbdce4813c2a5b0f03af2fb7ec38baabc6eb64bd4394cc94fa4c330cbfbb5ab1
-  data.tar.gz: acf35a43147e32c004af60c591ae4070752856a108f11436fcb3faf9af955d11
+  metadata.gz: e723eb9d358a2b674c497f70192e6172ba18d20fa472e588e38adcbf9f318a54
+  data.tar.gz: 8f88abec47d56529a4ec23c1b45b58d940fc1b7c6b6ceaf3f86d46b75c3591a8
 SHA512:
-  metadata.gz: c6a4752df14975eddac3c03a21e89e707078b0768ab2b177b6021be8e8d0cc2a80f6622b68397a100cd88232bcfce199b585da9c0e72f7bb5a190346a5b939c6
-  data.tar.gz: bc648fd9cf599de7a9743ac2810f0e26b6c4f677e238ef9b65ef827ad9d325057ead500227ea2a292358cfd9a607ba93366fa2f249818da7f6ef6e7e0fa8fcef
+  metadata.gz: 708d985dffabeee18e46906f1e976dc988a92c85e12db77a04f0319b0f73f8e25c03d884fee19393b4909160c8a631abc12dfcdbef80c739217e67cfb1becf5c
+  data.tar.gz: 64cab548cb88b306788ac88f05ee26628cbd60c72d7b7a9987b54ab988b03ca24782fb84870917ee06c6790abefea4a1029e6fdb8f0710a9f27dd2a9f9b464d9

data/README.rdoc

@@ -31,7 +31,7 @@ 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>.
+One of <tt>:habitual</tt>, <tt>:perfect</tt>, <tt>:perfective</tt>, <tt>:progressive</tt>, or <tt>:prospective</tt>. Defaults to <tt>:habitual</tt> (<tt>:perfective</tt> for past tense).
 
 See below for a guide to verb aspect.
 

data/lib/verbs/conjugator.rb

@@ -1,10 +1,10 @@
 # The program conjugates most common english verbs with the following option:
-# * :tense => :past or :present or :future
-# * :person => :first or :second or :third
-# * :plurality => :singular or :plural
-# * :aspect => :habitual or :perfect or :perfective or :progressive or :prospective
-# * :mood => :indicative or :imperative or :subjunctive
-# Respective defaults are :present, :third, :singular, :habitual, and :indicative
+# * :tense => :past or :present or :future (default: :present)
+# * :person => :first or :second or :third (default: :third)
+# * :plurality => :singular or :plural (default: :singular)
+# * :aspect => :habitual or :perfect or :perfective or :progressive or :prospective (default: :habitual, or :perfective for past tense)
+# * :mood => :indicative or :imperative or :subjunctive (default: :indicative)
+# * :diathesis => :active or :passive (default: :active)
 #
 # Author::    Andy Rossmeissl
 # Copyright:: Copyright (c) 2009 Andy Rossmeissl
@@ -77,7 +77,7 @@ module Verbs
       plurality = options[:plurality] || :singular   # singular, plural
       diathesis = options[:diathesis] || :active     # active, passive
       mood = options[:mood] ||           :indicative # imperative, subjunctive
-      aspect = options[:aspect] ||       :habitual   # perfective, habitual, progressive, perfect, prospective
+      aspect = options[:aspect] ||       default_aspect(options) # perfective, habitual, progressive, perfect, prospective
 
       check_for_improper_constructions(infinitive, tense, person, mood, diathesis) # find incompatabilities
       form = form_for(tense, aspect, diathesis)                                    # find form array based on tense and aspect
@@ -328,5 +328,9 @@ module Verbs
         raise Verbs::ImproperConstruction, 'There is no passive diathesis for the copula'
       end
     end
+
+    def default_aspect(options)
+      options[:tense] == :past ? :perfective : :habitual
+    end
   end
 end

data/lib/verbs/version.rb

@@ -1,3 +1,3 @@
 module Verbs
-  VERSION = "2.3.1"
+  VERSION = "3.0.0"
 end

data/test/test_verbs.rb

@@ -9,6 +9,9 @@ class TestVerbs < Test::Unit::TestCase
     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)
 
+    # past
+    assert_equal 'was', Verbs::Conjugator.conjugate(:be, :tense => :past)
+
     # past habitual
     assert_equal 'used to be', Verbs::Conjugator.conjugate(:be, :tense => :past, :person => :first, :plurality => :singular, :aspect => :habitual)
     assert_equal 'used to be', Verbs::Conjugator.conjugate(:be, :tense => :past, :person => :second, :plurality => :singular, :aspect => :habitual)
@@ -40,6 +43,7 @@ class TestVerbs < Test::Unit::TestCase
     assert_equal 'has', Verbs::Conjugator.conjugate(:have, :tense => :present, :person => :third, :plurality => :singular, :aspect => :habitual)
   end
   def test_know
+    assert_equal 'knew', Verbs::Conjugator.conjugate(:know, :tense => :past)
     assert_equal 'had known', Verbs::Conjugator.conjugate(:know, :tense => :past, :person => :third, :plurality => :singular, :aspect => :perfect)
     assert_equal 'knew', Verbs::Conjugator.conjugate(:know, :tense => :past, :person => :third, :plurality => :singular, :aspect => :perfective)
     assert_equal 'was knowing', Verbs::Conjugator.conjugate(:know, :tense => :past, :person => :third, :plurality => :singular, :aspect => :progressive)
@@ -113,7 +117,7 @@ class TestVerbs < Test::Unit::TestCase
   end
   def test_aspects
     Verbs::Conjugator.with_options :person => :first, :plurality => :singular, :subject => true do |standard|
-      assert_equal 'I used to accept',        standard.conjugate(:accept, :tense => :past, :aspect => :habitual)
+      assert_equal 'I used to accept',          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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: verbs
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Andy Rossmeissl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit