te_reo_maori 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9c4d305f849d2fb625c6d34cf88e0bf45ef333ae788ab8ae68fb997208582e8
-  data.tar.gz: 8d9ebc46de387bf2423bd5442e9645de57f0e07ca4ea25606c36a57135157c6c
+  metadata.gz: 33fd56f0fbea59f62ed3418fbd08300062f79157c5420213908d57b0f4b10c5b
+  data.tar.gz: 61891b379f7de2fc0b89c4c9a45b405053e2f859ee77e7a5afd49d1c1ed3a6f4
 SHA512:
-  metadata.gz: 89addf2f4b6d484bc4fb1d2def719d61019de90846a1a929b42cefff1f40a80a1d317bf3430b6dcbf3a822e3a3a5a0242916425fce225cf2ce4717b46260207f
-  data.tar.gz: 336ff0c1fbaf7b977e8ad8e35dfbccf70e8f9eb09c63dd45646d3d2a9858df88c0343d6527d79cd92404e1e2eddb77fb7a1ba650d6d10ac08e6b50979051790f
+  metadata.gz: 462f7843737bdd38df06ea4d46355d41bc3688f85d8d016aac68e5dc722c1055711f5ca8c028ea6bc24b2a27baf4e6688a3cba4f3c3737a6605b60af5a48b0f9
+  data.tar.gz: fab3e451336138f49b03697f412d3fdb61b62687d7765f6a510aa7efdaf4564fd31791167b3ff5ba8e5a0f0ea466bdb3050e7605f072a609f11b1f541c7166ed

data/ChangeLog

@@ -1,2 +1,10 @@
-* v 0.1.1 Has docker image. Handle up to 99
-* v 0.1.0 Handles numbers 1-19
+* 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
+FROM ruby:2.7
 MAINTAINER Samuel Garratt
 
 RUN mkdir /app
 WORKDIR /app
 COPY . /app
 RUN gem install bundler
-RUN bundle install
+RUN bundle install --without development
 
 ENTRYPOINT ["ruby", "exe/te_reo_maori"]

data/Gemfile

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

data/README.md

@@ -4,6 +4,12 @@ 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`
+
+### As a ruby gem
+
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -25,8 +31,14 @@ 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.
@@ -35,7 +47,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitLab at https://github.com/samuelgarratt/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://github.com/[USERNAME]/te_reo_maori/blob/master/CODE_OF_CONDUCT.md).
+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
@@ -44,4 +56,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## 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://github.com/[USERNAME]/te_reo_maori/blob/master/CODE_OF_CONDUCT.md).
+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/exe/te_reo_maori

@@ -10,14 +10,19 @@ def putanga
 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 'Example of bigger numbers. 12: (tekau ma rua). Add 23 + 33: (rua tekau ma toru) + (toru tekau ma toru)  '
+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

@@ -2,6 +2,7 @@
 
 require 'te_reo_maori/version'
 require 'te_reo_maori/tau'
+require 'te_reo_maori/whakamatautau_pangarau'
 
 module TeReoMaori
   class Error < StandardError; end

data/lib/te_reo_maori/tau.rb

@@ -1,12 +1,20 @@
 # 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'
+      1 => 'tahi', 2 => 'rua', 3 => 'toru', 4 => 'whā', 5 => 'rima', 6 => 'ono', 7 => 'waru',
+      8 => 'iwa', 9 => 'iwa', 10 => 'tekau'
     }
   end
 
@@ -36,6 +44,8 @@ module Tau
     digit(4, second_digit)
   end
 
+  alias whā wha
+
   # 5
   def rima(second_digit = nil)
     digit(5, second_digit)
@@ -67,4 +77,6 @@ module Tau
   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.1'
+  VERSION = '0.1.6'
 end

data/lib/te_reo_maori/whakahua.rb

@@ -0,0 +1,51 @@
+# 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: te_reo_maori
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.6
 platform: ruby
 authors:
 - Samuel Garratt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2020-09-30 00:00:00.000000000 Z
 dependencies: []
 description: Tool to aid one to learn Maori and enable one to program in Maori.
 email:
@@ -34,6 +34,8 @@ files:
 - lib/te_reo_maori.rb
 - 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: