te_reo_maori 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 888493dde3753dab96b6a52cf6e923c3809fbf933cbc2660e1336573f7e3680f
-  data.tar.gz: 89b86a9e0fefeede4cd44c5be9d13cc5347b37ff658708a86939cd1ebbd53b22
+  metadata.gz: 0c8a52e8d2878c16777d0c9dc0dd55f8e6bd06ab3cdba4d80b5a39848ef84668
+  data.tar.gz: d9e823fbc6fd89bfb00dd8ef07448224da8184eb026bb5e8d6c5cd17113f4eb6
 SHA512:
-  metadata.gz: 3dedcefdb704f6c04d4782eb18b6455197dff7137c41a4ff5b23bc6dc52ce9d73fc28c56583b9cb0719a5f48d5839d89421ce9ea8691d66707950221c95bf58a
-  data.tar.gz: 0214c81325760c026b87dd6af7f99f4f38c5207972ff059a023829b288fe8788ad43db076f2e3e41f639793282e97c38284c7b1d1432e4cc92e2e1d7f7d083aa
+  metadata.gz: e3347d474bcfdae117be822b4e7c767d698de58bf92e171db70822ab1e2cab34492c9a804494bc35c2424259e14ec124c0df9ec4b8569b615b27acc008fd37ed
+  data.tar.gz: af33af46aa99029683bd2e3cdc79322720a31072bb824d9962c21eb4e9b978d380bfccaede06894d1d4ba3db02f867429b8ad8c27e0118a5eeac1ab91bf78968

data/ChangeLog

@@ -1,3 +1,5 @@
+* 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

data/exe/te_reo_maori

@@ -18,8 +18,9 @@ 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 'To pronounce numbers one can use. "5.whakahua" or "whakahua((toru tekau ma tahi) + wha))"'
+puts 'See integer form by calling "to_s", e.g., "((rua tekau ma toru) + (toru tekau ma toru)).to_s" '
 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/tau.rb

@@ -13,7 +13,7 @@ module Tau
   # List numbers
   def self.rarangi
     {
-      1 => 'tahi', 2 => 'rua', 3 => 'toru', 4 => 'wha', 5 => 'rima', 6 => 'ono', 7 => 'waru',
+      1 => 'tahi', 2 => 'rua', 3 => 'toru', 4 => 'whā', 5 => 'rima', 6 => 'ono', 7 => 'waru',
       8 => 'iwa', 9 => 'iwa', 10 => 'tekau'
     }
   end

data/lib/te_reo_maori/version.rb

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

data/lib/te_reo_maori/whakahua.rb

@@ -2,24 +2,45 @@
 
 # Extension to Integer for Maori
 class Integer
+  def inspect
+    whakahua
+  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, 'Pronounciation not implemented yet' if self > 99
+    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 = self % 10
+    last_digit = lower_part % 10
     last_digit_word = Tau.rarangi[last_digit]
 
-    first_digit = (self / 10)
+    first_digit = (lower_part / 10)
     if first_digit.positive?
       if last_digit.zero?
-        return 'tekau' if first_digit == 1
-        return "#{Tau.rarangi[first_digit]} tekau"
+        return add_parts(upper_part, 'tekau') if first_digit == 1
+
+        return add_parts upper_part, "#{Tau.rarangi[first_digit]} tekau"
       end
 
-      return "tekau ma #{last_digit_word}" if first_digit == 1
+      return add_parts upper_part, "tekau mā #{last_digit_word}" if first_digit == 1
 
-      return "#{Tau.rarangi[first_digit]} tekau ma #{last_digit_word}"
+      return add_parts upper_part, "#{Tau.rarangi[first_digit]} tekau mā #{last_digit_word}"
     end
-    last_digit_word
+    add_parts upper_part, last_digit_word
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: te_reo_maori
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Samuel Garratt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2020-09-19 00:00:00.000000000 Z
 dependencies: []
 description: Tool to aid one to learn Maori and enable one to program in Maori.
 email: