conjugate 1.6.0 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df25562c7b30bebf362cd32ebee17284aca23b49
-  data.tar.gz: 4f01c56fe1d9665bd2ba6715d11f276b289984c2
+  metadata.gz: 62694fcd1b97309b90bfb9b45d46e08953136870
+  data.tar.gz: e2f0b278ce4cd83dfe83194c80137a3fc371aa5f
 SHA512:
-  metadata.gz: 484d6989392dc8e747975983d24a7a3ff60fadc5f1b0feb1a687e9ff218bcc8866540efaefda7ebdde9da27cc450499a636b36ab8f8fff542a15f8e538df62c5
-  data.tar.gz: 1fa557846689ba6745080f8116ff0c06a3c3bd1f8a07a9f121902c63a8e19af2c6739cce15ba2140a3427b6f36bdcad9ab42f989df083f4ff05b88fd4ac883df
+  metadata.gz: 3293687d94223d341c1d1146fc9e7d65cfdb2d5db7b47e9629f93ae2f11110bfbdf33ec0210171dfffef2e5db7b9bb92e86ac4d0f990db60d59acf56cc111ee1
+  data.tar.gz: 6c262b319dc762846f24a0a0ed4014f37b29221b144c65ae3339c6eb8aa8be3027f45ef155b2b535863587043d7f1a6d972872ae05d1caa5008bee7a048f3016

data/Gemfile

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

data/Gemfile.lock

@@ -1,13 +1,44 @@
 PATH
   remote: .
   specs:
-    conjugate (1.6.0)
+    conjugate (1.6.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    coderay (1.1.0)
     diff-lcs (1.2.5)
+    ffi (1.9.10)
+    formatador (0.2.5)
+    guard (2.12.8)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, <= 4.0)
+      lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-rspec (4.3.1)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
+    listen (3.0.1)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.9)
+    method_source (0.8.2)
+    nenv (0.2.0)
+    notiffany (0.0.6)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     rake (10.1.1)
+    rb-fsevent (0.9.5)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -16,11 +47,16 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
+    shellany (0.0.1)
+    slop (3.6.0)
+    thor (0.19.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   conjugate!
+  guard
+  guard-rspec
   rake
   rspec

data/Guardfile

@@ -1,7 +1,15 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard :rspec do
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rsspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separetly)
+#  * 'just' rspec: 'rspec'
+guard :rspec, cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
@@ -13,6 +21,7 @@ guard :rspec do
   watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
   watch('config/routes.rb')                           { "spec/routing" }
   watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  watch('spec/rails_helper.rb')                       { "spec" }
 
   # Capybara features specs
   watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }

data/README.markdown

@@ -3,7 +3,7 @@ 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.
+Currently only has support for Spanish and French.
 
 ```
 Conjugate::Spanish.conjugate(:pronoun => :yo, :verb => 'tener')
@@ -16,7 +16,7 @@ Conjugate::Spanish.conjugate(:pronoun => :yo, :verb => 'tener', :tense => :past)
 => tuve
 ```
 
