conjugate 1.4.0 → 1.4.1

data/conjugate.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'conjugate'
-  s.version     = '1.4.0'
+  s.version     = '1.4.1'
   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/spanish_templates/irregular_verbs.rb

@@ -1110,30 +1110,32 @@ SpanishIrregularVerbs = {
 	
 	'competir' => :ir_e_i,
 	'concebir' => :ir_e_i,
-	'derretir' => :ir_e_i,
-	'despedir' => :ir_e_i,
-	'despedirse' => :ir_e_i,
-	'desvestir' => :ir_e_i,
 	'embestir' => :ir_e_i,
 	'expedir' => :ir_e_i,
 	'gemir' => :ir_e_i,
 	'impedir' => :ir_e_i,
 	'medir' => :ir_e_i,
 	'pedir' => :ir_e_i,
-	'reexpedir' => :ir_e_i,
+	'reexpedir' => :ir_e_e_i,
 	'rendir' => :ir_e_i,
-	'repetir' => :ir_e_i,
-	'revestir' => :ir_e_i,
+	'repetir' => :ir_e_e_i,
+	'revestir' => :ir_e_e_i,
 	'servir' => :ir_e_i,
 	'trasgredir' => :ir_e_i,
 	'vestir' => :ir_e_i,
 	'vestirse' => :ir_e_i,
-	'preconcebir' => :ir_e_i,
+	'preconcebir' => :ir_e_e_i,
+	
+	
+	'derretir' => :ir_e_e_i,
+	'despedir' => :ir_e_e_i,
+	'despedirse' => :ir_e_e_i,
+	'desvestir' => :ir_e_e_i,
 	
 	
 	'adherir' => :ir_e_ie_i,
 	'advertir' => :ir_e_ie_i,
-	'arrepentir' => :ir_e_ie_i,
+
 	'asentir' => :ir_e_ie_i,
 	'conferir' => :ir_e_ie_i,
 	'consentir' => :ir_e_ie_i,
@@ -1153,8 +1155,6 @@ SpanishIrregularVerbs = {
 	'invertir' => :ir_e_ie_i,
 	'malherir' => :ir_e_ie_i,
 	'mentir' => :ir_e_ie_i,
-	'preferir' => :ir_e_ie_i,
-	'presentir' => :ir_e_ie_i,
 	'proferir' => :ir_e_ie_i,
 	'sentir' => :ir_e_ie_i,
 	'sentirse' => :ir_e_ie_i,
@@ -1162,6 +1162,10 @@ SpanishIrregularVerbs = {
 	'transferir' => :ir_e_ie_i,
 	'zaherir' => :ir_e_ie_i,
 	
+	'arrepentir' => :ir_e_e_ie_i,
+	'preferir' => :ir_e_e_ie_i,
+	'presentir' => :ir_e_e_ie_i,
+	
 	
 	'desmentir' => :ir_desmentir,
 	'pervertir' => :ir_desmentir,

data/lib/conjugate/spanish_templates/templates.rb

@@ -3477,6 +3477,50 @@ SpanishTemplates = {
   		:ellos => "{{{1}}}e{{{2}}}irían"
   	}
   },
+  
+  :ir_e_e_i => {
+  	:infinitive => "{{{1}}}e{{{2}}}e{{{3}}}ir", 
+  	:present => {
+  		:yo => "{{{1}}}e{{{2}}}i{{{3}}}o",
+  		:tu => "{{{1}}}e{{{2}}}i{{{3}}}es",
+  		:el => "{{{1}}}e{{{2}}}i{{{3}}}e",
+  		:nosotros => "{{{1}}}e{{{2}}}e{{{3}}}imos",
+  		:vosotros => "{{{1}}}e{{{2}}}e{{{3}}}ís",
+  		:ellos => "{{{1}}}e{{{2}}}i{{{3}}}en"
+  	}, 
+  	:imperfect => {
+  		:yo => "{{{1}}}e{{{2}}}e{{{3}}}ía",
+  		:tu => "{{{1}}}e{{{2}}}e{{{3}}}ías",
+  		:el => "{{{1}}}e{{{2}}}e{{{3}}}ía",
+  		:nosotros => "{{{1}}}e{{{2}}}e{{{3}}}íamos",
+  		:vosotros => "{{{1}}}e{{{2}}}e{{{3}}}íais",
+  		:ellos => "{{{1}}}e{{{2}}}e{{{3}}}ían"
+  	},
+  	:preterite => {
+  		:yo => "{{{1}}}e{{{2}}}e{{{3}}}í",
+  		:tu => "{{{1}}}e{{{2}}}e{{{3}}}iste",
+  		:el => "{{{1}}}e{{{2}}}i{{{3}}}ió",
+  		:nosotros => "{{{1}}}e{{{2}}}e{{{3}}}imos",
+  		:vosotros => "{{{1}}}e{{{2}}}e{{{3}}}isteis",
+  		:ellos => "{{{1}}}e{{{2}}}i{{{3}}}ieron"
+  	},
+  	:future => {
+  		:yo => "{{{1}}}e{{{2}}}e{{{3}}}iré",
+  		:tu => "{{{1}}}e{{{2}}}e{{{3}}}irás",
+  		:el => "{{{1}}}e{{{2}}}e{{{3}}}irá",
+  		:nosotros => "{{{1}}}e{{{2}}}e{{{3}}}iremos",
+  		:vosotros => "{{{1}}}e{{{2}}}e{{{3}}}iréis",
+  		:ellos => "{{{1}}}e{{{2}}}e{{{3}}}irán"
+  	},
+  	:conditional => {
+  		:yo => "{{{1}}}e{{{2}}}e{{{3}}}iría",
+  		:tu => "{{{1}}}e{{{2}}}e{{{3}}}irías",
+  		:el => "{{{1}}}e{{{2}}}e{{{3}}}iría",
+  		:nosotros => "{{{1}}}e{{{2}}}e{{{3}}}iríamos",
+  		:vosotros => "{{{1}}}e{{{2}}}e{{{3}}}iríais",
+  		:ellos => "{{{1}}}e{{{2}}}e{{{3}}}irían"
+  	}
+  },
 
   :ir_e_ie_i => {
   	:infinitive => "{{{1}}}e{{{2}}}ir", 
@@ -3522,6 +3566,50 @@ SpanishTemplates = {
   	}
   },
   
+  :ir_e_e_ie_i => {
+  	:infinitive => "{{{1}}}e{{{2}}}e{{{2}}}ir", 
+  	:present => {
+  		:yo => "{{{1}}}e{{{2}}}ie{{{3}}}o",
+  		:tu => "{{{1}}}e{{{2}}}ie{{{3}}}es",
+  		:el => "{{{1}}}e{{{2}}}ie{{{3}}}e",
+  		:nosotros => "{{{1}}}e{{{2}}}e{{{3}}}imos",
+  		:vosotros => "{{{1}}}e{{{2}}}e{{{3}}}ís",
+  		:ellos => "{{{1}}}e{{{2}}}ie{{{3}}}en"
+  	}, 
+  	:imperfect => {
+  		:yo => "{{{1}}}e{{{2}}}e{{{3}}}ía",
+  		:tu => "{{{1}}}e{{{2}}}e{{{3}}}ías",
+  		:el => "{{{1}}}e{{{2}}}e{{{3}}}ía",
+  		:nosotros => "{{{1}}}e{{{2}}}e{{{3}}}íamos",
+  		:vosotros => "{{{1}}}e{{{2}}}e{{{3}}}íais",
+  		:ellos => "{{{1}}}e{{{2}}}e{{{3}}}ían"
+  	},
+  	:preterite => {
+  		:yo => "{{{1}}}e{{{2}}}e{{{3}}}í",
+  		:tu => "{{{1}}}e{{{2}}}e{{{3}}}iste",
+  		:el => "{{{1}}}e{{{2}}}i{{{3}}}ió",
+  		:nosotros => "{{{1}}}e{{{2}}}e{{{3}}}imos",
+  		:vosotros => "{{{1}}}e{{{2}}}e{{{3}}}isteis",
+  		:ellos => "{{{1}}}e{{{2}}}i{{{3}}}ieron"
+  	},
+  	:future => {
+  		:yo => "{{{1}}}e{{{2}}}e{{{3}}}iré",
+  		:tu => "{{{1}}}e{{{2}}}e{{{3}}}irás",
+  		:el => "{{{1}}}e{{{2}}}e{{{3}}}irá",
+  		:nosotros => "{{{1}}}e{{{2}}}e{{{3}}}iremos",
+  		:vosotros => "{{{1}}}e{{{2}}}e{{{3}}}iréis",
+  		:ellos => "{{{1}}}e{{{2}}}e{{{3}}}irán"
+  	},
+  	:conditional => {
+  		:yo => "{{{1}}}e{{{2}}}e{{{3}}}iría",
+  		:tu => "{{{1}}}e{{{2}}}e{{{3}}}irías",
+  		:el => "{{{1}}}e{{{2}}}e{{{3}}}iría",
+  		:nosotros => "{{{1}}}e{{{2}}}e{{{3}}}iríamos",
+  		:vosotros => "{{{1}}}e{{{2}}}e{{{3}}}iríais",
+  		:ellos => "{{{1}}}e{{{2}}}e{{{3}}}irían"
+  	}
+  },
+  
   :ir_desmentir => {
   	:infinitive => "{{{1}}}e{{{2}}}e{{{3}}}ir", 
   	:present => {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjugate
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors: