te_reo_maori 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15f1388c18d6a441b6fd21c1ce469812ba9699ae0d077652810a123a3f02d7c2
-  data.tar.gz: ce16604c09f8dc6cd936af662947675086e41c08ada7588a9f2c4e0aab5a03b8
+  metadata.gz: 4d7e033dd690ec5a8b082f109638dedcfca0ecd77ec637426486f283b905d229
+  data.tar.gz: 733fba9ba22ac5574c552fd9854c961737175e255fce0485ee5031d3958afb91
 SHA512:
-  metadata.gz: d7f8c9574ed5707599ffb943c159d833018678a3bbf83d4efdb6e7411b84eca56585ba9b40a30299b2eb5bb718767e08006ce6dbb693fb2071d88ee2172a0d23
-  data.tar.gz: 226301514fb751764e133fff9def65574c5eb288218c2da2d353567511ef09776328863c598d21bab2757a8b3310f9d7cea19a241fb9e8d0f1b54fe1bb5223f4
+  metadata.gz: b0f769a32c1154f0a7914b9f4929358223dfea55685ae46b18e2a5f3b89403135e5027c465977c3361eed96c47fe046df18a36a6ff99019d41189a80761c29c1
+  data.tar.gz: 5c84a699c686ec242211b051eb682b7abfc0633d6082fb355cac2cc511380c9e073f71bedee4eda849869ba5c909b300ddfcca5bbc31b28e6554cadaac152ae8

data/.gitlab-ci.yml

@@ -1,8 +1,28 @@
 image: ruby:2.6
 
-before_script:
-  - bundle install
-
 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/ChangeLog

@@ -1 +1,7 @@
-* v 0.1.0 Handles numbers 1-19
+* 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

@@ -0,0 +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"]

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:latest`
+
+### 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

@@ -5,4 +5,24 @@ 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

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

data/lib/te_reo_maori/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TeReoMaori
-  VERSION = '0.1.0'
+  VERSION = '0.1.5'
 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,18 @@
+# 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 + 1
+    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.0
+  version: 0.1.5
 platform: ruby
 authors:
 - Samuel Garratt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-17 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:
@@ -23,6 +23,7 @@ files:
 - ".rspec"
 - CODE_OF_CONDUCT.md
 - ChangeLog
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -33,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: