conjugate 1.5.0 → 1.6.0

data/lib/conjugate.rb

@@ -4,7 +4,15 @@ require 'conjugate/spanish'
 require 'conjugate/french'
 
 module Conjugate
-  
-end
 
+  def self.conjugate(opts = {})
+    if opts[:language].downcase == 'french' || opts[:language].downcase == 'fr'
+      Conjugate::French.conjugate(opts)
+    elsif opts[:language].downcase == 'spanish' || opts[:language].downcase == 'es'
+      Conjugate::Spanish.conjugate(opts)
+    else
+      raise ArgumentError.new("Langauge: #{ opts[:language] } is not able to be conjugated")  
+    end
+  end
 
+end

data/spec/common_spec.rb

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+require 'rspec'
+require 'conjugate'
+
+
+describe 'Helper Conjugations' do
+
+  describe 'methods testing' do
+
+    it '.conjugate calls Spanish' do
+      verb = Conjugate.conjugate({language: 'spanish', verb: 'comprar', tense: :present, pronoun: :yo})
+      expect(verb).to eq('compro')
+
+      verb = Conjugate.conjugate({language: 'es', verb: 'comprar', tense: :present, pronoun: :yo})
+      expect(verb).to eq('compro')
+    end
+
+    it '.conjugate calls french' do
+      verb = Conjugate.conjugate({language: 'french', verb: 'jouer', tense: :present, pronoun: :je})
+      expect(verb).to eq('joue')
+
+      verb = Conjugate.conjugate({language: 'fr', verb: 'jouer', tense: :present, pronoun: :je})
+      expect(verb).to eq('joue')
+    end
+
+    it 'fails with other language' do
+      expect { Conjugate.conjugate({language: 'japanese'}) }.to raise_error(ArgumentError)
+    end
+  end
+end

data/spec/french_spec.rb

