conjugate 1.4.4 → 1.4.5

data/conjugate.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'conjugate'
-  s.version     = '1.4.4'
+  s.version     = '1.4.5'
   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

@@ -18,13 +18,12 @@ module Common
     
     verb_parts = divide_infinitive(infinitive, verb)
     debug(verb_parts)
-    
-    return nil if template[tense].nil? || template[tense][opts[:pronoun].to_sym].nil?
-    
+    debug(tense)
+    return nil if (tense != :passe_compose) && (template[tense].nil? || template[tense][opts[:pronoun].to_sym].nil?)
+    debug('v')
     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
@@ -88,8 +87,9 @@ module Common
   # stubbed method individual languages override this to support multiple tenses names
   def common_name(t)
     return nil unless t
-    changable_names = {:past => :preterite}
-    actual_tense = changable_names[t.to_sym] || t
+    actual_tense = t.to_s.gsub(' ', '_').to_sym
+    changable_names = {:past => :preterite, :passé_composé => :passe_compose}
+    actual_tense = changable_names[actual_tense] || actual_tense
     actual_tense
   end
   

data/lib/conjugate/french.rb

@@ -21,12 +21,16 @@ module Conjugate
     end
     
     def conjugation_template_finder(template, tense, opts)
-      debug('here')
-      if opts[:tense] == 'passé composé' || opts[:tense] == 'passe compose'
+      if tense == :passe_compose
         if is_etre_verb(opts[:verb])
-          FrenchTemplates[:être][:present][opts[:pronoun]] + ' ' + template[:past_particitple]
+          debug('h')
+          debug(FrenchTemplates[:être])
+          debug(FrenchTemplates[:être][:present])
+          debug(FrenchTemplates[:être][:present][opts[:pronoun].to_sym])
+          debug(template)
+          FrenchTemplates[:être][:present][opts[:pronoun].to_sym] + ' ' + template[:past_participle]
         else
-          FrenchTemplates[:avoir][:present][opts[:pronoun]] + ' ' + template[:past_particitple]
+          FrenchTemplates[:avoir][:present][opts[:pronoun].to_sym] + ' ' + template[:past_participle]
         end
       else
         template[tense][opts[:pronoun].to_sym]
@@ -34,7 +38,7 @@ module Conjugate
     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
+      ['monter', 'rester', 'sortir', 'venir', 'aller', 'naître', 'descendre', 'entrer', 'retourner', 'tomber', 'renter', 'arriver', 'mourir', 'partir', 'passer', 'décéder', 'redescendre', 'rentrer', 'remonter', 'repartir', 'renaître', 'retomber', 'ressortir', 'devenir', 'parvenir', 'revenir', 'survenir', 'provenir', 'intervenir', 'convenir', 'contrevenir', 'advenir'].include? verb.downcase
     end
     
   end

data/lib/conjugate/french_templates/irregular_verbs.rb

@@ -337,6 +337,32 @@ FrenchIrregularVerbs = {
 
   'enjoindre' => :re_gn,
 
-  'rejoindre' => :re_gn
+  'rejoindre' => :re_gn,
+  
+  'venir' => :venir,
+  
+  'devenir' => :venir,
+  
+  'advenir ' => :venir,
+  
+  'contrevenir' => :venir,
+  
+  'circonvenir' => :venir,
+  
+  'convenir' => :venir,
+  
+  'intervenir' => :venir,
+  
+  'parvenir' => :venir, 
+  
+  'prévenir' => :venir,
+  
+  'provenir' => :venir,
+  
+  'revenir' => :venir,
+  
+  'subvenir' => :venir,
+  
+  'survenir' => :venir
   
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjugate
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -19,7 +19,6 @@ extra_rdoc_files: []
 files:
 - .DS_Store
 - README.markdown
-- conjugate-1.4.4.gem
 - conjugate.gemspec
 - lib/.DS_Store
 - lib/conjugate.rb