verbs 2.2.1 → 3.1.0

data/lib/verbs/conjugator.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # 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
@@ -24,7 +26,9 @@ module Verbs
 
       # Creates initial variables for class
       def initialize
-        @irregulars, @single_terminal_consonants, @copulars = {}, [], {}
+        @irregulars = {}
+        @single_terminal_consonants = []
+        @copulars = {}
       end
 
       # Determines irregular verbs from the expression
@@ -38,9 +42,13 @@ module Verbs
           # 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
+          unless preterite && past_participle
+            raise ArgumentError,
+                  'Standard irregular verbs must specify preterite and past participle forms'
+          end
+
           # create new Verb object with infinitive, preterite and past_participle
-          irregular = ::Verbs::Verb.new infinitive, :preterite => preterite, :past_participle => past_participle
+          irregular = ::Verbs::Verb.new infinitive, preterite: preterite, past_participle: past_participle
         end
         @irregulars[infinitive] = irregular
       end
@@ -77,10 +85,10 @@ 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(tense, person, mood)   # find incompatabilities
-      form = form_for(tense, aspect)                          # find form array based on tense and 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
@@ -99,15 +107,15 @@ module Verbs
     # * options, list of options given to determine conjugation
     def subject(options)
       case [options[:person], options[:plurality]]
-      when [:first, :singular]
+      when %i[first singular]
         'I'
-      when [:first, :plural]
+      when %i[first plural]
         'we'
-      when [:second, :singular], [:second, :plural]
+      when %i[second singular], %i[second plural]
         'you'
-      when [:third, :singular]
+      when %i[third singular]
         'he'
-      when [:third, :plural]
+      when %i[third plural]
         'they'
       end
     end
@@ -143,13 +151,13 @@ module Verbs
     # * 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]))
+      send(*[inflection, infinitive, person, plurality, mood][0, method(inflection).arity + 1])
     end
 
     def present(infinitive, person, plurality, mood)
-      if verb = conjugations.irregulars[infinitive]
-        conjugate_irregular(verb, :tense => :present, :person => person, :plurality => plurality, :mood => mood)
-      elsif person == :third and plurality == :singular and not mood == :subjunctive
+      if (verb = conjugations.irregulars[infinitive])
+        conjugate_irregular(verb, tense: :present, person: person, plurality: plurality, mood: mood)
+      elsif (person == :third) && (plurality == :singular) && (mood != :subjunctive)
         present_third_person_singular_form_for infinitive
       else
         infinitive
@@ -163,8 +171,8 @@ module Verbs
     # * 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)
+      if (verb = conjugations.irregulars[infinitive])
+        conjugate_irregular(verb, tense: :past, person: person, plurality: plurality, mood: mood)
       else
         regular_preterite_for infinitive
       end
@@ -174,36 +182,40 @@ module Verbs
     # 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.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(/^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
-      elsif infinitive.to_s.match(/e$/)
-        infinitive.to_s[0..-2].concat('ing').to_sym
-      else
-        infinitive.to_s[0..-1].concat('ing').to_sym
+      if infinitive.to_s.match(/#{CONSONANT_PATTERN}#{VOWEL_PATTERN}#{CONSONANTS_WITHOUT_C_PATTERN}$/) &&
+         !conjugations.single_terminal_consonants.include?(infinitive.to_sym)
+        return present_participle_with_doubled_terminal_consonant_for infinitive
       end
+
+      case infinitive.to_s
+      when /c$/
+        "#{infinitive}k"
+      when /(^be|ye|oe|nge|ee)$/
+        infinitive.to_s
+      when /ie$/
+        infinitive.to_s.gsub(/ie$/, 'y')
+      when /#{VOWEL_PATTERN}#{CONSONANT_PATTERN}e$/, /ue$/
+        infinitive.to_s[0..-2]
+      else # rubocop:disable Lint/DuplicateBranch
+        infinitive.to_s
+      end.dup.concat('ing').to_sym
     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)
+      if (verb = conjugations.irregulars[infinitive])
+        conjugate_irregular(verb, tense: :past, derivative: :participle)
       else
         regular_preterite_for infinitive
       end
     end
 
-    # 
+    #
     # Params:
-    # * verb, 
-    # * options, 
+    # * verb,
+    # * options,
     def conjugate_irregular(verb, options)
       return verb[options] if verb[options]
 
