conjugate 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4fa1d49b881834a7a9257ec44a60ebc30f571a9
-  data.tar.gz: 2ce5eb47a58c5b83303d6f5f04ddab6ab0ee0267
+  metadata.gz: df25562c7b30bebf362cd32ebee17284aca23b49
+  data.tar.gz: 4f01c56fe1d9665bd2ba6715d11f276b289984c2
 SHA512:
-  metadata.gz: ce1789b185fdbd54c5efbd5bde91cad55b5350c9b0ec7536919d2bb98ed9a7df9dd0769da7ef3c99da2f88a9e7f8e1ee303864347eab4cc8a2d533ffb0b53936
-  data.tar.gz: 61739dc171da26e2518f3c7692dcd641ad0dfee25248006b16862c54d5779566f4cfc6bf44a497edeff6a3f8a55cf9fb1ce2513165bd7fa686834f61a00cc6ee
+  metadata.gz: 484d6989392dc8e747975983d24a7a3ff60fadc5f1b0feb1a687e9ff218bcc8866540efaefda7ebdde9da27cc450499a636b36ab8f8fff542a15f8e538df62c5
+  data.tar.gz: 1fa557846689ba6745080f8116ff0c06a3c3bd1f8a07a9f121902c63a8e19af2c6739cce15ba2140a3427b6f36bdcad9ab42f989df083f4ff05b88fd4ac883df

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in edmodo-api.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,26 @@
+PATH
+  remote: .
+  specs:
+    conjugate (1.6.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.2.5)
+    rake (10.1.1)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  conjugate!
+  rake
+  rspec

data/Guardfile

@@ -0,0 +1,24 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard :rspec do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end
+

data/README.markdown

@@ -1,5 +1,6 @@
 Conjugate
 =========
