torasup 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2afc73a58c33f042464f822c3f03ab451d0ed603
-  data.tar.gz: 6f9bdb79d91ce3a28310ca92d98a4942b7e660b8
+  metadata.gz: 9599e7603adef5065a28bad6206eb29ee3ff4dfe
+  data.tar.gz: 6b88f5093ccf748789ef22e0234de5be6745d8f1
 SHA512:
-  metadata.gz: 58646bd12bbabfc24eee9b30a43d09c5490e71099b657f3a26e755c8a22ce5891bb371b8a943784532e11cffce93b5d1f55507b3068313e46a8c24926f31f941
-  data.tar.gz: ae4fcc306ffd1858d41978bd74ae050a88b425f2f060bf0ff327416d2bc57473270c89ee1b99a158b0ecc3fc5b12865272bdbd339ab64cd16ecce57c20de1d70
+  metadata.gz: 0822508de2801a60af3cdf654375695043590bec63feba622e37b404a1dfeb629b54e363575e37d628771cf261cd4283eee86da900e4a496386fa32f18fb373f
+  data.tar.gz: a44865824ca4faddc34ab13a77347acbbb2b39912e9278886be2b271b01ef670913faa4e30ee9490be34b7c2075215869d39a5a3fd630c270e86613a578591ff

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/README.md

@@ -2,7 +2,7 @@
 
 Retuns metadata about a phone number such as operator info, area code and more.
 
