verbs 2.0.10 → 2.1.0

data/.gitignore

@@ -0,0 +1,22 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/README.rdoc

@@ -1,6 +1,6 @@
 = verbs
 
-Conjugates most common english verbs for all persons in all tenses and all standard aspects (with active diathesis and indicative mood). Standard and exceptional spelling rules are obeyed.
+Conjugates most common english verbs for all persons, tenses, standard aspects, and modern moods (with active diathesis). Standard and exceptional spelling rules are obeyed.
 
   >> Verbs::Conjugator.conjugate :be, :tense => :past, :person => :second, :plurality => :singular, :aspect => :perfective
   => :were
@@ -9,7 +9,6 @@ Conjugates most common english verbs for all persons in all tenses and all stand
   >> :sleep.verb.conjugate :tense => :future, :person => :first, :plurality => :singular, :aspect => :progressive, :subject => true
   => :"I will be sleeping"
 
-  
 == Installation
 
 The gem is hosted at http://gemcutter.org/gems/verbs
@@ -38,6 +37,10 @@ One of <tt>:habitual</tt>, <tt>:perfect</tt>, <tt>:perfective</tt>, <tt>:progres
 
 See below for a guide to verb aspect.
 
+=== <tt>:mood</tt>
+
+One of <tt>:indicative</tt>, <tt>:imperative</tt>, or <tt>:subjunctive</tt>. Defaults to <tt>:indicative</tt>.
+
 === <tt>:subject</tt>
 
 Set this to a string to prepend the conjugated verb with it. When set to <tt>true</tt>, a standard personal pronoun will be used.

data/Rakefile

@@ -1,53 +1,27 @@
 require 'rubygems'
-require 'rake'
 
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "verbs"
-    gem.summary = %Q{English verb conjugation in Ruby}
-    gem.description = %Q{Conjugates most common english verbs for all persons in all tenses and all standard aspects (with active diathesis and indicative mood). Standard and exceptional spelling rules are obeyed.}
-    gem.email = "andy@rossmeissl.net"
-    gem.homepage = "http://github.com/rossmeissl/verbs"
-    gem.authors = ["Andy Rossmeissl"]
-    gem.add_dependency 'activesupport', '>=2.3.4'
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
+  require 'bundler'
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+  $stderr.puts "You must install bundler - run `gem install bundler`"
+end
+
+begin
+  Bundler.setup
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
 end
 
+require 'bueller'
+Bueller::Tasks.new
+
+require 'rake'
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
 task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "verbs #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/lib/verbs.rb

@@ -5,6 +5,7 @@ require 'verbs/verb'
 require 'verbs/conjugator'
 require 'verbs/conjugations'
 require 'verbs/verblike'
+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)

data/lib/verbs/conjugations.rb

@@ -11,6 +11,8 @@ Verbs::Conjugator.conjugations do |conjugate|
     verb.form :were,  :tense => :past,    :person => :second, :plurality => :singular
     verb.form :were,  :tense => :past,    :person => :first,  :plurality => :plural
     verb.form :were,  :tense => :past,    :person => :third,  :plurality => :plural
+    verb.form :were,  :tense => :past,    :mood => :subjunctive
+    verb.form :be,    :tense => :present, :mood => :subjunctive
     verb.form :being, :tense => :present, :derivative => :participle
     verb.form :been,  :tense => :past,    :derivative => :participle
   end

data/lib/verbs/conjugator.rb

@@ -39,12 +39,14 @@ module Verbs
       person = options[:person] ||       :third      # first, second, third
       plurality = options[:plurality] || :singular   # singular, plural
       diathesis = options[:diathesis] || :active     # active, passive
-      mood = options[:mood] ||           :indicative # conditional, imperative, indicative, injunctive, optative, potential, subjunctive
+      mood = options[:mood] ||           :indicative # imperative, subjunctive
       aspect = options[:aspect] ||       :habitual   # perfective, habitual, progressive, perfect, prospective
-
+      
+      check_for_improper_constructions(tense, person, mood)
+      
       form = form_for(tense, aspect)
 
