mobile-subscriber 1.0.0.alpha1 → 1.0.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae67ac6282a540faba3e4b5212070bf6032ff29b
-  data.tar.gz: 25145806d895c4a019f788672f7034de4647695c
+  metadata.gz: 80a1f00c8af97774375ce292825d1ccd16125ea2
+  data.tar.gz: 53b1c2b1cf5fa8d65665abd9c59be800d71d702e
 SHA512:
-  metadata.gz: 7ec68823ec387842a9b55a03d635c4207052a60f04545184fc19ee2ecf01287b59de2d5b724dd282bbc0f36a806634ec0717c6f75a45d347b3dfc4d6db90da54
-  data.tar.gz: 60122de6fe24bd0e9375574ff1bbe28b26d48e43eab85a3291798f2473ebeeaec59a853929a12fe73c8bde4e2ddb3b320c85e683acbb528fc52d38d3a4048163
+  metadata.gz: 72ef14f604142edb0243bb764e09ab3da9bc36a938175dd10dae93c9be72977bd7f68a5db57db4c076efd0150fedc28ab5f5ef1a83ef8bcc93315bd3a0b650a4
+  data.tar.gz: 00eee445ece94fa6445e270ba1902645669cc0e8d096a57199e9dc501be9eac3bb60f119093f43a9e4c5233d2fa9463b6d38300ed08d224269dcea7feb0ddcdd

data/lib/mobile-subscriber.rb

@@ -13,7 +13,9 @@ module MobileSubscriber
     autoload :FromXUpCallingLineIdHttpRequestHeader
     autoload :FromXUpChMsisdnHttpRequestHeader
     autoload :FromXUpSubnoHttpRequestHeader
+    autoload :FromXWapMsisdnHttpRequestHeader
     autoload :FromXWapSesiones3gMdnHttpRequestHeader
+    autoload :FromXZtgoBeareraddressHttpRequestHeader
     autoload :HttpRequestInfo
   end
 end

data/lib/mobile_subscriber/detection/from_msisdn_http_request_header.rb

@@ -5,14 +5,8 @@ module MobileSubscriber::Detection
   # Módulo que provee métodos de detección y validacion para MSISDN por el
   # header de HTTP 'Msisdn':
   # - Claro Brasil
-  # - Claro Chile
-  # - Claro Colombia
-  # - Claro Costa Rica
   # - Claro República Dominicana
   # - Claro Ecuador
-  # - Claro El Salvador
-  # - Claro Nicaragua
-  # - Claro Panamá
   # - Claro Paraguay
   module FromMsisdnHttpRequestHeader
 
@@ -30,25 +24,13 @@ module MobileSubscriber::Detection
         network_id_tuple = case country_code
         when 'BR' # Claro Brasil
           # TODO: Determine (if possible) the MNC (05, 38)
-          { mcc: "724", mnc: "05"   }
-        when 'CL' # Claro Chile
-          { mcc: "730", mnc: "03"   }
-        when 'CO' # Claro Colombia
-          { mcc: "732", mnc: "101"  }
-        when 'CR' # Claro Costa Rica
-          { mcc: "712", mnc: "03"   }
+          { mcc: "724", mnc: "05"  }
         when 'DO' # Claro Dominicana:
-          { mcc: "370", mnc: "02"   }
+          { mcc: "370", mnc: "02"  }
         when 'EC' # Claro Ecuador:
-          { mcc: "740", mnc: "01"   }
-        when 'SV' # Claro El Salvador:
-          { mcc: "706", mnc: "01"   }
-        when 'NI' # Claro Nicaragua:
-          { mcc: "710", mnc: "21"   }
-        when 'PA' # Claro Panamá:
-          { mcc: "714", mnc: "03"   }
+          { mcc: "740", mnc: "01"  }
         when 'PY' # Claro Paraguay:
-          { mcc: "744", mnc: "02"   }
+          { mcc: "744", mnc: "02"  }
         end
 
         # Return only if we identified the network:

data/lib/mobile_subscriber/detection/from_x_nokia_msisdn_http_request_header.rb

@@ -1,11 +1,15 @@
 require 'mobile_subscriber/dictionaries/dialing_and_country_codes'
+
 module MobileSubscriber::Detection
 
   # Módulo que provee métodos de deteccion y validacion para MSISDN's de:
   # - Telcel México
   # - Claro Argentina
+  # - Claro Costa Rica
   # - Claro Guatemala
   # - Claro Honduras
+  # - Claro Nicaragua
+  # - Claro El Salvador
   module FromXNokiaMsisdnHttpRequestHeader
 
     def extract_from_x_nokia_msisdn_http_request_header(http_request_info)
@@ -23,8 +27,14 @@ module MobileSubscriber::Detection
           { mcc: "334", mnc: "020"  }
         when 'GT' # Claro Guatemala:
           { mcc: "704", mnc: "01"   }
+        when 'SV' # Claro El Salvador:
+          { mcc: "706", mnc: "01"  }
         when 'HN' # Claro Honduras:
           { mcc: "708", mnc: "001"  }
+        when 'NI' # Claro Nicaragua:
+          { mcc: "710", mnc: "21"  }
+        when 'CR' # Claro Costa Rica
+          { mcc: "712", mnc: "03"  }
         when 'AR' # Claro Argentina:
           { mcc: "722", mnc: "330"  }
         end

data/lib/mobile_subscriber/detection/from_x_up_calling_line_id_http_request_header.rb

@@ -1,4 +1,5 @@
 require 'mobile_subscriber/dictionaries/dialing_and_country_codes'
+
 module MobileSubscriber::Detection
 
   # Módulo que provee métodos de deteccion y validacion para MSISDN por el
@@ -8,7 +9,6 @@ module MobileSubscriber::Detection
   # - OI Brasil
   # - Movistar México
   # - Movistar Argentina
-  # - Movistar Ecuador
   # - Movistar Perú
   module FromXUpCallingLineIdHttpRequestHeader
 
@@ -25,10 +25,10 @@ module MobileSubscriber::Detection
         network_id_tuple = case country_code
         when 'PE'
           if (via_header = http_request_info.headers['Via']).present? and via_header =~ /Comverse/i
-            # Claro Peru:
+            # Claro Peru: (IP's 190.113.x)
             { mcc: "716", mnc: "10" }
           else
-            # Movistar Peru:
+            # Movistar Peru: (IP's 190.238.x)
             { mcc: "716", mnc: "06" }
           end
         when 'BR'
@@ -46,8 +46,6 @@ module MobileSubscriber::Detection
         when 'AR' # Movistar Argentina:
           # TODO: Determine (if possible) the MNC (010 or 070)
           { mcc: "722", mnc: "010" }
-        when 'EC' # Movistar Ecuador:
-          { mcc: "740", mnc: "00" }
         end
 
         # Return only if we identified the network:

data/lib/mobile_subscriber/detection/from_x_up_subno_http_request_header.rb

@@ -1,8 +1,11 @@
 require 'mobile_subscriber/dictionaries/dialing_and_country_codes'
+
 module MobileSubscriber::Detection
   # Módulo que provee métodos de deteccion y validacion para MSISDN por el
-  # header de HTTP 'Msisdn':
-  #  - Comcel Colombia
+  # header de HTTP 'X-Up-Subno':
+  # - Claro Colombia
+  # - Claro Panamá
+  # - Comcel Colombia
   module FromXUpSubnoHttpRequestHeader
 
     def extract_from_x_up_subno_http_request_header(http_request_info)
@@ -16,8 +19,14 @@ module MobileSubscriber::Detection
         # Determine the Network Operator tuple (MCC + MNC):
         # TODO: Validate IP ranges, additional headers, etc.
         network_id_tuple = case country_code
-        when 'CO' # Comcel Colombia
+        when 'CO'
+          # TODO: Discernir por ip/hostname
+          #{ mcc: "732", mnc: "101" } # Comcel Colombia
+
+          # Claro Colombia
           { mcc: "732", mnc: "101" }
+        when 'PA' # Claro Panamá:
+          { mcc: "714", mnc: "03"  }
         end
 
         # Return only if we identified the network:

data/lib/mobile_subscriber/detection/from_x_wap_msisdn_http_request_header.rb

@@ -0,0 +1,37 @@
+require 'mobile_subscriber/dictionaries/dialing_and_country_codes'
+
+module MobileSubscriber::Detection
+
+  # Módulo que provee métodos de detección y validacion para MSISDN por el
+  # header de HTTP 'X-Wap-Msisdn':
+  # - Claro Chile
+  module FromXWapMsisdnHttpRequestHeader
+
+    def extract_from_x_wap_msisdn_http_request_header(http_request_info)
+      if msisdn = http_request_info.headers['X-Wap-Msisdn'] and msisdn.length >= 8
+
+        country_code = (
+          MobileSubscriber::DIALING_COUNTRY_CODES[msisdn[0,2]] ||
+          MobileSubscriber::DIALING_COUNTRY_CODES[msisdn[0,3]]
+        )
+
+        # Determine the Network Operator tuple (MCC + MNC):
+        # TODO: Validate IP ranges, additional headers, etc.
+        network_id_tuple = case country_code
+        when 'CL' # Claro Chile
+          { mcc: "730", mnc: "03"  }
+        end
+
+        # Return only if we identified the network:
+        if network_id_tuple.present?
+          {
+            id:                   msisdn,
+            mobile_country_code:  network_id_tuple[:mcc],
+            mobile_network_code:  network_id_tuple[:mnc],
+            http_request_info:    http_request_info
+          }
+        end
+      end
+    end
+  end
+end

data/lib/mobile_subscriber/detection/from_x_ztgo_beareraddress_http_request_header.rb

@@ -0,0 +1,36 @@
+require 'mobile_subscriber/dictionaries/dialing_and_country_codes'
+
+module MobileSubscriber::Detection
+  # Módulo que provee métodos de detección y validacion para MSISDN por el
+  # header de HTTP 'X-Ztgo-Beareraddress':
+  # - Movistar Ecuador
+  module FromXZtgoBeareraddressHttpRequestHeader
+
+    def extract_from_x_ztgo_beareraddress_http_request_header(http_request_info)
+      if msisdn = http_request_info.headers['X-Ztgo-Beareraddress'] and msisdn.length >= 8
+
+        country_code = (
+          MobileSubscriber::DIALING_COUNTRY_CODES[msisdn[0,2]] ||
+          MobileSubscriber::DIALING_COUNTRY_CODES[msisdn[0,3]]
+        )
+
+        # Determine the Network Operator tuple (MCC + MNC):
+        # TODO: Validate IP ranges, additional headers, etc.
+        network_id_tuple = case country_code
+        when 'EC' # Movistar Ecuador:
+          { mcc: "740", mnc: "00" }
+        end
+
+        # Return only if we identified the network:
+        if network_id_tuple.present?
+          {
+            id:                   msisdn,
+            mobile_country_code:  network_id_tuple[:mcc],
+            mobile_network_code:  network_id_tuple[:mnc],
+            http_request_info:    http_request_info
+          }
+        end
+      end
+    end
+  end
+end

data/lib/mobile_subscriber/dictionaries/dialing_and_country_codes.rb

@@ -1,4 +1,5 @@
 module MobileSubscriber
+  # See: http://countrycode.org/
   # Diccionario de Dialing Country Codes => ISO country codes:
   DIALING_COUNTRY_CODES = {
     # Caribbean Islands' country codes are a mess!
@@ -6,13 +7,15 @@ module MobileSubscriber
     '1829' => 'DO', # Dominican Republic Overlay 1
     '1849' => 'DO', # Dominican Republic Overlay 2
 
+    '225' => 'CI',  # Costa de Marfil
+
     '501'	=> 'BZ',	# Belize
     '502'	=> 'GT',	# Guatemala
     '503'	=> 'SV',	# El Salvador
     '504'	=> 'HN',	# Honduras
     '505'	=> 'NI',	# Nicaragua
     '506'	=> 'CR',	# Costa Rica
-    '507'	=> 'CI',	# Costa de Marfil
+    '507'	=> 'PA',	# Panamá
     '509'	=> 'HT',	# Haití
     '51'	=> 'PE',	# Perú
     '52'	=> 'MX',	# México

data/lib/mobile_subscriber/isdn.rb

@@ -14,6 +14,9 @@ module MobileSubscriber
     extend MobileSubscriber::Detection::FromXUpCallingLineIdHttpRequestHeader
     extend MobileSubscriber::Detection::FromXUpChMsisdnHttpRequestHeader
     extend MobileSubscriber::Detection::FromXUpSubnoHttpRequestHeader
+    extend MobileSubscriber::Detection::FromXWapMsisdnHttpRequestHeader
+    extend MobileSubscriber::Detection::FromXWapSesiones3gMdnHttpRequestHeader
+    extend MobileSubscriber::Detection::FromXZtgoBeareraddressHttpRequestHeader
 
     def initialize(attributes={})
       @id                   = attributes.delete :id

data/lib/mobile_subscriber/version.rb

@@ -1,3 +1,3 @@
 module MobileSubscriber
-  VERSION = "1.0.0.alpha1"
+  VERSION = "1.0.0.alpha2"
 end

data/spec/detection/from_msisdn_http_request_header_spec.rb

@@ -28,26 +28,6 @@ describe MobileSubscriber::Detection::FromMsisdnHttpRequestHeader do
       end
     end
 
-    context "when given a request made from Claro Chile" do
-      let(:test_request) { build :mobile_request_from_claro_chile }
-
-      include_examples "of detection of msisdn from a valid chilean mobile network http request"
-
-      it "has a :mobile_network_code value of '03'" do
-        expect(subject[:mobile_network_code]).to eq '03'
-      end
-    end
-
-    context "when given a request made from Claro Colombia" do
-      let(:test_request) { build :mobile_request_from_claro_colombia }
-
-      include_examples "of detection of msisdn from a valid colombian mobile network http request"
-
-      it "has a :mobile_network_code value of '101'" do
-        expect(subject[:mobile_network_code]).to eq '101'
-      end
-    end
-
     context "when given a request made from Claro Ecuador" do
       let(:test_request) { build :mobile_request_from_claro_ecuador }
 
@@ -58,6 +38,16 @@ describe MobileSubscriber::Detection::FromMsisdnHttpRequestHeader do
       end
     end
 
+    context "when given a request made from Claro República Dominicana" do
+      let(:test_request) { build :mobile_request_from_claro_dominican_republic }
+
+      include_examples "of detection of msisdn from a valid dominican mobile network http request"
+
+      it "has a :mobile_network_code value of '02'" do
+        expect(subject[:mobile_network_code]).to eq '02'
+      end
+    end
+
   end
 
 end

data/spec/detection/from_x_nokia_msisdn_http_request_header_spec.rb

@@ -35,6 +35,16 @@ describe MobileSubscriber::Detection::FromXNokiaMsisdnHttpRequestHeader do
       end
     end
 
+    context "when given a request made from Claro Costa Rica" do
+      let(:test_request) { build :mobile_request_from_claro_costa_rica }
+
+      include_examples "of detection of msisdn from a valid costa rican mobile network http request"
+
+      it "has a :mobile_network_code value of '03'" do
+        expect(subject[:mobile_network_code]).to eq '03'
+      end
+    end
+
     context "when given a request made from Claro Guatemala" do
       let(:test_request) { build :mobile_request_from_claro_guatemala }
 
@@ -54,6 +64,26 @@ describe MobileSubscriber::Detection::FromXNokiaMsisdnHttpRequestHeader do
         expect(subject[:mobile_network_code]).to eq '001'
       end
     end
+
+    context "when given a request made from Claro Nicaragua" do
+      let(:test_request) { build :mobile_request_from_claro_nicaragua }
+
+      include_examples "of detection of msisdn from a valid nicaraguan mobile network http request"
+
+      it "has a :mobile_network_code value of '21'" do
+        expect(subject[:mobile_network_code]).to eq '21'
+      end
+    end
+
+    context "when given a request made from Claro El Salvador" do
+      let(:test_request) { build :mobile_request_from_claro_el_salvador }
+
+      include_examples "of detection of msisdn from a valid salvadoran mobile network http request"
+
+      it "has a :mobile_network_code value of '01'" do
+        expect(subject[:mobile_network_code]).to eq '01'
+      end
+    end
   end
 
 end

data/spec/detection/from_x_up_subno_http_request_header_spec.rb

@@ -0,0 +1,43 @@
+require "spec_helper"
+
+describe MobileSubscriber::Detection::FromXUpSubnoHttpRequestHeader do
+
+  include described_class
+
+  let :test_request do
+    build :mobile_request_from_claro_colombia
+  end
+
+  let :test_request_info do
+    MobileSubscriber::Detection::HttpRequestInfo.new test_request.env
+  end
+
+  describe "the returned object of self.extract_from_msisdn_http_request_header" do
+
+    subject do
+      extract_from_x_up_subno_http_request_header test_request_info
+    end
+
+    context "when given a request made from Claro Colombia" do
+
+      include_examples "of detection of msisdn from a valid colombian mobile network http request"
+
+      it "has a :mobile_network_code value of '101'" do
+        expect(subject[:mobile_network_code]).to eq '101'
+      end
+    end
+
+    context "when given a request made from Claro Panamá" do
+
+      let(:test_request) { build :mobile_request_from_claro_panama }
+
+      include_examples "of detection of msisdn from a valid panamanian mobile network http request"
+
+      it "has a :mobile_network_code value of '03'" do
+        expect(subject[:mobile_network_code]).to eq '03'
+      end
+    end
+
+  end
+
+end

data/spec/detection/from_x_wap_msisdn_http_request_header_spec.rb

@@ -0,0 +1,32 @@
+require "spec_helper"
+
+describe MobileSubscriber::Detection::FromXWapMsisdnHttpRequestHeader do
+
+  include described_class
+
+  let :test_request do
+    build :mobile_request_from_claro_chile
+  end
+
+  let :test_request_info do
+    MobileSubscriber::Detection::HttpRequestInfo.new test_request.env
+  end
+
+  describe "the returned object of self.extract_from_msisdn_http_request_header" do
+
+    subject do
+      extract_from_x_wap_msisdn_http_request_header test_request_info
+    end
+
+    context "when given a request made from Claro Chile" do
+
+      include_examples "of detection of msisdn from a valid chilean mobile network http request"
+
+      it "has a :mobile_network_code value of '03'" do
+        expect(subject[:mobile_network_code]).to eq '03'
+      end
+    end
+
+  end
+
+end

data/spec/factories/requests.rb

@@ -61,12 +61,22 @@ FactoryGirl.define do
       end
     end
 
+    # TODO: Replace with a real example:
+    factory :mobile_request_from_claro_dominican_republic do
+      initialize_with do
+        new build(:common_mobile_request_env).merge(
+          "REMOTE_ADDR" =>  "181.37.104.3",
+          "HTTP_MSISDN" =>  "18098591800"
+        )
+      end
+    end
+
     # http://ns.myip.ms/view/ip_owners/181034/Claro_Chile_S_a.html
     factory :mobile_request_from_claro_chile do
       initialize_with do
         new build(:common_mobile_request_env).merge(
           "REMOTE_ADDR" =>  "191.116.39.114",
-          "HTTP_MSISDN" =>  "56024440000"
+          "HTTP_X_WAP_MSISDN" =>  "56024440000"
         )
       end
     end
@@ -75,7 +85,17 @@ FactoryGirl.define do
       initialize_with do
         new build(:common_mobile_request_env).merge(
           "REMOTE_ADDR" =>  "200.26.137.100",
-          "HTTP_MSISDN" =>  "57000000000"
+          "HTTP_X_UP_SUBNO" =>  "57000000000"
+        )
+      end
+    end
+
+    # TODO: Replace with a real example request:
+    factory :mobile_request_from_claro_costa_rica do
+      initialize_with do
+        new build(:common_mobile_request_env).merge(
+          "REMOTE_ADDR" =>  "186.26.126.37",
+          "HTTP_X_NOKIA_MSISDN" =>  "50600000000"
         )
       end
     end
@@ -113,6 +133,26 @@ FactoryGirl.define do
       end
     end
 
+    # TODO: Replace with a real example request:
+    factory :mobile_request_from_claro_nicaragua do
+      initialize_with do
+        new build(:common_mobile_request_env).merge(
+          "REMOTE_ADDR" =>  "190.212.88.8",
+          "HTTP_X_NOKIA_MSISDN" =>  "50500000000"
+        )
+      end
+    end
+
+    # TODO: Replace with a real example request:
+    factory :mobile_request_from_claro_el_salvador do
+      initialize_with do
+        new build(:common_mobile_request_env).merge(
+          "REMOTE_ADDR" =>  "190.86.139.225",
+          "HTTP_X_NOKIA_MSISDN" =>  "50300000000"
+        )
+      end
+    end
+
     # http://myip.ms/view/ip_owners/90291/America_Movil_Peru_S_a_c.html
     factory :mobile_request_from_claro_peru do
       initialize_with do
@@ -133,6 +173,16 @@ FactoryGirl.define do
       end
     end
 
+    # TODO: Replace with a real example:
+    factory :mobile_request_from_claro_panama do
+      initialize_with do
+        new build(:common_mobile_request_env).merge(
+          "REMOTE_ADDR"     => "181.178.231.8",
+          "HTTP_X_UP_SUBNO" => "5070000000"
+        )
+      end
+    end
+
     # http://myip.ms/view/ip_owners/7424/Telefonica_Del_Peru_Saa.html
     factory :mobile_request_from_movistar_peru do
       initialize_with do

data/spec/models/isdn_spec.rb

@@ -44,7 +44,12 @@ describe MobileSubscriber::ISDN do
 
   describe "detection from request headers" do
 
-    shared_examples "of detection from a valid request" do
+    context "from a request made from a valid mobile network" do
+
+      subject do
+        described_class.new_from_request(build :mobile_request_from_telcel_mexico)
+      end
+
       it "is not nil" do
         expect(subject).not_to be_nil
       end
@@ -56,186 +61,33 @@ describe MobileSubscriber::ISDN do
       it "responds to #inspect with a string containing '(validated by HTTP)'" do
         expect(subject.inspect).to match /\(validated by HTTP\)>\z/
       end
-    end
-
-    # of detection from a request made from a {Demonym} mobile network:
-    shared_examples "of detection from a request made from a mexican mobile network" do
-      it "responds to #id with a string starting with '52'" do
-        expect(subject.id).to match /\A52/
-      end
-
-      it "responds to #mobile_country_code with '334'" do
-        expect(subject.mobile_country_code).to eq '334'
-      end
-
-      it "responds to #dialing_code with '52'" do
-        expect(subject.dialing_code).to eq '52'
-      end
-
-      it "responds to #iso_3166_country_code with 'MX'" do
-        expect(subject.iso_3166_country_code).to eq 'MX'
-      end
-    end
-
-    shared_examples "of detection from a request made from an argentinian mobile network" do
-      it "responds to #id with a string starting with '54'" do
-        expect(subject.id).to match /\A54/
-      end
-
-      it "responds to #mobile_country_code with '722'" do
-        expect(subject.mobile_country_code).to eq '722'
-      end
-
-      it "responds to #dialing_code with '54'" do
-        expect(subject.dialing_code).to eq '54'
-      end
-
-      it "responds to #iso_3166_country_code with 'AR'" do
-        expect(subject.iso_3166_country_code).to eq 'AR'
-      end
-    end
-
-    shared_examples "of detection from a request made from a brazilian mobile network" do
-      it "responds to #id with a string starting with '55'" do
-        expect(subject.id).to match /\A55/
-      end
-
-      it "responds to #mobile_country_code with '724'" do
-        expect(subject.mobile_country_code).to eq '724'
-      end
-
-      it "responds to #dialing_code with '55'" do
-        expect(subject.dialing_code).to eq '55'
-      end
-
-      it "responds to #iso_3166_country_code with 'BR'" do
-        expect(subject.iso_3166_country_code).to eq 'BR'
-      end
-    end
-
-    shared_examples "of detection from a request made from a chilean mobile network" do
-      it "responds to #id with a string starting with '56'" do
-        expect(subject.id).to match /\A56/
-      end
-
-      it "responds to #mobile_country_code with '730'" do
-        expect(subject.mobile_country_code).to eq '730'
-      end
-
-      it "responds to #dialing_code with '56'" do
-        expect(subject.dialing_code).to eq '56'
-      end
-
-      it "responds to #iso_3166_country_code with 'CL'" do
-        expect(subject.iso_3166_country_code).to eq 'CL'
-      end
-    end
-
-    shared_examples "of detection from a request made from a peruvian mobile network" do
-      it "responds to #id with a string starting with '51'" do
-        expect(subject.id).to match /\A51/
-      end
-
-      it "responds to #mobile_country_code with '716'" do
-        expect(subject.mobile_country_code).to eq '716'
-      end
 
-      it "responds to #dialing_code with '51'" do
-        expect(subject.dialing_code).to eq '51'
+      it "#id is present" do
+        expect(subject.id).to be_present
       end
 
-      it "responds to #iso_3166_country_code with 'PE'" do
-        expect(subject.iso_3166_country_code).to eq 'PE'
-      end
-    end
-
-    shared_examples "of detection from a request made from a Claro network" do
-      it "responds to #mobile_network_brand with a string containing 'Claro'" do
-        expect(subject.mobile_network_brand).to match /\AClaro/
-      end
-    end
-
-    context "from a request made from Telcel México" do
-
-      subject do
-        described_class.new_from_request(build :mobile_request_from_telcel_mexico)
+      it "#mobile_country_code is present" do
+        expect(subject.mobile_country_code).to be_present
       end
 
-      include_examples "of detection from a valid request"
-      include_examples "of detection from a request made from a mexican mobile network"
-
-      it "responds to #mobile_network_brand with 'Telcel'" do
-        expect(subject.mobile_network_brand).to eq 'Telcel'
+      it "#dialing_code is present" do
+        expect(subject.dialing_code).to be_present
       end
 
-      it "responds to #mobile_network_operator with 'América Móvil'" do
-        expect(subject.mobile_network_operator).to eq 'América Móvil'
+      it "#iso_3166_country_code is present" do
+        expect(subject.iso_3166_country_code).to be_present
       end
 
-    end
-
-    context "from a request made from Claro Argentina" do
-
-      subject do
-        described_class.new_from_request(build :mobile_request_from_claro_argentina)
+      it "#mobile_network_brand is present" do
+        expect(subject.mobile_network_brand).to be_present
       end
 
-      include_examples "of detection from a valid request"
-      include_examples "of detection from a request made from an argentinian mobile network"
-      include_examples "of detection from a request made from a Claro network"
-
-      it "responds to #mobile_network_operator with 'AMX Argentina S.A.'" do
-        expect(subject.mobile_network_operator).to eq 'AMX Argentina S.A.'
+      it "#mobile_network_operator is present" do
+        expect(subject.mobile_network_operator).to be_present
       end
 
     end
 
-    context "from a request made from Claro Perú" do
-
-      subject do
-        described_class.new_from_request(build :mobile_request_from_claro_peru)
-      end
-
-      include_examples "of detection from a valid request"
-      include_examples "of detection from a request made from a peruvian mobile network"
-      include_examples "of detection from a request made from a Claro network"
-
-      it "responds to #mobile_network_operator with 'América Móvil Perú'" do
-        expect(subject.mobile_network_operator).to eq 'América Móvil Perú'
-      end
-
-    end
-
-    context "from a request made from Claro Brasil" do
-
-      subject do
-        described_class.new_from_request(build :mobile_request_from_claro_brasil)
-      end
-
-      include_examples "of detection from a valid request"
-      include_examples "of detection from a request made from a brazilian mobile network"
-      include_examples "of detection from a request made from a Claro network"
-
-      it "responds to #mobile_network_operator with 'Claro'" do
-        expect(subject.mobile_network_operator).to eq 'Claro'
-      end
-    end
-
-    context "from a request made from Claro Chile" do
-
-      subject do
-        described_class.new_from_request(build :mobile_request_from_claro_chile)
-      end
-
-      include_examples "of detection from a valid request"
-      include_examples "of detection from a request made from a chilean mobile network"
-      include_examples "of detection from a request made from a Claro network"
-
-      it "responds to #mobile_network_operator with 'Claro Chile S.A.'" do
-        expect(subject.mobile_network_operator).to eq 'Claro Chile S.A.'
-      end
-    end
-
   end
 
 end

data/spec/shared_examples/of_msisdn_detection_from_http_request.rb

@@ -92,6 +92,28 @@ shared_examples "of detection of msisdn from a valid chilean mobile network http
   end
 end
 
+shared_examples "of detection of msisdn from a valid salvadoran mobile network http request" do
+  include_examples "of detection of msisdn from a valid mobile network http request"
+  it "has an :id value that starts with '503'" do
+    expect(subject[:id]).to match /\A503/
+  end
+
+  it "has a :mobile_country_code value of '706'" do
+    expect(subject[:mobile_country_code]).to eq '706'
+  end
+end
+
+shared_examples "of detection of msisdn from a valid costa rican mobile network http request" do
+  include_examples "of detection of msisdn from a valid mobile network http request"
+  it "has an :id value that starts with '506'" do
+    expect(subject[:id]).to match /\A506/
+  end
+
+  it "has a :mobile_country_code value of '712'" do
+    expect(subject[:mobile_country_code]).to eq '712'
+  end
+end
+
 shared_examples "of detection of msisdn from a valid colombian mobile network http request" do
   include_examples "of detection of msisdn from a valid mobile network http request"
   it "has an :id value that starts with '57'" do
@@ -114,6 +136,39 @@ shared_examples "of detection of msisdn from a valid ecuadorian mobile network h
   end
 end
 
+shared_examples "of detection of msisdn from a valid dominican mobile network http request" do
+  include_examples "of detection of msisdn from a valid mobile network http request"
+  it "has an :id value that starts with '1809'" do
+    expect(subject[:id]).to match /\A1809/
+  end
+
+  it "has a :mobile_country_code value of '370'" do
+    expect(subject[:mobile_country_code]).to eq '370'
+  end
+end
+
+shared_examples "of detection of msisdn from a valid nicaraguan mobile network http request" do
+  include_examples "of detection of msisdn from a valid mobile network http request"
+  it "has an :id value that starts with '505'" do
+    expect(subject[:id]).to match /\A505/
+  end
+
+  it "has a :mobile_country_code value of '710'" do
+    expect(subject[:mobile_country_code]).to eq '710'
+  end
+end
+
+shared_examples "of detection of msisdn from a valid panamanian mobile network http request" do
+  include_examples "of detection of msisdn from a valid mobile network http request"
+  it "has an :id value that starts with '507'" do
+    expect(subject[:id]).to match /\A507/
+  end
+
+  it "has a :mobile_country_code value of '714'" do
+    expect(subject[:mobile_country_code]).to eq '714'
+  end
+end
+
 shared_examples "of detection of msisdn from a valid peruvian mobile network http request" do
   include_examples "of detection of msisdn from a valid mobile network http request"
   it "has an :id value that starts with '51'" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobile-subscriber
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha1
+  version: 1.0.0.alpha2
 platform: ruby
 authors:
 - Roberto Quintanilla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -118,7 +118,9 @@ files:
 - lib/mobile_subscriber/detection/from_x_up_calling_line_id_http_request_header.rb
 - lib/mobile_subscriber/detection/from_x_up_ch_msisdn_http_request_header.rb
 - lib/mobile_subscriber/detection/from_x_up_subno_http_request_header.rb
+- lib/mobile_subscriber/detection/from_x_wap_msisdn_http_request_header.rb
 - lib/mobile_subscriber/detection/from_x_wap_sesiones3g_mdn_http_request_header.rb
+- lib/mobile_subscriber/detection/from_x_ztgo_beareraddress_http_request_header.rb
 - lib/mobile_subscriber/detection/http_request_info.rb
 - lib/mobile_subscriber/dictionaries/dialing_and_country_codes.rb
 - lib/mobile_subscriber/dictionaries/mobile_and_iso_country_codes.rb
@@ -130,6 +132,8 @@ files:
 - spec/detection/from_msisdn_http_request_header_spec.rb
 - spec/detection/from_x_nokia_msisdn_http_request_header_spec.rb
 - spec/detection/from_x_up_calling_line_id_http_request_header_spec.rb
+- spec/detection/from_x_up_subno_http_request_header_spec.rb
+- spec/detection/from_x_wap_msisdn_http_request_header_spec.rb
 - spec/detection/from_x_wap_sesiones3g_mdn_http_request_header_spec.rb
 - spec/factories/requests.rb
 - spec/mobile_subscriber_spec.rb
@@ -166,6 +170,8 @@ test_files:
 - spec/detection/from_msisdn_http_request_header_spec.rb
 - spec/detection/from_x_nokia_msisdn_http_request_header_spec.rb
 - spec/detection/from_x_up_calling_line_id_http_request_header_spec.rb
+- spec/detection/from_x_up_subno_http_request_header_spec.rb
+- spec/detection/from_x_wap_msisdn_http_request_header_spec.rb
 - spec/detection/from_x_wap_sesiones3g_mdn_http_request_header_spec.rb
 - spec/factories/requests.rb
 - spec/mobile_subscriber_spec.rb