verbs 2.1.3 → 2.1.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f0be8c541f264896e8f106be8bd64f97504c6261
+  data.tar.gz: 654aee13d012ace83b367b599edaf43b35a03fb8
+SHA512:
+  metadata.gz: 4b248c62b8c8b6ce14f144bf1bd719471d09ee0303ca68872e9635ee3e914b624cdb15a4baac647415e5080cc6b015d9174a31b7a2332ebdb1d933ee63711d85
+  data.tar.gz: fdbb938f6809c81ef825d16b9f3ff62bec2740efe75e6629833a58c7fd766df90259c243c37ab9e0a72f0d4d0311a3b50fb6927c5c5c73a27808a13752d1bded

data/lib/verbs.rb

@@ -10,7 +10,7 @@ require 'verbs/improper_construction'
 module Verbs
   CONSONANTS = %w(b c d f g h j k l m n p q r s t v w x z)
   CONSONANT_PATTERN = "[#{CONSONANTS.join}]"
-  DOUBLED_CONSONANTS = %w(b c d f g h j k l m n p q r s t w z)
+  DOUBLED_CONSONANTS = %w(b c d f g h j k l m n p q r s t z)
   DOUBLED_CONSONANT_PATTERN = "[#{DOUBLED_CONSONANTS.join}]"
   VOWELS = %w(a e i o u y)
   VOWEL_PATTERN = "[#{VOWELS.join}]"

data/lib/verbs/conjugations.rb

@@ -128,6 +128,7 @@ Verbs::Conjugator.conjugations do |conjugate|
   conjugate.irregular :put, :put, :put
   conjugate.irregular :quit, :quit, :quit
   conjugate.irregular :read, :read, :read
+  conjugate.irregular :reset, :reset, :reset
   conjugate.irregular :rid, :rid, :rid
   conjugate.irregular :ride, :rode, :ridden
   conjugate.irregular :ring, :rang, :rung
@@ -198,7 +199,7 @@ Verbs::Conjugator.conjugations do |conjugate|
   conjugate.irregular :upset, :upset, :upset
   conjugate.irregular :wake, :woke, :woken
   conjugate.irregular :wear, :wore, :worn
-  conjugate.irregular :weave, :weaved, :weaved
+  conjugate.irregular :weave, :wove, :woven
   conjugate.irregular :wed, :wed, :wed
   conjugate.irregular :weep, :wept, :wept
   conjugate.irregular :wind, :wound, :wound
@@ -250,6 +251,7 @@ Verbs::Conjugator.conjugations do |conjugate|
   conjugate.single_terminal_consonant :cocker
   conjugate.single_terminal_consonant :coedit
   conjugate.single_terminal_consonant :cohabit
+  conjugate.single_terminal_consonant :color
   conjugate.single_terminal_consonant :concenter
   conjugate.single_terminal_consonant :corner
   conjugate.single_terminal_consonant :cover
@@ -427,6 +429,7 @@ Verbs::Conjugator.conjugations do |conjugate|
   conjugate.single_terminal_consonant :toughen
   conjugate.single_terminal_consonant :tower
   conjugate.single_terminal_consonant :transit
+  conjugate.single_terminal_consonant :trigger
   conjugate.single_terminal_consonant :tucker
   conjugate.single_terminal_consonant :unburden
   conjugate.single_terminal_consonant :uncover

data/lib/verbs/conjugator.rb

