conjugate 1.4.3 → 1.4.4

data/conjugate.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'conjugate'
-  s.version     = '1.4.3'
+  s.version     = '1.4.4'
   s.date        = '2012-02-15'
   s.summary     = "Conjugate Verbs using a version of the templates defined here http://en.wiktionary.org/wiki/Category:Spanish_verb_inflection-table_templates"
   s.description = s.summary

data/lib/conjugate/common.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module Common
   
   @@dividing_infinitive_regex = /\{{3}\d+\}{3}(\w+)/
@@ -20,7 +21,14 @@ module Common
     
     return nil if template[tense].nil? || template[tense][opts[:pronoun].to_sym].nil?
     
-    conjugation_template = template[tense][opts[:pronoun].to_sym].dup
+    conjugation_template = nil
+    
+    if defined? conjugation_template_finder
+      debug('s')
+      conjugation_template = conjugation_template_finder(template, tense, opts).dup
+    else
+      conjugation_template = template[tense][opts[:pronoun].to_sym].dup
+    end
     debug(conjugation_template)
     
     positions = conjugation_template.scan(/\{{3}(\d+)\}{3}/).flatten
@@ -36,6 +44,10 @@ module Common
     conjugation_template
   end
   
+  # def conjugation_template_finder(template, tense, opts)
+  # 
+  # end
+  
   def regular_ending(verb)
     verb[-2..-1]
   end

data/lib/conjugate/french.rb

@@ -1,11 +1,12 @@
+# -*- coding: utf-8 -*-
 require 'conjugate/french_templates/templates'
 require 'conjugate/french_templates/irregular_verbs'
 require 'conjugate/common'
 
 module Conjugate
   module French
-    extend self
     extend Common
+    extend self
     
     def generate_list_of_know_irregular_verbs
       puts "- " + FrenchIrregularVerbs.keys.sort.join("\n- ")
@@ -19,5 +20,22 @@ module Conjugate
       FrenchTemplates[(opts[:template] || find_irregular(opts[:verb]) || regular_ending(opts[:verb])).to_sym]
     end
     
+    def conjugation_template_finder(template, tense, opts)
+      debug('here')
+      if opts[:tense] == 'passé composé' || opts[:tense] == 'passe compose'
+        if is_etre_verb(opts[:verb])
+          FrenchTemplates[:être][:present][opts[:pronoun]] + ' ' + template[:past_particitple]
+        else
+          FrenchTemplates[:avoir][:present][opts[:pronoun]] + ' ' + template[:past_particitple]
+        end
+      else
+        template[tense][opts[:pronoun].to_sym]
+      end
+    end
+    
+    def is_etre_verb(verb)
+      ['monter', 'rester', 'sortir', 'venir', 'aller', 'naître', 'descendre', 'entrer', 'retourner', 'tomber', 'renter', 'arriver', 'mourir', 'partir', 'passer', 'décéder'].include? verb.downcase
+    end
+    
   end
 end