conjugate 1.3.8 → 1.3.9

data/conjugate.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name        = 'conjugate'
-  s.version     = '1.3.8'
+  s.version     = '1.3.9'
   s.date        = '2012-02-15'
-  s.summary     = "Conjugate Verbs using a version of the templates defined here http://en.wiktionary.org/wiki/Category:Spanish_conjugation-table_templates"
+  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
   s.authors     = ["Jeremy Geros"]
   s.email       = 'jeremy@govocab.com'

data/lib/conjugate/templates/spanish_irregular_verbs.rb

@@ -469,10 +469,6 @@ SpanishIrregularVerbs = {
 	'atender' => :er_e_ie,
 	'cerner' => :er_e_ie,
 	'contender' => :er_e_ie,
-	'defender' => :er_e_ie,
-	'desatender' => :er_e_ie,
-	'descender' => :er_e_ie,
-	'desentenderse' => :er_e_ie,
 	'encender' => :er_e_ie,
 	'entender' => :er_e_ie,
 	'extender' => :er_e_ie,
@@ -480,11 +476,14 @@ SpanishIrregularVerbs = {
 	'hender' => :er_e_ie,
 	'perder' => :er_e_ie,
 	'tender' => :er_e_ie,
-	'tenderse' => :er_e_ie,
 	'trascender' => :er_e_ie,
 	'verter' => :er_e_ie,
 	
 	
+	'defender' => :er_e_defender,
+	'descender' => :er_e_defender,
+	
+	
 	'desosar' => :er_o_hue,
 	
 	

data/lib/conjugate/templates/spanish_templates.rb

@@ -749,6 +749,50 @@ SpanishTemplates = {
   		:ellos => "{{{1}}}e{{{2}}}erían"
   	}
   },
+  
+  :er_e_defender => {
+  	:infinitive => "{{{1}}}e{{{2}}}e{{{3}}}er", 
+  	: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}}}emos",
+  		:vosotros => "{{{1}}}e{{{2}}}e{{{3}}}éis",
+  		: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}}}e{{{3}}}ió",
+  		:nosotros => "{{{1}}}e{{{2}}}e{{{3}}}imos",
+  		:vosotros => "{{{1}}}e{{{2}}}e{{{3}}}isteis",
+  		:ellos => "{{{1}}}e{{{2}}}e{{{3}}}ieron"
+  	},
+  	:future => {
+  		:yo => "{{{1}}}e{{{2}}}e{{{3}}}eré",
+  		:tu => "{{{1}}}e{{{2}}}e{{{3}}}erás",
+  		:el => "{{{1}}}e{{{2}}}e{{{3}}}erá",
+  		:nosotros => "{{{1}}}e{{{2}}}e{{{3}}}eremos",
+  		:vosotros => "{{{1}}}e{{{2}}}e{{{3}}}eréis",
+  		:ellos => "{{{1}}}e{{{2}}}e{{{3}}}erán"
+  	},
+  	:conditional => {
+  		:yo => "{{{1}}}e{{{2}}}e{{{3}}}ería",
+  		:tu => "{{{1}}}e{{{2}}}e{{{3}}}erías",
+  		:el => "{{{1}}}e{{{2}}}e{{{3}}}ería",
+  		:nosotros => "{{{1}}}e{{{2}}}e{{{3}}}eríamos",
+  		:vosotros => "{{{1}}}e{{{2}}}e{{{3}}}eríais",
+  		:ellos => "{{{1}}}e{{{2}}}e{{{3}}}erían"
+  	
+  },
 
   :er_o_hue => {
   	:infinitive => "{{{1}}}o{{{2}}}er", 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjugate
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ bindir: bin
 cert_chain: []
 date: 2012-02-15 00:00:00.000000000Z
 dependencies: []
-description: Conjugate Verbs using a version of the templates defined here http://en.wiktionary.org/wiki/Category:Spanish_conjugation-table_templates
+description: Conjugate Verbs using a version of the templates defined here http://en.wiktionary.org/wiki/Category:Spanish_verb_inflection-table_templates
 email: jeremy@govocab.com
 executables: []
 extensions: []
@@ -49,5 +49,5 @@ rubyforge_project:
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Conjugate Verbs using a version of the templates defined here http://en.wiktionary.org/wiki/Category:Spanish_conjugation-table_templates
+summary: Conjugate Verbs using a version of the templates defined here http://en.wiktionary.org/wiki/Category:Spanish_verb_inflection-table_templates
 test_files: []