nanakshahi 0.1.8 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8bf32dd0f801fd9e4f465ba281842e52a79f1b256612b330464b2b775cb6b91
-  data.tar.gz: 1ddc9d47468022bc6a6118458da69dc412546dc281d9103f3b222635d31eb945
+  metadata.gz: 6d6f1860020f496e46759bfbf773e907511eef5349cd1386fd305473bbfca0c2
+  data.tar.gz: 348c4f90184c307f2ba3d7eba2867dbdd089288285eb5fd2761f42a6be631096
 SHA512:
-  metadata.gz: 5b40df13b0fbbc96f76c0727d42f6bfe6d1ea8247e65130162707517425ef554a060de418c6fab0a38b4a158f5513655a5f7229edda53a355dd61f857c8726cc
-  data.tar.gz: 7ff41203d3d4dd9064c557be241ef4989e724a2b50879d605a5b37666e0c89330e9ed87eca964f3b32849218b7e05210dad52c6b3fc77fe4b648ca6ba14f85f7
+  metadata.gz: e9c95621d31dc09b969aa75a7d32e843094e13388e2ef66d8f790065621958abc0899456b26d62c2fae2f8ccaa4ab63a3bc93a7d3ca5f86cf72e80d101b12f7a
+  data.tar.gz: ec63fb3edd2a44f293943e2eb754872483282e2eee3a80dc67e2990528959f527ab77a94d6836d4ff4b9b090e72911110aa0a9c7f58a372731946748fae6e98b

data/.github/workflows/gempush.yml

@@ -0,0 +1,48 @@
+name: Ruby Gem
+
+on: [push]
+
+jobs:
+  minitest:
+    name: Run tests
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Set up Ruby 2.7.1
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.7.x
+
+      - name: Run minitest
+        run: |
+          bundle install
+          bundle exec rake test
+
+  publish:
+    name: Publish
+    runs-on: ubuntu-latest
+
+    if: github.ref == 'refs/heads/master'
+
+    needs: minitest
+
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Set up Ruby 2.7
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.7.x
+
+      - name: Publish to RubyGems
+        run: |
+          mkdir -p $HOME/.gem
+          touch $HOME/.gem/credentials
+          chmod 0600 $HOME/.gem/credentials
+          printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+          gem build *.gemspec
+          gem push *.gem
+        env:
+          GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_AUTH_TOKEN}}

data/CHANGELOG.md

@@ -1,8 +1,34 @@
 # coding: UTF-8
+=== 0.3 / 2021-09-20
+
+Features:
+
+- Now supports Shahmukhi Script of Panjabi language via `to_shahmukhi` method
+
+Bug fixes:
+- Fixed a bug which returned incorrect `to_gregorian method`
+
+=== 0.2.0 / 2021-09-12
+
+Bug fixes:
+
+- Updated rake 13.0.6 (was 13.0.1)
+- Updated minitest 5.14.4 (was 5.14.0)
+- Updated i18n 1.8.10 (was 1.8.2)
+
+=== 0.1.9 / 2020-04-15
+
+Bug fixes:
+
+- Updated Rakefile to Version 13.0 - security fix
+- Updated minitest to version to 15.4
+- Updated i18n to version 1.8.2
+- Updated bundler to version 2.1
+- Added a new test for 1 Vaisakh
 
 === 0.1.8 / 2019-03-14
 
 Bug fixes:
 
-* Fixed to_s method that failed because of unavailability of locales.
-* Added a CHANGELOG.md to the gem code to keep track of changes over time.
+- Fixed to_s method that failed because of unavailability of locales.
+- Added a CHANGELOG.md to the gem code to keep track of changes over time.

data/Gemfile.lock

@@ -1,26 +1,26 @@
 PATH
   remote: .
   specs:
