te_reo_maori 0.1.2 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cea1d05343bd752d42bd5a3bbc0fcf4bfd5da4f3155a823141f87168cf30ef91
-  data.tar.gz: 78bdb847c7172cf11d63998c6155610894e965ebb66367ac1d7ac1dd7204bc93
+  metadata.gz: 04cb8205736ee80d52825971f38bf50ad638b7fa3b734a30765ff29d319f6126
+  data.tar.gz: 560c00d171aa7659025a72ba3a92e08372b49e7513eedbc76165b8ee388892d9
 SHA512:
-  metadata.gz: 97b24cc3ab1e0620e83e35ce9edbffbf3d86247c8be309799b4577e1a82ecb4f1f9f440536652421eaad71c501223eef05f0657e399036e0161a3545cf5eb57e
-  data.tar.gz: c441af3e82c6b222f2577df0506b211c5276a392564688b1bb0c090fde62d751dbe3c48b25bcd702a0f660a82b3aeeabe614fdc92881061e36792fc2d771f1f4
+  metadata.gz: 90bb5856fd16765e987a081bcdb101c9fd85f08d807ab11dd14464c77c29365edf37ff28b34c870ec4434bf782794346e845cbc601f17d8e3388926ae9db9e3c
+  data.tar.gz: e64ddf6296e44ffb9340046040e409b9891a43e031d816933e44a21ac4e09cec1c0acb335ba90169aaf9dfa2de2848209384a644b1db5a5af33ea22671d490ee

data/.gitignore

@@ -1,13 +1,13 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/.idea/
-Gemfile.lock
-
-# rspec failure tracking
-.rspec_status
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+/.idea/
+Gemfile.lock
+
+# rspec failure tracking
+.rspec_status

data/.gitlab-ci.yml

@@ -1,28 +1,28 @@
-image: ruby:2.6
-
-test:
-  before_script:
-    - bundle install
-  script:
-    - rake
-
-include:
-  - template: Code-Quality.gitlab-ci.yml
-
-docker_build:
-  variables:
-    # Use TLS https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled
-    DOCKER_HOST: tcp://docker:2376
-    DOCKER_TLS_CERTDIR: "/certs"
-  stage: deploy # Part of a later stage
-  services:
-    - docker:19.03.5-dind
-  image: docker:19.03.5
-  script:
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker pull --quiet $CI_REGISTRY_IMAGE:latest || true
-    - docker build -t $CI_REGISTRY_IMAGE:latest .
-    - docker push $CI_REGISTRY_IMAGE:latest
-  only:
-    - master
-  needs: ["test"]
+image: ruby:2.6
+
+test:
+  before_script:
+    - bundle install
+  script:
+    - rake
+
+include:
+  - template: Code-Quality.gitlab-ci.yml
+
+docker_build:
+  variables:
+    # Use TLS https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled
+    DOCKER_HOST: tcp://docker:2376
+    DOCKER_TLS_CERTDIR: "/certs"
+  stage: deploy # Part of a later stage
+  services:
+    - docker:19.03.5-dind
+  image: docker:19.03.5
+  script:
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker pull --quiet $CI_REGISTRY_IMAGE:latest || true
+    - docker build -t $CI_REGISTRY_IMAGE:latest .
+    - docker push $CI_REGISTRY_IMAGE:latest
+  only:
+    - master
+  needs: ["test"]

data/.rspec

@@ -1,3 +1,3 @@
---format documentation
---color
---require spec_helper
+--format documentation
+--color
+--require spec_helper

data/CODE_OF_CONDUCT.md

