verbs 2.1.2 → 2.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 39ca9a05484aea9907d487a1fd2d6c51bbe969040ae748411640076ae9cb4b50
+  data.tar.gz: fd81415cc5cad33a4ae06c1e7b45d26edb64bfc94acbf2fc2c0e29f576a228c1
+SHA512:
+  metadata.gz: 81bc1a48d71745e5443985abc0a7bb14c9e5548820eb1fa8c6455d81a14baa2928009a07a00e4d6561fac7afdfa3ba313b1e610a8af14e949c505fa6ec7f27cf
+  data.tar.gz: c16c9318396e3edf0f9b13c78f8c9e84e35bed61bc9fd05714e9009022e2df79c59b1d5057cbeafd22a8bda172c9292d15a35773e2b281f0753cc68c6552f66f

data/.github/workflows/ruby.yml

@@ -0,0 +1,29 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.6
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake

data/.gitignore

@@ -17,6 +17,8 @@ tmtags
 coverage
 rdoc
 pkg
+vendor
+.bundle
 
 ## PROJECT::SPECIFIC
 Gemfile.lock

data/README.rdoc

@@ -43,11 +43,15 @@ One of <tt>:indicative</tt>, <tt>:imperative</tt>, or <tt>:subjunctive</tt>. Def
 
 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.
 
+=== <tt>:diathesis</tt>
+
+One of <tt>:active</tt> or <tt>:passive</tt>. Defaults to <tt>:active</tt>.
+
 == Tense/aspect quick reference
 
   EXAMPLE                   TENSE    ASPECT
   
-  I usually accepted        past     habitual
+  I used to accept          past     habitual
   I had accepted            past     perfect
   I accepted                past     perfective
   I was accepting           past     progressive
@@ -70,7 +74,9 @@ Set this to a string to prepend the conjugated verb with it. When set to <tt>tru
 * {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]
+* {Anatoli Makarevich}[https://github.com/makaroni4] for {#6}[https://github.com/rossmeissl/verbs/pull/6]
+* {Nikita Kamaev}[https://github.com/nerixim] for {#35}[https://github.com/rossmeissl/verbs/pull/35]
 
 == Copyright
 
-Copyright (c) 2009 Andy Rossmeissl. See LICENSE for details.
+Copyright (c) 2012 Andy Rossmeissl. See LICENSE for details.

data/Rakefile

@@ -14,9 +14,6 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 
-require 'bueller'
-Bueller::Tasks.new
-
 require 'rake'
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|

data/lib/verbs.rb

@@ -10,7 +10,7 @@ require 'verbs/improper_construction'
 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_CONSONANTS = %w(b c d f g h j k l m n p q r s t z)
   DOUBLED_CONSONANT_PATTERN = "[#{DOUBLED_CONSONANTS.join}]"
   VOWELS = %w(a e i o u y)
   VOWEL_PATTERN = "[#{VOWELS.join}]"

data/lib/verbs/conjugations.rb

@@ -1,14 +1,16 @@
 Verbs::Conjugator.conjugations do |conjugate|
 
-  conjugate.irregular :be do |verb| # copular 
+  conjugate.irregular :be do |verb| # copular
     verb.form :am,    :tense => :present, :person => :first,  :plurality => :singular
     verb.form :is,    :tense => :present, :person => :third,  :plurality => :singular
     verb.form :are,   :tense => :present, :person => :second, :plurality => :singular
+    verb.form :are,   :tense => :present, :person => :second, :plurality => :plural
     verb.form :are,   :tense => :present, :person => :first,  :plurality => :plural
     verb.form :are,   :tense => :present, :person => :third,  :plurality => :plural
     verb.form :was,   :tense => :past,    :person => :first,  :plurality => :singular
     verb.form :was,   :tense => :past,    :person => :third,  :plurality => :singular
     verb.form :were,  :tense => :past,    :person => :second, :plurality => :singular
+    verb.form :were,  :tense => :past,    :person => :second, :plurality => :plural
     verb.form :were,  :tense => :past,    :person => :first,  :plurality => :plural
     verb.form :were,  :tense => :past,    :person => :third,  :plurality => :plural
     verb.form :were,  :tense => :past,    :mood => :subjunctive
@@ -17,15 +19,17 @@ Verbs::Conjugator.conjugations do |conjugate|
     verb.form :been,  :tense => :past,    :derivative => :participle
   end
 
-  conjugate.irregular :have do |verb| 
+  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 => :second, :plurality => :plural
     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 => :second, :plurality => :plural
     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
@@ -128,6 +132,7 @@ Verbs::Conjugator.conjugations do |conjugate|
   conjugate.irregular :put, :put, :put
   conjugate.irregular :quit, :quit, :quit
   conjugate.irregular :read, :read, :read
+  conjugate.irregular :reset, :reset, :reset
   conjugate.irregular :rid, :rid, :rid
   conjugate.irregular :ride, :rode, :ridden
   conjugate.irregular :ring, :rang, :rung
@@ -181,7 +186,7 @@ Verbs::Conjugator.conjugations do |conjugate|
   conjugate.irregular :strive, :strove, :striven
   conjugate.irregular :swear, :swore, :sworn
   conjugate.irregular :sweep, :swept, :swept
-  conjugate.irregular :swell, :swelled, :swelled 
+  conjugate.irregular :swell, :swelled, :swelled
   conjugate.irregular :swim, :swam, :swum
   conjugate.irregular :swing, :swung, :swung
   conjugate.irregular :take, :took, :taken
@@ -198,7 +203,7 @@ Verbs::Conjugator.conjugations do |conjugate|
   conjugate.irregular :upset, :upset, :upset
   conjugate.irregular :wake, :woke, :woken
   conjugate.irregular :wear, :wore, :worn
-  conjugate.irregular :weave, :weaved, :weaved
+  conjugate.irregular :weave, :wove, :woven
   conjugate.irregular :wed, :wed, :wed
   conjugate.irregular :weep, :wept, :wept
   conjugate.irregular :wind, :wound, :wound
@@ -250,6 +255,7 @@ Verbs::Conjugator.conjugations do |conjugate|
   conjugate.single_terminal_consonant :cocker
   conjugate.single_terminal_consonant :coedit
   conjugate.single_terminal_consonant :cohabit
+  conjugate.single_terminal_consonant :color
   conjugate.single_terminal_consonant :concenter
   conjugate.single_terminal_consonant :corner
   conjugate.single_terminal_consonant :cover
@@ -262,6 +268,7 @@ Verbs::Conjugator.conjugations do |conjugate|
   conjugate.single_terminal_consonant :decipher
   conjugate.single_terminal_consonant :deflower
   conjugate.single_terminal_consonant :delimit
+  conjugate.single_terminal_consonant :deliver
   conjugate.single_terminal_consonant :deposit
   conjugate.single_terminal_consonant :develop
   conjugate.single_terminal_consonant :differ
@@ -307,6 +314,7 @@ Verbs::Conjugator.conjugations do |conjugate|
   conjugate.single_terminal_consonant :flounder
   conjugate.single_terminal_consonant :fluster
   conjugate.single_terminal_consonant :flutter
+  conjugate.single_terminal_consonant :follow
   conjugate.single_terminal_consonant :foreshorten
   conjugate.single_terminal_consonant :founder
   conjugate.single_terminal_consonant :fritter
@@ -427,6 +435,7 @@ Verbs::Conjugator.conjugations do |conjugate|
   conjugate.single_terminal_consonant :toughen
   conjugate.single_terminal_consonant :tower
   conjugate.single_terminal_consonant :transit
+  conjugate.single_terminal_consonant :trigger
   conjugate.single_terminal_consonant :tucker
   conjugate.single_terminal_consonant :unburden
   conjugate.single_terminal_consonant :uncover

data/lib/verbs/conjugator.rb

@@ -1,31 +1,60 @@
+# 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
+#
+# Author::    Andy Rossmeissl
+# Copyright:: Copyright (c) 2009 Andy Rossmeissl
+# License::   Found in LICENSE file
+
 module Verbs
   module Conjugator
     extend self
 
+    # This class determines the conjugations from the given options (or defaults)
+    # conjugations are then applied to the verb
     class Conjugations
       include Singleton
 
+      # permit outside functions access to these variables
       attr_reader :irregulars, :single_terminal_consonants, :copulars
 
+      # Creates initial variables for class
       def initialize
         @irregulars, @single_terminal_consonants, @copulars = {}, [], {}
       end
 
+      # Determines irregular verbs from the expression
+      # Params:
+      # * infinitive, the given verb
+      # * preterite, denote events that took place in the past
+      # * past_participle, form of a verb, ending in 'ed'
+      # * &blk, block of code that may be run
       def irregular(infinitive, preterite = nil, past_participle = nil, &blk)
         if block_given?
+          # create new Verb object with infinitive and &blk
           irregular = ::Verbs::Verb.new infinitive, &blk
         else
           raise ArgumentError, "Standard irregular verbs must specify preterite and past participle forms" unless preterite and past_participle
+          # create new Verb object with infinitive, preterite and past_participle
           irregular = ::Verbs::Verb.new infinitive, :preterite => preterite, :past_participle => past_participle
         end
         @irregulars[infinitive] = irregular
       end
 
+      # Find single terminal consonant with the infinitive
+      # Params:
+      # * infinitive, the given verb
       def single_terminal_consonant(infinitive)
         @single_terminal_consonants << infinitive
       end
     end
 
+    # Runs a block of code if given in a class instance
+    # else only class instance is created
     def conjugations
       if block_given?
         yield Conjugations.instance
@@ -34,28 +63,40 @@ module Verbs
       end
     end
 
+    # Using options given, determine the conjugation and the subject
+    # Return the subject, if there is one, and the proper conjugation
+    # Params:
+    # * infinitive, the given verb
+    # * options, the list of parameters to alter the conjugation
     def conjugate(infinitive, options = {})
+      infinitive = infinitive.dup if infinitive.is_a?(String)
+
+      # set all options according to parameter, or the default
       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 # imperative, subjunctive
       aspect = options[:aspect] ||       :habitual   # perfective, habitual, progressive, perfect, prospective
-      
-      check_for_improper_constructions(tense, person, mood)
-      
-      form = form_for(tense, aspect)
 
+      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
+
+      # map form array to conjugation array, applying infinitive and options to the array
       conjugation = form.map { |e| resolve e, infinitive, tense, person, plurality, mood }.join(' ').strip
 
-      if options[:subject]
-        actor = options.delete(:subject)
+      if options[:subject]                   # When options includes a subject,
+        actor = options.delete(:subject)     # remove from options and make subject humanized
         actor = subject(options).humanize if actor.is_a?(TrueClass)
       end
 
       "#{actor} #{conjugation}".strip
     end
 
+    # Finds the pronoun associated with the subject for the conjugation
+    # Returns the pronoun
+    # Params:
+    # * options, list of options given to determine conjugation
     def subject(options)
       case [options[:person], options[:plurality]]
       when [:first, :singular]
@@ -73,6 +114,14 @@ module Verbs
 
     private
 
+    # Resolves conflictions between options of the conjugation
+    # Params:
+    # * element,
+    # * infinitive, the given verb
+    # * tense, an option given by the user
+    # * person, an option given by the user
+    # * plurality, an option given by the user
+    # * mood, an option given by the user
     def resolve(element, infinitive, tense, person, plurality, mood)
       case element
       when String
@@ -86,6 +135,13 @@ module Verbs
       end
     end
 
+    # Change the form to express the proper grammatical function
+    # Params:
+    # * infinitive,the given verb
+    # * inflection, form to be changed
+    # * person, an option given by the user
+    # * plurality, an option given by the user
+    # * mood, an option given by the user
     def inflect(infinitive, inflection, person, plurality, mood)
       send(*([inflection, infinitive, person, plurality, mood][0, method(inflection).arity + 1]))
     end
@@ -100,6 +156,12 @@ module Verbs
       end
     end
 
+    # Conjugate verb to past with relevent options determining outcome
+    # Params:
+    # * infinitive, the given verb
+    # * person, the subject of the verb
+    # * plurality, an option given by the user
+    # * mood, an option given by the user
     def past(infinitive, person, plurality, mood)
       if verb = conjugations.irregulars[infinitive]
         conjugate_irregular(verb, :tense => :past, :person => person, :plurality => plurality, :mood => mood)
@@ -108,12 +170,15 @@ module Verbs
       end
     end
 
+    # Forming verb to apply present tense endings
+    # Params:
+    # * infinitive, the given verb
     def present_participle(infinitive)
-      if infinitive.to_s.match(/#{CONSONANT_PATTERN}#{VOWEL_PATTERN}#{CONSONANT_PATTERN}$/) and !conjugations.single_terminal_consonants.include?(infinitive)
+      if infinitive.to_s.match(/#{CONSONANT_PATTERN}#{VOWEL_PATTERN}#{CONSONANT_PATTERN}$/) and !conjugations.single_terminal_consonants.include?(infinitive.to_sym)
         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$/)
+      elsif infinitive.to_s.match(/^be$/) or 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
@@ -124,6 +189,9 @@ module Verbs
       end
     end
 
+    # Forming verb to apply past tense endings
+    # Params:
+    # * infinitive, the given verb
     def past_participle(infinitive)
       if verb = conjugations.irregulars[infinitive]
         conjugate_irregular(verb, :tense => :past, :derivative => :participle)
@@ -132,6 +200,10 @@ module Verbs
       end
     end
 
+    # 
+    # Params:
+    # * verb, 
+    # * options, 
     def conjugate_irregular(verb, options)
       return verb[options] if verb[options]
 
@@ -151,30 +223,30 @@ module Verbs
       end
     end
 
+    # Apply thir person rules to the verb for the conjugation
+    # Params:
+    # * verb, apply proper third person rules to this
     def present_third_person_singular_form_for(verb)
-      infinitive = case verb
-      when Verb
-        verb.infinitive
-      when String, Symbol
-        verb.to_sym
-      end
-      if infinitive.to_s.match(/#{CONSONANT_PATTERN}y$/)
-        infinitive.to_s.gsub(/y$/, 'ies').to_sym
-      elsif infinitive.to_s.match(/[szx]$/) or infinitive.to_s.match(/[sc]h$/)
-        infinitive.to_s.concat('es').to_sym
+      infinitive = verb.is_a?(Verb) ? verb.infinitive.to_s : verb.to_s
+
+      if infinitive =~ /[a-z&&#{CONSONANT_PATTERN}]y$/i
+        infinitive[0..-2] + 'ies'
+      elsif infinitive =~ /(ss|sh|t?ch|zz|x|#{CONSONANT_PATTERN}o)$/i
+        infinitive + 'es'
+      elsif infinitive =~ /[^s]s$/i
+        infinitive + 'ses'
       else
-        infinitive.to_s.concat('s').to_sym
+        infinitive + 's'
       end
     end
 
+    # Apply the regular past tense to a given verb for the conjugation
+    # Params:
+    # * verb, apply regular past tense rules to this
     def regular_preterite_for(verb)
-      infinitive = case verb
-      when Verb
-        verb.infinitive
-      when String, Symbol
-        verb.to_sym
-      end
-      if verb.to_s.match(/#{CONSONANT_PATTERN}#{VOWEL_PATTERN}#{DOUBLED_CONSONANT_PATTERN}$/) and !conjugations.single_terminal_consonants.include?(verb)
+      infinitive = verb.is_a?(Verb) ? verb.infinitive.to_s : verb.to_s
+
+      if verb.to_s.match(/#{CONSONANT_PATTERN}#{VOWEL_PATTERN}#{DOUBLED_CONSONANT_PATTERN}$/) and !conjugations.single_terminal_consonants.include?(verb.to_sym)
         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
@@ -185,39 +257,76 @@ module Verbs
       end
     end
 
+    # Apply proper rules to consonant endings
+    # Params:
+    # * verb, apply doule consonant to this
     def regular_preterite_with_doubled_terminal_consonant_for(verb)
       regular_preterite_for verb.to_s.concat(verb.to_s[-1,1]).to_sym
     end
 
+    # Apply proper rules to consonant endings
+    # Params:
+    # * verb, apply doule consonant to this
     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)
+    # Add appropriate aspects to the tense of the conjugation
+    # Params:
+    # * tense, an option given by the user
+    # * aspect, an option given by the user
+    # * diathesis, an option given by the user
+    def form_for(tense, aspect, diathesis)
       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]
+      if diathesis == :active
+        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 ['used to', :infinitive] 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
+      elsif diathesis == :passive
+        if tense == :future
+          form << 'will'
+          form.concat ['be', :past_participle] if aspect == :habitual
+          form.concat ['have been', :past_participle] if aspect == :perfect
+          form.concat ['be being', :past_participle] if aspect == :progressive
+          form.concat ['be about to be', :past_participle] if aspect == :prospective
+        else
+          form.concat ['used to be', :past_participle] if [tense, aspect] == [:past, :habitual]
+          form.concat [:have, 'been', :past_participle] if aspect == :perfect
+          form.concat [:be, :past_participle] if [tense, aspect] == [:past, :perfective]
+          form.concat [:be, 'being', :past_participle] if aspect == :progressive
+          form.concat [:be, 'about to be', :past_participle] if aspect == :prospective
+          form.concat [:be, :past_participle] if [tense, aspect] == [:present, :habitual]
+        end
       end
       form
     end
-    
-    def check_for_improper_constructions(tense, person, mood)
+
+    # Confirm an imperative mood contains the present tense and second person
+    # Params:
+    # * tense, an option given by the user
+    # * person, how the conjugation refers to the subject
+    # * mood, an option given by the user
+    # * diathesis, an option given by the user
+    def check_for_improper_constructions(infinitive, tense, person, mood, diathesis)
       if mood == :imperative and not (person == :second and tense == :present)
         raise Verbs::ImproperConstruction, 'The imperative mood requires present tense and second person'
       end
+      if infinitive.to_sym == :be and diathesis == :passive
+        raise Verbs::ImproperConstruction, 'There is no passive diathesis for the copula'
+      end
     end
   end
 end

data/lib/verbs/verblike.rb

@@ -1,32 +1,32 @@
-module Verbs
-  module Verblike
-    class Wrapper
-      def initialize(base)
-        @base = base
-      end
-      
-      def conjugate(options)
-        words = @base.to_s.split(' ')
-        words.shift if words.first.downcase == 'to'
-        infinitive = words.shift.to_sym
-        conjugation = ::Verbs::Conjugator.conjugate infinitive, options
-        conjugated = words.unshift(conjugation.to_s).join(' ')
-        @base.is_a?(Symbol) ? conjugated.to_sym : conjugated
-      end
-    end
-    
-    module Access
-      def verb
-        ::Verbs::Verblike::Wrapper.new self
-      end
-    end
-  end
-end
-
-class String
-  include ::Verbs::Verblike::Access
-end
-
-class Symbol
-  include ::Verbs::Verblike::Access
-end
+module Verbs
+  module Verblike
+    class Wrapper
+      def initialize(base)
+        @base = base
+      end
+      
+      def conjugate(options)
+        words = @base.to_s.split(' ')
+        words.shift if words.first.downcase == 'to'
+        infinitive = words.shift.to_sym
+        conjugation = ::Verbs::Conjugator.conjugate infinitive, options
+        conjugated = words.unshift(conjugation.to_s).join(' ')
+        @base.is_a?(Symbol) ? conjugated.to_sym : conjugated
+      end
+    end
+    
+    module Access
+      def verb
+        ::Verbs::Verblike::Wrapper.new self
+      end
+    end
+  end
+end
+
+class String
+  include ::Verbs::Verblike::Access
+end
+
+class Symbol
+  include ::Verbs::Verblike::Access
+end

data/lib/verbs/version.rb

@@ -1,3 +1,3 @@
-module Verbs
-  VERSION = "2.1.2"
-end
+module Verbs
+  VERSION = "2.3.0"
+end

data/test/test_verbs.rb

@@ -2,16 +2,29 @@ require 'helper'
 
 class TestVerbs < Test::Unit::TestCase
   def test_copular_conjugation
+    # present habitual
     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)
+
+    # 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)
+    assert_equal 'used to be', Verbs::Conjugator.conjugate(:be, :tense => :past, :person => :third, :plurality => :singular, :aspect => :habitual)
+    assert_equal 'used to be', Verbs::Conjugator.conjugate(:be, :tense => :past, :person => :first, :plurality => :plural, :aspect => :habitual)
+    assert_equal 'used to be', Verbs::Conjugator.conjugate(:be, :tense => :past, :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)
+
+    assert_equal 'was being', Verbs::Conjugator.conjugate(:be, :tense => :past, :person => :third, :aspect => :progressive)
+    assert_equal 'is being', Verbs::Conjugator.conjugate(:be, :tense => :present, :person => :third,  :aspect => :progressive)
+    assert_equal 'will be being', Verbs::Conjugator.conjugate(:be, :tense => :future, :person => :third, :aspect => :progressive)
   end
   def test_irregular_conjugation
     assert_equal 'break', Verbs::Conjugator.conjugate(:break, :tense => :present, :person => :first, :plurality => :singular, :aspect => :habitual)
@@ -53,6 +66,10 @@ class TestVerbs < Test::Unit::TestCase
   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 'followed', Verbs::Conjugator.conjugate(:follow, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
+    assert_equal 'triggered', Verbs::Conjugator.conjugate(:trigger, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
+    assert_equal 'colored', Verbs::Conjugator.conjugate(:color, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
+    assert_equal 'delivered', Verbs::Conjugator.conjugate(:deliver, :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)
@@ -76,6 +93,7 @@ class TestVerbs < Test::Unit::TestCase
   end
   def test_conjugation_with_terminal_sibilance
     assert_equal 'passes', Verbs::Conjugator.conjugate(:pass, :tense => :present, :person => :third, :plurality => :singular, :aspect => :habitual)
+    assert_equal 'focusses', Verbs::Conjugator.conjugate(:focus, :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)
@@ -94,7 +112,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 usually accepted',        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)
@@ -123,4 +141,75 @@ class TestVerbs < Test::Unit::TestCase
       Verbs::Conjugator.conjugate(:accept, :mood => :imperative)
     end
   end
+
+  def test_s_forms
+    Verbs::Conjugator.with_options :person => :third, :tense => :present do |standard|
+      assert_equal 'does', standard.conjugate('do')
+      assert_equal 'flies', standard.conjugate('fly')
+      assert_equal 'assesses', standard.conjugate('assess')
+      assert_equal 'blushes', standard.conjugate('blush')
+      assert_equal 'catches', standard.conjugate('catch')
+      assert_equal 'fizzes', standard.conjugate('fizz')
+      assert_equal 'relaxes', standard.conjugate('relax')
+      assert_equal 'bakes', standard.conjugate('bake')
+      assert_equal 'calls', standard.conjugate('call')
+      assert_equal 'dies', standard.conjugate('die')
+      assert_equal 'glues', standard.conjugate('glue')
+      assert_equal 'moos', standard.conjugate('moo')
+      assert_equal 'changes', standard.conjugate('change')
+    end
+  end
+
+  def test_immutability
+    verb = 'like'
+    Verbs::Conjugator.conjugate(verb, :tense => :past, :aspect => :perfective)
+    assert_equal 'like', verb
+  end
+
+  def test_second_person_plural_forms
+    Verbs::Conjugator.with_options :person => :second, :plurality => :plural, :subject => true do |standard|
+      assert_equal 'You had accepted',            standard.conjugate(:accept, :tense => :past, :aspect => :perfect)
+      assert_equal 'You accepted',                standard.conjugate(:accept, :tense => :past, :aspect => :perfective)
+      assert_equal 'You were accepting',           standard.conjugate(:accept, :tense => :past, :aspect => :progressive)
+      assert_equal 'You were about to accept',     standard.conjugate(:accept, :tense => :past, :aspect => :prospective)
+    end
+  end
+
+  def test_passive
+    Verbs::Conjugator.with_options :diathesis => :passive, :person => :first, :plurality => :singular, :subject => true do |standard|
+      assert_equal 'I used to be accepted',          standard.conjugate(:accept, :tense => :past, :aspect => :habitual)
+      assert_equal 'I had been accepted',            standard.conjugate(:accept, :tense => :past, :aspect => :perfect)
+      assert_equal 'I was accepted',                 standard.conjugate(:accept, :tense => :past, :aspect => :perfective)
+      assert_equal 'I was being accepted',           standard.conjugate(:accept, :tense => :past, :aspect => :progressive)
+      assert_equal 'I was about to be accepted',     standard.conjugate(:accept, :tense => :past, :aspect => :prospective)
+      assert_equal 'I am accepted',                  standard.conjugate(:accept, :tense => :present, :aspect => :habitual)
+      assert_equal 'I have been accepted',           standard.conjugate(:accept, :tense => :present, :aspect => :perfect)
+      assert_equal 'I am being accepted',            standard.conjugate(:accept, :tense => :present, :aspect => :progressive)
+      assert_equal 'I am about to be accepted',      standard.conjugate(:accept, :tense => :present, :aspect => :prospective)
+      assert_equal 'I will be accepted',             standard.conjugate(:accept, :tense => :future, :aspect => :habitual)
+      assert_equal 'I will have been accepted',      standard.conjugate(:accept, :tense => :future, :aspect => :perfect)
+      assert_equal 'I will be being accepted',       standard.conjugate(:accept, :tense => :future, :aspect => :progressive)
+      assert_equal 'I will be about to be accepted', standard.conjugate(:accept, :tense => :future, :aspect => :prospective)
+    end
+
+    Verbs::Conjugator.with_options :diathesis => :passive, :person => :third, :plurality => :plural, :subject => true do |standard|
+      assert_equal 'They used to be accepted',          standard.conjugate(:accept, :tense => :past, :aspect => :habitual)
+      assert_equal 'They had been accepted',            standard.conjugate(:accept, :tense => :past, :aspect => :perfect)
+      assert_equal 'They were accepted',                standard.conjugate(:accept, :tense => :past, :aspect => :perfective)
+      assert_equal 'They were being accepted',          standard.conjugate(:accept, :tense => :past, :aspect => :progressive)
+      assert_equal 'They were about to be accepted',    standard.conjugate(:accept, :tense => :past, :aspect => :prospective)
+      assert_equal 'They are accepted',                 standard.conjugate(:accept, :tense => :present, :aspect => :habitual)
+      assert_equal 'They have been accepted',           standard.conjugate(:accept, :tense => :present, :aspect => :perfect)
+      assert_equal 'They are being accepted',           standard.conjugate(:accept, :tense => :present, :aspect => :progressive)
+      assert_equal 'They are about to be accepted',     standard.conjugate(:accept, :tense => :present, :aspect => :prospective)
+      assert_equal 'They will be accepted',             standard.conjugate(:accept, :tense => :future, :aspect => :habitual)
+      assert_equal 'They will have been accepted',      standard.conjugate(:accept, :tense => :future, :aspect => :perfect)
+      assert_equal 'They will be being accepted',       standard.conjugate(:accept, :tense => :future, :aspect => :progressive)
+      assert_equal 'They will be about to be accepted', standard.conjugate(:accept, :tense => :future, :aspect => :prospective)
+    end
+
+    assert_raise Verbs::ImproperConstruction do
+      Verbs::Conjugator.conjugate(:be, :diathesis => :passive)
+    end
+  end
 end

data/verbs.gemspec

@@ -1,24 +1,25 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "verbs/version"
-
-Gem::Specification.new do |s|
-  s.name = 'verbs'
-  s.version = Verbs::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors = ["Andy Rossmeissl"]
-  s.description = %q{Conjugates most common english verbs for all persons, tenses, standard aspects, and modern moods (with active diathesis). Standard and exceptional spelling rules are obeyed.}
-  s.summary = %q{English verb conjugation in Ruby}
-  s.email = %q{andy@rossmeissl.net}
-  s.homepage = %q{http://github.com/rossmeissl/verbs}
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-  
-  s.add_development_dependency 'bueller'
-  s.add_dependency 'activesupport', '>= 2.3.4'
-  s.add_dependency 'i18n'
-end
-
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "verbs/version"
+
+Gem::Specification.new do |s|
+  s.name = 'verbs'
+  s.version = Verbs::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors = ["Andy Rossmeissl"]
+  s.description = %q{Conjugates most common english verbs for all persons, tenses, standard aspects, and modern moods (with active diathesis). Standard and exceptional spelling rules are obeyed.}
+  s.summary = %q{English verb conjugation in Ruby}
+  s.email = %q{andy@rossmeissl.net}
+  s.homepage = %q{http://github.com/rossmeissl/verbs}
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  
+  s.add_development_dependency 'test-unit'
+  s.add_development_dependency 'rake'
+  s.add_dependency 'activesupport', '>= 2.3.4'
+  s.add_dependency 'i18n'
+end
+

metadata

@@ -1,62 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: verbs
 version: !ruby/object:Gem::Version
-  version: 2.1.2
-  prerelease: 
+  version: 2.3.0
 platform: ruby
 authors:
 - Andy Rossmeissl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bueller
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.4
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Conjugates most common english verbs for all persons, tenses, standard
@@ -67,13 +74,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
+- ".document"
+- ".github/workflows/ruby.yml"
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - lib/verbs.rb
 - lib/verbs/conjugations.rb
 - lib/verbs/conjugator.rb
@@ -86,32 +93,26 @@ files:
 - verbs.gemspec
 homepage: http://github.com/rossmeissl/verbs
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -499867661
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -499867661
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 3.1.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: English verb conjugation in Ruby
-test_files: []
+test_files:
+- test/helper.rb
+- test/test_verbs.rb

data/VERSION

@@ -1 +0,0 @@
-2.0.10