-    nanakshahi (0.1.1)
-      i18n (~> 1.1, >= 1.1.4)
+    nanakshahi (0.2.0)
+      i18n (~> 1.8, >= 1.8.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    concurrent-ruby (1.1.4)
-    i18n (1.5.1)
+    concurrent-ruby (1.1.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
-    rake (10.5.0)
+    minitest (5.14.4)
+    rake (13.0.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
-  minitest (~> 5.0)
+  bundler (~> 2.1)
+  minitest (~> 5.14)
   nanakshahi!
-  rake (~> 10.0)
+  rake (~> 13.0)
 
 BUNDLED WITH
-   1.17.2
+   2.2.22

data/README.md

@@ -1,8 +1,9 @@
-# ਨਾਨਕਸ਼ਾਹੀ (Nanakshahi)
+ਨਾਨਕਸ਼ਾਹੀ (Nanakshahi)[![Gem Version](https://badge.fury.io/rb/nanakshahi.svg)](https://badge.fury.io/rb/nanakshahi)  ![Build Status](https://github.com/akaltakht/nanakshahi/actions/workflows/gempush.yml/badge.svg)
+========
 
 ਨਾਨਕਸ਼ਾਹੀ ਇੱਕ ਰੂਬੀ ਪਰੋਗਰਾਮਿੰਗ ਭਾਸ਼ਾ ਚ ਲਿਖਿਆ ਗਿਆ gem ਹੈ ਜੋ ਕਿ [ਪਾਲ ਸਿੰਘ ਪੁਰੇਵਾਲ](http://purewal.biz/) ਦੁਆਰਾ ਲਿਖੇ ਗਏ [ਮੂਲ ਨਾਨਕਸ਼ਾਹੀ ਕਲੰਡਰ](http://www.purewal.biz/Gurbani_and_Nanakshahi_Calendar.pdf) ਤੇ ਅਧਾਰਿਤ ਹੈ।
 
-ਇਹ ਆਮ/ਗਰਿਗੋਰੀਅਨ ਕਲੰਡਰ ਦੀਆਂ ਤਰੀਕਾਂ ਤੋਂ ਨਾਨਕਸ਼ਾਹੀ ਤੇ ਵਾਪਸ ਬਦਲਣ ਦੇ ਤਰੀਕੇ ਮੁਹੱੲੀਆ ਕਰਵਾਉਂਦਾ ਹੈ। ਤੁਸੀਂ ਇਸ ਨੂੰ ਕਿਸੇ ਵੀ ਰੂਬੀ ਪਰੋਗਰਾਮ ਵਿੱਚ ਨਾਨਕਸ਼ਾਹੀ ਤਰੀਕਾਂ ਵਰਤਣ ਲੲੀ ਵਰਤ ਸਕਦੇ ਹੋ।
+ਇਹ ਆਮ/ਗਰਿਗੋਰੀਅਨ ਕਲੰਡਰ ਦੀਆਂ ਤਰੀਕਾਂ ਤੋਂ ਨਾਨਕਸ਼ਾਹੀ ਤੇ ਵਾਪਸ ਬਦਲਣ ਦੇ ਤਰੀਕੇ ਮੁਹੱਈਆ ਕਰਵਾਉਂਦਾ ਹੈ। ਤੁਸੀਂ ਇਸ ਨੂੰ ਕਿਸੇ ਵੀ ਰੂਬੀ ਪਰੋਗਰਾਮ ਵਿੱਚ ਨਾਨਕਸ਼ਾਹੀ ਤਰੀਕਾਂ ਵਰਤਣ ਲਈ ਵਰਤ ਸਕਦੇ ਹੋ।
 
 Nanakshahi is a ruby gem for Nanakshahi Calendar based on the [original work](http://www.purewal.biz/Gurbani_and_Nanakshahi_Calendar.pdf) by [Pal Singh Purewal](http://purewal.biz/).
 
@@ -96,7 +97,7 @@ For a complete list of all the methods, check out [the documentation](https://ww
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/punjab/nanakshahi.
+Bug reports and pull requests are welcome on GitHub at https://github.com/akaltakht/nanakshahi.
 
 ## License
 

data/config/locales/pa_PK.yml

@@ -0,0 +1,34 @@
+pa_PK:
+  nanakshahi_months:
+    -
+    - چیت
+    - وساکھ
+    - جیٹھ
+    - ہاڑھ
+    - ساؤݨ
+    - بھادوں
+    - اسو
+    - کتک
+    - مگھر
+    - پوہ
+    - ماگھ
+    - پھگݨ
+  digits:
+    - ۰
+    - ۱
+    - ۲
+    - ۳
+    - ۴
+    - ۵
+    - ۶
+    - ۷
+    - ۸
+    - ۹
+  day_names:
+    - سوم وار
+    - منگل
+    - بدھ
+    - جمعرات
+    - شکروار
+    - سن
+    - اتوار

data/lib/nanakshahi/version.rb

@@ -1,3 +1,3 @@
 class Nanakshahi
-  VERSION = "0.1.8"
+  VERSION = "0.3"
 end

data/lib/nanakshahi.rb

@@ -15,7 +15,7 @@ require "nanakshahi/gurpurab"
 # @attr_reader [Integer] day Day part of Nanakshahi date object
 class Nanakshahi
   I18n.load_path << Dir[File.expand_path("config/locales") + "/*.yml"]
-  I18n.available_locales = [:en, :pa]
+  I18n.available_locales = [:en, :pa, :pa_PK]
   include Comparable
   extend Utils
   extend Grid
@@ -42,15 +42,7 @@ class Nanakshahi
   #
   # @return [Date] Converts nanakshahi into corresponding gregorian# as Date object
   def to_gregorian
-    last_nmonth_of_gyear = 10 # ਪੋਹ
-    last_nday_of_gyear = 18 # ੧੮
-
-    if month <= last_nmonth_of_gyear && day <= last_nday_of_gyear
-      gyear = year + 1468
-    else
-      gyear = year + 1469
-    end
-
+    gyear = year + 1468
     nanakshahi_months = self.class.date_grid(gyear)
     nanakshahi_months[month - 1][day - 1]
   end
@@ -71,6 +63,14 @@ class Nanakshahi
     "#{panjabi_numerals(day)} #{I18n.t(:nanakshahi_months, locale: :pa)[month]}, #{panjabi_numerals(year_zero_correction(year))} #{era}"
   end
 
+  # Shahmukhi String representation of Nanakshahi object
+  #
+  # @return [String] Shahmukhi String representation of Nanakshahi
+  def to_shahmukhi
+    era = year < 1 ? :دھندکال  : :نانکشاھی 
+    "#{shahmukhi_numerals(day)} #{I18n.t(:nanakshahi_months, locale: :pa_PK)[month]} #{shahmukhi_numerals(year_zero_correction(year))} #{era} "
+  end
+
   # Checks Nanakshahi leap year
   #
   # @return [Boolean] True if Nanakshahi year's Phagun has 31 days
@@ -157,4 +157,13 @@ class Nanakshahi
   def panjabi_numerals(number)
     number.to_s.chars.map { |digit| I18n.t(:digits, locale: :pa)[digit.to_i] }.join
   end
+
+  # Converts english numerals to Shahmukhi
+  #
+  # @param [Integer] number A numeric usually date
+  # @return [String] Shahmukhi representation of date
+  # @private
+  def shahmukhi_numerals(number)
+    number.to_s.chars.map { |digit| I18n.t(:digits, locale: :pa_PK)[digit.to_i] }.join
+  end
 end

data/nanakshahi.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_runtime_dependency "i18n", "~> 1.5", ">= 1.5.1"
+  spec.add_development_dependency "bundler", "~> 2.1"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "minitest", "~> 5.14"
+  spec.add_runtime_dependency "i18n", "~> 1.8", ">= 1.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanakshahi
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: '0.3'
 platform: ruby
 authors:
 - Arvinder Singh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,62 +16,62 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.14'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.8.1
 description: Implementation of original nanakshahi calendar developed by Pal Singh
   Purewal
 email:
@@ -80,6 +80,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/gempush.yml"
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".travis.yml"
@@ -93,6 +94,7 @@ files:
 - bin/setup
 - config/locales/en.yml
 - config/locales/pa.yml
+- config/locales/pa_PK.yml
 - lib/nanakshahi.rb
 - lib/nanakshahi/date.rb
 - lib/nanakshahi/grid.rb
@@ -119,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Nanakshahi calendar by Pal Singh Purewal