hablaba 0.0.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 999cfb467e3b8d4b9d44c9c53c62819da12a30fc
-  data.tar.gz: 22c009cbffaffbb934cbfb11348e46edd1946abc
+SHA256:
+  metadata.gz: b3667a098fb9e82c4c24e8f823935488da1f927b39d09b1e3deb342eb309a571
+  data.tar.gz: dcbb203fe8f136e9ac1ea467407279d8c0fec7e5f2529e6de0698256ab3138b7
 SHA512:
-  metadata.gz: 8430685d0b27034bf1ebec4e16e6b63d27e3a89eaaa941eafcc2aa8c3422d6118c662892a923313859b52efc0160d7462ac172bd3016d814f6a0b932b02976fd
-  data.tar.gz: 2875b7213bd3b72da1189800b293f6012fda3c935461b2c02f3108b9e1cd6df27e90ef6d18ed1b534dfdc36df42304faefce4d440462a4445296bf5bf56819c6
+  metadata.gz: 3099e4586682a1b997a1237a69d4b85535da9e2c4a9f4149cb1fa8852b6ab5aa409df1dbc3a600703a2c026d6796f945dede4eb78ea5c25f31902506802b12b6
+  data.tar.gz: 7a964443876025f04818cf79c3ce426adc4dfc4e0e570f3af39c44e1e645129f9196e25f90db2e79f7140a94bc0db0be0972e3c533a8fda29084e4934f98006f

data/CHANGELOG.md

@@ -0,0 +1,59 @@
+# Changelog
+
+All notable changes to this project are documented here. This project adheres
+to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [1.0.0] - 2026-08-27
+
+First release in a decade. The conjugations are unchanged; everything around
+them was rebuilt.
+
+### Added
+
+- `Hablaba::Error` and its subclasses `UnknownPronounError`,
+  `UnknownVerbError` and `UnknownTenseError`, so bad input fails with a message
+  that says what was wrong.
+- Unaccented pronoun spellings (`tu`, `el`) and the feminine plurals
+  (`nosotras`, `vosotras`), for callers without a Spanish keyboard.
+- Public `Hablaba::PRONOUNS` and `Hablaba::TENSES` constants.
+- `Hablaba::VERSION`.
+- Input is Unicode-normalized, so a decomposed `e` + combining acute accent is
+  accepted wherever `é` is.
+- Surrounding whitespace in arguments is ignored.
+- A GitHub Actions build running the tests on Ruby 3.1 through 3.4 and head.
+- Full conjugation tables for one verb of each conjugation in the test suite:
+  every person, in every tense.
+
+### Changed
+
+- **Breaking:** unrecognized input raises instead of returning `nil` or
+  crashing with an internal `TypeError`/`NoMethodError`. An unknown tense used
+  to return `nil` silently.
+- **Breaking:** a pronoun must now be an exact match. `"yolanda"` previously
+  conjugated as `yo`, and `"él mismo"` crashed.
+- Requires Ruby >= 3.1.
+- The conjugation logic is now a set of lookup tables rather than one method
+  per tense per verb ending.
+
+### Fixed
+
+- User input is no longer interpolated into a regular expression.
+- Arguments are never mutated, and frozen strings are accepted.
+
+## [0.0.4] - 2015-12-09
+
+- Added the imperfect subjunctive and the accented `nosotros` form.
+
+## [0.0.3] - 2015-12-08
+
+- Added the present subjunctive, conditional and future tenses.
+
+## [0.0.2] - 2014-12-31
+
+- Made the pronoun and verb arguments case-insensitive.
+
+## [0.0.1] - 2014-12-31
+
+- Initial release: present, preterite and imperfect tenses.
+
+[1.0.0]: https://github.com/adriand/hablaba/releases/tag/v1.0.0

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014-2026 Adrian Duyzer
+
+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.md

@@ -0,0 +1,102 @@
+# Hablaba
+
+[![CI](https://github.com/adriand/hablaba/actions/workflows/ci.yml/badge.svg)](https://github.com/adriand/hablaba/actions/workflows/ci.yml)
+[![Gem Version](https://badge.fury.io/rb/hablaba.svg)](https://rubygems.org/gems/hablaba)
+
+Hablaba conjugates regular Spanish verbs in seven tenses. Pure Ruby, no runtime
+dependencies.
+
+## Installation
+
+```sh
+gem install hablaba
+```
+
+Or in a Gemfile:
+
+```ruby
+gem "hablaba"
+```
+
+## Usage
+
+```ruby
+require "hablaba"
+
+Hablaba.conjugate("yo", "hablar")                    # => "hablo"
+Hablaba.conjugate("yo", "hablar", :preterite)        # => "hablé"
+Hablaba.conjugate("nosotros", "comer", :future)      # => "comeremos"
+Hablaba.conjugate("ellas", "vivir", :conditional)    # => "vivirían"
+```
+
+The tense defaults to `:present`. Arguments are case-insensitive, trimmed of
+surrounding whitespace, and never mutated.
+
+### Pronouns
+
+    yo  tú  él  ella  usted  nosotros  vosotros  ellos  ellas  ustedes
+
+Accents are optional (`tu` and `el` work), and the feminine plurals `nosotras`
+and `vosotras` are accepted. The full list is available as
+`Hablaba::PRONOUNS`, a hash of each spelling to its column in a conjugation
+table.
+
+### Tenses
+
+| Tense                    | Example                          |
+| ------------------------ | -------------------------------- |
+| `:present`               | I *speak* — *hablo*              |
+| `:preterite`             | I *spoke* — *hablé*              |
+| `:imperfect`             | I *used to speak* — *hablaba*    |
+| `:present_subjunctive`   | I hope *that I speak* — *hable*  |
+| `:imperfect_subjunctive` | I hoped *that I spoke* — *hablara* |
+| `:conditional`           | I *would speak* — *hablaría*     |
+| `:future`                | I *will speak* — *hablaré*       |
+
+Also available as `Hablaba::TENSES`.
+
+### Errors
+
+Unrecognized input raises, rather than returning something misleading:
+
+```ruby
+Hablaba.conjugate("we", "hablar")            # Hablaba::UnknownPronounError
+Hablaba.conjugate("yo", "casa")              # Hablaba::UnknownVerbError
+Hablaba.conjugate("yo", "hablar", :pluscuamperfecto) # Hablaba::UnknownTenseError
+```
+
+All three inherit from `Hablaba::Error`, so a single `rescue` catches them:
+
+```ruby
+begin
+  Hablaba.conjugate(pronoun, verb, tense)
+rescue Hablaba::Error => e
+  warn e.message
+end
+```
+
+## Limitations
+
+- **Regular verbs only.** Irregular verbs are not detected, so
+  `Hablaba.conjugate("yo", "tener")` returns the regular `"teno"`, not
+  `"tengo"`. Stem-changing verbs (`pensar` → `pienso`) and orthographic changes
+  (`buscar` → `busqué`) are not handled either.
+- The imperfect subjunctive returns the `-ra` form (`hablara`), not the `-se`
+  form (`hablase`).
+- Voseo (`vos hablás`) is not supported.
+- Compound tenses, the imperative, and the participles are not supported.
+
+## Development
+
+```sh
+bundle install
+bundle exec rake test
+```
+
+Tests run against Ruby 3.1 through 3.4 in CI. The suite checks the complete
+conjugation table — every person, in every tense — for one verb of each
+conjugation.
+
+## License
+
+MIT. See [LICENSE](LICENSE).

data/lib/hablaba/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class Hablaba
+  VERSION = "1.0.0"
+end

data/lib/hablaba.rb

@@ -1,141 +1,161 @@
-# accented chars for copying into an editor: é ú á í ñ ó
+# frozen_string_literal: true
 
+require_relative "hablaba/version"
+
+# Hablaba conjugates regular Spanish verbs in seven tenses.
+#
+#   Hablaba.conjugate("yo", "hablar")                 # => "hablo"
+#   Hablaba.conjugate("nosotros", "comer", :future)   # => "comeremos"
+#
+# Only regular verbs are supported. Irregular verbs are not detected, so
+# Hablaba.conjugate("yo", "tener") returns the regular form "teno", not "tengo".
 class Hablaba
+  # Base class for every error Hablaba raises.
+  class Error < StandardError; end
+
+  # Raised when the pronoun is not one Hablaba recognizes.
+  class UnknownPronounError < Error; end
+
+  # Raised when the verb is not an infinitive ending in -ar, -er or -ir.
+  class UnknownVerbError < Error; end
+
+  # Raised when the tense is not one Hablaba supports.
+  class UnknownTenseError < Error; end
+
+  # Every accepted pronoun, mapped to its column in a conjugation table
+  # (0 = first person singular through 5 = third person plural). Unaccented
+  # spellings are accepted so callers do not need a Spanish keyboard.
+  PRONOUNS = {
+    "yo" => 0,
+    "tú" => 1, "tu" => 1,
+    "él" => 2, "el" => 2, "ella" => 2, "usted" => 2,
+    "nosotros" => 3, "nosotras" => 3,
+    "vosotros" => 4, "vosotras" => 4,
+    "ellos" => 5, "ellas" => 5, "ustedes" => 5
+  }.freeze
+
+  # Supported tenses, in the order they appear in the README.
+  TENSES = %i[
+    present preterite imperfect present_subjunctive
+    imperfect_subjunctive conditional future
+  ].freeze
+
+  # The three regular infinitive endings.
+  INFINITIVE_ENDINGS = %w[ar er ir].freeze
+
+  # Endings that attach to the stem (the infinitive minus -ar/-er/-ir).
+  STEM_ENDINGS = {
+    present: {
+      "ar" => %w[o as a amos áis an],
+      "er" => %w[o es e emos éis en],
+      "ir" => %w[o es e imos ís en]
+    },
+    preterite: {
+      "ar" => %w[é aste ó amos asteis aron],
+      "er" => %w[í iste ió imos isteis ieron],
+      "ir" => %w[í iste ió imos isteis ieron]
+    },
+    imperfect: {
+      "ar" => %w[aba abas aba ábamos abais aban],
+      "er" => %w[ía ías ía íamos íais ían],
+      "ir" => %w[ía ías ía íamos íais ían]
+    },
+    present_subjunctive: {
+      "ar" => %w[e es e emos éis en],
+      "er" => %w[a as a amos áis an],
+      "ir" => %w[a as a amos áis an]
+    }
+  }.freeze
+
+  # Endings that attach to the whole infinitive rather than the stem.
+  INFINITIVE_ENDINGS_BY_TENSE = {
+    conditional: %w[ía ías ía íamos íais ían],
+    future: %w[é ás á emos éis án]
+  }.freeze
+
+  # The imperfect subjunctive is built from the third person plural preterite
+  # with its -ron dropped: hablaron -> habla-, comieron -> comie-. Only the
+  # nosotros form carries an accent, so each ending has a plain and an
+  # accented variant.
+  IMPERFECT_SUBJUNCTIVE_LINKS = {
+    "ar" => %w[a á],
+    "er" => %w[ie ié],
+    "ir" => %w[ie ié]
+  }.freeze
+  private_constant :IMPERFECT_SUBJUNCTIVE_LINKS
+
+  IMPERFECT_SUBJUNCTIVE_ENDINGS = %w[ra ras ra ramos rais ran].freeze
+  private_constant :IMPERFECT_SUBJUNCTIVE_ENDINGS
+
+  # The one person whose imperfect subjunctive form is accented.
+  NOSOTROS = 3
+  private_constant :NOSOTROS
 
   class << self
-
-    # Conjugate a Spanish verb
+    # Conjugate a regular Spanish verb.
     #
     # Example:
-    #   >> Hablaba.conjugate('yo', 'hablar')
-    #   => hablo
+    #   >> Hablaba.conjugate("yo", "hablar")
+    #   => "hablo"
     #
     # Arguments:
-    #   pronoun: (String)
-    #   verb: (String)
-    #   tense: (Symbol)
-    #     - optional, defaults to :present
-    #     - options: :present, :preterite, :imperfect
+    #   pronoun: (String) one of PRONOUNS, in any case, with or without accents
+    #   verb:    (String) an infinitive ending in -ar, -er or -ir
+    #   tense:   (Symbol) one of TENSES, defaults to :present
+    #
+    # Raises UnknownPronounError, UnknownVerbError or UnknownTenseError when
+    # an argument is not recognized.
     def conjugate(pronoun, verb, tense = :present)
-      pronoun, verb = pronoun.downcase, verb.downcase
-      case tense
-      when :present
-        conjugate_in_the_present(pronoun, verb)
-      when :preterite
-        conjugate_in_the_preterite(pronoun, verb)
-      when :imperfect
-        conjugate_in_the_imperfect(pronoun, verb)
-      when :present_subjunctive
-        conjugate_in_the_present_subjunctive(pronoun, verb)
-      when :imperfect_subjunctive
-        conjugate_in_the_imperfect_subjunctive(pronoun, verb)
-      when :conditional
-        conjugate_in_the_conditional(pronoun, verb)
-      when :future
-        conjugate_in_the_future(pronoun, verb)
+      person = person_for(pronoun)
+      infinitive = normalize(verb, "verb")
+      ending = infinitive_ending(infinitive)
+      stem = infinitive[0..-3]
+
+      if (endings_by_ending = STEM_ENDINGS[tense])
+        stem + endings_by_ending.fetch(ending)[person]
+      elsif (endings = INFINITIVE_ENDINGS_BY_TENSE[tense])
+        infinitive + endings[person]
+      elsif tense == :imperfect_subjunctive
+        imperfect_subjunctive(person, ending, stem)
       else
-        # TODO: raise error
+        raise UnknownTenseError,
+              "#{tense.inspect} is not a supported tense; expected one of #{TENSES.join(', ')}"
       end
     end
 
     private
 
-    def pronouns
-      %W[yo tú él ella nosotros vosotros ellos ellas usted ustedes]
-    end
-
-    def pronoun_index(pronoun)
-      [/yo/,/tú/,/él\z|ella\z|usted\z/,/nosotros/,/vosotros/,/ellos|ellas|ustedes/].index { |p| p =~ pronoun }
-    end
-
-    def get_verb_ending_and_root(verb)
-      verb_ending = /ar\z|er\z|ir\z/.match(verb)[0]
-      root = verb.gsub(/#{verb_ending}\z/, '')
-      return verb_ending, root
-    end
-
-    def conjugate_in_the_present(pronoun, verb)
-      verb_ending, root = get_verb_ending_and_root(verb)
-      case verb_ending
-      when 'ar' then conjugate_ar_in_the_present(pronoun, root)
-      when 'er' then conjugate_er_in_the_present(pronoun, root)
-      when 'ir' then conjugate_ir_in_the_present(pronoun, root)
+    def person_for(pronoun)
+      key = normalize(pronoun, "pronoun")
+      PRONOUNS.fetch(key) do
+        raise UnknownPronounError,
+              "#{pronoun.inspect} is not a supported pronoun; expected one of #{PRONOUNS.keys.join(', ')}"
       end
     end
 
-    def conjugate_ar_in_the_present(pronoun, root_of_verb)
-      root_of_verb + %W[o as a amos áis an][pronoun_index(pronoun)]
-    end
+    def infinitive_ending(infinitive)
+      ending = infinitive[-2, 2]
+      return ending if INFINITIVE_ENDINGS.include?(ending)
 
-    def conjugate_er_in_the_present(pronoun, root_of_verb)
-      root_of_verb + %W[o es e emos éis en][pronoun_index(pronoun)]
+      raise UnknownVerbError,
+            "#{infinitive.inspect} is not an infinitive; expected a verb ending in -ar, -er or -ir"
     end
 
-    def conjugate_ir_in_the_present(pronoun, root_of_verb)
-      root_of_verb + %W[o es e imos ís en][pronoun_index(pronoun)]
+    def imperfect_subjunctive(person, ending, stem)
+      plain, accented = IMPERFECT_SUBJUNCTIVE_LINKS.fetch(ending)
+      link = person == NOSOTROS ? accented : plain
+      stem + link + IMPERFECT_SUBJUNCTIVE_ENDINGS[person]
     end
 
-    def conjugate_in_the_preterite(pronoun, verb)
-      verb_ending, root = get_verb_ending_and_root(verb)
-      if verb_ending == 'ar'
-        conjugate_ar_in_the_preterite(pronoun, root)
-      else # er and ir are the same
-        conjugate_er_ir_in_the_preterite(pronoun, root)
+    # Downcase, trim, and compose accents so that a decomposed "e" + combining
+    # acute (which is what some keyboards and macOS filenames produce) matches
+    # the precomposed "é" used in the tables above.
+    def normalize(word, label)
+      unless word.respond_to?(:to_str)
+        raise ArgumentError, "#{label} must be a String, got #{word.class}"
       end
-    end
 
-    def conjugate_ar_in_the_preterite(pronoun, root_of_verb)
-      root_of_verb + %W[é aste ó amos asteis aron][pronoun_index(pronoun)]
+      word.to_str.unicode_normalize(:nfc).strip.downcase
     end
-
-    def conjugate_er_ir_in_the_preterite(pronoun, root_of_verb)
-      root_of_verb + %W[í iste ió imos isteis ieron][pronoun_index(pronoun)]
-    end
-
-    def conjugate_in_the_imperfect(pronoun, verb)
-      verb_ending, root = get_verb_ending_and_root(verb)
-      if verb_ending == 'ar'
-        conjugate_ar_in_the_imperfect(pronoun, root)
-      else # er and ir are the same
-        conjugate_er_ir_in_the_imperfect(pronoun, root)
-      end
-    end
-
-    def conjugate_ar_in_the_imperfect(pronoun, root_of_verb)
-      root_of_verb + %W[aba abas aba ábamos abais aban][pronoun_index(pronoun)]
-    end
-
-    def conjugate_er_ir_in_the_imperfect(pronoun, root_of_verb)
-      root_of_verb + %W[ía ías ía íamos íais ían][pronoun_index(pronoun)]
-    end
-
-    # normally you would actually need to start by getting the verb in the first-person
-    # present, but since this only handles regular verbs, this is easy enough to handle
-    # with this method
-    def conjugate_in_the_present_subjunctive(pronoun, verb)
-      verb_ending, root = get_verb_ending_and_root(verb)
-      if verb_ending == 'ar'
-        root + %W[e es e emos éis en][pronoun_index(pronoun)]
-      else # er and ir are the same
-        root + %W[a as a amos áis an][pronoun_index(pronoun)]
-      end
-    end
-        
-    def conjugate_in_the_imperfect_subjunctive(pronoun, verb)
-      verb_ending, root = get_verb_ending_and_root(verb)
-      # get the third person preterite
-      third_person_root = conjugate_in_the_preterite('ellos', verb).gsub(/on\z|an\z/i, '')
-      third_person_root + %W[a as a amos ais an][pronoun_index(pronoun)]
-    end
-
-    def conjugate_in_the_conditional(pronoun, verb)
-      verb + %W[ía ías ía íamos íais ían][pronoun_index(pronoun)]
-    end
-    
-    def conjugate_in_the_future(pronoun, verb)
-      verb + %W[é ás á emos éis án][pronoun_index(pronoun)]
-    end
-
   end
-
 end

metadata

@@ -1,27 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: hablaba
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Adrian Duyzer
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2026-08-27 00:00:00.000000000 Z
 dependencies: []
-description: Hablaba conjugates regular Spanish verbs in multiple tenses
-email: adrianduyzer@gmail.com
+description: Hablaba conjugates regular Spanish verbs across seven tenses. Pure Ruby,
+  with no runtime dependencies.
+email:
+- adrianduyzer@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- LICENSE
+- README.md
 - lib/hablaba.rb
+- lib/hablaba/version.rb
 homepage: https://github.com/adriand/hablaba
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  source_code_uri: https://github.com/adriand/hablaba
+  bug_tracker_uri: https://github.com/adriand/hablaba/issues
+  changelog_uri: https://github.com/adriand/hablaba/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -29,16 +37,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.6.1
 specification_version: 4
-summary: Hablaba Spanish verb conjugator
+summary: Spanish verb conjugator
 test_files: []