@@ -0,0 +1,187 @@
+# -*- coding: utf-8 -*-
+require 'rspec'
+require 'conjugate'
+
+
+describe 'French Conjugations' do
+
+  describe 'methods testing' do
+
+    it '.find_irregular' do
+      type = Conjugate::French.find_irregular('aller')
+      expect(type).to eq(:aller)
+
+      type = Conjugate::French.find_irregular('placer')
+      expect(type).to eq(:cer)
+    end
+
+    it '.template' do
+      template = Conjugate::French.template({verb: 'aller'})
+      expect(template[:present][:je]).to eq('vais')
+
+      template = Conjugate::French.template({verb: 'placer'})
+      expect(template[:present][:je]).to eq('{{{1}}}ce')
+    end
+
+    it '.regular_ending' do
+      ending = Conjugate::French.regular_ending('aller')
+      expect(ending).to eq('er')
+
+      ending = Conjugate::French.regular_ending('vair')
+      expect(ending).to eq('ir')
+    end
+
+    it '.tense' do
+      tense = Conjugate::French.tense(:present)
+      expect(tense).to eq(:present)
+
+      tense = Conjugate::French.tense(:passé_composé)
+      expect(tense).to eq(:passe_compose)
+
+      tense = Conjugate::French.tense(:past)
+      expect(tense).to eq(:passe_compose)
+    end
+
+    it '.conjugate regular er' do
+      verb = Conjugate::French.conjugate({verb: 'jouer', tense: :present, pronoun: :je})
+      expect(verb).to eq('joue')
+
+      verb = Conjugate::French.conjugate({verb: 'jouer', tense: :present, pronoun: :tu})
+      expect(verb).to eq('joues')
+
+      verb = Conjugate::French.conjugate({verb: 'jouer', tense: :present, pronoun: :il})
+      expect(verb).to eq('joue')
+
+      verb = Conjugate::French.conjugate({verb: 'jouer', tense: :present, pronoun: :nous})
+      expect(verb).to eq('jouons')
+
+      verb = Conjugate::French.conjugate({verb: 'jouer', tense: :present, pronoun: :vous})
+      expect(verb).to eq('jouez')
+
+      verb = Conjugate::French.conjugate({verb: 'jouer', tense: :present, pronoun: :ils})
+      expect(verb).to eq('jouent')
+
+      verb = Conjugate::French.conjugate({verb: 'jouer', tense: :past, pronoun: :je})
+      expect(verb).to eq('ai joué')
+
+      verb = Conjugate::French.conjugate({verb: 'jouer', tense: :future, pronoun: :je})
+      expect(verb).to eq('jouerai')
+    end
+
+    it '.conjugate regular ir' do
+      verb = Conjugate::French.conjugate({verb: 'choisir', tense: :present, pronoun: :je})
+      expect(verb).to eq('choisis')
+
+      verb = Conjugate::French.conjugate({verb: 'choisir', tense: :present, pronoun: :tu})
+      expect(verb).to eq('choisis')
+
+      verb = Conjugate::French.conjugate({verb: 'choisir', tense: :present, pronoun: :il})
+      expect(verb).to eq('choisit')
+
+      verb = Conjugate::French.conjugate({verb: 'choisir', tense: :present, pronoun: :nous})
+      expect(verb).to eq('choisissons')
+
+      verb = Conjugate::French.conjugate({verb: 'choisir', tense: :present, pronoun: :vous})
+      expect(verb).to eq('choisissez')
+
+      verb = Conjugate::French.conjugate({verb: 'choisir', tense: :present, pronoun: :ils})
+      expect(verb).to eq('choisissent')
+
+      verb = Conjugate::French.conjugate({verb: 'choisir', tense: :past, pronoun: :je})
+      expect(verb).to eq('ai choisi')
+
+      verb = Conjugate::French.conjugate({verb: 'choisir', tense: :future, pronoun: :je})
+      expect(verb).to eq('choisirai')
+    end
+
+    it '.conjugate regular re' do
+      verb = Conjugate::French.conjugate({verb: 'perdre', tense: :present, pronoun: :je})
+      expect(verb).to eq('perds')
+
+      verb = Conjugate::French.conjugate({verb: 'perdre', tense: :present, pronoun: :tu})
+      expect(verb).to eq('perds')
+
+      verb = Conjugate::French.conjugate({verb: 'perdre', tense: :present, pronoun: :il})
+      expect(verb).to eq('perd')
+
+      verb = Conjugate::French.conjugate({verb: 'perdre', tense: :present, pronoun: :nous})
+      expect(verb).to eq('perdons')
+
+      verb = Conjugate::French.conjugate({verb: 'perdre', tense: :present, pronoun: :vous})
+      expect(verb).to eq('perdez')
+
+      verb = Conjugate::French.conjugate({verb: 'perdre', tense: :present, pronoun: :ils})
+      expect(verb).to eq('perdent')
+
+      verb = Conjugate::French.conjugate({verb: 'perdre', tense: :past, pronoun: :je})
+      expect(verb).to eq('ai perdu')
+
+      verb = Conjugate::French.conjugate({verb: 'perdre', tense: :future, pronoun: :je})
+      expect(verb).to eq('perdrai')
+    end
+
+    it '.conjugate_irregular avoir verb' do
+      verb = Conjugate::French.conjugate({verb: 'faire', tense: :present, pronoun: :je})
+      expect(verb).to eq('fais')
+
+      verb = Conjugate::French.conjugate({verb: 'faire', tense: :past, pronoun: :je})
+      expect(verb).to eq('ai fait')
+
+      verb = Conjugate::French.conjugate({verb: 'faire', tense: :future, pronoun: :je})
+      expect(verb).to eq('ferai')
+    end
+
+
+    it '.conjugate_irregular etre verb' do
+      verb = Conjugate::French.conjugate({verb: 'aller', tense: :present, pronoun: :je})
+      expect(verb).to eq('vais')
+
+      verb = Conjugate::French.conjugate({verb: 'aller', tense: :past, pronoun: :je})
+      expect(verb).to eq('suis allé‎')
+
+      verb = Conjugate::French.conjugate({verb: 'aller', tense: :future, pronoun: :je})
+      expect(verb).to eq('irai')
+    end
+
+    it '.conjugates acheter correctly' do
+      verb = Conjugate::French.conjugate({verb: 'acheter', tense: :present, pronoun: :je})
+      expect(verb).to eq('achète')
+
+      verb = Conjugate::French.conjugate({verb: 'acheter', tense: :present, pronoun: :tu})
+      expect(verb).to eq('achètes')
+
+      verb = Conjugate::French.conjugate({verb: 'acheter', tense: :present, pronoun: :il})
+      expect(verb).to eq('achète')
+
+      verb = Conjugate::French.conjugate({verb: 'acheter', tense: :present, pronoun: :nous})
+      expect(verb).to eq('achetons')
+
+      verb = Conjugate::French.conjugate({verb: 'acheter', tense: :present, pronoun: :vous})
+      expect(verb).to eq('achetez')
+
+      verb = Conjugate::French.conjugate({verb: 'acheter', tense: :present, pronoun: :ils})
+      expect(verb).to eq('achètent')
+
+
+
+      verb = Conjugate::French.conjugate({verb: 'acheter', tense: :conditional, pronoun: :je})
+      expect(verb).to eq('achèterais')
+
+      verb = Conjugate::French.conjugate({verb: 'acheter', tense: :conditional, pronoun: :tu})
+      expect(verb).to eq('achèterais')
+
+      verb = Conjugate::French.conjugate({verb: 'acheter', tense: :conditional, pronoun: :il})
+      expect(verb).to eq('achèterait')
+
+      verb = Conjugate::French.conjugate({verb: 'acheter', tense: :conditional, pronoun: :nous})
+      expect(verb).to eq('achèterions')
+
+      verb = Conjugate::French.conjugate({verb: 'acheter', tense: :conditional, pronoun: :vous})
+      expect(verb).to eq('achèteriez')
+
+      verb = Conjugate::French.conjugate({verb: 'acheter', tense: :conditional, pronoun: :ils})
+      expect(verb).to eq('achèteraient')
+
+    end
+  end
+end

data/spec/spanish_spec.rb

@@ -0,0 +1,115 @@
+# -*- coding: utf-8 -*-
+require 'rspec'
+require 'conjugate'
+
+
+describe 'Spanish Conjugations' do
+
+  describe 'methods testing' do
+
+    it '.find_irregular' do
+      type = Conjugate::Spanish.find_irregular('ventar')
+      expect(type).to eq(:ar_e_ie)
+
+      type = Conjugate::Spanish.find_irregular('haber')
+      expect(type).to eq(:er_haber)
+    end
+
+    it '.template' do
+      template = Conjugate::Spanish.template({verb: 'ventar'})
+      expect(template[:present][:yo]).to eq('{{{1}}}ie{{{2}}}o')
+
+      template = Conjugate::Spanish.template({verb: 'placer'})
+      expect(template[:present][:yo]).to eq('{{{1}}}plazco')
+    end
+    it '.conjugate regular ar' do
+      verb = Conjugate::Spanish.conjugate({verb: 'comprar', tense: :present, pronoun: :yo})
+      expect(verb).to eq('compro')
+
+      verb = Conjugate::Spanish.conjugate({verb: 'comprar', tense: :present, pronoun: :tu})
+      expect(verb).to eq('compras')
+
+      verb = Conjugate::Spanish.conjugate({verb: 'comprar', tense: :present, pronoun: :el})
+      expect(verb).to eq('compra')
+
+      verb = Conjugate::Spanish.conjugate({verb: 'comprar', tense: :present, pronoun: :nosotros})
+      expect(verb).to eq('compramos')
+
+      verb = Conjugate::Spanish.conjugate({verb: 'comprar', tense: :present, pronoun: :vosotros})
+      expect(verb).to eq('compráis')
+
+      verb = Conjugate::Spanish.conjugate({verb: 'comprar', tense: :present, pronoun: :ellos})
+      expect(verb).to eq('compran')
+
+      verb = Conjugate::Spanish.conjugate({verb: 'comprar', tense: :past, pronoun: :yo})
+      expect(verb).to eq('compré')
+
+      verb = Conjugate::Spanish.conjugate({verb: 'comprar', tense: :future, pronoun: :yo})
+      expect(verb).to eq('compraré')
+    end
+
+    it '.conjugate regular er' do
+      verb = Conjugate::Spanish.conjugate({verb: 'beber', tense: :present, pronoun: :yo})
+      expect(verb).to eq('bebo')
+
+      verb = Conjugate::Spanish.conjugate({verb: 'beber', tense: :present, pronoun: :tu})
+      expect(verb).to eq('bebes')
+
+      verb = Conjugate::Spanish.conjugate({verb: 'beber', tense: :present, pronoun: :el})
+      expect(verb).to eq('bebe')
+
+      verb = Conjugate::Spanish.conjugate({verb: 'beber', tense: :present, pronoun: :nosotros})
+      expect(verb).to eq('bebemos')
+
+      verb = Conjugate::Spanish.conjugate({verb: 'beber', tense: :present, pronoun: :vosotros})
+      expect(verb).to eq('bebéis')
+
+      verb = Conjugate::Spanish.conjugate({verb: 'beber', tense: :present, pronoun: :ellos})
+      expect(verb).to eq('beben')
+
+      verb = Conjugate::Spanish.conjugate({verb: 'beber', tense: :past, pronoun: :yo})
+      expect(verb).to eq('bebí')
+
+      verb = Conjugate::Spanish.conjugate({verb: 'beber', tense: :future, pronoun: :yo})
+      expect(verb).to eq('beberé')
+    end
+
+    it '.conjugate regular re' do
+      verb = Conjugate::Spanish.conjugate({verb: 'vivir', tense: :present, pronoun: :yo})
+      expect(verb).to eq('vivo')
+
+      verb = Conjugate::Spanish.conjugate({verb: 'vivir', tense: :present, pronoun: :tu})
+      expect(verb).to eq('vives')
+
+      verb = Conjugate::Spanish.conjugate({verb: 'vivir', tense: :present, pronoun: :el})
+      expect(verb).to eq('vive')
+
+      verb = Conjugate::Spanish.conjugate({verb: 'vivir', tense: :present, pronoun: :nosotros})
+      expect(verb).to eq('vivimos')
+
+      verb = Conjugate::Spanish.conjugate({verb: 'vivir', tense: :present, pronoun: :vosotros})
+      expect(verb).to eq('vivís')
+
+      verb = Conjugate::Spanish.conjugate({verb: 'vivir', tense: :present, pronoun: :ellos})
+      expect(verb).to eq('viven')
+
+      verb = Conjugate::Spanish.conjugate({verb: 'vivir', tense: :past, pronoun: :yo})
+      expect(verb).to eq('viví')
+
+      verb = Conjugate::Spanish.conjugate({verb: 'vivir', tense: :future, pronoun: :yo})
+      expect(verb).to eq('viviré')
+    end
+
+    it '.conjugate_irregular verb' do
+      verb = Conjugate::Spanish.conjugate({verb: 'ir', tense: :present, pronoun: :yo})
+      expect(verb).to eq('voy')
+
+      verb = Conjugate::Spanish.conjugate({verb: 'ir', tense: :past, pronoun: :yo})
+      expect(verb).to eq('fui')
+
+      verb = Conjugate::Spanish.conjugate({verb: 'ir', tense: :future, pronoun: :yo})
+      expect(verb).to eq('iré')
+    end
+
+  end
+end

metadata

@@ -1,25 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: conjugate
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Jeremy Geros
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-15 00:00:00.000000000 Z
-dependencies: []
+date: 2015-07-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 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: []
 extra_rdoc_files: []
 files:
-- .DS_Store
-- .gitignore
+- ".DS_Store"
+- ".gitignore"
+- ".travis.yml"
+- Gemfile
+- Gemfile.lock
+- Guardfile
 - LICENSE
 - README.markdown
+- Rakefile
 - conjugate.gemspec
 - lib/.DS_Store
 - lib/conjugate.rb
@@ -31,6 +64,9 @@ files:
 - lib/conjugate/spanish.rb
 - lib/conjugate/spanish_templates/irregular_verbs.rb
 - lib/conjugate/spanish_templates/templates.rb
+- spec/common_spec.rb
+- spec/french_spec.rb
+- spec/spanish_spec.rb
 homepage: https://github.com/JeremyGeros/Conjugate
 licenses:
 - MIT
@@ -41,17 +77,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Conjugate Verbs using a version of the templates defined here http://en.wiktionary.org/wiki/Category:Spanish_verb_inflection-table_templates