torasup 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 888eca4d5a8db09f5784bbb6de787143393a5f0b
-  data.tar.gz: 37652d228d0a9708775248cdef7f9f1ca496e163
+SHA256:
+  metadata.gz: edd45e45ba249800acd5270089cc64b53592617106d1e51a27ccb852b405f1bd
+  data.tar.gz: 553054695cf8be0734cad6d576bf0a5d1c702fb58a512607e2611aee9fb35005
 SHA512:
-  metadata.gz: e20aa4caea8eb67315a9425d1e27f19136aa6cdbac5c547008d1372b1a68e369efdc16cb37a12b16de8cd93bc3c9ee2c0e2a502620fea2bae43760cee7d00121
-  data.tar.gz: af5fa3eb04a5e85b951d77b8c70ce9b7ffab012550b984d3ebe657355fc3427408c88410696ecd9c53933e387e74f0905500dd1d8a9b98d9deb1047ff6b89880
+  metadata.gz: 49f26e1e771ec9df3a1dd7f952295b9fb3efb38433597afb245ccbac9da0267915ce27a5bb7a8e96fd34a4b07b7103207599b7578030fe5b0f3f5b060ce336b1
+  data.tar.gz: 3413d6e025acbcf2b0599bff021ccba403ab1fe0c61f54b2a1a2cab853fdeedcf5c673373bea00b940160e5ce7b12b5288a604ba59e7c0c9e30c4bd5b1e3f59f

data/.rubocop.yml

@@ -0,0 +1,11 @@
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Metrics/LineLength:
+  Max: 100
+
+Style/Documentation:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.4.2
+2.5.0

data/README.md

@@ -3,8 +3,8 @@
 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://codeclimate.com/github/somleng/torasup/badges/coverage.svg)](https://codeclimate.com/github/somleng/torasup/coverage)
-[![Code Climate](https://codeclimate.com/github/somleng/torasup/badges/gpa.svg)](https://codeclimate.com/github/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)
 
 ## Installation
 

data/lib/torasup/configuration.rb

@@ -1,5 +1,5 @@
 class Configuration
-  DEFAULT_COUNTRIES = ["US", "GB", "AU", "IT", "RU", "NO"]
+  DEFAULT_COUNTRIES = %w[US GB AU IT RU NO].freeze
   attr_accessor :registered_operators, :default_countries, :custom_pstn_data_files
 
   def initialize

data/lib/torasup/data/pstn.yaml

@@ -220,3 +220,7 @@ sl:
       - '30'
       - '77'
       - '88'
+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"

data/lib/torasup/test/helpers.rb

@@ -1,10 +1,9 @@
 module Torasup
   module Test
     module Helpers
-
       private
 
-      def yaml_file(filename)
+      def yaml_file(_filename)
         raise "Override this method to return the full path of the yaml spec"
       end
 
@@ -26,17 +25,17 @@ module Torasup
         custom_spec ? data.deeper_merge(load_yaml_file(custom_spec)) : data
       end
 
-      def with_operators(options = {}, &block)
+      def with_operators(options = {})
         operator_assertions = {}
         with_pstn_data(options) do |country_id, country_data, country_prefix|
           operator_assertions[country_prefix] = {}
           local_number = country_data["local_number"]
-          default_assertions = {"country_code" => country_prefix}
+          default_assertions = { "country_code" => country_prefix }
           with_operator_data(country_id, options) do |operator, operator_data|
             default_operator_assertions = operator_data["assertions"].merge(
               "country_id" => country_id, "id" => operator
             ).merge(default_assertions)
-            with_operator_area_codes(country_data, operator_data) do |area_code_prefix, area_code, area|
+            with_operator_area_codes(country_data, operator_data) do |area_code_prefix, area_code, _area|
               if area_code_prefix.is_a?(Hash)
                 custom_local_number = area_code_prefix.values.first
                 area_code_prefix = area_code_prefix.keys.first
@@ -58,7 +57,7 @@ module Torasup
                 custom_local_number = prefix.values.first
                 prefix = prefix.keys.first
               end
-              prefix_assertions =  operator_assertions[country_prefix][prefix] = {}
+              prefix_assertions = operator_assertions[country_prefix][prefix] = {}
               no_area_code_assertions = prefix_assertions[nil] = {}
 
               custom_local_number ||= local_number
@@ -84,21 +83,21 @@ module Torasup
         end
       end
 
-      def with_pstn_data(options = {}, &block)
+      def with_pstn_data(options = {})
         pstn_data(options[:with_custom_pstn_data]).each do |country_id, country_data|
           next if options[:only_registered] && !options[:only_registered].include?(country_id)
           yield country_id, country_data, country_data["prefix"]
         end
       end
 
-      def with_operator_data(country_id, options = {}, &block)
+      def with_operator_data(country_id, options = {})
         country_data(country_id, options[:with_custom_pstn_data])["operators"].each do |operator, operator_data|
           next if options[:only_registered] && !options[:only_registered][country_id].include?(operator)
           yield operator, operator_data
         end
       end
 
-      def with_operator_area_codes(country_data, operator_data, &block)
+      def with_operator_area_codes(country_data, operator_data)
         (operator_data["area_code_prefixes"] || {}).each do |area_code_prefix|
           country_data["area_codes"].each do |area_code, area|
             yield area_code_prefix, area_code, area
@@ -106,7 +105,7 @@ module Torasup
         end
       end
 
-      def with_operator_prefixes(operator_data, &block)
+      def with_operator_prefixes(operator_data)
         (operator_data["prefixes"] || {}).each do |prefix|
           yield prefix
         end

data/lib/torasup/version.rb

@@ -1,3 +1,3 @@
 module Torasup
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/torasup.rb

@@ -1,7 +1,7 @@
-require 'yaml'
-require 'phony'
-require 'countries'
-require 'deep_merge/rails_compat'
+require "yaml"
+require "phony"
+require "countries"
+require "deep_merge/rails_compat"
 
 require "torasup/version"
 require "torasup/configuration"
@@ -10,12 +10,15 @@ require "torasup/operator"
 require "torasup/location"
 
 module Torasup
+  ALL_PREFIXES_KEYS = ["*", "all"].freeze
+  DEFAULT_PREFIXES = ("10".."99").to_a.freeze
+
   module Test
-    autoload :Helpers, 'torasup/test/helpers'
+    autoload :Helpers, "torasup/test/helpers"
   end
 
   class << self
-    def configure(&block)
+    def configure
       yield(configuration)
     end
 
@@ -28,7 +31,7 @@ module Torasup
     end
 
     def load_pstn_data!
-      @pstn_data = load_yaml_file(File.join(File.dirname(__FILE__), 'torasup/data/pstn.yaml'))
+      @pstn_data = load_yaml_file(File.join(File.dirname(__FILE__), "torasup/data/pstn.yaml"))
       configuration.custom_pstn_data_files.compact.each do |pstn_data_file|
         @pstn_data.deeper_merge!(
           load_yaml_file(pstn_data_file)
@@ -38,7 +41,7 @@ module Torasup
     end
 
     def country_id(country_code)
-      @international_dialing_codes[country_code].downcase if @international_dialing_codes[country_code]
+      @international_dialing_codes[country_code]&.downcase
     end
 
     def area_code(country_id, code)
@@ -115,7 +118,7 @@ module Torasup
     end
 
     def operator_metadata(country_id, operator)
-      {"country_id" => country_id, "id" => operator}.merge(operator_data(country_id, operator)["metadata"] || {})
+      { "country_id" => country_id, "id" => operator }.merge(operator_data(country_id, operator)["metadata"] || {})
     end
 
     def operator_area_code_prefixes(country_id, operator)
@@ -125,7 +128,7 @@ module Torasup
     def prefix_defaults(country_properties, operator_properties, prefix_properties)
       defaults = {}
       prefix_type = prefix_properties["type"]
-      [:min, :max, :pattern].each do |prefix_key|
+      %i[min max pattern].each do |prefix_key|
         result_key = "subscriber_number_#{prefix_key}"
         default_key = "default_#{prefix_type}_#{result_key}"
         result_value = prefix_properties[result_key] || operator_properties[default_key] || country_properties[default_key]
@@ -137,11 +140,13 @@ module Torasup
     def operator_mobile_prefixes(country_id, operator)
       full_prefixes = {}
       operator_data = operator_data(country_id, operator)
-      mobile_prefixes = array_to_hash(operator_data["prefixes"] || [])
+      prefixes = DEFAULT_PREFIXES if operator_data["prefixes"].is_a?(String) && ALL_PREFIXES_KEYS.include?(operator_data["prefixes"])
+      prefixes ||= operator_data["prefixes"] || []
+      mobile_prefixes = array_to_hash(prefixes)
       mobile_prefixes.each do |mobile_prefix, prefix_metadata|
         full_prefixes[operator_full_prefix(country_id, mobile_prefix)] = {
           "type" => "mobile",
-          "prefix" => mobile_prefix,
+          "prefix" => mobile_prefix
         }.merge(prefix_metadata)
       end
       full_prefixes
@@ -155,7 +160,7 @@ module Torasup
       operator_prefixes = operator_mobile_prefixes(country_id, operator)
       area_code_prefixes = array_to_hash(operator_area_code_prefixes(country_id, operator))
       area_code_prefixes.each do |operator_area_code_prefix, prefix_metadata|
-        area_codes(country_id).each do |area_code, area|
+        area_codes(country_id).each do |area_code, _area|
           operator_prefixes[operator_full_prefix(country_id, area_code, operator_area_code_prefix)] = {
             "type" => "landline",
             "prefix" => operator_area_code_prefix,
@@ -167,7 +172,7 @@ module Torasup
     end
 
     def array_to_hash(array)
-      array.map { |n| n.is_a?(Hash) ? n : {n => {}} }.reduce(Hash.new, :merge)
+      array.map { |n| n.is_a?(Hash) ? n : { n => {} } }.reduce({}, :merge)
     end
   end
 

data/spec/support/custom_pstn.yaml

@@ -17,3 +17,9 @@ kh:
       - '87'
       area_code_prefixes:
       - '45'
+br:
+  operators:
+    mundivox:
+      metadata:
+        name: "Mundivox"
+      prefixes: "*"

data/spec/torasup/operator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 module Torasup
   describe Operator do
@@ -11,7 +11,7 @@ module Torasup
       it "should return the operators with their metadata" do
         operators = Operator.send(method)
         operators = Operator.send(method) # run it twice to highlight the duplication problem
-        with_operators do |number_parts, assertions|
+        with_operators do |_number_parts, assertions|
           operator = operators[assertions["country_id"]][assertions["id"]]
           expect(operator["country_id"]).to eq(assertions["country_id"])
           expect(operator["id"]).to eq(assertions["id"])
@@ -53,7 +53,7 @@ module Torasup
           let(:method) { :registered }
 
           def with_operators(&block)
-            super(:only_registered => {sample_operator[0] => [sample_operator[1]]}, &block)
+            super(only_registered: { sample_operator[0] => [sample_operator[1]] }, &block)
           end
         end
       end
@@ -65,10 +65,10 @@ module Torasup
           subject = Operator.new(*number_parts)
           assertions.each do |method, assertion|
             args = []
-            args << {:interpolation => nil} unless subject.respond_to?(method)
+            args << { interpolation: nil } unless subject.respond_to?(method)
             result = subject.send(method, *args)
             result_error = result.nil? ? "nil" : "'#{result}'"
-            expect(result).to(eq(interpolated_assertion(assertion, :interpolation => nil)), "expected Operator.new('#{number_parts}').#{method} to return '#{assertion}' but got #{result_error}")
+            expect(result).to(eq(interpolated_assertion(assertion, interpolation: nil)), "expected Operator.new('#{number_parts}').#{method} to return '#{assertion}' but got #{result_error}")
           end
         end
       end
@@ -87,14 +87,19 @@ module Torasup
 
       context "with a single configuration file" do
         let(:configuration_options) { {} }
+        let(:options) { { with_custom_pstn_data: true } }
 
-        it_should_behave_like "an operator" do
-          let(:options) { { :with_custom_pstn_data => true } }
+        it_should_behave_like "an operator"
+
+        it "should handle wildcard prefixes" do
+          torasup_number = Torasup::PhoneNumber.new("5582999489999")
+          operator = torasup_number.operator
+          expect(operator.id).to eq("mundivox")
         end
       end
 
       context "with multiple configuration files" do
-        let(:configuration_options) { {:multiple_files => true} }
+        let(:configuration_options) { { multiple_files: true } }
 
         def assert_overridden_data!
           torasup_number = Torasup::PhoneNumber.new("85515234567")

data/spec/torasup_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Torasup do
   describe "#prefixes" do
@@ -6,7 +6,7 @@ describe Torasup do
 
     context "metadata" do
       it "should include the correct min, max and pattern values" do
-        with_operators do |number_parts, assertions|
+        with_operators do |_number_parts, assertions|
           prefix = assertions["country_code"].to_s + assertions["area_code"].to_s + assertions["prefix"].to_s
           prefix_metadata = prefixes[prefix]
           local_number = assertions["local_number"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torasup
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - David Wilkie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-01 00:00:00.000000000 Z
+date: 2018-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
@@ -118,6 +118,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
@@ -164,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: '"Retuns metadata about a phone number such as operator, area code and more"'