torasup 0.2.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edd45e45ba249800acd5270089cc64b53592617106d1e51a27ccb852b405f1bd
-  data.tar.gz: 553054695cf8be0734cad6d576bf0a5d1c702fb58a512607e2611aee9fb35005
+  metadata.gz: e150d23399a32f50bc95b591bbec1d02812532e55df25eb0be2fafa8dce9544a
+  data.tar.gz: ed59ddd0a7072579d111d47f37e806de43e98dbba5d73b10e53b133ef0303021
 SHA512:
-  metadata.gz: 49f26e1e771ec9df3a1dd7f952295b9fb3efb38433597afb245ccbac9da0267915ce27a5bb7a8e96fd34a4b07b7103207599b7578030fe5b0f3f5b060ce336b1
-  data.tar.gz: 3413d6e025acbcf2b0599bff021ccba403ab1fe0c61f54b2a1a2cab853fdeedcf5c673373bea00b940160e5ce7b12b5288a604ba59e7c0c9e30c4bd5b1e3f59f
+  metadata.gz: 0ee295f805616e923ed5bf8d02b73ca9807ea2d4294a22b7fb59da0d36d641b83ab4b395c80f82a47043d1fbb23dfd20625cb02c16e49073570e20b8dfd978eb
+  data.tar.gz: 51c634ebb1411948800e486be1e4b87655f93cfa87bba68faf062c4e41f983ee259c94803ec331955270f930f27ac35e3a92b99c6a244cd86a02ee91e07edc7a

data/.github/workflows/build.yml

@@ -0,0 +1,35 @@
+name: Build
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Ruby
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.7.x
+
+    - name: Install Dependencies
+      run: |
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+
+    - name: Deploy
+      if: github.ref == 'refs/heads/master' && !contains(github.event.commits[0].message, '[skip deploy]')
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GEM_HOST_API_KEY: ${{ secrets.GEM_HOST_API_KEY }}
+
+      run: |
+        git config --global user.email "dwilkie@gmail.com"
+        git config --global user.name "David Wilkie"
+        mkdir -p ~/.gem
+        echo -e "---\r\n:rubygems_api_key: $GEM_HOST_API_KEY" > ~/.gem/credentials
+        chmod 0600 ~/.gem/credentials
+        bundle exec rake release

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.7.1

data/Gemfile

@@ -1,9 +1,4 @@
-source 'https://rubygems.org'
-
-git_source(:github) do |repo_name|
-  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
-  "https://github.com/#{repo_name}.git"
-end
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in torasup.gemspec
 gemspec

data/README.md

@@ -2,9 +2,7 @@
 
 Retuns metadata about a phone number such as operator info, area code and more.
 
