torasup 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dbd5a2adc5614dce03ce4d40f2e98ddab6b06f1
-  data.tar.gz: 28562f9426b2ae900c513865c410f08e24473210
+  metadata.gz: 697f9e78d549bb0018721944ca2c00c4a8405602
+  data.tar.gz: 8f2d17ead469e759480bfc72de7e50246f5de871
 SHA512:
-  metadata.gz: c422d74526c12d04d2db42e69c871df37ec2a7da73845130d08b49bdd6291e4e76efdf43bfbf8bb8ef4225b6b65635dfe6a9ab828161e9fd6c8fa9dfb08ded50
-  data.tar.gz: 64527d7bdbbdfe6ab02762ff7958802d782f5e211b91bd7ab9d1d67fa5a3f159e683a79a1e496f8aadfda6d9589f8769c244b4bed2bcc291cbcd8ea0fce73e77
+  metadata.gz: e12b61733c2f54c37990b432b62916e65195d54e87588567bd510cb118b72b7b12cae3d0c306f51cd7aca6f720e18e54db7187203f83a35159c39ffa1058290e
+  data.tar.gz: cef6cb7719d64a6536daa4dc0db6b27685d7088156bc2f241916a9dbc354069aacbf4ac70e865e997b917559523a174e0089efcda985d203dac602308051bffe

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+vendor/ruby

data/.travis.yml

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

data/README.md

@@ -86,6 +86,7 @@ kh:
         name: Hello
         my_custom_property: hello-foo
         my_custom_interpolated_property: "hello-%{interpolation}"
+        my_custom_boolean_property: true
       prefixes:
       - '15'
       - '16'
@@ -114,6 +115,9 @@ op.my_custom_property
 
 op.my_custom_interpolated_property(:interpolation => "bar")
 => "hello-bar"
+
+op.my_custom_boolean_property
+=> true
 ```
 
 ### Accessing Operator Metadata

data/lib/torasup/data/pstn.yaml

@@ -50,6 +50,7 @@ kh:
       metadata:
         name: "Beeline"
       prefixes:
+        - "31"
         - "60"
         - "66"
         - "67"
@@ -79,6 +80,7 @@ kh:
       prefixes:
         - '97'
         - '88'
+        - '71'
     qb:
       metadata:
         name: "Qb"
@@ -87,3 +89,15 @@ kh:
         - '80'
         - '83'
         - '84'
+    excell:
+      metadata:
+        name: "Excell"
+      prefixes:
+        - '18'
+    cootel:
+      metadata:
+        name: "CooTel"
+      prefixes:
+        - '38'
+      area_code_prefixes:
+        - '47'

data/lib/torasup/operator.rb

@@ -9,13 +9,12 @@ module Torasup
 
     def method_missing(method, interpolations = {})
       value = Torasup.prefix_data(full_prefix)[method.to_s]
-      if value
-        interpolated_result = value.dup
-        interpolations.each do |interpolation, interpolated_value|
-          interpolated_result.gsub!("%{#{interpolation}}", interpolated_value)
-        end
-        interpolated_result
+      return value unless value.is_a?(String)
+      interpolated_result = value.dup
+      interpolations.each do |interpolation, interpolated_value|
+        interpolated_result.gsub!("%{#{interpolation}}", interpolated_value.to_s)
       end
+      interpolated_result
     end
 
     def self.registered

data/lib/torasup/phone_number.rb

@@ -9,6 +9,7 @@ module Torasup
     private
 
     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/test/helpers.rb

@@ -1,6 +1,9 @@
 module Torasup
   module Test
     module Helpers
+
+      private
+
       def yaml_file(filename)
         raise "Override this method to return the full path of the yaml spec"
       end
@@ -27,30 +30,39 @@ module Torasup
         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}
           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|
-              operator_assertions[country_prefix][area_code] = {}
-              local_number = ("0" * (6 - area_code_prefix.length))
-              unresolved_number = area_code_prefix + local_number
-              operator_assertions[country_prefix][area_code][unresolved_number] = default_operator_assertions.merge(
-                "area_code" => area_code, "prefix" => area_code_prefix, "local_number" => local_number
+              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)]
+              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
               )
             end
             with_operator_prefixes(operator_data) do |prefix|
-              operator_assertions[country_prefix][prefix] = {}
-              local_number = ("0" * 6)
-              operator_assertions[country_prefix][prefix][local_number] = default_operator_assertions.merge(
+              if prefix.is_a?(Hash)
+                custom_local_number = prefix.values.first
+                prefix = prefix.keys.first
+              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
               )
             end
           end
         end
         operator_assertions.each do |country_prefix, country_assertions|
-          country_assertions.each do |area_code_or_prefix, area_code_or_prefix_assertions|
-            area_code_or_prefix_assertions.each do |unresolved_local_number, assertions|
-              yield [country_prefix, area_code_or_prefix, unresolved_local_number], assertions
+          country_assertions.each do |area_code_or_prefix, area_code_assertions|
+            area_code_assertions.each do |area_code_prefix, local_numbers|
+              local_numbers.each do |local_number, assertions|
+                unresolved_local_number = area_code_prefix.to_s + local_number
+                yield [country_prefix, area_code_or_prefix, unresolved_local_number], assertions
+              end
             end
           end
         end
@@ -89,13 +101,12 @@ module Torasup
       end
 
       def interpolated_assertion(assertion, interpolations = {})
-        if assertion
-          interpolated_result = assertion.dup
-          interpolations.each do |interpolation, value|
-            interpolated_result.gsub!("%{#{interpolation}}", value)
-          end
-          interpolated_result
+        return assertion unless assertion.is_a?(String)
+        interpolated_result = assertion.dup
+        interpolations.each do |interpolation, value|
+          interpolated_result.gsub!("%{#{interpolation}}", value.to_s)
         end
+        interpolated_result
       end
     end
   end

data/lib/torasup/version.rb

@@ -1,3 +1,3 @@
 module Torasup
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/spec_helper.rb

@@ -4,5 +4,12 @@ Coveralls.wear!
 
 RSpec.configure do |config|
   Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
-  config.treat_symbols_as_metadata_keys_with_true_values = true
+
+  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/custom_pstn.yaml

@@ -9,6 +9,7 @@ kh:
         name: Hello
         my_custom_property: hello-foo
         my_custom_interpolated_property: "hello-%{interpolation}"
+        my_custom_boolean_property: true
       prefixes:
       - '15'
       - '16'

data/spec/support/custom_pstn_spec.yaml

@@ -9,6 +9,7 @@ kh:
         name: "Hello"
         my_custom_property: "hello-foo"
         my_custom_interpolated_property: "hello-%{interpolation}"
+        my_custom_boolean_property: true
       prefixes:
       - '15'
       - '16'

data/spec/support/pstn_spec.yaml

@@ -4,6 +4,7 @@
 kh:
   # http://en.wikipedia.org/wiki/Telephone_numbers_in_Cambodia
   prefix: '855'
+  local_number: "234567"
   area_codes:
     '23': Phnom Penh
     '24': Kandal
@@ -44,7 +45,7 @@ kh:
         - '86'
         - '87'
         - '93'
-        - '96'
+        - '96': "2345678"
         - '98'
       area_code_prefixes:
         - '45'
@@ -52,6 +53,7 @@ kh:
       assertions:
         name: Beeline
       prefixes:
+        - '31': "2345678"
         - '60'
         - '66'
         - '67'
@@ -72,15 +74,16 @@ kh:
         - '95'
         - '11'
         - '61'
-        - '76'
+        - '76': "2345678"
         - '85'
         - '99'
     metfone:
       assertions:
         name: Metfone
       prefixes:
-        - '97'
-        - '88'
+        - '97': "2345678"
+        - '88': "2345678"
+        - '71': "2345678"
     qb:
       assertions:
         name: Qb
@@ -89,3 +92,15 @@ kh:
         - '80'
         - '83'
         - '84'
+    excell:
+      assertions:
+        name: Excell
+      prefixes:
+        - '18'
+    cootel:
+      assertions:
+        name: CooTel
+      prefixes:
+        - '38': "2345678"
+      area_code_prefixes:
+        - '47'

data/spec/torasup/operator_spec.rb

@@ -63,10 +63,10 @@ module Torasup
           subject = Operator.new(*number_parts)
           assertions.each do |method, assertion|
             args = []
-            args << {:interpolation => "interpolation"} unless subject.respond_to?(method)
+            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 => "interpolation")), "expected Operator.new('#{number_parts}').#{method} to return '#{assertion}' but got #{result_error}")
+            result.should(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

@@ -6,14 +6,12 @@ module Torasup
 
     def with_phone_numbers(options = {}, &block)
       phone_number_assertions = {}
-      with_pstn_data(options) do |country_id, country_data, country_prefix|
-        area_code_or_prefix = (10 + rand(100 - 10)).to_s
-        local_number = [(100 + rand(1000 - 100)).to_s, (100 + rand(1000 - 100)).to_s]
-        sample_number = "+#{country_prefix} (0) #{area_code_or_prefix}-#{local_number[0]}-#{local_number[1]}"
-        normalized_number = country_prefix + area_code_or_prefix + local_number[0] + local_number[1]
+      with_operators(options) do |number_parts, assertions|
+        number = number_parts.join
+        sample_number = "+#{number}"
         phone_number_assertions[sample_number] = {
-          "number" => normalized_number, "country_id" => country_id, "country_code" => country_prefix,
-          "area_code_or_prefix" => area_code_or_prefix, "local_number" => local_number.join
+          "number" => number, "country_id" => assertions["country_id"], "country_code" => assertions["country_code"],
+          "area_code_or_prefix" => assertions["area_code"] || assertions["prefix"], "local_number" => number_parts.last
         }
       end
 
@@ -22,7 +20,7 @@ module Torasup
       end
     end
 
-    subject { PhoneNumber.new("123456789") }
+    subject { PhoneNumber.new("85512234567") }
     let(:location) { double(Torasup::Location).as_null_object }
     let(:operator) { double(Torasup::Operator).as_null_object }
 

data/torasup.gemspec

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

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: torasup
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - David Wilkie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: phony
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.10.2
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !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
@@ -102,8 +102,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -136,17 +136,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: '"Retuns metadata about a phone number such as operator, area code and more"'