rw_validator 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ddd2b405a5a0c1feadbc3e1581326043e87522e0f4de10e0bfbd0cf89068dd6
-  data.tar.gz: 5e638c126d65fcf762269c27bb982bbf7f4a11e98f8b4d1c15220279e189e293
+  metadata.gz: 2c65589b8620235352d2924fb4bcfeaabdf441d7aa6a23258282c58aceb59fbc
+  data.tar.gz: 3efc703468e18bba2a65d4bb4d9defe156d24783511c2c03b5181d4c48e045c0
 SHA512:
-  metadata.gz: 6d5672a54622c078e114192fec34ff3962432358f355e59b349015e9c43bbd43b244e8d3b0941f4e88182e89ac482258b9b5fb3393287eeccc8bff1c4939b284
-  data.tar.gz: b1aa6cf035dc4d1b12277593f642d7d07383dc555908a41748a30d991d630ee9dc08eaeb0e4b5999dccc13034fad7c8826644532aa435c1d536bdaf52001d870
+  metadata.gz: ce7290828e74679a135c6f407275029f74ef60c6550e5a4949c02937dcf6d4b91abc4a90336ed3d84c9324d371b2d7593dac8eb34d910ea5fc13a9c1d7890841
+  data.tar.gz: 43203a490428887ebfd7509f0966a8a466cc4781e4871f7bc7d5208e3a9a2bb40541ae0a6c442e8085b4f5d953bf5e64cf8a5d3e680f7aa57397fbfc740880d6

data/.github/workflows/ci.yml

@@ -0,0 +1,22 @@
+name: Ruby
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake

data/.rubocop.yml

@@ -1,5 +1,6 @@
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.7
+  SuggestExtensions: false
 
 Style/StringLiterals:
   Enabled: true

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## [0.1.1] - 2021-06-14
+
+- Linting
+- Code refactoring
+
 ## [0.1.0] - 2021-06-14
 
 - Added phone number validator

data/README.md

@@ -25,8 +25,8 @@ Or install it yourself as:
   ```ruby
   require "rw_validator"
 
-  RwValidator.is_phone_number? "0788854444" // true
-  RwValidator.is_phone_number? "0778854444" // false
+  RwValidator.phone_number? "0788854444" // true
+  RwValidator.phone_number? "0778854444" // false
 
   ```
 
@@ -34,8 +34,8 @@ Or install it yourself as:
 
   ```ruby
 
-  RwValidator.is_national_id? "1199672222000040" // true
-  RwValidator.is_national_id? "1201772222000040" // false
+  RwValidator.national_id? "1199672222000040" // true
+  RwValidator.national_id? "1201772222000040" // false
 
   ```
 
@@ -49,4 +49,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the rw_validator::Validator project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/knowbee/rw-validator-gem/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the rw_validator::Validator project's codebases, and issue trackers is expected to follow the [code of conduct](https://github.com/knowbee/rw-validator-gem/blob/master/CODE_OF_CONDUCT.md).

data/lib/rw_validator.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 require_relative "./rw_validator/validator"
 
+# RwValidator Module
 module RwValidator
-
-  class << self 
-    def is_phone_number?(number)
-      Validate.new.is_phone_number?(number)
+  class << self
+    def phone_number?(number)
+      Validate.new.phone_number?(number)
     end
 
-    def is_national_id?(id)
-      Validate.new.is_national_id?(id)
+    def national_id?(id)
+      Validate.new.national_id?(id)
     end
   end
-end
+end

data/lib/rw_validator/validator.rb

@@ -3,22 +3,24 @@
 require_relative "version"
 
 module RwValidator
-    class Error < StandardError; end
-    class Validate
-      def is_phone_number?(number)
-        number.match(/^(\+?25)?(078|075|073|072)\d{7}$/).nil? ? false : true
-      end
+  class Error < StandardError; end
 
-      def is_national_id?(id)
-        return false if id.length < 16 || id.length > 16 
-        year_born = id[1..4]
-        return !id.match(/^[1-3](19|20)\d{2}[7-8]\d{7}[0-9]\d{2}$/).nil? && check_if_eligible?(year_born)
-      end
+  # Validate class, validate phone number and national id
+  class Validate
+    def phone_number?(number)
+      number.match(/^(\+?25)?(079|078|075|073|072)\d{7}$/).nil? ? false : true
+    end
+
+    def national_id?(id)
+      return false if id.length < 16 || id.length > 16
 
-      def check_if_eligible?(year_born)
-        current_year = Time.new.year
-        current_year.to_i - year_born.to_i  < 16 ? false : true
-      end
+      year_born = id[1..4]
+      !id.match(/^[1-3](19|20)\d{2}[7-8]\d{7}[0-9]\d{2}$/).nil? && check_if_eligible?(year_born)
     end
 
+    def check_if_eligible?(year_born)
+      current_year = Time.new.year
+      current_year.to_i - year_born.to_i >= 16
+    end
+  end
 end

data/lib/rw_validator/version.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 module RwValidator
   module VERSION
     MAJOR = 0
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
-    STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
+    STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
 
     SUMMARY = "rw_validator #{STRING}"
   end
-end
+end

data/rw_validator.gemspec

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
 require_relative "lib/rw_validator/version"
 
 Gem::Specification.new do |spec|
@@ -12,9 +13,9 @@ Gem::Specification.new do |spec|
   spec.description   = "Validate Rwandan phone numbers and national id"
   spec.homepage      = "https://github.com/knowbee/rw-validator-gem"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.metadata["allowed_push_host"] = 'https://rubygems.org'
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/knowbee/rw-validator-gem.git"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rw_validator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Igwaneza Bruce
@@ -17,6 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -48,7 +49,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -58,5 +59,5 @@ requirements: []
 rubygems_version: 3.2.16
 signing_key:
 specification_version: 4
-summary: rw_validator 0.1.0
+summary: rw_validator 0.1.1
 test_files: []