torasup 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7144467b57e2eeafdba6c249cb437af5c6343c2
-  data.tar.gz: cc55cdf7563d65b4d12976e2e0e1a766ace0cb7c
+  metadata.gz: 02c09491e5cda23554f00cc013fded14e8d838c6
+  data.tar.gz: a6ff34c7db89102b4a78c409becdeff38d7551e0
 SHA512:
-  metadata.gz: 0e95a24e60abc5a90b55664e2d07a54fff4c629a7ca9bc7111d7deace3b51c5179ffc15e34f2c4bd076384745cc74e885ca28da5e11958788197ffbcff843f73
-  data.tar.gz: 8a5ea60ec29983fb47037ccc48eea81466644012ca60f0a7d9b0718e42f8c23536dc0de7f03382accd9c9c86455e58d4b3c9a3f58b34e35009dd02bdd63aa7d6
+  metadata.gz: 20ab556f408911e118d895335f3bf2759ca688a42972152f7ba52c834b34dd43d2b885845e36d260f7616cce3d7528a98d27f376889d3ab506a75bd9cfcc9bd0
+  data.tar.gz: 54263d8a2b91be632769031b7ac8d5f937c4db7751d4671f8b6466b527f0124f893f5837f51da0cbc2813ca8ad6979341fb1855a0d40c3ae463cd7a31103ce3e

data/lib/torasup/version.rb

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

data/lib/torasup.rb

@@ -23,7 +23,7 @@ module Torasup
       @international_dialing_codes = {}
       ISO3166::Country.all.each do |country|
         dialing_code = country.country_code
-        @international_dialing_codes[dialing_code] = country.alpha2 if !@international_dialing_codes[dialing_code] && !configuration.default_countries.include?(country.alpha2)
+        @international_dialing_codes[dialing_code] = country.alpha2 if !@international_dialing_codes[dialing_code] || configuration.default_countries.include?(country.alpha2)
       end
     end
 

data/spec/torasup/configuration_spec.rb

@@ -32,19 +32,32 @@ describe Torasup do
       end
     end
 
-    describe "#default_countries=('['US', 'AU']')" do
-      before do
-        allow(Torasup).to receive(:load_international_dialing_codes!)
-      end
+    describe "#default_countries=(value)" do
+      let(:torasup_number) { Torasup::PhoneNumber.new("+1 415-234 5678") }
 
-      it "should set the default countries and reload the data" do
-        Torasup.configure do |config|
-          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"]
-          expect(config.default_countries).to eq(["US", "GB"])
+      context "configuring" do
+        before do
+          allow(Torasup).to receive(:load_international_dialing_codes!)
+        end
+
+        it "should set the default countries and reload the data" do
+          Torasup.configure do |config|
+            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"]
+            expect(config.default_countries).to eq(["US", "GB"])
+          end
         end
       end
+
+      context "by default" do
+        it { expect(torasup_number.country_id).to eq("us") }
+      end
+
+      context "overriding defaults" do
+        before { Torasup.configure { |config| config.default_countries = ["CA"] } }
+        it { expect(torasup_number.country_id).to eq("ca") }
+      end
     end
 
     describe "#custom_pstn_data_file=('path_to_yaml_file.yaml')" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torasup
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - David Wilkie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-26 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries