verbs 2.0.9 → 2.0.10

data/lib/verbs/conjugator.rb

@@ -1,213 +1,213 @@
-module Verbs
-  module Conjugator
-    extend self
-
-    class Conjugations
-      include Singleton
-
-      attr_reader :irregulars, :single_terminal_consonants, :copulars
-
-      def initialize
-        @irregulars, @single_terminal_consonants, @copulars = {}, [], {}
-      end
-
-      def irregular(infinitive, preterite = nil, past_participle = nil, &blk)
-        if block_given?
-          irregular = ::Verbs::Verb.new infinitive, &blk
-        else
-          raise ArgumentError, "Standard irregular verbs must specify preterite and past participle forms" unless preterite and past_participle
-          irregular = ::Verbs::Verb.new infinitive, :preterite => preterite, :past_participle => past_participle
-        end
-        @irregulars[infinitive] = irregular
-      end
-
-      def single_terminal_consonant(infinitive)
-        @single_terminal_consonants << infinitive
-      end
-    end
-
-    def conjugations
-      if block_given?
-        yield Conjugations.instance
-      else
-        Conjugations.instance
-      end
-    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
-
-      form = form_for(tense, aspect)
-
-      conjugation = form.map { |e| resolve e, infinitive, tense, person, plurality }.join(' ').strip
-
-      if options[:subject]
-        actor = options.delete(:subject)
-        actor = subject(options).humanize if actor.is_a?(TrueClass)
-      end
-
-      "#{actor} #{conjugation}".strip
-    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
-
-    private
-
-    def resolve(element, infinitive, tense, person, plurality)
-      case element
-      when String
-        element
-      when :infinitive
-        infinitive
-      when :present, :past, :present_participle, :past_participle
-        inflect infinitive, element, person, plurality
-      when Symbol
-        inflect element, tense, person, plurality
-      end
-    end
-
-    def inflect(infinitive, inflection, person, plurality)
-      send(*([inflection, infinitive, person, plurality][0, method(inflection).arity + 1]))
-    end
-
-    def present(infinitive, person, plurality)
-      if verb = conjugations.irregulars[infinitive]
-        conjugate_irregular(verb, :tense => :present, :person => person, :plurality => plurality)
-      elsif person == :third and plurality == :singular
-        present_third_person_singular_form_for infinitive
-      else
-        infinitive
-      end
-    end
-
-    def past(infinitive, person, plurality)
-      if verb = conjugations.irregulars[infinitive]
-        conjugate_irregular(verb, :tense => :past, :person => person, :plurality => plurality)
-      else
-        regular_preterite_for infinitive
-      end
-    end
-
-    def present_participle(infinitive)
-      if infinitive.to_s.match(/#{CONSONANT_PATTERN}#{VOWEL_PATTERN}#{CONSONANT_PATTERN}$/) and !conjugations.single_terminal_consonants.include?(infinitive)
-        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$/)
-        infinitive.to_s.concat('ing').to_sym
-      elsif infinitive.to_s.match(/ie$/)
-        infinitive.to_s[0..-2].concat('ying').to_sym
-      else
-        infinitive.to_s[0..-1].concat('ing').to_sym
-      end
-    end
-
-    def past_participle(infinitive)
-      if verb = conjugations.irregulars[infinitive]
-        conjugate_irregular(verb, :tense => :past, :derivative => :participle)
-      else
-        regular_preterite_for infinitive
-      end
-    end
-
-    def conjugate_irregular(verb, options)
-      return verb[options] if verb[options]
-
-      tense = options[:tense]
-      person = options[:person]
-      plurality = options[:plurality]
-      derivative = options[:derivative]
-
-      if [tense, person, plurality] == [:present, :third, :singular]
-        present_third_person_singular_form_for verb
-      elsif [tense, derivative] == [:past, :participle]
-        verb.past_participle
-      elsif tense == :present
-        verb.infinitive
-      elsif tense == :past
-        verb.preterite
-      end
-    end
-
-    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
-      else
-        infinitive.to_s.concat('s').to_sym
-      end
-    end
-
-    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)
-        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
-      else
-        infinitive.to_s.concat('ed').to_sym
-      end
-    end
-
-    def regular_preterite_with_doubled_terminal_consonant_for(verb)
-      regular_preterite_for verb.to_s.concat(verb.to_s[-1,1]).to_sym
-    end
-
-    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)
-      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]
-      end
-      form
-    end
-  end
-end
+module Verbs
+  module Conjugator
+    extend self
+
+    class Conjugations
+      include Singleton
+
+      attr_reader :irregulars, :single_terminal_consonants, :copulars
+
+      def initialize
+        @irregulars, @single_terminal_consonants, @copulars = {}, [], {}
+      end
+
+      def irregular(infinitive, preterite = nil, past_participle = nil, &blk)
+        if block_given?
+          irregular = ::Verbs::Verb.new infinitive, &blk
+        else
+          raise ArgumentError, "Standard irregular verbs must specify preterite and past participle forms" unless preterite and past_participle
+          irregular = ::Verbs::Verb.new infinitive, :preterite => preterite, :past_participle => past_participle
+        end
+        @irregulars[infinitive] = irregular
+      end
+
+      def single_terminal_consonant(infinitive)
+        @single_terminal_consonants << infinitive
+      end
+    end
+
+    def conjugations
+      if block_given?
+        yield Conjugations.instance
+      else
+        Conjugations.instance
+      end
+    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
+
+      form = form_for(tense, aspect)
+
+      conjugation = form.map { |e| resolve e, infinitive, tense, person, plurality }.join(' ').strip
+
+      if options[:subject]
+        actor = options.delete(:subject)
+        actor = subject(options).humanize if actor.is_a?(TrueClass)
+      end
+
+      "#{actor} #{conjugation}".strip
+    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
+
+    private
+
+    def resolve(element, infinitive, tense, person, plurality)
+      case element
+      when String
+        element
+      when :infinitive
+        infinitive
+      when :present, :past, :present_participle, :past_participle
+        inflect infinitive, element, person, plurality
+      when Symbol
+        inflect element, tense, person, plurality
+      end
+    end
+
+    def inflect(infinitive, inflection, person, plurality)
+      send(*([inflection, infinitive, person, plurality][0, method(inflection).arity + 1]))
+    end
+
+    def present(infinitive, person, plurality)
+      if verb = conjugations.irregulars[infinitive]
+        conjugate_irregular(verb, :tense => :present, :person => person, :plurality => plurality)
+      elsif person == :third and plurality == :singular
+        present_third_person_singular_form_for infinitive
+      else
+        infinitive
+      end
+    end
+
+    def past(infinitive, person, plurality)
+      if verb = conjugations.irregulars[infinitive]
+        conjugate_irregular(verb, :tense => :past, :person => person, :plurality => plurality)
+      else
+        regular_preterite_for infinitive
+      end
+    end
+
+    def present_participle(infinitive)
+      if infinitive.to_s.match(/#{CONSONANT_PATTERN}#{VOWEL_PATTERN}#{CONSONANT_PATTERN}$/) and !conjugations.single_terminal_consonants.include?(infinitive)
+        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$/)
+        infinitive.to_s.concat('ing').to_sym
+      elsif infinitive.to_s.match(/ie$/)
+        infinitive.to_s[0..-2].concat('ying').to_sym
+      else
+        infinitive.to_s[0..-1].concat('ing').to_sym
+      end
+    end
+
+    def past_participle(infinitive)
+      if verb = conjugations.irregulars[infinitive]
+        conjugate_irregular(verb, :tense => :past, :derivative => :participle)
+      else
+        regular_preterite_for infinitive
+      end
+    end
+
+    def conjugate_irregular(verb, options)
+      return verb[options] if verb[options]
+
+      tense = options[:tense]
+      person = options[:person]
+      plurality = options[:plurality]
+      derivative = options[:derivative]
+
+      if [tense, person, plurality] == [:present, :third, :singular]
+        present_third_person_singular_form_for verb
+      elsif [tense, derivative] == [:past, :participle]
+        verb.past_participle
+      elsif tense == :present
+        verb.infinitive
+      elsif tense == :past
+        verb.preterite
+      end
+    end
+
+    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
+      else
+        infinitive.to_s.concat('s').to_sym
+      end
+    end
+
+    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)
+        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
+      else
+        infinitive.to_s.concat('ed').to_sym
+      end
+    end
+
+    def regular_preterite_with_doubled_terminal_consonant_for(verb)
+      regular_preterite_for verb.to_s.concat(verb.to_s[-1,1]).to_sym
+    end
+
+    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)
+      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]
+      end
+      form
+    end
+  end
+end

data/lib/verbs/verb.rb

@@ -1,40 +1,40 @@
-module Verbs
-  class Verb
-    attr_reader :infinitive, :preterite, :past_participle
-    
-    def initialize(infinitive, options = {}, &blk)
-      @infinitive = infinitive
-      @forms = {}
-      if block_given?
-        yield self
-      else
-        @preterite = options[:preterite]
-        @past_participle = options[:past_participle]
-      end
-    end
-    
-    def form(word, options = {})
-      raise ArgumentError, 'Irregular verb specifications must identify tense and must identify either derivative or person and plurality' unless options[:tense] and (options[:derivative] or (options[:person] and options[:plurality]))
-      
-      tense = options[:tense]
-
-      @forms[:present] ||= {}
-      @forms[:past] ||= {}
-      if derivative = options[:derivative]
-        @forms[tense][derivative] = word
-      elsif person = options[:person]
-        @forms[tense][person] ||= {}
-        @forms[tense][person][options[:plurality]] = word
-      end
-    end
-    
-    def [](options = {})
-      tense, person, plurality, derivative = options[:tense], options[:person], options[:plurality], options[:derivative]
-      if tense and person and plurality
-        @forms[tense].andand[person].andand[plurality]
-      elsif tense and derivative
-        @forms[tense].andand[derivative]
-      end
-    end
-  end
-end
+module Verbs
+  class Verb
+    attr_reader :infinitive, :preterite, :past_participle
+    
+    def initialize(infinitive, options = {}, &blk)
+      @infinitive = infinitive
+      @forms = {}
+      if block_given?
+        yield self
+      else
+        @preterite = options[:preterite]
+        @past_participle = options[:past_participle]
+      end
+    end
+    
+    def form(word, options = {})
+      raise ArgumentError, 'Irregular verb specifications must identify tense and must identify either derivative or person and plurality' unless options[:tense] and (options[:derivative] or (options[:person] and options[:plurality]))
+      
+      tense = options[:tense]
+
+      @forms[:present] ||= {}
+      @forms[:past] ||= {}
+      if derivative = options[:derivative]
+        @forms[tense][derivative] = word
+      elsif person = options[:person]
+        @forms[tense][person] ||= {}
+        @forms[tense][person][options[:plurality]] = word
+      end
+    end
+    
+    def [](options = {})
+      tense, person, plurality, derivative = options[:tense], options[:person], options[:plurality], options[:derivative]
+      if tense and person and plurality
+        @forms[tense].try(:[], person).try(:[], plurality)
+      elsif tense and derivative
+        @forms[tense].try(:[], derivative)
+      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.rb

@@ -1,16 +1,16 @@
-require 'singleton'
-require 'verbs/verb'
-require 'verbs/conjugator'
-require 'verbs/conjugations'
-require 'verbs/verblike'
-require 'andand'
-require 'active_support'
-
-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_CONSONANT_PATTERN = "[#{DOUBLED_CONSONANTS.join}]"
-  VOWELS = %w(a e i o u y)
-  VOWEL_PATTERN = "[#{VOWELS.join}]"
-end
+require 'singleton'
+require 'active_support'
+require 'active_support/core_ext'
+require 'verbs/verb'
+require 'verbs/conjugator'
+require 'verbs/conjugations'
+require 'verbs/verblike'
+
+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_CONSONANT_PATTERN = "[#{DOUBLED_CONSONANTS.join}]"
+  VOWELS = %w(a e i o u y)
+  VOWEL_PATTERN = "[#{VOWELS.join}]"
+end

data/test/test_verbs.rb

@@ -1,11 +1,4 @@
 require 'helper'
-require 'active_support/version'
-%w{
-  active_support/core_ext/object/misc
-  active_support/inflector
-}.each do |active_support_3_requirement|
-  require active_support_3_requirement
-end if ActiveSupport::VERSION::MAJOR == 3
 
 class TestVerbs < Test::Unit::TestCase
   def test_copular_conjugation