mobile-subscriber 0.0.1.alpha2 → 0.0.1.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b29c8cf76516b361c8753086b5bfe49b923d00c
-  data.tar.gz: fa9a11ddf533e3b8ef39b10468da7f788f899343
+  metadata.gz: 05c532c346541fb9e968134f7513aae13e009372
+  data.tar.gz: 3397d7e1ab671876b3d3b20f435451369c8f40a8
 SHA512:
-  metadata.gz: f36e4adef6a826ef1722b103380953593ed3b1a1be28d10a59f78743293d48ec67402c4c56c36718e5370327edaa476abcaaf4ea40ee6c6d843b8cb0df5a7ee2
-  data.tar.gz: 58bd599c9534d5a7d13cd2b04743316f828e697ef0b6bc286f782818da041997e660249b8a5055df7d4c2e4251f50475f5acec53d90ac1f389991051ddc9a3ec
+  metadata.gz: 96511b79ddd731ced98b6c72f626d70971725fac9820e0515c0f62d53a6c4564f6a168ef916d0d9119578ddf60144bd6a349519ec41717fb732a7f8130a92c58
+  data.tar.gz: 7acf06ddc07c20291526bf1940212229d4de5907e70f45a447f5cb93a9044513b339becc1f5293ac34f9a87c40d9b04a0954e1d24dd389d03dd84d1c7014759d

data/lib/mobile-subscriber.rb

@@ -8,8 +8,9 @@ module MobileSubscriber
 
   module Detection
     extend ActiveSupport::Autoload
-    autoload :FromMsisdnHeader
-    autoload :FromXNokiaMsisdnHeader
-    autoload :FromXUpChMsisdnHeader
+    autoload :FromMsisdnHttpRequestHeader
+    autoload :FromXNokiaMsisdnHttpRequestHeader
+    autoload :FromXUpChMsisdnHttpRequestHeader
+    autoload :FromXUpCallingLineIdHttpRequestHeader
   end
 end

data/lib/mobile_subscriber/detection/{from_msisdn_header.rb → from_msisdn_http_request_header.rb}

@@ -4,7 +4,7 @@ module MobileSubscriber
     # Módulo que provee métodos de deteccion y validacion para MSISDN por el
     # header de HTTP 'Msisdn':
     #  - Vivo Brasil
-    module FromMsisdnHeader
+    module FromMsisdnHttpRequestHeader
 
       extend ActiveSupport::Concern
 
@@ -15,20 +15,26 @@ module MobileSubscriber
 
           isdn_attributes = nil
 
-          if msisdn = request.env[header_env_key]
+          isdn_attributes = if msisdn = request.env[header_env_key] and msisdn.length >= 8
 