-Also now works for French 
+Also now works for French
 
 ```
 Conjugate::French.conjugate(:pronoun => :je, :verb => 'acheter', :tense => :present)
@@ -62,5 +62,3 @@ 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,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name        = 'conjugate'
-  gem.version     = '1.6.0'
+  gem.version     = '1.6.2'
   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
@@ -17,4 +17,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'guard'
+  gem.add_development_dependency 'guard-rspec'
 end

data/lib/conjugate/french_templates/irregular_verbs.rb

@@ -221,8 +221,6 @@ FrenchIrregularVerbs = {
 
   'rejeter' => :e_xx_er,
 
-  'dormir' => :ir_s,
-
   'endormir' => :ir_s,
 
   'redormir' => :ir_s,
@@ -323,8 +321,6 @@ FrenchIrregularVerbs = {
 
   'geindre' => :re_gn,
 
-  'peindre' => :re_gn,
-
   'repeindre' => :re_gn,
 
   'restreindre' => :re_gn,

data/lib/conjugate/french_templates/templates.rb

@@ -2965,53 +2965,6 @@ FrenchTemplates = {
     :past_participle => "{{{1}}}i"
   },
 
-  :lire => {
-  	:infinitive => "{{{1}}}lire", 
-  	:present => {
-  		:je => "{{{1}}}lis",
-  		:tu => "{{{1}}}lis",
-  		:il => "{{{1}}}lit",
-  		:nous => "{{{1}}}lisons",
-  		:vous => "{{{1}}}lisez",
-  		:ils => "{{{1}}}lisent"
-  	}, 
-  	:imperfect => {
-  		:je => "{{{1}}}lisais",
-  		:tu => "{{{1}}}lisais",
-  		:il => "{{{1}}}lisait",
-  		:nous => "{{{1}}}lisions",
-  		:vous => "{{{1}}}lisiez",
-  		:ils => "{{{1}}}lisaient"
-  	},
-  	:past_historic => {
-  		:je => "{{{1}}}lus",
-  		:tu => "{{{1}}}lus",
-  		:il => "{{{1}}}lut",
-  		:nous => "{{{1}}}lûmes",
-  		:vous => "{{{1}}}lûtes",
-  		:ils => "{{{1}}}lurent"
-  	},
-  	:future => {
-  		:je => "{{{1}}}lirai",
-  		:tu => "{{{1}}}liras",
-  		:il => "{{{1}}}lira",
-  		:nous => "{{{1}}}lirons",
-  		:vous => "{{{1}}}lirez",
-  		:ils => "{{{1}}}liront"
-  	},
-  	:conditional => {
-  		:je => "{{{1}}}lirais",
-  		:tu => "{{{1}}}lirais",
-  		:il => "{{{1}}}lirait",
-  		:nous => "{{{1}}}lirions",
-  		:vous => "{{{1}}}liriez",
-  		:ils => "{{{1}}}liraient"
-  	},
-  	
-  	:present_participle => "{{{1}}}lisant",
-    :past_participle => "{{{1}}}lu"
-  },
-
   :luire => {
   	:infinitive => "{{{1}}}luire", 
   	:present => {
@@ -4703,54 +4656,7 @@ FrenchTemplates = {
   	:present_participle => "taisant",
     :past_participle => "tu"
   },
-
-  :tenir => {
-  	:infinitive => "{{{1}}}tenir", 
-  	:present => {
-  		:je => "{{{1}}}tiens",
-  		:tu => "{{{1}}}tiens",
-  		:il => "{{{1}}}tient",
-  		:nous => "{{{1}}}tenons",
-  		:vous => "{{{1}}}tenez",
-  		:ils => "{{{1}}}tiennent"
-  	}, 
-  	:imperfect => {
-  		:je => "{{{1}}}tenais",
-  		:tu => "{{{1}}}tenais",
-  		:il => "{{{1}}}tenait",
-  		:nous => "{{{1}}}tenions",
-  		:vous => "{{{1}}}teniez",
-  		:ils => "{{{1}}}tenaient"
-  	},
-  	:past_historic => {
-  		:je => "{{{1}}}tins",
-  		:tu => "{{{1}}}tins",
-  		:il => "{{{1}}}tint",
-  		:nous => "{{{1}}}tînmes",
-  		:vous => "{{{1}}}tîntes",
-  		:ils => "{{{1}}}tinrent"
-  	},
-  	:future => {
-  		:je => "{{{1}}}tiendrai",
-  		:tu => "{{{1}}}tiendras",
-  		:il => "{{{1}}}tiendra",
-  		:nous => "{{{1}}}tiendrons",
-  		:vous => "{{{1}}}tiendrez",
-  		:ils => "{{{1}}}tiendront"
-  	},
-  	:conditional => {
-  		:je => "{{{1}}}tiendrais",
-  		:tu => "{{{1}}}tiendrais",
-  		:il => "{{{1}}}tiendrait",
-  		:nous => "{{{1}}}tiendrions",
-  		:vous => "{{{1}}}tiendriez",
-  		:ils => "{{{1}}}tiendraient"
-  	},
-  	
-  	:present_participle => "{{{1}}}tenant",
-    :past_participle => "{{{1}}}tenu"
-  },
-
+  
   :traire => {
   	:infinitive => "traire", 
   	:present => {
@@ -5373,4 +5279,4 @@ FrenchTemplates = {
   }
 
  
-}
+}

data/spec/spanish_spec.rb

@@ -109,6 +109,9 @@ describe 'Spanish Conjugations' do
 
       verb = Conjugate::Spanish.conjugate({verb: 'ir', tense: :future, pronoun: :yo})
       expect(verb).to eq('iré')
+
+      verb = Conjugate::Spanish.conjugate(:pronoun => :yo, :verb => 'tener', :tense => :past)
+      expect(verb).to eq('tuve')
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjugate
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.2
 platform: ruby
 authors:
 - Jeremy Geros
@@ -38,6 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  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: guard-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'
 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: []