@@ -158,6 +158,8 @@ module Verbs
         infinitive[0..-2] + 'ies'
       elsif infinitive =~ /(ss|sh|t?ch|zz|x|#{CONSONANT_PATTERN}o)$/i
         infinitive + 'es'
+      elsif infinitive =~ /[^s]s$/i
+        infinitive + 'ses'
       else
         infinitive + 's'
       end

data/lib/verbs/verblike.rb

@@ -1,32 +1,32 @@
-module Verbs
-  module Verblike
-    class Wrapper
-      def initialize(base)
-        @base = base
-      end
-      
-      def conjugate(options)
-        words = @base.to_s.split(' ')
-        words.shift if words.first.downcase == 'to'
-        infinitive = words.shift.to_sym
-        conjugation = ::Verbs::Conjugator.conjugate infinitive, options
-        conjugated = words.unshift(conjugation.to_s).join(' ')
-        @base.is_a?(Symbol) ? conjugated.to_sym : conjugated
-      end
-    end
-    
-    module Access
-      def verb
-        ::Verbs::Verblike::Wrapper.new self
-      end
-    end
-  end
-end
-
-class String
-  include ::Verbs::Verblike::Access
-end
-
-class Symbol
-  include ::Verbs::Verblike::Access
-end
+module Verbs
+  module Verblike
+    class Wrapper
+      def initialize(base)
+        @base = base
+      end
+      
+      def conjugate(options)
+        words = @base.to_s.split(' ')
+        words.shift if words.first.downcase == 'to'
+        infinitive = words.shift.to_sym
+        conjugation = ::Verbs::Conjugator.conjugate infinitive, options
+        conjugated = words.unshift(conjugation.to_s).join(' ')
+        @base.is_a?(Symbol) ? conjugated.to_sym : conjugated
+      end
+    end
+    
+    module Access
+      def verb
+        ::Verbs::Verblike::Wrapper.new self
+      end
+    end
+  end
+end
+
+class String
+  include ::Verbs::Verblike::Access
+end
+
+class Symbol
+  include ::Verbs::Verblike::Access
+end

data/lib/verbs/version.rb

@@ -1,3 +1,3 @@
-module Verbs
-  VERSION = "2.1.3"
-end
+module Verbs
+  VERSION = "2.1.4"
+end

data/test/test_verbs.rb

@@ -53,6 +53,8 @@ class TestVerbs < Test::Unit::TestCase
   end
   def test_regular_conjugation_with_irregular_terminal_consonant
     assert_equal 'abandoned', Verbs::Conjugator.conjugate(:abandon, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
+    assert_equal 'triggered', Verbs::Conjugator.conjugate(:trigger, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
+    assert_equal 'colored', Verbs::Conjugator.conjugate(:color, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
   end
   def test_regular_conjugation_with_ean_suffix
     assert_equal 'cleaned',  Verbs::Conjugator.conjugate(:clean, :tense => :past, :person => :first, :plurality => :singular, :aspect => :perfective)
@@ -76,6 +78,7 @@ class TestVerbs < Test::Unit::TestCase
   end
   def test_conjugation_with_terminal_sibilance
     assert_equal 'passes', Verbs::Conjugator.conjugate(:pass, :tense => :present, :person => :third, :plurality => :singular, :aspect => :habitual)
+    assert_equal 'focusses', Verbs::Conjugator.conjugate(:focus, :tense => :present, :person => :third, :plurality => :singular, :aspect => :habitual)
     assert_equal 'buzzes', Verbs::Conjugator.conjugate(:buzz, :tense => :present, :person => :third, :plurality => :singular, :aspect => :habitual)
     assert_equal 'coaxes', Verbs::Conjugator.conjugate(:coax, :tense => :present, :person => :third, :plurality => :singular, :aspect => :habitual)
     assert_equal 'washes', Verbs::Conjugator.conjugate(:wash, :tense => :present, :person => :third, :plurality => :singular, :aspect => :habitual)

data/verbs.gemspec

@@ -1,24 +1,24 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "verbs/version"
-
-Gem::Specification.new do |s|
-  s.name = 'verbs'
-  s.version = Verbs::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors = ["Andy Rossmeissl"]
-  s.description = %q{Conjugates most common english verbs for all persons, tenses, standard aspects, and modern moods (with active diathesis). Standard and exceptional spelling rules are obeyed.}
-  s.summary = %q{English verb conjugation in Ruby}
-  s.email = %q{andy@rossmeissl.net}
-  s.homepage = %q{http://github.com/rossmeissl/verbs}
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-  
-  s.add_development_dependency 'bueller'
-  s.add_dependency 'activesupport', '>= 2.3.4'
-  s.add_dependency 'i18n'
-end
-
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "verbs/version"
+
+Gem::Specification.new do |s|
+  s.name = 'verbs'
+  s.version = Verbs::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors = ["Andy Rossmeissl"]
+  s.description = %q{Conjugates most common english verbs for all persons, tenses, standard aspects, and modern moods (with active diathesis). Standard and exceptional spelling rules are obeyed.}
+  s.summary = %q{English verb conjugation in Ruby}
+  s.email = %q{andy@rossmeissl.net}
+  s.homepage = %q{http://github.com/rossmeissl/verbs}
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  
+  s.add_development_dependency 'bueller'
+  s.add_dependency 'activesupport', '>= 2.3.4'
+  s.add_dependency 'i18n'
+end
+

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: verbs
 version: !ruby/object:Gem::Version
-  version: 2.1.3
-  prerelease: 
+  version: 2.1.4
 platform: ruby
 authors:
 - Andy Rossmeissl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bueller
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.4
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Conjugates most common english verbs for all persons, tenses, standard
@@ -67,8 +60,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
+- ".document"
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -86,32 +79,27 @@ files:
 - verbs.gemspec
 homepage: http://github.com/rossmeissl/verbs
 licenses: []
+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'
-      segments:
-      - 0
-      hash: -427894591
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -427894591
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: English verb conjugation in Ruby
-test_files: []
+test_files:
+- test/helper.rb
+- test/test_verbs.rb