@@ -212,9 +224,9 @@ module Verbs
       plurality = options[:plurality]
       derivative = options[:derivative]
 
-      if [tense, person, plurality] == [:present, :third, :singular]
+      if [tense, person, plurality] == %i[present third singular]
         present_third_person_singular_form_for verb
-      elsif [tense, derivative] == [:past, :participle]
+      elsif [tense, derivative] == %i[past participle]
         verb.past_participle
       elsif tense == :present
         verb.infinitive
@@ -229,14 +241,15 @@ module Verbs
     def present_third_person_singular_form_for(verb)
       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'
+      case infinitive
+      when /[a-z&&#{CONSONANT_PATTERN}]y$/i
+        "#{infinitive[0..-2]}ies"
+      when /(ss|sh|t?ch|zz|x|#{CONSONANT_PATTERN}o)$/i
+        "#{infinitive}es"
+      when /[^s]s$/i
+        "#{infinitive}ses"
       else
-        infinitive + 's'
+        "#{infinitive}s"
       end
     end
 
@@ -246,52 +259,81 @@ module Verbs
     def regular_preterite_for(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
-      elsif verb.to_s.match(/#{CONSONANT_PATTERN}y$/)
-        infinitive.to_s.chomp('y').concat('ied').to_sym
+      if verb.to_s.match(/#{CONSONANT_PATTERN}#{VOWEL_PATTERN}#{DOUBLED_CONSONANT_WITHOUT_C_PATTERN}$/) &&
+         !conjugations.single_terminal_consonants.include?(verb.to_sym)
+        return regular_preterite_with_doubled_terminal_consonant_for verb
+      end
+
+      case verb.to_s
+      when /(#{CONSONANT_PATTERN}e|ye|oe|nge|ie|ee|ue)$/
+        infinitive.concat('d').to_sym
+      when /#{CONSONANT_PATTERN}y$/
+        infinitive.gsub(/y$/, 'ied').to_sym
+      when /c$/
+        infinitive.gsub(/c$/, 'cked').to_sym
       else
-        infinitive.to_s.concat('ed').to_sym
+        infinitive.concat('ed').to_sym
       end
     end
 
     # Apply proper rules to consonant endings
     # Params:
-    # * verb, apply doule consonant to this
+    # * verb, apply double 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
+      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
+    # * verb, apply double 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
+      if /c$/ =~ verb.to_s
+        present_participle verb.to_sym
+      else
+        present_participle verb.to_s.concat(verb.to_s[-1, 1]).to_sym
+      end
     end
 
     # Add appropriate aspects to the tense of the conjugation
     # Params:
     # * tense, an option given by the user
     # * aspect, an option given by the user
-    def form_for(tense, aspect)
+    # * 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 ['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]
+      case diathesis
+      when :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] == %i[past habitual]
+          form.concat %i[have past_participle] if aspect == :perfect
+          form << :past if [tense, aspect] == %i[past perfective]
+          form.concat %i[be present_participle] if aspect == :progressive
+          form.concat [:be, 'about to', :infinitive] if aspect == :prospective
+          form << :present if [tense, aspect] == %i[present habitual]
+          form.concat [:be, 'having', :past_participle] if [tense, aspect] == %i[present perfective]
+        end
+      when :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] == %i[past habitual]
+          form.concat [:have, 'been', :past_participle] if aspect == :perfect
+          form.concat %i[be past_participle] if [tense, aspect] == %i[past perfective]
+          form.concat [:be, 'being', :past_participle] if aspect == :progressive
+          form.concat [:be, 'about to be', :past_participle] if aspect == :prospective
+          form.concat %i[be past_participle] if [tense, aspect] == %i[present habitual]
+        end
       end
       form
     end
@@ -301,10 +343,18 @@ module Verbs
     # * tense, an option given by the user
     # * person, how the conjugation refers to the subject
     # * mood, an option given by the user
-    def check_for_improper_constructions(tense, person, mood)
-      if mood == :imperative and not (person == :second and tense == :present)
+    # * diathesis, an option given by the user
+    def check_for_improper_constructions(infinitive, tense, person, mood, diathesis)
+      if (mood == :imperative) && !((person == :second) && (tense == :present))
         raise Verbs::ImproperConstruction, 'The imperative mood requires present tense and second person'
       end
+      if (infinitive.to_sym == :be) && (diathesis == :passive)
+        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/improper_construction.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 module Verbs
-  class ImproperConstruction < ArgumentError;
+  class ImproperConstruction < ArgumentError
   end
 end

data/lib/verbs/verb.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Verbs
   class Verb
     attr_reader :infinitive, :preterite, :past_participle
-    
-    def initialize(infinitive, options = {}, &blk)
+
+    def initialize(infinitive, options = {})
       @infinitive = infinitive
       @forms = {}
       if block_given?
@@ -12,29 +14,36 @@ module Verbs
         @past_participle = options[:past_participle]
       end
     end
-    
+
     def form(word, options = {})
-      raise ArgumentError, 'Irregular verb specifications must identify tense and must identify either derivative, mood, or person and plurality' unless options[:tense] and (options[:derivative] or options[:mood] or (options[:person] and options[:plurality]))
-      
+      unless options[:tense] && (options[:derivative] || options[:mood] || (options[:person] && options[:plurality]))
+        raise ArgumentError,
+              'Irregular verb specifications must identify tense and must identify either derivative, mood, or person and plurality'
+      end
+
       tense = options[:tense]
 
       @forms[:present] ||= {}
       @forms[:past] ||= {}
-      if derivative = options[:derivative]
+      if (derivative = options[:derivative])
         @forms[tense][derivative] = word
-      elsif mood = options[:mood]
+      elsif (mood = options[:mood])
         @forms[tense][mood] = word
-      elsif person = options[:person]
+      elsif (person = options[:person])
         @forms[tense][person] ||= {}
         @forms[tense][person][options[:plurality]] = word
       end
     end
-    
+
     def [](options = {})
-      tense, person, plurality, derivative, mood = options[:tense], options[:person], options[:plurality], options[:derivative], options[:mood]
-      if tense and person and plurality and mood
+      tense = options[:tense]
+      person = options[:person]
+      plurality = options[:plurality]
+      derivative = options[:derivative]
+      mood = options[:mood]
+      if tense && person && plurality && mood
         @forms[tense].try(:[], mood) || @forms[tense].try(:[], person).try(:[], plurality)
-      elsif tense and derivative
+      elsif tense && derivative
         @forms[tense].try(:[], derivative)
       end
     end

data/lib/verbs/verblike.rb

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 module Verbs
   module Verblike
     class Wrapper
       def initialize(base)
         @base = base
       end
-      
+
       def conjugate(options)
-        words = @base.to_s.split(' ')
+        words = @base.to_s.split
         words.shift if words.first.downcase == 'to'
-        infinitive = words.shift.to_sym
+        infinitive = words.shift.downcase.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

data/lib/verbs/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Verbs
-  VERSION = "2.2.1"
+  VERSION = '3.1.0'
 end

data/lib/verbs.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require 'singleton'
+require 'time'
 require 'active_support'
 require 'active_support/core_ext'
 require 'verbs/verb'
@@ -8,10 +11,14 @@ require 'verbs/verblike'
 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)
+  CONSONANTS = %w[b c d f g h j k l m n p q r s t v w x z].freeze
   CONSONANT_PATTERN = "[#{CONSONANTS.join}]"
-  DOUBLED_CONSONANTS = %w(b c d f g h j k l m n p q r s t z)
+  CONSONANTS_WITHOUT_C = (CONSONANTS - ['c']).freeze
+  CONSONANTS_WITHOUT_C_PATTERN = "[#{CONSONANTS_WITHOUT_C.join}]"
+  DOUBLED_CONSONANTS = (CONSONANTS - %w[v w x]).freeze
   DOUBLED_CONSONANT_PATTERN = "[#{DOUBLED_CONSONANTS.join}]"
-  VOWELS = %w(a e i o u y)
+  DOUBLED_CONSONANTS_WITHOUT_C = (DOUBLED_CONSONANTS - ['c']).freeze
+  DOUBLED_CONSONANT_WITHOUT_C_PATTERN = "[#{DOUBLED_CONSONANTS_WITHOUT_C.join}]"
+  VOWELS = %w[a e i o u y].freeze
   VOWEL_PATTERN = "[#{VOWELS.join}]"
 end