-      conjugation = form.map { |e| resolve e, infinitive, tense, person, plurality }.join(' ').strip
+      conjugation = form.map { |e| resolve e, infinitive, tense, person, plurality, mood }.join(' ').strip
 
       if options[:subject]
         actor = options.delete(:subject)
@@ -71,36 +73,36 @@ module Verbs
 
     private
 
-    def resolve(element, infinitive, tense, person, plurality)
+    def resolve(element, infinitive, tense, person, plurality, mood)
       case element
       when String
         element
       when :infinitive
         infinitive
       when :present, :past, :present_participle, :past_participle
-        inflect infinitive, element, person, plurality
+        inflect infinitive, element, person, plurality, mood
       when Symbol
-        inflect element, tense, person, plurality
+        inflect element, tense, person, plurality, mood
       end
     end
 
-    def inflect(infinitive, inflection, person, plurality)
-      send(*([inflection, infinitive, person, plurality][0, method(inflection).arity + 1]))
+    def inflect(infinitive, inflection, person, plurality, mood)
+      send(*([inflection, infinitive, person, plurality, mood][0, method(inflection).arity + 1]))
     end
 
-    def present(infinitive, person, plurality)
+    def present(infinitive, person, plurality, mood)
       if verb = conjugations.irregulars[infinitive]
-        conjugate_irregular(verb, :tense => :present, :person => person, :plurality => plurality)
-      elsif person == :third and plurality == :singular
+        conjugate_irregular(verb, :tense => :present, :person => person, :plurality => plurality, :mood => mood)
+      elsif person == :third and plurality == :singular and not mood == :subjunctive
         present_third_person_singular_form_for infinitive
       else
         infinitive
       end
     end
 
-    def past(infinitive, person, plurality)
+    def past(infinitive, person, plurality, mood)
       if verb = conjugations.irregulars[infinitive]
-        conjugate_irregular(verb, :tense => :past, :person => person, :plurality => plurality)
+        conjugate_irregular(verb, :tense => :past, :person => person, :plurality => plurality, :mood => mood)
       else
         regular_preterite_for infinitive
       end
@@ -209,5 +211,11 @@ module Verbs
       end
       form
     end
+    
+    def check_for_improper_constructions(tense, person, mood)
+      if mood == :imperative and not (person == :second and tense == :present)
+        raise Verbs::ImproperConstruction, 'The imperative mood requires present tense and second person'
+      end
+    end
   end
 end

data/lib/verbs/improper_construction.rb

@@ -0,0 +1,4 @@
+module Verbs
+  class ImproperConstruction < ArgumentError;
+  end
+end

data/lib/verbs/verb.rb

@@ -14,7 +14,7 @@ module Verbs
     end
     
     def form(word, options = {})
-      raise ArgumentError, 'Irregular verb specifications must identify tense and must identify either derivative or person and plurality' unless options[:tense] and (options[:derivative] or (options[:person] and options[:plurality]))
+      raise ArgumentError, 'Irregular verb specifications must identify tense and must identify either derivative, mood, or person and plurality' unless options[:tense] and (options[:derivative] or options[:mood] or (options[:person] and options[:plurality]))
       
       tense = options[:tense]
 
@@ -22,6 +22,8 @@ module Verbs
       @forms[:past] ||= {}
       if derivative = options[:derivative]
         @forms[tense][derivative] = word
+      elsif mood = options[:mood]
+        @forms[tense][mood] = word
       elsif person = options[:person]
         @forms[tense][person] ||= {}
         @forms[tense][person][options[:plurality]] = word
@@ -29,9 +31,9 @@ module Verbs
     end
     
     def [](options = {})
-      tense, person, plurality, derivative = options[:tense], options[:person], options[:plurality], options[:derivative]
-      if tense and person and plurality
-        @forms[tense].try(:[], person).try(:[], plurality)
+      tense, person, plurality, derivative, mood = options[:tense], options[:person], options[:plurality], options[:derivative], options[:mood]
+      if tense and person and plurality and mood
+        @forms[tense].try(:[], mood) || @forms[tense].try(:[], person).try(:[], plurality)
       elsif tense and derivative
         @forms[tense].try(:[], derivative)
       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