-[![Build Status](https://travis-ci.org/somleng/torasup.png)](https://travis-ci.org/somleng/torasup)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/5598e3554335eb385bd8/test_coverage)](https://codeclimate.com/github/somleng/torasup/test_coverage)
-[![Maintainability](https://api.codeclimate.com/v1/badges/5598e3554335eb385bd8/maintainability)](https://codeclimate.com/github/somleng/torasup/maintainability)
+![Build](https://github.com/somleng/torasup/workflows/Build/badge.svg)
 
 ## Installation
 

data/lib/torasup.rb

@@ -11,7 +11,8 @@ require "torasup/location"
 
 module Torasup
   ALL_PREFIXES_KEYS = ["*", "all"].freeze
-  DEFAULT_PREFIXES = ("10".."99").to_a.freeze
+  DEFAULT_OPERATOR_PREFIX_MIN = "10".freeze
+  DEFAULT_OPERATOR_PREFIX_MAX = "99".freeze
 
   module Test
     autoload :Helpers, "torasup/test/helpers"
@@ -26,7 +27,9 @@ module Torasup
       @international_dialing_codes = {}
       ISO3166::Country.all.each do |country|
         dialing_code = country.country_code
-        @international_dialing_codes[dialing_code] = country.alpha2 if !@international_dialing_codes[dialing_code] || configuration.default_countries.include?(country.alpha2)
+        if !@international_dialing_codes[dialing_code] || configuration.default_countries.include?(country.alpha2)
+          @international_dialing_codes[dialing_code] = country.alpha2
+        end
       end
     end
 
@@ -79,7 +82,9 @@ module Torasup
             ).merge(prefix_data)
 
             @pstn_prefixes[operator_prefix] = prefix_properties
-            @registered_pstn_prefixes[operator_prefix] = prefix_properties if operator_registered?(country_id, operator)
+            if operator_registered?(country_id, operator)
+              @registered_pstn_prefixes[operator_prefix] = prefix_properties
+            end
           end
         end
       end
@@ -140,8 +145,13 @@ module Torasup
     def operator_mobile_prefixes(country_id, operator)
       full_prefixes = {}
       operator_data = operator_data(country_id, operator)
-      prefixes = DEFAULT_PREFIXES if operator_data["prefixes"].is_a?(String) && ALL_PREFIXES_KEYS.include?(operator_data["prefixes"])
-      prefixes ||= operator_data["prefixes"] || []
+      if operator_data["prefixes"].is_a?(String) && ALL_PREFIXES_KEYS.include?(operator_data["prefixes"])
+        operator_prefix_min = country_data(country_id).fetch("operator_prefix_min", DEFAULT_OPERATOR_PREFIX_MIN)
+        operator_prefix_max = country_data(country_id).fetch("operator_prefix_max", DEFAULT_OPERATOR_PREFIX_MAX)
+        prefixes = (operator_prefix_min.to_s..operator_prefix_max).to_a
+      end
+      prefixes ||= operator_data["prefixes"]
+      prefixes ||= []
       mobile_prefixes = array_to_hash(prefixes)
       mobile_prefixes.each do |mobile_prefix, prefix_metadata|
         full_prefixes[operator_full_prefix(country_id, mobile_prefix)] = {

data/lib/torasup/data/pstn.yaml

@@ -220,7 +220,69 @@ sl:
       - '30'
       - '77'
       - '88'
+    orange:
+      metadata:
+        name: "Orange"
+      prefixes:
+      - '75'
+      - '76'
+      - '78'
+      - '79'
 br:
   # https://en.wikipedia.org/wiki/Telecommunications_in_Brazil
   # https://en.wikipedia.org/wiki/List_of_mobile_network_operators_of_the_Americas#Brazil
   international_dialing_code: "55"
+
+mx:
+  international_dialing_code: "52"
+
+gt:
+  international_dialing_code: "502"
+
+in:
+  # https://en.wikipedia.org/wiki/Mobile_telephone_numbering_in_India
+  international_dialing_code: "91"
+  operator_prefix_min: "6000"
+  operator_prefix_max: "9999"
+
+gh:
+  international_dialing_code: "233"
+  # https://en.m.wikipedia.org/wiki/Telephone_numbers_in_Ghana
+  operators:
+    globacom:
+      # https://en.wikipedia.org/wiki/Glo_(company)
+      metadata:
+        name: "Globacom"
+      prefixes:
+      - '23'
+    mtn:
+      # https://en.wikipedia.org/wiki/MTN_Group
+      metadata:
+        name: "MTN"
+      prefixes:
+      - '24'
+      - '54'
+      - '55'
+      - '59'
+    airtel_tigo:
+      # https://en.wikipedia.org/wiki/Airtel_Africa#Tigo_Ghana_merger
+      metadata:
+        name: "AirtelTigo"
+      prefixes:
+      - '27'
+      - '57'
+      - '26'
+      - '56'
+    expresso:
+      # https://en.wikipedia.org/wiki/Expresso_Telecom
+      metadata:
+        name: "Expresso"
+      prefixes:
+      - '28'
+    vodafone:
+      # https://en.wikipedia.org/wiki/Vodafone_Ghana
+      metadata:
+        name: "Vodafone"
+      prefixes:
+      - '20'
+      - '50'

data/lib/torasup/phone_number.rb

@@ -17,6 +17,7 @@ module Torasup
 
     def parse_phone_number(number)
       raise "Not a vaild number" unless Phony.plausible?(number)
+
       @number = Phony.normalize(number)
       number_parts = split_number
       @country_code = number_parts.shift

data/lib/torasup/version.rb

@@ -1,3 +1,3 @@
 module Torasup
-  VERSION = "0.2.1"
+  VERSION = "0.3.2".freeze
 end

data/spec/support/custom_pstn.yaml

@@ -17,6 +17,14 @@ kh:
       - '87'
       area_code_prefixes:
       - '45'
+
+in:
+  operators:
+    imimobile:
+      metadata:
+        name: "IMImobile"
+      prefixes: "*"
+
 br:
   operators:
     mundivox:

data/spec/support/pstn_spec.yaml

@@ -187,3 +187,45 @@ sl:
       - '30'
       - '77'
       - '88'
+
+gh:
+  prefix: "233"
+  local_number: "2437103"
+  operators:
+    # https://en.m.wikipedia.org/wiki/Telephone_numbers_in_Ghana
+    globacom:
+      # https://en.wikipedia.org/wiki/Glo_(company)
+      assertions:
+        name: "Globacom"
+      prefixes:
+      - '23'
+    mtn:
+      # https://en.wikipedia.org/wiki/MTN_Group
+      assertions:
+        name: "MTN"
+      prefixes:
+      - '24'
+      - '54'
+      - '55'
+    airtel_tigo:
+      # https://en.wikipedia.org/wiki/Airtel_Africa#Tigo_Ghana_merger
+      assertions:
+        name: "AirtelTigo"
+      prefixes:
+      - '27'
+      - '57'
+      - '26'
+      - '56'
+    expresso:
+      # https://en.wikipedia.org/wiki/Expresso_Telecom
+      assertions:
+        name: "Expresso"
+      prefixes:
+      - '28'
+    vodafone:
+      # https://en.wikipedia.org/wiki/Vodafone_Ghana
+      assertions:
+        name: "Vodafone"
+      prefixes:
+      - '20'
+      - '50'

data/spec/torasup/operator_spec.rb

@@ -91,11 +91,17 @@ module Torasup
 
         it_should_behave_like "an operator"
 
-        it "should handle wildcard prefixes" do
+        it "handles default prefixes" do
           torasup_number = Torasup::PhoneNumber.new("5582999489999")
           operator = torasup_number.operator
           expect(operator.id).to eq("mundivox")
         end
+
+        it "handles long prefixes" do
+          torasup_number = Torasup::PhoneNumber.new("919560234567")
+          operator = torasup_number.operator
+          expect(operator.id).to eq("imimobile")
+        end
       end
 
       context "with multiple configuration files" do

data/torasup.gemspec

@@ -1,29 +1,29 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'torasup/version'
+require "torasup/version"
 
 Gem::Specification.new do |gem|
   gem.name          = "torasup"
   gem.version       = Torasup::VERSION
   gem.authors       = ["David Wilkie"]
   gem.email         = ["dwilkie@gmail.com"]
-  gem.description   = %q{"Retuns metadata about a phone number such as operator, area code and more"}
-  gem.summary       = %q{"Retuns metadata about a phone number such as operator, area code and more"}
+  gem.description   = '"Retuns metadata about a phone number such as operator, area code and more"'
+  gem.summary       = '"Retuns metadata about a phone number such as operator, area code and more"'
   gem.homepage      = "https://github.com/dwilkie/torasup/"
-  gem.license       = 'MIT'
+  gem.license       = "MIT"
 
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency "countries", '>= 1.1.0'
-  gem.add_runtime_dependency "phony", '>= 2.15.47'
+  gem.add_runtime_dependency "countries"
   gem.add_runtime_dependency "deep_merge"
+  gem.add_runtime_dependency "phony"
 
-  gem.add_development_dependency "rspec"
+  gem.add_development_dependency "codeclimate-test-reporter"
   gem.add_development_dependency "rake"
+  gem.add_development_dependency "rspec"
   gem.add_development_dependency "simplecov"
-  gem.add_development_dependency "codeclimate-test-reporter", "~> 1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torasup
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.2
 platform: ruby
 authors:
 - David Wilkie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-11 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
@@ -16,30 +16,30 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: phony
+  name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.15.47
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.15.47
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: deep_merge
+  name: phony
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 description: '"Retuns metadata about a phone number such as operator, area code and
   more"'
 email:
@@ -116,11 +116,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".ruby-version"
-- ".travis.yml"
+- ".tool-versions"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -164,8 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: '"Retuns metadata about a phone number such as operator, area code and more"'

data/.ruby-version

@@ -1 +0,0 @@
-2.5.0

data/.travis.yml

@@ -1,11 +0,0 @@
-language: ruby
-sudo: false
-env:
-  global:
-    - START_SIMPLECOV=1
-addons:
-  code_climate:
-    repo_token:
-      secure: "Xk7T8ZyorwO85WfXC7OB2HfIM9Z/GO85u97P1qwXukL1ZjjDffr3mzhh706AVA9JPpTQGDbLNU5aStxX6NVLjBXyflvEpSGmYLl0aHDVikcNvZA/jBGlIfJH/6/V5bJA11X3V2/9FeO5l2fPkusWxbcpAIowe7xclDXfujdoNGk="
-after_success:
-  - bundle exec codeclimate-test-reporter