torasup 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5383412630638aec5f64180496cc1e120e16896f
-  data.tar.gz: a3e569658c46e1d0d080de3473f67bc83e679f07
+  metadata.gz: 1a859f5d8854bd2f0529cffaeb722f2b21321c06
+  data.tar.gz: 4ce0d87b60165ce4823c6362f94e173d1c004287
 SHA512:
-  metadata.gz: 274e51bffadf55b2f54dd8b7685f2d723dfa1adfb95bfd3f531549ee93e452fb8eb2e5bf3798ca6409cc34a9305572927fb63d27a94d8f71061509c287519df5
-  data.tar.gz: e8bb07f93569f4094923ed9c89d44506cd94813ae22225c37f161afe6bc88fe5e6f0dd1973cd82d6dff7161a47e98be81c5f3a291c4adfad9b7b9277058ed837
+  metadata.gz: 2de767f9311bf72be0ca50a982278eb1877761620b92d9c8698b5bb476c336b5f480fbe1b6c28760ddc0e2f313a6adbaba0602b83fc19b08119601f3452483c5
+  data.tar.gz: f335bbc17621224b0a3a14f285ee8fabfe7d1a38882d302ecdcfca5d7bd7784e6d1ac72f047a777f6a9f59fe8d7957071cc71b898a4cd7dfff89c48ec04e3fb4

data/.travis.yml

@@ -1,5 +1,2 @@
 rvm:
- - 1.9.3
- - 2.0.0
- - 2.1.5
- - 2.2.0
+ - 2.3.3

data/Gemfile

@@ -1,4 +1,9 @@
 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
+
 # Specify your gem's dependencies in torasup.gemspec
 gemspec

data/README.md

@@ -137,6 +137,22 @@ op.my_custom_boolean_property
 => true
 ```
 
+It's also possible to specify multiple custom pstn files independently of each other.
+
+E.g.
+
+```ruby
+Torasup.configure do |config|
+  config.custom_pstn_data_file = "my_pstn_data.yaml"
+end
+
+Torasup.configure do |config|
+  config.custom_pstn_data_file = "my_pstn_data_2.yaml"
+end
+```
+
+This will merge `my_pstn_data.yaml` and `my_pstn_data_2.yaml` together.
+
 ### Registering Operators
 
 Sometimes you may only be interested in certain prefixes. For example let's say you want to match phone numbers from a certain operator from the database. You can register operators for this purpose. e.g.

data/lib/torasup/data/pstn.yaml

@@ -61,7 +61,10 @@ kh:
         name: "Mobitel"
       prefixes:
       - '11'
-      - '12'
+      - '12':
+          subscriber_number_min: 1000000
+          subscriber_number_max: 9999999
+          subscriber_number_pattern: "([2-9]\\d{5})|(1\\d{6})"
       - '14'
       - '17'
       - '61'
@@ -165,3 +168,37 @@ kh:
         - '4'
         - '7'
         - '8'
+so:
+  # https://en.wikipedia.org/wiki/Telecommunications_in_Somaliland
+  international_dialing_code: "252"
+  operators:
+    telesom:
+      # https://en.wikipedia.org/wiki/Telecommunications_in_Somaliland
+      metadata:
+        name: "Telesom"
+      prefixes:
+      - '63'
+    golis:
+      # https://en.wikipedia.org/wiki/Golis_Telecom_Somalia
+      metadata:
+        name: "Golis"
+      prefixes:
+      - '90'
+    nationlink:
+      # https://en.wikipedia.org/wiki/NationLink_Telecom
+      metadata:
+        name: "NationLink"
+      prefixes:
+      - '69'
+    somtel:
+      # https://en.wikipedia.org/wiki/Somtel
+      metadata:
+        name: "Somtel"
+      prefixes:
+      - '65'
+    hormuud:
+      # https://en.wikipedia.org/wiki/Hormuud_Telecom
+      metadata:
+        name: "Hormuud"
+      prefixes:
+      - '61'

data/lib/torasup/version.rb

@@ -1,3 +1,3 @@
 module Torasup
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/support/pstn_spec.yaml

@@ -55,7 +55,7 @@ kh:
         name: Mobitel
       prefixes:
       - '11'
-      - '12'
+      - '12': "1234567"
       - '14'
       - '17'
       - '61'
@@ -133,3 +133,38 @@ kh:
         - '4'
         - '7'
         - '8'
+so:
+  prefix: "252"
+  local_number: "2345678"
+  operators:
+    # https://en.wikipedia.org/wiki/Telecommunications_in_Somaliland
+    telesom:
+      # https://en.wikipedia.org/wiki/Telesom
+      assertions:
+        name: "Telesom"
+      prefixes:
+      - '63'
+    golis:
+      # https://en.wikipedia.org/wiki/Golis_Telecom_Somalia
+      assertions:
+        name: "Golis"
+      prefixes:
+      - '90'
+    nationlink:
+      # https://en.wikipedia.org/wiki/NationLink_Telecom
+      assertions:
+        name: "NationLink"
+      prefixes:
+      - '69'
+    somtel:
+      # https://en.wikipedia.org/wiki/Somtel
+      assertions:
+        name: "Somtel"
+      prefixes:
+      - '65'
+    hormuud:
+      # https://en.wikipedia.org/wiki/Hormuud_Telecom
+      assertions:
+        name: "Hormuud"
+      prefixes:
+      - '61'

data/spec/torasup/location_spec.rb

@@ -7,7 +7,7 @@ module Torasup
       with_pstn_data(options) do |country_id, country_data|
         default_assertions = {"country_id" => country_id}
         location_assertions[country_id] = {}
-        country_data["area_codes"].each do |area_code, area|
+        (country_data["area_codes"] || []).each do |area_code, area|
           location_assertions[country_id][area_code] = default_assertions.merge("area_code" => area_code, "area" => area)
         end
       end

data/spec/torasup_spec.rb

@@ -10,9 +10,18 @@ describe Torasup do
           prefix = assertions["country_code"].to_s + assertions["area_code"].to_s + assertions["prefix"].to_s
           prefix_metadata = prefixes[prefix]
           local_number = assertions["local_number"]
-          expect(local_number.to_i).to be >= prefix_metadata["subscriber_number_min"]
-          expect(local_number.to_i).to be <= prefix_metadata["subscriber_number_max"]
-          expect(local_number).to match(Regexp.new(prefix_metadata["subscriber_number_pattern"]))
+
+          if subscriber_number_min = prefix_metadata["subscriber_number_min"]
+            expect(local_number.to_i).to be >= subscriber_number_min
+          end
+
+          if subscriber_number_max = prefix_metadata["subscriber_number_max"]
+            expect(local_number.to_i).to be <= subscriber_number_max
+          end
+
+          if subscriber_number_pattern = prefix_metadata["subscriber_number_pattern"]
+            expect(local_number).to match(Regexp.new(subscriber_number_pattern))
+          end
         end
       end
     end

data/torasup.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_runtime_dependency "countries", '>= 1.1.0'
-  gem.add_runtime_dependency "phony", '>= 2.14.14'
+  gem.add_runtime_dependency "phony", '>= 2.15.43'
   gem.add_runtime_dependency "deep_merge"
 
   gem.add_development_dependency "rspec"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torasup
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - David Wilkie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-01 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.14
+        version: 2.15.43
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.14
+        version: 2.15.43
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: '"Retuns metadata about a phone number such as operator, area code and more"'