verbs 1.0.4 → 1.0.5

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/verbs/conjugator.rb

@@ -35,17 +35,42 @@ module Verbs
     end
     
     def conjugate(infinitive, options = {})
-      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 # conditional, imperative, indicative, injunctive, optative, potential, subjunctive
-      aspect = options[:aspect] ||       :habitual   # perfective, habitual, progressive, perfect, prospective 
+      # 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 # conditional, imperative, indicative, injunctive, optative, potential, subjunctive
+      # aspect = options[:aspect] ||       :habitual   # perfective, habitual, progressive, perfect, prospective
+      
+      if actor = options.delete(:subject)
+        actor = subject(options).humanize if actor.is_a?(TrueClass)
+      end
       
       if verb = conjugations.irregulars[infinitive]
-        verb[options] || conjugate_irregular(verb, options)
+        conjugation = verb[options] || conjugate_irregular(verb, options)
+      else
+        conjugation = conjugate_regular(infinitive, options)
+      end
+      
+      if actor
+        "#{actor} #{conjugation}"
       else
-        conjugate_regular(infinitive, options)
+        conjugation
+      end
+    end
+    
+    def subject(options)
+      case [options[:person], options[:plurality]]
+      when [:first, :singular]
+        'I'
+      when [:first, :plural]
+        'we'
+      when [:second, :singular], [:second, :plural]
+        'you'
+      when [:third, :singular]
+        'he'
+      when [:third, :plural]
+        'they'
       end
     end
     

data/lib/verbs.rb

@@ -3,6 +3,7 @@ require 'verbs/verb'
 require 'verbs/conjugator'
 require 'verbs/conjugations'
 require 'andand'
+require 'activesupport'
 
 module Verbs
   CONSONANTS = %w(b c d f g h j k l m n p q r s t v w x z)

data/test/test_verbs.rb

@@ -78,4 +78,8 @@ class TestVerbs < Test::Unit::TestCase
     assert_equal :washes, Verbs::Conjugator.conjugate(:wash, :tense => :present, :person => :third, :plurality => :singular)
     assert_equal :watches, Verbs::Conjugator.conjugate(:watch, :tense => :present, :person => :third, :plurality => :singular)
   end
+  def test_conjugation_with_subject
+    assert_equal 'Matz is', Verbs::Conjugator.conjugate(:be, :tense => :present, :person => :third, :plurality => :singular, :subject => 'Matz')
+    assert_equal 'We are', Verbs::Conjugator.conjugate(:be, :tense => :present, :person => :first, :plurality => :plural, :subject => true)
+  end
 end

data/verbs.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{verbs}
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Rossmeissl"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: verbs
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - Andy Rossmeissl