torasup 0.0.15 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02c09491e5cda23554f00cc013fded14e8d838c6
-  data.tar.gz: a6ff34c7db89102b4a78c409becdeff38d7551e0
+  metadata.gz: 5383412630638aec5f64180496cc1e120e16896f
+  data.tar.gz: a3e569658c46e1d0d080de3473f67bc83e679f07
 SHA512:
-  metadata.gz: 20ab556f408911e118d895335f3bf2759ca688a42972152f7ba52c834b34dd43d2b885845e36d260f7616cce3d7528a98d27f376889d3ab506a75bd9cfcc9bd0
-  data.tar.gz: 54263d8a2b91be632769031b7ac8d5f937c4db7751d4671f8b6466b527f0124f893f5837f51da0cbc2813ca8ad6979341fb1855a0d40c3ae463cd7a31103ce3e
+  metadata.gz: 274e51bffadf55b2f54dd8b7685f2d723dfa1adfb95bfd3f531549ee93e452fb8eb2e5bf3798ca6409cc34a9305572927fb63d27a94d8f71061509c287519df5
+  data.tar.gz: e8bb07f93569f4094923ed9c89d44506cd94813ae22225c37f161afe6bc88fe5e6f0dd1973cd82d6dff7161a47e98be81c5f3a291c4adfad9b7b9277058ed837

data/lib/torasup.rb

@@ -28,9 +28,12 @@ module Torasup
     end
 
     def load_pstn_data!
-      @pstn_data = load_yaml_file(File.join(File.dirname(__FILE__), 'torasup/data/pstn.yaml')).deeper_merge(
-        load_yaml_file(configuration.custom_pstn_data_file)
-      )
+      @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)
+        )
+      end
       load_pstn_prefixes!
     end
 

data/lib/torasup/configuration.rb

@@ -1,6 +1,6 @@
 class Configuration
   DEFAULT_COUNTRIES = ["US", "GB", "AU", "IT", "RU", "NO"]
-  attr_accessor :registered_operators, :default_countries, :custom_pstn_data_file
+  attr_accessor :registered_operators, :default_countries, :custom_pstn_data_files
 
   def initialize
     @default_countries = DEFAULT_COUNTRIES
@@ -12,7 +12,8 @@ class Configuration
   end
 
   def custom_pstn_data_file=(value)
-    @custom_pstn_data_file = value
+    @custom_pstn_data_files ||= []
+    value ? (@custom_pstn_data_files << value) : @custom_pstn_data_files.clear
     Torasup.load_pstn_data!
   end
 
@@ -29,4 +30,8 @@ class Configuration
   def registered_operators
     @registered_operators ||= {}
   end
+
+  def custom_pstn_data_files
+    (@custom_pstn_data_files ||= []).compact
+  end
 end

data/lib/torasup/version.rb

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

data/spec/support/custom_pstn_2.yaml

@@ -0,0 +1,6 @@
+---
+kh:
+  operators:
+    hello:
+      metadata:
+        my_custom_property_2: hello-foo-2

data/spec/support/pstn_helpers.rb

@@ -25,9 +25,14 @@ module PstnHelpers
     end
   end
 
-  def configure_with_custom_data
-    Torasup.configure do |config|
-      config.custom_pstn_data_file = File.join(File.dirname(__FILE__), "../support", "/custom_pstn.yaml")
+  def configure_with_custom_data(options = {})
+    custom_data_files = ["custom_pstn.yaml"]
+    custom_data_files << "custom_pstn_2.yaml" if options[:multiple_files]
+
+    custom_data_files.each do |custom_data_file|
+      Torasup.configure do |config|
+        config.custom_pstn_data_file = File.join(File.dirname(__FILE__), "../support", "/#{custom_data_file}")
+      end
     end
   end
 end

data/spec/torasup/configuration_spec.rb

@@ -61,16 +61,38 @@ describe Torasup do
     end
 
     describe "#custom_pstn_data_file=('path_to_yaml_file.yaml')" do
-      before do
+      def setup_expectations
         allow(Torasup).to receive(:load_pstn_data!)
+        expect(Torasup).to receive(:load_pstn_data!)
       end
 
-      it "should set a custom pstn data file and reload the data" do
-        Torasup.configure do |config|
-          expect(Torasup).to receive(:load_pstn_data!)
-          expect(config.custom_pstn_data_file).to be_nil
-          config.custom_pstn_data_file = "foo.yaml"
-          expect(config.custom_pstn_data_file).to eq("foo.yaml")
+      def setup_scenario
+        setup_expectations
+      end
+
+      before do
+        setup_scenario
+      end
+
+      context "setting a custom pstn data file" do
+        it "should set a custom pstn data file and reload the data" do
+          Torasup.configure do |config|
+            expect(config.custom_pstn_data_files).to eq([])
+            config.custom_pstn_data_file = "foo.yaml"
+            expect(config.custom_pstn_data_files).to eq(["foo.yaml"])
+          end
+        end
+      end
+
+      context "setting the custom pstn data file to nil" do
+        it "should clear the pstn data files and reload the data" do
+          Torasup.configure do |config|
+            expect(config.custom_pstn_data_files).to eq([])
+            config.custom_pstn_data_file = "foo.yaml"
+            expect(config.custom_pstn_data_files).to eq(["foo.yaml"])
+            config.custom_pstn_data_file = nil
+            expect(config.custom_pstn_data_files).to eq([])
+          end
         end
       end
     end

data/spec/torasup/operator_spec.rb

@@ -82,11 +82,27 @@ module Torasup
 
     context "using overridden data" do
       before do
-        configure_with_custom_data
+        configure_with_custom_data(configuration_options)
       end
 
-      it_should_behave_like "an operator" do
-        let(:options) { { :with_custom_pstn_data => true } }
+      context "with a single configuration file" do
+        let(:configuration_options) { {} }
+
+        it_should_behave_like "an operator" do
+          let(:options) { { :with_custom_pstn_data => true } }
+        end
+      end
+
+      context "with multiple configuration files" do
+        let(:configuration_options) { {:multiple_files => true} }
+
+        def assert_overridden_data!
+          torasup_number = Torasup::PhoneNumber.new("85515234567")
+          operator = torasup_number.operator
+          expect(operator.my_custom_property_2).to eq("hello-foo-2")
+        end
+
+        it { assert_overridden_data! }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torasup
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.1.0
 platform: ruby
 authors:
 - David Wilkie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2016-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
@@ -105,6 +105,7 @@ files:
 - lib/torasup/version.rb
 - spec/spec_helper.rb
 - spec/support/custom_pstn.yaml
+- spec/support/custom_pstn_2.yaml
 - spec/support/custom_pstn_spec.yaml
 - spec/support/pstn_helpers.rb
 - spec/support/pstn_spec.yaml
@@ -134,13 +135,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: '"Retuns metadata about a phone number such as operator, area code and more"'
 test_files:
 - spec/spec_helper.rb
 - spec/support/custom_pstn.yaml
+- spec/support/custom_pstn_2.yaml
 - spec/support/custom_pstn_spec.yaml
 - spec/support/pstn_helpers.rb
 - spec/support/pstn_spec.yaml