@@ -0,0 +1,3 @@
+module Verbs
+  VERSION = "2.1.0"
+end

data/test/test_verbs.rb

@@ -105,4 +105,16 @@ class TestVerbs < Test::Unit::TestCase
       assert_equal 'I will be about to accept', standard.conjugate(:accept, :tense => :future, :aspect => :prospective)
     end
   end
+  def test_mood
+    assert_equal Verbs::Conjugator.conjugate(:accept, :person => :third), Verbs::Conjugator.conjugate(:accept, :person => :third, :mood => :indicative)
+    assert_equal 'accept', Verbs::Conjugator.conjugate(:accept, :person => :third, :mood => :subjunctive)
+    assert_equal 'be', Verbs::Conjugator.conjugate(:be, :mood => :subjunctive, :tense => :present)
+    assert_equal 'were', Verbs::Conjugator.conjugate(:be, :mood => :subjunctive, :tense => :past, :aspect => :perfective)
+    assert_equal 'accept', Verbs::Conjugator.conjugate(:accept, :person => :second, :mood => :imperative)
+  end
+  def test_improper_construction
+    assert_raise Verbs::ImproperConstruction do
+      Verbs::Conjugator.conjugate(:accept, :mood => :imperative)
+    end
+  end
 end

data/verbs.gemspec

@@ -1,51 +1,23 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{verbs}
-  s.version = "2.0.10"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Andy Rossmeissl"]
-  s.date = %q{2011-06-09}
-  s.description = %q{Conjugates most common english verbs for all persons in all tenses and all standard aspects (with active diathesis and indicative mood). Standard and exceptional spelling rules are obeyed.}
-  s.email = %q{andy@rossmeissl.net}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/verbs.rb",
-    "lib/verbs/conjugations.rb",
-    "lib/verbs/conjugator.rb",
-    "lib/verbs/verb.rb",
-    "lib/verbs/verblike.rb",
-    "test/helper.rb",
-    "test/test_verbs.rb",
-    "verbs.gemspec"
-  ]
-  s.homepage = %q{http://github.com/rossmeissl/verbs}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{English verb conjugation in Ruby}
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
-    else
-      s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-    end
-  else
-    s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-  end
-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'
+end
+

metadata

@@ -1,39 +1,65 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: verbs
-version: !ruby/object:Gem::Version
-  version: 2.0.10
+version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: 
+  segments: 
+  - 2
+  - 1
+  - 0
+  version: 2.1.0
 platform: ruby
-authors:
+authors: 
 - Andy Rossmeissl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-09 00:00:00.000000000 -05:00
+
+date: 2011-08-09 00:00:00 -05:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: bueller
+  type: :development
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   name: activesupport
-  requirement: &2159015740 !ruby/object:Gem::Requirement
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 3
+        - 4
         version: 2.3.4
-  type: :runtime
-  prerelease: false
-  version_requirements: *2159015740
-description: Conjugates most common english verbs for all persons in all tenses and
-  all standard aspects (with active diathesis and indicative mood). Standard and exceptional
-  spelling rules are obeyed.
+  requirement: *id002
+description: Conjugates most common english verbs for all persons, tenses, standard aspects, and modern moods (with active diathesis). Standard and exceptional spelling rules are obeyed.
 email: andy@rossmeissl.net
 executables: []
+
 extensions: []
-extra_rdoc_files:
-- LICENSE
-- README.rdoc
-files:
+
+extra_rdoc_files: []
+
+files: 
 - .document
+- .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -41,34 +67,46 @@ files:
 - lib/verbs.rb
 - lib/verbs/conjugations.rb
 - lib/verbs/conjugator.rb
+- lib/verbs/improper_construction.rb
 - lib/verbs/verb.rb
 - lib/verbs/verblike.rb
+- lib/verbs/version.rb
 - test/helper.rb
 - test/test_verbs.rb
 - verbs.gemspec
 has_rdoc: true
 homepage: http://github.com/rossmeissl/verbs
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: English verb conjugation in Ruby
 test_files: []
+