conjugate 1.4.19 → 1.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e4fa1d49b881834a7a9257ec44a60ebc30f571a9
+  data.tar.gz: 2ce5eb47a58c5b83303d6f5f04ddab6ab0ee0267
+SHA512:
+  metadata.gz: ce1789b185fdbd54c5efbd5bde91cad55b5350c9b0ec7536919d2bb98ed9a7df9dd0769da7ef3c99da2f88a9e7f8e1ee303864347eab4cc8a2d533ffb0b53936
+  data.tar.gz: 61739dc171da26e2518f3c7692dcd641ad0dfee25248006b16862c54d5779566f4cfc6bf44a497edeff6a3f8a55cf9fb1ce2513165bd7fa686834f61a00cc6ee

data/LICENSE

@@ -0,0 +1,24 @@
+
+The MIT License (MIT)
+
+Copyright (c) 2013 Jeremy Geros
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+        
+          

data/README.markdown

@@ -13,4 +13,38 @@ Can also pass tenses
 ```
 Conjugate::Spanish.conjugate(:pronoun => :yo, :verb => 'tener', :tense => :past)
 => tuve
-```
+```
+
+Also now works for French 
+
+```
+Conjugate::French.conjugate(:pronoun => :je, :verb => 'acheter', :tense => :present)
+=> achète
+```
+
+License
+=======
+
+The MIT License (MIT)
+
+Copyright (c) 2013 Jeremy Geros
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+        
+          

data/conjugate.gemspec

@@ -1,15 +1,15 @@
 Gem::Specification.new do |s|
   s.name        = 'conjugate'
-  s.version     = '1.4.19'
+  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'
-end
+end

data/lib/conjugate/french.rb

@@ -23,7 +23,6 @@ module Conjugate
     def conjugation_template_finder(template, tense, opts)
       if tense == :passe_compose
         if is_etre_verb(opts[:verb])
-          debug('h')
           debug(FrenchTemplates[:être])
           debug(FrenchTemplates[:être][:present])
           debug(FrenchTemplates[:être][:present][opts[:pronoun].to_sym])

data/lib/conjugate/french_templates/templates.rb

@@ -1560,8 +1560,8 @@ FrenchTemplates = {
   		:je => "{{{1}}}è{{{2}}}e",
   		:tu => "{{{1}}}è{{{2}}}es",
   		:il => "{{{1}}}è{{{2}}}e",
-  		:nous => "{{{1}}}è{{{2}}}ons",
-  		:vous => "{{{1}}}è{{{2}}}ez",
+  		:nous => "{{{1}}}e{{{2}}}ons",
+  		:vous => "{{{1}}}e{{{2}}}ez",
   		:ils => "{{{1}}}è{{{2}}}ent"
   	}, 
   	:imperfect => {

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjugate
 version: !ruby/object:Gem::Version
-  version: 1.4.19
-  prerelease: 
+  version: 1.5.0
 platform: ruby
 authors:
 - Jeremy Geros
@@ -19,6 +18,7 @@ extra_rdoc_files: []
 files:
 - .DS_Store
 - .gitignore
+- LICENSE
 - README.markdown
 - conjugate.gemspec
 - lib/.DS_Store
@@ -32,27 +32,27 @@ files:
 - lib/conjugate/spanish_templates/irregular_verbs.rb
 - lib/conjugate/spanish_templates/templates.rb
 homepage: https://github.com/JeremyGeros/Conjugate
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+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
 test_files: []