verbs 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46ce7e5cfe62a82289b8c7770e9bf9905106d776c960a309007b41782bf1b6fa
-  data.tar.gz: f92d5047b6743da58b2669744fd04e6400e913c2c7221b83f657b8f2f39cef25
+  metadata.gz: 39ca9a05484aea9907d487a1fd2d6c51bbe969040ae748411640076ae9cb4b50
+  data.tar.gz: fd81415cc5cad33a4ae06c1e7b45d26edb64bfc94acbf2fc2c0e29f576a228c1
 SHA512:
-  metadata.gz: aff4a218c912eaa3266f416e79b2de1420179e3c282ef30777d155a84560d83cade09d850a85ae546a8f52f714372cd7a1a2f4daa4140e52c68dd24da757221b
-  data.tar.gz: '0798baa0c945dad303ac4c8c569f7a7d30bd55faa50d40f09168983ed4868ea18d214f55dea71a6f81336bec04f64a0b1a6a58eee11bfec8e2d65b11322974fc'
+  metadata.gz: 81bc1a48d71745e5443985abc0a7bb14c9e5548820eb1fa8c6455d81a14baa2928009a07a00e4d6561fac7afdfa3ba313b1e610a8af14e949c505fa6ec7f27cf
+  data.tar.gz: c16c9318396e3edf0f9b13c78f8c9e84e35bed61bc9fd05714e9009022e2df79c59b1d5057cbeafd22a8bda172c9292d15a35773e2b281f0753cc68c6552f66f

data/.github/workflows/ruby.yml

@@ -15,16 +15,12 @@ on:
 
 jobs:
   test:
-
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: 2.6
     - name: Install dependencies

data/.gitignore

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

data/README.rdoc

@@ -43,6 +43,10 @@ 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
@@ -71,6 +75,7 @@ Set this to a string to prepend the conjugated verb with it. When set to <tt>tru
 * {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
 

data/lib/verbs/conjugator.rb

@@ -79,8 +79,8 @@ module Verbs
       mood = options[:mood] ||           :indicative # imperative, subjunctive
       aspect = options[:aspect] ||       :habitual   # 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
@@ -275,23 +275,41 @@ module Verbs
     # 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]
+      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
@@ -301,10 +319,14 @@ 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)
+    # * 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/version.rb

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

data/test/test_verbs.rb

@@ -174,4 +174,42 @@ class TestVerbs < Test::Unit::TestCase
       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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: verbs
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Andy Rossmeissl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-25 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -81,7 +81,6 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - lib/verbs.rb
 - lib/verbs/conjugations.rb
 - lib/verbs/conjugator.rb
@@ -110,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: English verb conjugation in Ruby

data/VERSION

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