@@ -1,74 +1,74 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at TODO: Write your email address. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [https://contributor-covenant.org/version/1/4][version]
-
-[homepage]: https://contributor-covenant.org
-[version]: https://contributor-covenant.org/version/1/4/
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at TODO: Write your email address. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [https://contributor-covenant.org/version/1/4][version]
+
+[homepage]: https://contributor-covenant.org
+[version]: https://contributor-covenant.org/version/1/4/

data/ChangeLog

@@ -1,3 +1,11 @@
-* v 0.1.2 whakahua method to pronounce numbers
-* v 0.1.1 Has docker image. Handle up to 99
-* v 0.1.0 Handles numbers 1-19
+* 0.1.7 - Fixed whitu and waru number mix up
+* 0.1.6 - Allow input of macrons
+        - Fixed math test
+        - Use Ruby 2.7 in docker
+* 0.1.5 - Added simple addition math test
+* 0.1.4 - Pronounce integers on inspection for better terminal experience
+        - Handle up to 999 and accent marks
+* 0.1.3 Bug fix. 'Whakahua' did not handle 'iwa' and numbers like toru tekau
+* 0.1.2 whakahua method to pronounce numbers
+* 0.1.1 Has docker image. Handle up to 99
+* 0.1.0 Handles numbers 1-19

data/Dockerfile

@@ -1,10 +1,10 @@
-FROM ruby:2.6
-MAINTAINER Samuel Garratt
-
-RUN mkdir /app
-WORKDIR /app
-COPY . /app
-RUN gem install bundler
-RUN bundle install
-
-ENTRYPOINT ["ruby", "exe/te_reo_maori"]
+FROM ruby:3-alpine
+LABEL AUTHOR="Samuel Garratt"
+
+RUN mkdir /app
+WORKDIR /app
+COPY . /app
+RUN gem install bundler
+RUN bundle install --without development
+
+ENTRYPOINT ["ruby", "exe/te_reo_maori"]

data/Gemfile

@@ -1,9 +1,11 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in te_reo_maori.gemspec
-gemspec
-
-gem 'rake', '~> 12.0'
-gem 'rspec', '~> 3.0'
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in te_reo_maori.gemspec
+gemspec
+
+group :development do
+  gem 'rake', '~> 12.0'
+  gem 'rspec', '~> 3.0'
+end

data/LICENSE.txt

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2020 TODO: Write your name
-
-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.
+The MIT License (MIT)
+
+Copyright (c) 2020 TODO: Write your name
+
+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

@@ -1,59 +1,61 @@
-# TeReoMaori
-
-Tool to aid one to learn Maori and enable one to program in Maori.
-
-## Installation
-
-Execute interactive terminal in docker
-
-`docker run --rm -it registry.gitlab.com/samuel-garratt/te_reo_maori:latest`
-
-### As a ruby gem
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'te_reo_maori'
-```
-
-And then execute:
-
-    $ bundle install
-
-Or install it yourself as:
-
-    $ gem install te_reo_maori
-
-## Usage
-
-Count in maori
-
-```ruby
-tahi + rua
-# Will give a result of 3
-3.whakahua
-# Will return 'toru'
-whakahua(tahi + tahi)
-# Will return 'rua' 
-```
-
-Execute in interactive terminal. After installing type `te_reo_maori` on command prompt to open it.
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitLab at https://gitlab.com/samuel-garratt/te_reo_maori. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://gitlab.com/samuel-garratt/te_reo_maori/blob/master/CODE_OF_CONDUCT.md).
-
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the TeReoMaori project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://gitlab.com/samuel-garratt/te_reo_maori/blob/master/CODE_OF_CONDUCT.md).
+# TeReoMaori
+
+Tool to aid one to learn Maori and enable one to program in Maori.
+
+Learn Maori at https://maoridictionary.co.nz/
+
+## Installation
+
+Execute interactive terminal in docker
+
+`docker run --rm -it registry.gitlab.com/samuel-garratt/te_reo_maori`
+
+### As a ruby gem
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'te_reo_maori'
+```
+
+And then execute:
+
+    $ bundle install
+
+Or install it yourself as:
+
+    $ gem install te_reo_maori
+
+## Usage
+
+Count in maori
+
+```ruby
+tahi + rua
+# Will give a result of 3
+3.whakahua
+# Will return 'toru'
+whakahua(tahi + tahi)
+# Will return 'rua' 
+```
+
+Execute in interactive terminal. After installing type `te_reo_maori` on command prompt to open it.
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitLab at https://gitlab.com/samuel-garratt/te_reo_maori. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://gitlab.com/samuel-garratt/te_reo_maori/blob/master/CODE_OF_CONDUCT.md).
+
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+## Code of Conduct
+
+Everyone interacting in the TeReoMaori project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://gitlab.com/samuel-garratt/te_reo_maori/blob/master/CODE_OF_CONDUCT.md).

data/Rakefile

@@ -1,8 +1,8 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

data/bin/console

@@ -1,15 +1,15 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require 'bundler/setup'
-require 'te_reo_maori'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require 'irb'
-IRB.start(__FILE__)
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'te_reo_maori'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require 'irb'
+IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/exe/te_reo_maori

@@ -1,25 +1,28 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require 'irb'
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-require 'te_reo_maori'
-
-def putanga
-  exit
-end
-
-extend Tau # Make numbers available
-
-puts 'Nau mai haere mai. Welcome to this application for learning and interacting with Maori.'
-puts 'Type "putanga" to exit'
-puts 'Try and perform +, -, * (times), / (divide) with Maori'
-puts 'The numbers are: '
-Tau.rarangi.each do |tau, whakamaoritanga|
-  puts "#{tau}: #{whakamaoritanga}"
-end
-puts 'Example of bigger numbers. 12: "tekau ma rua". Add 23 + 33: "(rua tekau ma toru) + (toru tekau ma toru)"'
-puts 'To pronounce numbers one can use. "5.whakahua" or "whakahua((toru tekau ma tahi) + wha))"'
-puts 'If you have any ideas on how this can be improved add issue to https://gitlab.com/samuel-garratt/te_reo_maori/-/issues'
-
-IRB.start(__FILE__)
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'irb'
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'te_reo_maori'
+
+def putanga
+  exit
+end
+
+extend Tau # Make numbers available
+extend WhakamatautauPangarau
+
+puts 'Nau mai haere mai. Welcome to this application for learning and interacting with Maori.'
+puts 'Type "putanga" to exit'
+puts 'Type "pangarau" for maths test'
+puts 'Try and perform +, -, * (times), / (divide) with Maori'
+puts 'The numbers are: '
+Tau.rarangi.each do |tau, whakamaoritanga|
+  puts "#{tau}: #{whakamaoritanga}"
+end
+puts 'If you type a number and press you will see Maori equivalent. Numbers > 10 must be wrapped in (). Greatest supported is 999'
+puts 'Example of bigger numbers. 12: "tekau ma rua". Add 23 + 33: "(rua tekau ma toru) + (toru tekau ma toru)"'
+puts 'See integer form by calling "tau", e.g., "((rua tekau ma toru) + (toru tekau ma toru)).tau" '
+puts 'If you have any ideas on how this can be improved add issue to https://gitlab.com/samuel-garratt/te_reo_maori/-/issues'
+
+IRB.start(__FILE__)

data/lib/te_reo_maori.rb

@@ -1,9 +1,10 @@
-# frozen_string_literal: true
-
-require 'te_reo_maori/version'
-require 'te_reo_maori/tau'
-
-module TeReoMaori
-  class Error < StandardError; end
-  # Your code goes here...
-end
+# frozen_string_literal: true
+
+require 'te_reo_maori/version'
+require 'te_reo_maori/tau'
+require 'te_reo_maori/whakamatautau_pangarau'
+
+module TeReoMaori
+  class Error < StandardError; end
+  # Your code goes here...
+end

data/lib/te_reo_maori/tau.rb

@@ -1,78 +1,83 @@
-# frozen_string_literal: true
-
-require_relative 'whakahua'
-
-# Number in Maori
-module Tau
-  def whakahua(tau)
-    raise "Class '#{tau.class}' not implmemented" unless tau.is_a? Integer
-
-    tau.whakahua
-  end
-
-  # List numbers
-  def self.rarangi
-    {
-      1 => 'tahi', 2 => 'rua', 3 => 'toru', 4 => 'wha', 5 => 'rima', 6 => 'ono', 7 => 'waru',
-      8 => 'iwa', 10 => 'tekau'
-    }
-  end
-
-  def digit(tau, second_digit)
-    return tau if second_digit.nil?
-
-    ((tau - 1) * 10) + second_digit
-  end
-
-  # 1
-  def tahi
-    1
-  end
-
-  # 2
-  def rua(second_digit = nil)
-    digit(2, second_digit)
-  end
-
-  # 3
-  def toru(second_digit = nil)
-    digit(3, second_digit)
-  end
-
-  # 4
-  def wha(second_digit = nil)
-    digit(4, second_digit)
-  end
-
-  # 5
-  def rima(second_digit = nil)
-    digit(5, second_digit)
-  end
-
-  # 6
-  def ono(second_digit = nil)
-    digit(6, second_digit)
-  end
-
-  def whitu(second_digit = nil)
-    digit(7, second_digit)
-  end
-
-  def waru(second_digit = nil)
-    digit(8, second_digit)
-  end
-
-  def iwa(second_digit = nil)
-    digit(9, second_digit)
-  end
-
-  # 10. Used to add groups of 10
-  def tekau(extra_digit = nil)
-    extra_digit ? 10 + extra_digit : 10
-  end
-
-  # Add extra digit
-  def ma(extra_digit)
-    extra_digit
-  end
-end
+# frozen_string_literal: true
+
+require_relative 'whakahua'
+
+# Number in Maori
+module Tau
+  def whakahua(tau)
+    raise "Class '#{tau.class}' not implmemented" unless tau.is_a? Integer
+
+    tau.whakahua
+  end
+
+  # List numbers
+  def self.rarangi
+    {
+      1 => 'tahi', 2 => 'rua', 3 => 'toru', 4 => 'whā', 5 => 'rima', 6 => 'ono', 7 => 'whitu',
+      8 => 'waru', 9 => 'iwa', 10 => 'tekau'
+    }
+  end
+
+  # Handles multiple digits
+  def digit(tau, second_digit)
+    return tau if second_digit.nil?
+
+    ((tau - 1) * 10) + second_digit
+  end
+
+  # 1
+  def tahi
+    1
+  end
+
+  # 2
+  def rua(second_digit = nil)
+    digit(2, second_digit)
+  end
+
+  # 3
+  def toru(second_digit = nil)
+    digit(3, second_digit)
+  end
+
+  # 4
+  def wha(second_digit = nil)
+    digit(4, second_digit)
+  end
+
+  alias whā wha
+
+  # 5
+  def rima(second_digit = nil)
+    digit(5, second_digit)
+  end
+
+  # 6
+  def ono(second_digit = nil)
+    digit(6, second_digit)
+  end
+
+  def whitu(second_digit = nil)
+    digit(7, second_digit)
+  end
+
+  def waru(second_digit = nil)
+    digit(8, second_digit)
+  end
+
+  def iwa(second_digit = nil)
+    digit(9, second_digit)
+  end
+
+  # 10. Used to add groups of 10
+  def tekau(extra_digit = nil)
+    extra_digit ? 10 + extra_digit : 10
+  end
+
+  # Add extra digit
+  def ma(extra_digit)
+    extra_digit
+  end
+
+  alias mā ma
+end

data/lib/te_reo_maori/version.rb

@@ -1,5 +1,5 @@
-# frozen_string_literal: true
-
-module TeReoMaori
-  VERSION = '0.1.2'
-end
+# frozen_string_literal: true
+
+module TeReoMaori
+  VERSION = '0.1.7'
+end

data/lib/te_reo_maori/whakahua.rb

@@ -1,22 +1,51 @@
-# frozen_string_literal: true
-
-# Extension to Integer for Maori
-class Integer
-  # Pronounce number
-  def whakahua
-    raise NotImplementedError, 'Pronounciation not implemented yet' if self > 99
-
-    last_digit = self % 10
-    last_digit_word = Tau.rarangi[last_digit]
-
-    first_digit = (self / 10)
-    if first_digit.positive?
-      return 'tekau' if last_digit.zero?
-
-      return "tekau ma #{last_digit_word}" if first_digit == 1
-
-      return "#{Tau.rarangi[first_digit]} tekau ma #{last_digit_word}"
-    end
-    last_digit_word
-  end
-end
+# frozen_string_literal: true
+
+# Extension to Integer for Maori
+class Integer
+  def inspect
+    whakahua
+  end
+
+  # Numeric form of integer
+  def tau
+    to_s
+  end
+
+  # @param [Integer] upper_part Integer of number of 100s
+  # @param [String] lower_part Already translated part less than 100
+  def add_parts(upper_part, lower_part)
+    if upper_part == 0
+      lower_part
+    elsif upper_part == 1
+      "kotahi rau #{lower_part}"
+    else
+      "#{upper_part.whakahua} rau #{lower_part}"
+    end
+  end
+
+  # Pronounce number
+  def whakahua
+    raise NotImplementedError, "Amount of #{self} implemented yet" if self > 999 || self < 1
+    return 'kotahi rau' if self == 100
+
+    lower_part = self % 100
+    upper_part = self / 100
+
+    last_digit = lower_part % 10
+    last_digit_word = Tau.rarangi[last_digit]
+
+    first_digit = (lower_part / 10)
+    if first_digit.positive?
+      if last_digit.zero?
+        return add_parts(upper_part, 'tekau') if first_digit == 1
+
+        return add_parts upper_part, "#{Tau.rarangi[first_digit]} tekau"
+      end
+
+      return add_parts upper_part, "tekau mā #{last_digit_word}" if first_digit == 1
+
+      return add_parts upper_part, "#{Tau.rarangi[first_digit]} tekau mā #{last_digit_word}"
+    end
+    add_parts upper_part, last_digit_word
+  end
+end

data/lib/te_reo_maori/whakamatautau_pangarau.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+# Math test
+module WhakamatautauPangarau
+  # Mathematics. Start a maths test
+  def pangarau
+    puts 'Nau mai. Please type the answer in Teo Reo Maori (e.g "tahi" for 1) when prompted'
+    tau1 = rand(100).to_i
+    tau2 = rand(100).to_i
+    whakautu_tika = tau1 + tau2
+    puts "#{tau1.inspect} + #{tau2.inspect}?"
+    whakautu = eval(gets).to_i
+    if whakautu == whakautu_tika
+      puts 'Ka pai. Correct!'
+    else
+      puts "Incorrect. You put '#{whakautu.inspect} (#{whakautu})'.
+  Correct answer is '#{whakautu_tika.inspect} (#{whakautu_tika})'"
+    end
+  end
+end

data/te_reo_maori.gemspec

@@ -1,29 +1,29 @@
-# frozen_string_literal: true
-
-require_relative 'lib/te_reo_maori/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'te_reo_maori'
-  spec.version       = TeReoMaori::VERSION
-  spec.authors       = ['Samuel Garratt']
-  spec.email         = ['samuel.garratt@integrationqa.com']
-
-  spec.summary       = 'Tool to aid one to learn Maori and enable one to program in Maori.'
-  spec.description   = 'Tool to aid one to learn Maori and enable one to program in Maori.'
-  spec.homepage      = 'https://gitlab.com/samuel-garratt/te_reo_maori'
-  spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
-
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://gitlab.com/samuel-garratt/te_reo_maori'
-  spec.metadata['changelog_uri'] = 'https://gitlab.com/samuel-garratt/te_reo_maori/ChangeLog'
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-end
+# frozen_string_literal: true
+
+require_relative 'lib/te_reo_maori/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'te_reo_maori'
+  spec.version       = TeReoMaori::VERSION
+  spec.authors       = ['Samuel Garratt']
+  spec.email         = ['samuel.garratt@integrationqa.com']
+
+  spec.summary       = 'Tool to aid one to learn Maori and enable one to program in Maori.'
+  spec.description   = 'Tool to aid one to learn Maori and enable one to program in Maori.'
+  spec.homepage      = 'https://gitlab.com/samuel-garratt/te_reo_maori'
+  spec.license       = 'MIT'
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = 'https://gitlab.com/samuel-garratt/te_reo_maori'
+  spec.metadata['changelog_uri'] = 'https://gitlab.com/samuel-garratt/te_reo_maori/ChangeLog'
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: te_reo_maori
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.7
 platform: ruby
 authors:
 - Samuel Garratt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2021-05-01 00:00:00.000000000 Z
 dependencies: []
 description: Tool to aid one to learn Maori and enable one to program in Maori.
 email:
@@ -35,6 +35,7 @@ files:
 - lib/te_reo_maori/tau.rb
 - lib/te_reo_maori/version.rb
 - lib/te_reo_maori/whakahua.rb
+- lib/te_reo_maori/whakamatautau_pangarau.rb
 - te_reo_maori.gemspec
 homepage: https://gitlab.com/samuel-garratt/te_reo_maori
 licenses:
@@ -58,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Tool to aid one to learn Maori and enable one to program in Maori.