-[![Build Status](https://travis-ci.org/dwilkie/torasup.png)](https://travis-ci.org/dwilkie/torasup) [![Dependency Status](https://gemnasium.com/dwilkie/torasup.png)](https://gemnasium.com/dwilkie/torasup) [![Coverage Status](https://coveralls.io/repos/dwilkie/torasup/badge.png)](https://coveralls.io/r/dwilkie/torasup) [![Code Climate](https://codeclimate.com/github/dwilkie/torasup.png)](https://codeclimate.com/github/dwilkie/torasup)
+[![Build Status](https://travis-ci.org/dwilkie/torasup.png)](https://travis-ci.org/dwilkie/torasup) [![Dependency Status](https://gemnasium.com/dwilkie/torasup.png)](https://gemnasium.com/dwilkie/torasup) [![Code Climate](https://codeclimate.com/github/dwilkie/torasup.png)](https://codeclimate.com/github/dwilkie/torasup)
 
 ## Installation
 
@@ -14,28 +14,28 @@ gem 'torasup'
 
 And then execute:
 
-```shell
+```
 $ bundle
 ```
 
 Or install it yourself as:
 
-```shell
+```
 $ gem install torasup
 ```
 
 ## Usage
 
-### Examples
+### Returning info about a Phone Number
 
-```shell
+```
 $ irb
 ```
 
 ```ruby
 require 'torasup'
 
-pn = Torasup::PhoneNumber.new("+855 (0) 62 451 234")
+pn = Torasup::PhoneNumber.new("+855 (0) 62 451 2345")
 
 pn.number
 => "85562451234"
@@ -53,7 +53,7 @@ pn.prefix
 => "45"
 
 pn.local_number
-=> "1234"
+=> "12345"
 
 loc = pn.location
 loc.area
@@ -68,6 +68,20 @@ op.name
 => "Smart"
 ```
 
+### Accessing Metadata by Operator
+
+```ruby
+Torasup::Operator.all["kh"]["metfone"]["mobile_prefixes"]
+=> {"85538"=>{"subscriber_number_min"=>2000000, "subscriber_number_max"=>9999999, "subscriber_number_pattern"=>"[2-9]\\d{6}"}}
+```
+
+### Accessing Metadata by Prefix
+
+```ruby
+Torasup.prefixes["8552345"]
+=> {"country_id"=>"kh", "id"=>"smart", "name"=>"Smart", "subscriber_number_min"=>0, "subscriber_number_max"=>99999, "subscriber_number_pattern"=>"\\d{5}", "type"=>"landline", "prefix"=>"45", "area_code"=>"23"}
+```
+
 ## Configuration
 
 ### Overriding Data
@@ -101,7 +115,7 @@ Torasup.configure do |config|
   config.custom_pstn_data_file = "my_pstn_data.yaml"
 end
 
-pn = Torasup::PhoneNumber.new("+855 (0) 62 451 234")
+pn = Torasup::PhoneNumber.new("+855 (0) 62 451 2345")
 op = pn.operator
 
 op.id
@@ -120,24 +134,18 @@ op.my_custom_boolean_property
 => true
 ```
 
-### Accessing Operator Metadata
-
-```ruby
-Torasup::Operator.all["kh"]["metfone"]["prefixes"]
-=> ["85597", "85588"]
-```
-
 ### 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.
 
 ```ruby
 Torasup.configure do |config|
-  config.register_operators("kh", "metfone")
+  config.register_operators("kh", "cootel")
 end
 
 Torasup::Operator.registered
-=> {"kh"=>{"metfone"=>{"country_id"=>"kh", "id"=>"metfone", "name"=>"Metfone", "prefixes"=>["85597", "85588"]}}}
+=> {"kh"=>{"cootel"=>{"country_id"=>"kh", "id"=>"cootel", "name"=>"CooTel", "mobile_prefixes"=>{"85538"=>{"subscriber_number_min"=>2000000, "subscriber_number_max"=>9999999, "subscriber_number_pattern"=>"[2-9]\\d{6}"}}
+}}}
 ```
 
 ### Default Operators

data/lib/torasup/data/pstn.yaml

@@ -2,6 +2,12 @@
 kh:
   # http://en.wikipedia.org/wiki/Telephone_numbers_in_Cambodia
   international_dialing_code: "855"
+  default_mobile_subscriber_number_min: 200000
+  default_mobile_subscriber_number_max: 999999
+  default_mobile_subscriber_number_pattern: "[2-9]\\d{5}"
+  default_landline_subscriber_number_min: 0
+  default_landline_subscriber_number_max: 99999
+  default_landline_subscriber_number_pattern: "\\d{5}"
   area_codes:
     "23": "Phnom Penh"
     "24": "Kandal"
@@ -9,7 +15,7 @@ kh:
     "26": "Kampong Chhnang"
     "32": "Takeo"
     "33": "Kampot"
-    "34": "Sihanoukville"
+    "34": "Preah Sihanouk"
     "35": "Koh Kong"
     "36": "Kep"
     "42": "Kampong Cham"
@@ -33,67 +39,118 @@ kh:
       metadata:
         name: "Smart"
       prefixes:
-        - "10"
-        - "15"
-        - "16"
-        - "69"
-        - "70"
-        - "81"
-        - "86"
-        - "87"
-        - "93"
-        - "96"
-        - "98"
+      - '10'
+      - '15'
+      - '16'
+      - '69'
+      - '70'
+      - '81'
+      - '86'
+      - '87'
+      - '93'
+      - '96':
+          subscriber_number_min: 2000000
+          subscriber_number_max: 9999999
+          subscriber_number_pattern: "[2-9]\\d{6}"
+      - '98'
       area_code_prefixes:
-        - "45"
+      - '45'
+      - '56'
     mobitel:
       metadata:
         name: "Mobitel"
       prefixes:
-        - '12'
-        - '17'
-        - '77'
-        - '78'
-        - '89'
-        - '92'
-        - '95'
-        - '11'
-        - '61'
-        - '76'
-        - '85'
-        - '99'
+      - '11'
+      - '12'
+      - '14'
+      - '17'
+      - '61'
+      - '76':
+          subscriber_number_min: 2000000
+          subscriber_number_max: 9999999
+          subscriber_number_pattern: "[2-9]\\d{6}"
+      - '77'
+      - '78'
+      - '85'
+      - '89'
+      - '92'
+      - '95'
+      - '99'
+      area_code_prefixes:
+      - '3'
+      - '50'
+      - '51'
+      - '52'
+      - '53'
+      - '54'
+      - '55'
     metfone:
       metadata:
         name: "Metfone"
       prefixes:
-        - '31'
-        - '60'
-        - '66'
-        - '67'
-        - '68'
-        - '71'
-        - '88'
-        - '90'
-        - '97'
+      - '31':
+          subscriber_number_min: 2000000
+          subscriber_number_max: 9999999
+          subscriber_number_pattern: "[2-9]\\d{6}"
+      - '60'
+      - '66'
+      - '67'
+      - '68'
+      - '71':
+          subscriber_number_min: 2000000
+          subscriber_number_max: 9999999
+          subscriber_number_pattern: "[2-9]\\d{6}"
+      - '88':
+          subscriber_number_min: 2000000
+          subscriber_number_max: 9999999
+          subscriber_number_pattern: "[2-9]\\d{6}"
+      - '90'
+      - '97':
+          subscriber_number_min: 2000000
+          subscriber_number_max: 9999999
+          subscriber_number_pattern: "[2-9]\\d{6}"
       area_code_prefixes:
-        - '46'
+      - '6':
+          subscriber_number_max: 999999
+          subscriber_number_pattern: "\\d{6}"
+      - '46'
     qb:
       metadata:
         name: "Qb"
       prefixes:
-        - '13'
-        - '80'
-        - '83'
-        - '84'
+      - '13'
+      - '80'
+      - '83'
+      - '84'
+      area_code_prefixes:
+      - '49'
     excell:
       metadata:
         name: "Excell"
       prefixes:
-        - '18'
+      - '18'
+      area_code_prefixes:
+      - '48'
     cootel:
       metadata:
         name: "CooTel"
       prefixes:
-        - '38'
+      - '38':
+          subscriber_number_min: 2000000
+          subscriber_number_max: 9999999
+          subscriber_number_pattern: "[2-9]\\d{6}"
+      area_code_prefixes:
+      - '47'
+    camintel:
+      metadata:
+        name: "Camintel"
+      area_code_prefixes:
+      - '9'
+    tc:
+      metadata:
+        name: "Telecom Cambodia"
       area_code_prefixes:
-        - '47'
+        - '2'
+        - '4'
+        - '7'
+        - '8'

data/lib/torasup/operator.rb

@@ -1,9 +1,10 @@
 module Torasup
   class Operator
-    attr_accessor :prefix, :local_number, :area_code, :country_code
+    attr_accessor :prefix, :local_number, :area_code, :country_code, :full_number
 
     def initialize(country_code, area_code_or_prefix, unresolved_local_number)
-      @country_code = country_code
+      self.country_code = country_code
+      self.full_number = full_prefix(area_code_or_prefix, unresolved_local_number)
       parse_phone_number(area_code_or_prefix, unresolved_local_number)
     end
 
@@ -28,37 +29,53 @@ module Torasup
     private
 
     def parse_phone_number(area_code_or_prefix, unresolved_local_number)
-      if Torasup.prefix_data(full_prefix(area_code_or_prefix, local_number_parts(unresolved_local_number)[0])).any?
-        @area_code = area_code_or_prefix
-        @prefix = local_number_parts(unresolved_local_number)[0]
-        @local_number = local_number_parts(unresolved_local_number)[1]
-      elsif Torasup.prefix_data(full_prefix(area_code_or_prefix)).any?
-        @prefix = area_code_or_prefix
-        @local_number = unresolved_local_number
-      else
-        @local_number = area_code_or_prefix + unresolved_local_number
+      resolve_number_parts(area_code_or_prefix, unresolved_local_number)
+    end
+
+    def resolve_number_parts(area_code_or_prefix, unresolved_local_number)
+      unresolved_local_number_length = unresolved_local_number.length
+      unresolved_local_number_length.times do |n|
+        return if set_number_parts(
+          full_prefix(area_code_or_prefix, unresolved_local_number[0..(unresolved_local_number_length - n - 1)])
+        )
       end
+
+      set_number_parts(full_prefix(area_code_or_prefix))
     end
 
-    def local_number_parts(number)
-      [number[0..1], number[2..-1]]
+    def set_number_parts(test_prefix)
+      prefix_data = Torasup.prefix_data(test_prefix)
+      self.area_code = prefix_data["area_code"]
+      self.prefix = prefix_data["prefix"]
+      local_number = full_number.gsub(/^#{full_prefix}/, "")
+      self.local_number = local_number.empty? ? nil : local_number
+      prefix_data.any?
     end
 
     def full_prefix(*parts)
-      parts = [@area_code, @prefix] if parts.empty?
-      @country_code + parts.join
+      parts = [area_code, prefix] if parts.empty?
+      country_code + parts.join
     end
 
     def self.build_metadata(operator_type)
       operators = {}
-      Torasup.send(operator_type).each do |prefix, metadata|
-        prefix_country_id = metadata["country_id"]
+      Torasup.send(operator_type).each do |prefix, prefix_metadata|
+        prefix_country_id = prefix_metadata["country_id"]
         country_operators = operators[prefix_country_id] ||= {}
-        prefix_operator_id = metadata["id"]
-        operator_metadata = country_operators[prefix_operator_id] ||= metadata.dup
+        prefix_operator_id = prefix_metadata["id"]
+        operator_metadata = country_operators[prefix_operator_id] ||= prefix_metadata.dup
         operator_metadata.delete("prefix")
-        prefixes = operator_metadata["prefixes"] ||= []
-        prefixes << prefix
+        operator_metadata.delete("type")
+        operator_metadata.delete("subscriber_number_min")
+        operator_metadata.delete("subscriber_number_max")
+        operator_metadata.delete("subscriber_number_pattern")
+        type = prefix_metadata["type"]
+        typed_prefixes = operator_metadata["#{type}_prefixes"] ||= {}
+        typed_prefixes[prefix] = {
+          "subscriber_number_min" => prefix_metadata["subscriber_number_min"],
+          "subscriber_number_max" => prefix_metadata["subscriber_number_max"],
+          "subscriber_number_pattern" => prefix_metadata["subscriber_number_pattern"],
+        }
       end
       operators
     end

data/lib/torasup/test/helpers.rb

@@ -33,14 +33,24 @@ module Torasup
           local_number = country_data["local_number"]
           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)
+            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|
+              if area_code_prefix.is_a?(Hash)
+                custom_local_number = area_code_prefix.values.first
+                area_code_prefix = area_code_prefix.keys.first
+              end
+
               area_code_assertions = operator_assertions[country_prefix][area_code] ||= {}
               area_code_assertions[area_code_prefix] = {}
-              custom_local_number = local_number.dup[0..(6 - area_code_prefix.length - 1)]
+              custom_local_number ||= local_number.dup[0..4]
               unresolved_number = area_code_prefix + custom_local_number
               area_code_assertions[area_code_prefix][custom_local_number] = default_operator_assertions.merge(
-                "area_code" => area_code, "prefix" => area_code_prefix, "local_number" => custom_local_number
+                "area_code" => area_code,
+                "prefix" => area_code_prefix,
+                "local_number" => custom_local_number,
+                "type" => "landline"
               )
             end
             with_operator_prefixes(operator_data) do |prefix|
@@ -50,8 +60,14 @@ module Torasup
               end
               prefix_assertions =  operator_assertions[country_prefix][prefix] = {}
               no_area_code_assertions = prefix_assertions[nil] = {}
-              no_area_code_assertions[custom_local_number || local_number] = default_operator_assertions.merge(
-                "prefix" => prefix, "area_code" => nil
+
+              custom_local_number ||= local_number
+
+              no_area_code_assertions[custom_local_number] = default_operator_assertions.merge(
+                "area_code" => nil,
+                "prefix" => prefix,
+                "local_number" => custom_local_number,
+                "type" => "mobile"
               )
             end
           end
@@ -91,7 +107,7 @@ module Torasup
       end
 
       def with_operator_prefixes(operator_data, &block)
-        operator_data["prefixes"].each do |prefix|
+        (operator_data["prefixes"] || {}).each do |prefix|
           yield prefix
         end
       end

data/lib/torasup/version.rb

@@ -1,3 +1,3 @@
 module Torasup
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/torasup.rb

@@ -10,7 +10,6 @@ require "torasup/operator"
 require "torasup/location"
 
 module Torasup
-
   module Test
     autoload :Helpers, 'torasup/test/helpers'
   end
@@ -47,6 +46,10 @@ module Torasup
       @pstn_prefixes[prefix] || {}
     end
 
+    def registered_operators
+      configuration.registered_operators
+    end
+
     def registered_operator_prefixes
       @registered_pstn_prefixes.dup
     end
@@ -63,7 +66,12 @@ module Torasup
       @pstn_data.each do |country_id, country_properties|
         operators(country_id).each do |operator, operator_properties|
           operator_prefixes(country_id, operator).each do |operator_prefix, prefix_data|
-            prefix_properties = operator_metadata(country_id, operator).merge(prefix_data)
+            prefix_properties = operator_metadata(
+              country_id, operator
+            ).merge(
+              prefix_defaults(country_properties, operator_properties, prefix_data)
+            ).merge(prefix_data)
+
             @pstn_prefixes[operator_prefix] = prefix_properties
             @registered_pstn_prefixes[operator_prefix] = prefix_properties if operator_registered?(country_id, operator)
           end
@@ -80,7 +88,7 @@ module Torasup
     end
 
     def operator_registered?(country_id, operator)
-      (configuration.registered_operators[country_id] || []).include?(operator)
+      (registered_operators[country_id] || []).include?(operator)
     end
 
     def country_data(country_id)
@@ -111,11 +119,27 @@ module Torasup
       operator_data(country_id, operator)["area_code_prefixes"] || {}
     end
 
+    def prefix_defaults(country_properties, operator_properties, prefix_properties)
+      defaults = {}
+      prefix_type = prefix_properties["type"]
+      [: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]
+        defaults.merge!(result_key => result_value)
+      end
+      defaults
+    end
+
     def operator_mobile_prefixes(country_id, operator)
       full_prefixes = {}
-      mobile_prefixes = operator_data(country_id, operator)["prefixes"] || {}
-      mobile_prefixes.each do |mobile_prefix|
-        full_prefixes[operator_full_prefix(country_id, mobile_prefix)] = {"prefix" => mobile_prefix}
+      operator_data = operator_data(country_id, operator)
+      mobile_prefixes = array_to_hash(operator_data["prefixes"] || [])
+      mobile_prefixes.each do |mobile_prefix, prefix_metadata|
+        full_prefixes[operator_full_prefix(country_id, mobile_prefix)] = {
+          "type" => "mobile",
+          "prefix" => mobile_prefix,
+        }.merge(prefix_metadata)
       end
       full_prefixes
     end
@@ -126,13 +150,22 @@ module Torasup
 
     def operator_prefixes(country_id, operator)
       operator_prefixes = operator_mobile_prefixes(country_id, operator)
-      operator_area_code_prefixes(country_id, operator).each do |operator_area_code_prefix|
+      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|
-          operator_prefixes[operator_full_prefix(country_id, area_code, operator_area_code_prefix)] = {"prefix" => operator_area_code_prefix}
+          operator_prefixes[operator_full_prefix(country_id, area_code, operator_area_code_prefix)] = {
+            "type" => "landline",
+            "prefix" => operator_area_code_prefix,
+            "area_code" => area_code
+          }.merge(prefix_metadata)
         end
       end
       operator_prefixes
     end
+
+    def array_to_hash(array)
+      array.map { |n| n.is_a?(Hash) ? n : {n => {}} }.reduce(Hash.new, :merge)
+    end
   end
 
   load_international_dialing_codes!

data/spec/spec_helper.rb

@@ -1,15 +1,5 @@
 require 'torasup'
-require 'coveralls'
-Coveralls.wear!
 
 RSpec.configure do |config|
   Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
-
-  config.expect_with :rspec do |c|
-    c.syntax = [:should, :expect]
-  end
-
-  config.mock_with :rspec do |mocks|
-    mocks.syntax = [:should, :expect]
-  end
 end

data/spec/support/pstn_helpers.rb

@@ -1,13 +1,6 @@
 module PstnHelpers
   include Torasup::Test::Helpers
 
-  RSpec.configure do |config|
-    config.before do
-      clear_pstn
-      clear_registered_operators
-    end
-  end
-
   private
 
   def yaml_file(filename)
@@ -38,3 +31,12 @@ module PstnHelpers
     end
   end
 end
+
+RSpec.configure do |config|
+  config.include(PstnHelpers)
+
+  config.before do
+    clear_pstn
+    clear_registered_operators
+  end
+end

data/spec/support/pstn_spec.yaml

@@ -12,7 +12,7 @@ kh:
     '26': Kampong Chhnang
     '32': Takeo
     '33': Kampot
-    '34': Sihanoukville
+    '34': Preah Sihanouk
     '35': Koh Kong
     '36': Kep
     '42': Kampong Cham
@@ -36,67 +36,95 @@ kh:
       assertions:
         name: Smart
       prefixes:
-        - '10'
-        - '15'
-        - '16'
-        - '69'
-        - '70'
-        - '81'
-        - '86'
-        - '87'
-        - '93'
-        - '96': "2345678"
-        - '98'
+      - '10'
+      - '15'
+      - '16'
+      - '69'
+      - '70'
+      - '81'
+      - '86'
+      - '87'
+      - '93'
+      - '96': "2345678"
+      - '98'
       area_code_prefixes:
-        - '45'
+      - '45'
+      - '56'
     mobitel:
       assertions:
         name: Mobitel
       prefixes:
-        - '12'
-        - '17'
-        - '77'
-        - '78'
-        - '89'
-        - '92'
-        - '95'
-        - '11'
-        - '61'
-        - '76': "2345678"
-        - '85'
-        - '99'
+      - '11'
+      - '12'
+      - '14'
+      - '17'
+      - '61'
+      - '76': "2345678"
+      - '77'
+      - '78'
+      - '85'
+      - '89'
+      - '92'
+      - '95'
+      - '99'
+      area_code_prefixes:
+      - '3'
+      - '50'
+      - '51'
+      - '52'
+      - '53'
+      - '54'
+      - '55'
     metfone:
       assertions:
         name: Metfone
       prefixes:
-        - '31': "2345678"
-        - '60'
-        - '66'
-        - '67'
-        - '68'
-        - '71': "2345678"
-        - '88': "2345678"
-        - '90'
-        - '97': "2345678"
+      - '31': "2345678"
+      - '60'
+      - '66'
+      - '67'
+      - '68'
+      - '71': "2345678"
+      - '88': "2345678"
+      - '90'
+      - '97': "2345678"
       area_code_prefixes:
-        - '46'
+      - '6': "234567"
+      - '46'
     qb:
       assertions:
         name: Qb
       prefixes:
-        - '13'
-        - '80'
-        - '83'
-        - '84'
+      - '13'
+      - '80'
+      - '83'
+      - '84'
+      area_code_prefixes:
+      - '49'
     excell:
       assertions:
         name: Excell
       prefixes:
-        - '18'
+      - '18'
+      area_code_prefixes:
+      - '48'
     cootel:
       assertions:
         name: CooTel
       prefixes:
-        - '38': "2345678"
+      - '38': "2345678"
+      area_code_prefixes:
+      - '47'
+    camintel:
+      assertions:
+        name: "Camintel"
+      area_code_prefixes:
+      - '9'
+    tc:
+      assertions:
+        name: "Telecom Cambodia"
       area_code_prefixes:
-        - '47'
+        - '2'
+        - '4'
+        - '7'
+        - '8'

data/spec/torasup/configuration_spec.rb

@@ -1,65 +1,63 @@
 require 'spec_helper'
 
 describe Torasup do
-  include PstnHelpers
-
   describe ".configure" do
     describe "#registered_operators=" do
       before do
-        Torasup.stub(:load_pstn_data!)
+        allow(Torasup).to receive(:load_pstn_data!)
       end
 
       it "should set the registered operators and clear" do
         Torasup.configure do |config|
-          Torasup.should_receive(:load_pstn_data!)
-          config.registered_operators.should == {}
+          expect(Torasup).to receive(:load_pstn_data!)
+          expect(config.registered_operators).to eq({})
           config.registered_operators = {"foo" => "bar"}
-          config.registered_operators.should == {"foo" => "bar"}
+          expect(config.registered_operators).to eq({"foo" => "bar"})
         end
       end
     end
 
     describe "#register_operators(country_id, *operators)" do
       before do
-        Torasup.stub(:load_pstn_data!)
+        allow(Torasup).to receive(:load_pstn_data!)
       end
 
       it "should set the registered operators" do
         Torasup.configure do |config|
-          Torasup.should_receive(:load_pstn_data!)
+          expect(Torasup).to receive(:load_pstn_data!)
           config.registered_operators = {}
           config.register_operators("kh", "smart", "beeline")
-          config.registered_operators.should == {"kh" => ["smart", "beeline"]}
+          expect(config.registered_operators).to eq({"kh" => ["smart", "beeline"]})
         end
       end
     end
 
     describe "#default_countries=('['US', 'AU']')" do
       before do
-        Torasup.stub(:load_international_dialing_codes!)
+        allow(Torasup).to receive(:load_international_dialing_codes!)
       end
 
       it "should set the default countries and reload the data" do
         Torasup.configure do |config|
-          Torasup.should_receive(:load_international_dialing_codes!)
-          config.default_countries.should == ["US", "GB", "AU", "IT", "RU", "NO"]
+          expect(Torasup).to receive(:load_international_dialing_codes!)
+          expect(config.default_countries).to eq(["US", "GB", "AU", "IT", "RU", "NO"])
           config.default_countries = ["US", "GB"]
-          config.default_countries.should == ["US", "GB"]
+          expect(config.default_countries).to eq(["US", "GB"])
         end
       end
     end
 
     describe "#custom_pstn_data_file=('path_to_yaml_file.yaml')" do
       before do
-        Torasup.stub(:load_pstn_data!)
+        allow(Torasup).to receive(:load_pstn_data!)
       end
 
       it "should set a custom pstn data file and reload the data" do
         Torasup.configure do |config|
-          Torasup.should_receive(:load_pstn_data!)
-          config.custom_pstn_data_file.should be_nil
+          expect(Torasup).to receive(:load_pstn_data!)
+          expect(config.custom_pstn_data_file).to be_nil
           config.custom_pstn_data_file = "foo.yaml"
-          config.custom_pstn_data_file.should == "foo.yaml"
+          expect(config.custom_pstn_data_file).to eq("foo.yaml")
         end
       end
     end

data/spec/torasup/location_spec.rb

@@ -2,8 +2,6 @@ require 'spec_helper'
 
 module Torasup
   describe Location do
-    include PstnHelpers
-
     def with_locations(options = {}, &block)
       location_assertions = {}
       with_pstn_data(options) do |country_id, country_data|
@@ -27,7 +25,7 @@ module Torasup
           assertions.each do |method, assertion|
             result = subject.send(method)
             result_error = result.nil? ? "nil" : "'#{result}'"
-            result.should(eq(assertion), "expected Location.new('#{country_id}', '#{area_code}').#{method} to return '#{assertion}' but got #{result_error}")
+            expect(result).to(eq(assertion), "expected Location.new('#{country_id}', '#{area_code}').#{method} to return '#{assertion}' but got #{result_error}")
           end
         end
       end

data/spec/torasup/operator_spec.rb

@@ -2,8 +2,6 @@ require 'spec_helper'
 
 module Torasup
   describe Operator do
-    include PstnHelpers
-
     let(:sample_operator) do
       country = pstn_data.first
       [country.first, country.last["operators"].first.first]
@@ -15,12 +13,16 @@ module Torasup
         operators = Operator.send(method) # run it twice to highlight the duplication problem
         with_operators do |number_parts, assertions|
           operator = operators[assertions["country_id"]][assertions["id"]]
-          operator["country_id"].should == assertions["country_id"]
-          operator["id"].should == assertions["id"]
-          operator["prefixes"].should == operator["prefixes"].uniq
-          operator["prefixes"].should include(
-            assertions["country_code"].to_s + assertions["area_code"].to_s + assertions["prefix"].to_s
-          )
+          expect(operator["country_id"]).to eq(assertions["country_id"])
+          expect(operator["id"]).to eq(assertions["id"])
+          asserted_prefix = assertions["country_code"].to_s + assertions["area_code"].to_s + assertions["prefix"].to_s
+          asserted_type = assertions["type"]
+          asserted_prefixes = operator["#{asserted_type}_prefixes"]
+          expect(asserted_prefixes).to include(asserted_prefix)
+          asserted_prefix_metadata = asserted_prefixes[asserted_prefix]
+          expect(asserted_prefix_metadata).to have_key("subscriber_number_min")
+          expect(asserted_prefix_metadata).to have_key("subscriber_number_max")
+          expect(asserted_prefix_metadata).to have_key("subscriber_number_pattern")
         end
       end
     end
@@ -38,7 +40,7 @@ module Torasup
         end
 
         it "should return an empty hash" do
-          Operator.registered.should == {}
+          expect(Operator.registered).to eq({})
         end
       end
 
@@ -66,7 +68,7 @@ module Torasup
             args << {:interpolation => nil} unless subject.respond_to?(method)
             result = subject.send(method, *args)
             result_error = result.nil? ? "nil" : "'#{result}'"
-            result.should(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

data/spec/torasup/phone_number_spec.rb

@@ -2,8 +2,6 @@ require 'spec_helper'
 
 module Torasup
   describe PhoneNumber do
-    include PstnHelpers
-
     def with_phone_numbers(options = {}, &block)
       phone_number_assertions = {}
       with_operators(options) do |number_parts, assertions|
@@ -26,53 +24,53 @@ module Torasup
 
     describe "#location" do
       it "should return an instance of Torasup::Location" do
-        subject.location.should be_a(Torasup::Location)
+        expect(subject.location).to be_a(Torasup::Location)
       end
     end
 
     describe "#operator" do
       it "should return an instance of Torasup::Operator" do
-        subject.operator.should be_a(Torasup::Operator)
+        expect(subject.operator).to be_a(Torasup::Operator)
       end
     end
 
     describe "#area_code" do
       before do
-        location.stub(:area_code).and_return("123")
-        Torasup::Location.stub(:new).and_return(location)
+        allow(location).to receive(:area_code).and_return("123")
+        allow(Torasup::Location).to receive(:new).and_return(location)
       end
 
       it "should delegate to location" do
-        subject.area_code.should == "123"
+        expect(subject.area_code).to eq("123")
       end
     end
 
     describe "#prefix" do
       before do
-        operator.stub(:prefix).and_return("12")
-        Torasup::Operator.stub(:new).and_return(operator)
+        allow(operator).to receive(:prefix).and_return("12")
+        allow(Torasup::Operator).to receive(:new).and_return(operator)
       end
 
       it "should delegate to operator" do
-        subject.prefix.should == "12"
+        expect(subject.prefix).to eq("12")
       end
     end
 
     describe "#local_number" do
       before do
-        operator.stub(:local_number).and_return("234567")
-        Torasup::Operator.stub(:new).and_return(operator)
+        allow(operator).to receive(:local_number).and_return("234567")
+        allow(Torasup::Operator).to receive(:new).and_return(operator)
       end
 
       it "should delegate to operator" do
-        subject.local_number.should == "234567"
+        expect(subject.local_number).to eq("234567")
       end
     end
 
     shared_examples_for "a phone number" do
       before do
-        Torasup::Location.stub(:new).and_return(location)
-        Torasup::Operator.stub(:new).and_return(operator)
+        allow(Torasup::Location).to receive(:new).and_return(location)
+        allow(Torasup::Operator).to receive(:new).and_return(operator)
       end
 
       it "should return all the phone number attributes" do
@@ -80,15 +78,15 @@ module Torasup
           area_code_or_prefix = assertions.delete("area_code_or_prefix")
           local_number = assertions.delete("local_number")
 
-          Torasup::Location.should_receive(:new).with(assertions["country_id"], area_code_or_prefix)
-          Torasup::Operator.should_receive(:new).with(assertions["country_code"], area_code_or_prefix, local_number)
+          expect(Torasup::Location).to receive(:new).with(assertions["country_id"], area_code_or_prefix)
+          expect(Torasup::Operator).to receive(:new).with(assertions["country_code"], area_code_or_prefix, local_number)
 
           subject = PhoneNumber.new(sample_number)
 
           assertions.each do |method, assertion|
             result = subject.send(method)
             result_error = result.nil? ? "nil" : "'#{result}'"
-            result.should(eq(assertion), "expected PhoneNumber.new('#{sample_number}').#{method} to return '#{assertion}' but got #{result_error}")
+            expect(result).to(eq(assertion), "expected PhoneNumber.new('#{sample_number}').#{method} to return '#{assertion}' but got #{result_error}")
           end
         end
       end

data/spec/torasup_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Torasup do
+  describe "#prefixes" do
+    let(:prefixes) { described_class.prefixes }
+
+    context "metadata" do
+      it "should include the correct min, max and pattern values" do
+        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"]
+          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"]))
+        end
+      end
+    end
+  end
+end

data/torasup.gemspec

@@ -19,10 +19,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_runtime_dependency "countries"
-  gem.add_runtime_dependency "phony", '>= 2.10.2'
+  gem.add_runtime_dependency "phony", '>= 2.14.3'
   gem.add_runtime_dependency "deep_merge"
 
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "coveralls"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torasup
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - David Wilkie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.10.2
+        version: 2.14.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.10.2
+        version: 2.14.3
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: '"Retuns metadata about a phone number such as operator, area code and
   more"'
 email:
@@ -103,6 +89,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -125,6 +112,7 @@ files:
 - spec/torasup/location_spec.rb
 - spec/torasup/operator_spec.rb
 - spec/torasup/phone_number_spec.rb
+- spec/torasup_spec.rb
 - torasup.gemspec
 homepage: https://github.com/dwilkie/torasup/
 licenses:
@@ -160,3 +148,4 @@ test_files:
 - spec/torasup/location_spec.rb
 - spec/torasup/operator_spec.rb
 - spec/torasup/phone_number_spec.rb
+- spec/torasup_spec.rb