+[![Build Status](https://travis-ci.org/JeremyGeros/Conjugate.png?branch=master)](https://travis-ci.org/JeremyGeros/Conjugate)
 
 Conjugates verbs into their proper form given a pronoun. Can conjugate irregular verbs that are in this list https://gist.github.com/1841995
 Currently only has support for Spanish.
@@ -22,6 +23,21 @@ Conjugate::French.conjugate(:pronoun => :je, :verb => 'acheter', :tense => :pres
 => achète
 ```
 
+There is also a helper method to pass a language option, either the name or language code
+```
+Conjugate.conjugate({language: 'french', verb: 'jouer', tense: :present, pronoun: :je})
+=> joue
+
+Conjugate.conjugate({language: 'fr', verb: 'jouer', tense: :present, pronoun: :je})
+=> joue
+
+Conjugate.conjugate({language: 'spanish', verb: 'comprar', tense: :present, pronoun: :yo})
+=> compro
+
+Conjugate.conjugate({language: 'es', verb: 'comprar', tense: :present, pronoun: :yo})
+=> compro
+```
+
 License
 =======
 

data/Rakefile

@@ -0,0 +1,7 @@
+require 'bundler'
+require 'rspec/core/rake_task'
+
+Bundler::GemHelper.install_tasks
+RSpec::Core::RakeTask.new :spec
+
+task :default  => :spec

data/conjugate.gemspec

@@ -1,15 +1,20 @@
-Gem::Specification.new do |s|
-  s.name        = 'conjugate'
-  s.version     = '1.5.0'
-  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
-  s.authors     = ["Jeremy Geros"]
-  s.email       = 'jeremy@govocab.com'
-  s.license     = 'MIT'
-
-  s.files         = `git ls-files`.split("\n") 
-  s.require_paths = ["lib"]
-
-  s.homepage    = 'https://github.com/JeremyGeros/Conjugate'
+Gem::Specification.new do |gem|
+  gem.name        = 'conjugate'
+  gem.version     = '1.6.0'
+  gem.date        = '2015-07-08'
+  gem.summary     = "Conjugate Verbs using a version of the templates defined here http://en.wiktionary.org/wiki/Category:Spanish_verb_inflection-table_templates"
+  gem.description = gem.summary
+  gem.authors     = ["Jeremy Geros"]
+  gem.email       = 'jeremy@govocab.com'
+  gem.license     = 'MIT'
+
+  gem.files         = `git ls-files`.split("\n")
+  gem.require_paths = ["lib"]
+
+  gem.homepage    = 'https://github.com/JeremyGeros/Conjugate'
+
+  gem.required_ruby_version = '>= 1.9.2'
+
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rake'
 end

data/lib/conjugate/common.rb

@@ -1,26 +1,17 @@
 # -*- coding: utf-8 -*-
 module Common
-  
   @@dividing_infinitive_regex = /\{{3}\d+\}{3}([[:alpha:]]+)/
-  
+
   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)
-    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
@@ -28,11 +19,9 @@ module Common
     else
       conjugation_template = template[tense][opts[:pronoun].to_sym].dup
     end
-    debug(conjugation_template)
-    
+
     positions = conjugation_template.scan(/\{{3}(\d+)\}{3}/).flatten
-    debug(positions)
-    
+
     positions.each do |p|
       if opts[:highlight]
         conjugation_template.gsub!(/\{{3}#{p}\}{3}/, "<span class='regular'>#{ verb_parts[p.to_i - 1] }</span>")
@@ -42,26 +31,25 @@ module Common
     end
     conjugation_template
   end
-  
+
   # def conjugation_template_finder(template, tense, opts)
-  # 
+  #
   # end
-  
+
   def regular_ending(verb)
     verb[-2..-1]
   end
-  
+
   def tense(t)
     (common_name(t) || :present).to_sym
   end
-  
+
   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 = ""
       if letters.length <= 1
@@ -70,27 +58,11 @@ module Common
         sub_word = word_copy.scan(/(.+)#{letters}/).flatten.first
       end
       sub_word ||= ""
-      
+
       word_parts << sub_word
-      word_copy = word_copy.gsub(/^#{sub_word}#{letters}/, '') 
+      word_copy = word_copy.gsub(/^#{sub_word}#{letters}/, '')
     end
     word_parts << word_copy unless word_copy == ""
     word_parts
   end
-  
-  def debug(info)
-    if @debug
-      puts info.inspect
-    end
-  end
-  
-  # stubbed method individual languages override this to support multiple tenses names
-  def common_name(t)
-    return nil unless t
-    actual_tense = t.to_s.gsub(' ', '_').to_sym
-    @changable_names ||= {:past => :preterite, :past => :passe_compose, :passé_composé => :passe_compose}
-    actual_tense = @changable_names[actual_tense] || actual_tense
-    actual_tense
-  end
-  
-end
+end

data/lib/conjugate/french.rb

@@ -5,28 +5,28 @@ require 'conjugate/common'
 
 module Conjugate
   module French
+    @@language = 'french'
+
     extend Common
     extend self
-    
+
+
+
     def generate_list_of_know_irregular_verbs
       puts "- " + FrenchIrregularVerbs.keys.sort.join("\n- ")
     end
-    
+
     def find_irregular(verb)
       FrenchIrregularVerbs[verb.downcase]
     end
-    
+
     def template(opts)
       FrenchTemplates[(opts[:template] || find_irregular(opts[:verb]) || regular_ending(opts[:verb])).to_sym]
     end
-    
+
     def conjugation_template_finder(template, tense, opts)
       if tense == :passe_compose
         if is_etre_verb(opts[:verb])
-          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].to_sym] + ' ' + template[:past_participle]
@@ -35,10 +35,19 @@ module Conjugate
         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', 'redescendre', 'rentrer', 'remonter', 'repartir', 'renaître', 'retomber', 'ressortir', 'devenir', 'parvenir', 'revenir', 'survenir', 'provenir', 'intervenir', 'convenir', 'contrevenir', 'advenir'].include? verb.downcase
     end
-    
+
+    # stubbed method individual languages override this to support multiple tenses names
+    def common_name(t)
+      return nil unless t
+      actual_tense = t.to_s.gsub(' ', '_').to_sym
+      @changable_names ||= {:past => :passe_compose, :passé_composé => :passe_compose}
+      actual_tense = @changable_names[actual_tense] || actual_tense
+      actual_tense
+    end
+
   end
-end
+end

data/lib/conjugate/french_templates/irregular_verbs.rb

@@ -8,7 +8,7 @@ FrenchIrregularVerbs = {
   'dire' => :dire,
 
   'avoir' => :avoir,
-  
+
   'lire' => :lire,
 
   'aller' => :aller,
@@ -162,7 +162,7 @@ FrenchIrregularVerbs = {
   'peser' => :e_er,
 
   'promener' => :e_er,
-  
+
   'acheter' => :e_er,
 
   'céder' => :é_er,
@@ -340,50 +340,50 @@ FrenchIrregularVerbs = {
   'enjoindre' => :re_gn,
 
   'rejoindre' => :re_gn,
-  
+
   'venir' => :venir,
-  
+
   'devenir' => :venir,
-  
+
   'advenir ' => :venir,
-  
+
   'contrevenir' => :venir,
-  
+
   'circonvenir' => :venir,
-  
+
   'convenir' => :venir,
-  
+
   'intervenir' => :venir,
-  
-  'parvenir' => :venir, 
-  
+
+  'parvenir' => :venir,
+
   'prévenir' => :venir,
-  
+
   'provenir' => :venir,
-  
+
   'revenir' => :venir,
-  
+
   'subvenir' => :venir,
-  
+
   'survenir' => :venir,
-  
+
   'revoir' => :revoir,
-  
+
   'dormir' => :dormir,
-  
+
   'appartenir' => :tenir,
-  
+
   'contenir' => :tenir,
-  
-  'obtenir' => :tenir, 
-  
+
+  'obtenir' => :tenir,
+
   'retenir' => :tenir,
-  
+
   'soutenir' => :tenir,
-  
+
   'tenir' => :tenir,
-  
+
   'devoir' => :devoir,
-  
+
   'valoir' => :valoir
 }

data/lib/conjugate/spanish.rb

@@ -7,18 +7,28 @@ module Conjugate
   module Spanish
     extend self
     extend Common
-    
+
+    @@language = 'spanish'
+
     def generate_list_of_know_irregular_verbs
       puts "- " + SpanishIrregularVerbs.keys.sort.join("\n- ")
     end
-    
+
     def find_irregular(verb)
       SpanishIrregularVerbs[verb.downcase]
     end
-    
+
     def template(opts)
       SpanishTemplates[(opts[:template] || find_irregular(opts[:verb]) || regular_ending(opts[:verb])).to_sym]
     end
-    
+
+    def common_name(t)
+      return nil unless t
+      actual_tense = t.to_s.gsub(' ', '_').to_sym
+      @changable_names ||= {:past => :preterite}
+      actual_tense = @changable_names[actual_tense] || actual_tense
+      actual_tense
+    end
+
   end
-end
+end