torasup 0.0.2 → 0.0.3

data/.travis.yml

@@ -1,2 +1,3 @@
 rvm:
  - 1.9.3
+ - 2.0.0

data/README.md

@@ -61,7 +61,7 @@ Or install it yourself as:
 
 ### Overriding Data
 
-Sometimes it maybe necessary to override the data that Torasup provides. For example you may want to provide custom attributes for different operators. In order to achieve this you can provide a custom [psdn](http://en.wikipedia.org/wiki/Public_switched_telephone_network) data file. See the format of the [pstn data files](https://github.com/dwilkie/torasup/tree/master/lib/torasup/data) for more info. e.g.
+Sometimes it maybe necessary to override the data that Torasup provides. For example you may want to provide custom attributes for different operators. In order to achieve this you can provide a custom [psdn](http://en.wikipedia.org/wiki/Public_switched_telephone_network) data file. Custom files also support interpolations using the `%{interpolation}` [I18n syntax](http://guides.rubyonrails.org/i18n.html#interpolation). See the format of sample custom [pstn data file](https://github.com/dwilkie/torasup/blob/master/spec/support/custom_pstn.yaml) for more info. e.g.
 
     # my_pstn_data.yaml
     ---
@@ -73,6 +73,7 @@ Sometimes it maybe necessary to override the data that Torasup provides. For exa
           metadata:
             name: Hello
             my_custom_property: hello-foo
+            my_custom_interpolated_property: "hello-%{interpolation}"
           prefixes:
           - '15'
           - '16'
@@ -97,6 +98,9 @@ Sometimes it maybe necessary to override the data that Torasup provides. For exa
     > op.my_custom_property
     => "hello-foo"
 
+    > op.my_custom_interpolated_property(:interpolation => "bar")
+    => "hello-bar"
+
 ### 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/operator.rb

@@ -7,8 +7,15 @@ module Torasup
       parse_phone_number(area_code_or_prefix, unresolved_local_number)
     end
 
-    def method_missing(method)
-      Torasup.prefix_data(full_prefix)[method.to_s]
+    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
+      end
     end
 
     def self.registered_prefixes

data/lib/torasup/test/helpers.rb

@@ -32,19 +32,19 @@ module Torasup
           operator_assertions[country_prefix] = {}
           default_assertions = {"country_code" => country_prefix}
           with_operator_data(country_id, options) do |operator, operator_data|
-            default_assertions.merge!("id" => operator).merge!(operator_data["assertions"])
+            default_operator_assertions = operator_data["assertions"].merge("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_assertions.merge(
+              operator_assertions[country_prefix][area_code][unresolved_number] = default_operator_assertions.merge(
                 "area_code" => area_code, "prefix" => area_code_prefix, "local_number" => 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_assertions.merge(
+              operator_assertions[country_prefix][prefix][local_number] = default_operator_assertions.merge(
                 "prefix" => prefix, "area_code" => nil
               )
             end
@@ -90,6 +90,16 @@ module Torasup
       def country_data(country_id, custom_file = nil)
         pstn_data(custom_file)[country_id.to_s] || {}
       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
+        end
+      end
     end
   end
 end

data/lib/torasup/version.rb

@@ -1,3 +1,3 @@
 module Torasup
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/support/custom_pstn.yaml

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

data/spec/support/custom_pstn_spec.yaml

@@ -1,5 +1,5 @@
 # this file is used to test the functionality of overriding the standard pstn data
-# with the data in spec/support/custom_pstn.data
+# with the data in spec/support/custom_pstn.yaml
 
 ---
 kh:
@@ -7,6 +7,8 @@ kh:
     hello:
       assertions:
         name: "Hello"
+        my_custom_property: "hello-foo"
+        my_custom_interpolated_property: "hello-%{interpolation}"
       prefixes:
       - '15'
       - '16'

data/spec/torasup/operator_spec.rb

@@ -34,9 +34,11 @@ module Torasup
         with_operators(options) do |number_parts, assertions|
           subject = Operator.new(*number_parts)
           assertions.each do |method, assertion|
-            result = subject.send(method)
+            args = []
+            args << {:interpolation => "interpolation"} unless subject.respond_to?(method)
+            result = subject.send(method, *args)
             result_error = result.nil? ? "nil" : "'#{result}'"
-            result.should(eq(assertion), "expected Operator.new('#{number_parts}').#{method} to return '#{assertion}' but got #{result_error}")
+            result.should(eq(interpolated_assertion(assertion, :interpolation => "interpolation")), "expected Operator.new('#{number_parts}').#{method} to return '#{assertion}' but got #{result_error}")
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: torasup
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
@@ -138,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -60913261
+      hash: -283226445
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -60913261
+      hash: -283226445
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24