-            # Determinar la procedencia del MSISDN
-            # TODO: Validar por IP, etc.
-            isdn_attributes = case
-
-            # Vivo BR (Claro):
-            when msisdn =~ /\A55/ then {
-              id: msisdn,
-              mobile_country_code: "724",
-              mobile_network_code: "06"
+            detection_cues = {
+              remote_ip: request.env["REMOTE_ADDR"],
+              http_request_headers: { 'Msisdn' => msisdn }
             }
 
-            end if msisdn.length >= 8
+            country_code = MobileSubscriber::DIALING_COUNTRY_CODES[msisdn[0,2]]
+
+            # Determinar la procedencia del MSISDN
+            # TODO: Validar por IP, etc.
+            case country_code
+            when 'BR'
+              # Vivo BR (Claro):
+              {
+                id: msisdn,
+                mobile_country_code: "724",
+                mobile_network_code: "06"
+              }
+            end
 
           end
 

data/lib/mobile_subscriber/detection/from_x_nokia_msisdn_http_request_header.rb

@@ -0,0 +1,52 @@
+module MobileSubscriber
+  module Detection
+
+    # Módulo que provee métodos de deteccion y validacion para MSISDN's de:
+    # - Telcel México
+    # - Claro Argentina
+    module FromXNokiaMsisdnHttpRequestHeader
+
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def extract_from_x_nokia_msisdn_http_request_header(request)
+
+          header_name = 'X-Nokia-Msisdn'
+          header_env_key = "HTTP_#{header_name.gsub('-','_').upcase}"
+
+          isdn_attributes = if msisdn = request.env[header_env_key] and msisdn.length >= 8
+            detection_cues = {
+              remote_ip: request.env["REMOTE_ADDR"],
+              http_request_headers: { 'X-Nokia-Msisdn' => msisdn }
+            }
+
+            country_code = MobileSubscriber::DIALING_COUNTRY_CODES[msisdn[0,2]]
+
+            # Determinar la procedencia del MSISDN
+            # TODO: Validar por IP, etc.
+            case country_code
+            when 'MX'
+              # Telcel México:
+              {
+                id: msisdn,
+                mobile_country_code: "334",
+                mobile_network_code: "020"
+              }.merge(detection_cues: detection_cues)
+
+            # Claro Argentina:
+            when 'AR'
+              {
+                id: msisdn,
+                mobile_country_code: "722",
+                mobile_network_code: "330"
+              }.merge(detection_cues: detection_cues)
+            end
+          end
+
+          isdn_attributes
+        end
+
+      end
+    end
+  end
+end

data/lib/mobile_subscriber/detection/from_x_up_calling_line_id_http_request_header.rb

@@ -0,0 +1,99 @@
+module MobileSubscriber
+  module Detection
+
+    # Módulo que provee métodos de deteccion y validacion para MSISDN por el
+    # header de HTTP 'X-Up-Calling-Line-Id':
+    # - Claro Perú
+    # - TIM (Telecom Italia Mobile) Brasil
+    # - OI Brasil
+    # - Movistar México
+    # - Movistar Argentina
+    # - Movistar Ecuador
+    # - Movistar Perú
+    module FromXUpCallingLineIdHttpRequestHeader
+
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def extract_from_x_up_calling_line_id_http_request_header(request)
+          header_name = 'X-Up-Calling-Line-Id'
+          header_env_key = "HTTP_#{header_name.gsub('-','_').upcase}"
+
+          isdn_attributes = if msisdn = request.env[header_env_key] and msisdn.length >= 8
+            
+            detection_cues = {
+              remote_ip: request.env["REMOTE_ADDR"],
+              http_request_headers: { header_name => msisdn }
+            }
+
+            country_code = MobileSubscriber::DIALING_COUNTRY_CODES[msisdn[0,2]] || MobileSubscriber::DIALING_COUNTRY_CODES[msisdn[0,3]]
+
+            case country_code
+            when 'PE'
+              if (http_request_via_header = request.env["HTTP_VIA"]).present? and http_request_via_header =~ /Comverse/i
+                # Is Claro Peru subscriber:
+                detection_cues[:http_request_headers]['Via'] = http_request_via_header
+                {
+                  id: msisdn,
+                  mobile_country_code: "716",
+                  mobile_network_code: "10"
+                }.merge(detection_cues: detection_cues)
+              else
+                # Is a Movistar Peru subscriber:
+                {
+                  id: msisdn,
+                  mobile_country_code: "716",
+                  mobile_network_code: "06"
+                }.merge(detection_cues: detection_cues)
+              end
+            when 'BR'
+              if http_request_x_msp_apn_header = request.env["HTTP_X_MSP_APN"] and http_request_x_msp_apn_header.present?
+                detection_cues[:http_request_headers]['X-Msp-Apn'] = http_request_x_msp_apn_header
+                if http_request_x_msp_apn_header =~ /OI/i
+                  # Is a Oi Brazil subscriber:
+                  {
+                    id: msisdn,
+                    mobile_country_code: "724",
+                    mobile_network_code: "30"
+                  }.merge(detection_cues: detection_cues)
+                else
+                  # Is a TIM Brasil subscriber:
+                  {
+                    id: msisdn,
+                    mobile_country_code: "724",
+                    mobile_network_code: "02"
+                  }.merge(detection_cues: detection_cues)
+                end
+              end
+            when 'MX'
+              # Is a Movistar Mexico subscriber:
+              {
+                id: msisdn,
+                mobile_country_code: "334",
+                mobile_network_code: "030"
+              }.merge(detection_cues: detection_cues)
+            when 'AR'
+              # Is a Movistar Argentina subscriber:
+              # TODO: Detect if MNC is 010 or 070 (Different MHz Bands)
+              {
+                id: msisdn,
+                mobile_country_code: "722",
+                mobile_network_code: "010"
+              }.merge(detection_cues: detection_cues)
+            when 'EC'
+              # Is a Movistar Ecuador subscriber:
+              {
+                id: msisdn,
+                mobile_country_code: "740",
+                mobile_network_code: "00"
+              }.merge(detection_cues: detection_cues)
+            end
+          end
+
+          isdn_attributes
+        end
+      end
+
+    end
+  end
+end

data/lib/mobile_subscriber/detection/from_x_up_ch_msisdn_http_request_header.rb

@@ -0,0 +1,44 @@
+module MobileSubscriber
+  module Detection
+
+    # Módulo que provee métodos de deteccion y validacion para MSISDN's de:
+    # - Claro Brasil
+    module FromXUpChMsisdnHttpRequestHeader
+
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def extract_from_x_up_ch_msisdn_http_request_header(request)
+          header_name = 'X-Up-Ch-Msisdn'
+          header_env_key = "HTTP_#{header_name.gsub('-','_').upcase}"
+
+          isdn_attributes = if msisdn = request.env[header_env_key] and msisdn.length >= 8
+
+            detection_cues = {
+              remote_ip: request.env["REMOTE_ADDR"],
+              http_request_headers: { 'X-Up-Ch-Msisdn' => msisdn }
+            }
+
+            country_code = MobileSubscriber::DIALING_COUNTRY_CODES[msisdn[0,2]]
+
+            # Determinar la procedencia del MSISDN
+            # TODO: Validar por IP, etc.
+            case country_code
+            when 'BR'
+              # Claro BR (Claro):
+              {
+                id: msisdn,
+                mobile_country_code: "724",
+                mobile_network_code: "05"
+              }.merge(detection_cues: detection_cues)
+            end
+
+          end
+          isdn_attributes
+        end
+
+      end
+
+    end
+  end
+end

data/lib/mobile_subscriber/dictionaries/dialing_and_country_codes.rb

@@ -0,0 +1,25 @@
+module MobileSubscriber
+  # Diccionario de Mobile Country Codes => ISO country codes:
+  DIALING_COUNTRY_CODES = {
+    '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
+    '509'	=> 'HT',	# Haití
+    '51'	=> 'PE',	# Perú
+    '52'	=> 'MX',	# México
+    '53'	=> 'CU',	# Cuba
+    '54'	=> 'AR',	# Argentina
+    '55'	=> 'BR',	# Brasil
+    '56'	=> 'CL',	# Chile
+    '57'	=> 'CO',	# Colombia
+    '58'	=> 'VE',	# Venezuela
+    '591'	=> 'BO',	# Bolivia
+    '593'	=> 'EC',	# Ecuador
+    '595'	=> 'PY',	# Paraguay
+    '598'	=> 'UY'		# Uruguay
+  }.with_indifferent_access.freeze
+end

data/lib/mobile_subscriber/isdn.rb

@@ -1,21 +1,24 @@
 require 'mobile_subscriber/dictionaries/mobile_and_iso_country_codes'
+require 'mobile_subscriber/dictionaries/dialing_and_country_codes'
 require 'mobile_subscriber/dictionaries/operator_data'
 
 module MobileSubscriber
 
   class ISDN
 
-    attr_reader :id, :mobile_country_code, :mobile_network_code
+    attr_reader :id, :mobile_country_code, :mobile_network_code, :detection_cues
     alias_method :to_s, :id
 
-    include MobileSubscriber::Detection::FromMsisdnHeader
-    include MobileSubscriber::Detection::FromXNokiaMsisdnHeader
-    include MobileSubscriber::Detection::FromXUpChMsisdnHeader
+    include MobileSubscriber::Detection::FromMsisdnHttpRequestHeader
+    include MobileSubscriber::Detection::FromXNokiaMsisdnHttpRequestHeader
+    include MobileSubscriber::Detection::FromXUpChMsisdnHttpRequestHeader
+    include MobileSubscriber::Detection::FromXUpCallingLineIdHttpRequestHeader
 
     def initialize(attributes={})
       @id                   = attributes.delete :id
       @mobile_country_code  = attributes.delete :mobile_country_code
       @mobile_network_code  = attributes.delete :mobile_network_code
+      @detection_cues       = attributes.delete :detection_cues
     end
 
     def dialing_code

data/lib/mobile_subscriber/version.rb

@@ -1,3 +1,3 @@
 module MobileSubscriber
-  VERSION = "0.0.1.alpha2"
+  VERSION = "0.0.1.alpha3"
 end

data/spec/factories/requests.rb

@@ -56,12 +56,13 @@ FactoryGirl.define do
       end
     end
 
-    factory :forged_mobile_request_from_telcel_mexico do
+    factory :mobile_request_from_claro_peru do
       initialize_with do
         new build(:common_mobile_request_env).merge(
-          "REMOTE_ADDR"           =>  "170.51.255.240", # An argentinian IP Address
-          "REMOTE_HOST"           =>  "170.51.255.240", # An argentinian IP Address
-          "HTTP_X_NOKIA_MSISDN"   =>  "528110000000"    # A mexican MSISDN
+          "REMOTE_ADDR"               => "190.113.192.9",
+          "REMOTE_HOST"               => "190.113.192.9",
+          "HTTP_X_UP_CALLING_LINE_ID" => "5100000000000",
+          "HTTP_VIA"                  => "aa Comverse aaa"
         )
       end
     end

data/spec/models/isdn_spec.rb

@@ -41,6 +41,10 @@ describe MobileSubscriber::ISDN do
   describe "detection from request headers" do
 
     shared_examples "of detection from a valid request" do
+      it "is not nil" do
+        expect(subject).not_to be_nil
+      end
+
       it "responds to #http_validated? with true" do
         expect(subject).to be_http_validated
       end
@@ -50,6 +54,7 @@ describe MobileSubscriber::ISDN do
       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/
@@ -104,6 +109,24 @@ describe MobileSubscriber::ISDN do
       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'
+      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/
@@ -160,6 +183,22 @@ describe MobileSubscriber::ISDN do
       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
+
   end
 
 end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'mobile_subscriber'
+require 'mobile-subscriber'
 require 'byebug'
 require 'factory_girl'
 require 'rack'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobile-subscriber
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha2
+  version: 0.0.1.alpha3
 platform: ruby
 authors:
 - Roberto Quintanilla
@@ -113,9 +113,11 @@ files:
 - build-docker.sh
 - fig.yml
 - lib/mobile-subscriber.rb
-- lib/mobile_subscriber/detection/from_msisdn_header.rb
-- lib/mobile_subscriber/detection/from_x_nokia_msisdn_header.rb
-- lib/mobile_subscriber/detection/from_x_up_ch_msisdn_header.rb
+- lib/mobile_subscriber/detection/from_msisdn_http_request_header.rb
+- lib/mobile_subscriber/detection/from_x_nokia_msisdn_http_request_header.rb
+- 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/dictionaries/dialing_and_country_codes.rb
 - lib/mobile_subscriber/dictionaries/mobile_and_iso_country_codes.rb
 - lib/mobile_subscriber/dictionaries/operator_data.rb
 - lib/mobile_subscriber/isdn.rb

data/lib/mobile_subscriber/detection/from_x_nokia_msisdn_header.rb

@@ -1,47 +0,0 @@
-module MobileSubscriber
-  module Detection
-
-    # Módulo que provee métodos de deteccion y validacion para MSISDN's de:
-    # - Telcel México
-    # - Claro Argentina
-    module FromXNokiaMsisdnHeader
-
-      extend ActiveSupport::Concern
-
-      module ClassMethods
-        def extract_from_x_nokia_msisdn_http_request_header(request)
-
-          header_name = 'X-Nokia-Msisdn'
-          header_env_key = "HTTP_#{header_name.gsub('-','_').upcase}"
-
-          isdn_attributes = nil
-
-          if msisdn = request.env[header_env_key]
-
-            # Determinar la procedencia del MSISDN
-            # TODO: Validar por IP, etc.
-            isdn_attributes = case
-
-            # Telcel México:
-            when msisdn =~ /\A52/ then {
-              id: msisdn,
-              mobile_country_code: "334",
-              mobile_network_code: "020"
-            }
-
-            # Claro Argentina:
-            when msisdn =~ /\A54/ then {
-              id: msisdn,
-              mobile_country_code: "722",
-              mobile_network_code: "330"
-            }
-            end if msisdn.length >= 8
-          end
-
-          isdn_attributes
-        end
-
-      end
-    end
-  end
-end

data/lib/mobile_subscriber/detection/from_x_up_ch_msisdn_header.rb

@@ -1,39 +0,0 @@
-module MobileSubscriber
-  module Detection
-
-    # Módulo que provee métodos de deteccion y validacion para MSISDN's de:
-    # - Claro Brasil
-    module FromXUpChMsisdnHeader
-
-      extend ActiveSupport::Concern
-
-      module ClassMethods
-        def extract_from_x_up_ch_msisdn_http_request_header(request)
-          header_name = 'X-Up-Ch-Msisdn'
-          header_env_key = "HTTP_#{header_name.gsub('-','_').upcase}"
-          isdn_attributes = nil
-
-          if msisdn = request.env[header_env_key]
-
-            # Determinar la procedencia del MSISDN
-            # TODO: Validar por IP, etc.
-            isdn_attributes = case
-
-            # Claro BR (Claro):
-            when msisdn =~ /\A55/ then {
-              id: msisdn,
-              mobile_country_code: "724",
-              mobile_network_code: "05"
-            }
-
-            end if msisdn.length >= 8
-
-          end
-          isdn_attributes
-        end
-
-      end
-
-    end
-  end
-end