conjugate 1.3.7 → 1.3.8

data/conjugate.gemspec

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

data/lib/conjugate/spanish.rb

@@ -13,18 +13,28 @@ module Conjugate
     
     
     def conjugate(opts ={})
+      @debug = opts[:debug].nil? ? false : true
+      
       template = template(opts)
+      debug(template)
       tense = tense(opts[:tense])
       
       verb = opts[:verb]
+      debug(verb)
       
       infinitive = template[:infinitive].dup
+      debug(infinitive)
+      
       verb_parts = divide_infinitive(infinitive, verb)
+      debug(verb_parts)
       
       return nil if template[tense].nil? || template[tense][opts[:pronoun].to_sym].nil?
       
       conjugation_template = template[tense][opts[:pronoun].to_sym].dup
+      debug(conjugation_template)
+      
       positions = conjugation_template.scan(/\{{3}(\d+)\}{3}/).flatten
+      debug(positions)
       
       positions.each do |p|
         if opts[:highlight]
@@ -61,12 +71,13 @@ module Conjugate
     
     def divide_infinitive(infinitive, verb)
       inserts = infinitive.scan(@dividing_infinitive_regex).flatten
+      debug(inserts)
       
       word_parts = []
       word_copy = verb.dup
       
       inserts.each do |letters|
-        sub_word = word_copy.scan(/(.+)#{letters}/).flatten.first
+        sub_word = word_copy.scan(/(.[^#{letters}]*)#{letters}/).flatten.first
         sub_word ||= ""
         
         word_parts << sub_word
@@ -76,5 +87,11 @@ module Conjugate
       word_parts
     end
     
+    def debug(info)
+      if @debug
+        puts info.inspect
+      end
+    end
+    
   end
 end

metadata

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