mobile-subscriber 0.0.1.alpha3 → 0.0.1.alpha4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05c532c346541fb9e968134f7513aae13e009372
-  data.tar.gz: 3397d7e1ab671876b3d3b20f435451369c8f40a8
+  metadata.gz: ae7f7ff2ab99759a49beef779711360052c0cc85
+  data.tar.gz: daa60ed245a79d3161c29f142244866c4afb2016
 SHA512:
-  metadata.gz: 96511b79ddd731ced98b6c72f626d70971725fac9820e0515c0f62d53a6c4564f6a168ef916d0d9119578ddf60144bd6a349519ec41717fb732a7f8130a92c58
-  data.tar.gz: 7acf06ddc07c20291526bf1940212229d4de5907e70f45a447f5cb93a9044513b339becc1f5293ac34f9a87c40d9b04a0954e1d24dd389d03dd84d1c7014759d
+  metadata.gz: 4781b295edb467703313ed06d9167998d457a5418445b52a31915563eea46e53561a0ec144cff37eaceba3ab0b264eae875d0445579ef644a87b0cc0b6747b67
+  data.tar.gz: f237cdbbc072af9ad6f4389fbcab25052982041727086a4a422035317b29842e43393fa33e08988a636e9598d2135b03123fb668afc066b134c5c60d44c2a357

data/lib/mobile-subscriber.rb

@@ -10,7 +10,8 @@ module MobileSubscriber
     extend ActiveSupport::Autoload
     autoload :FromMsisdnHttpRequestHeader
     autoload :FromXNokiaMsisdnHttpRequestHeader
-    autoload :FromXUpChMsisdnHttpRequestHeader
     autoload :FromXUpCallingLineIdHttpRequestHeader
+    autoload :FromXUpChMsisdnHttpRequestHeader
+    autoload :FromXUpSubnoHttpRequestHeader
   end
 end

data/lib/mobile_subscriber/detection/from_msisdn_http_request_header.rb

@@ -1,9 +1,21 @@
+require 'mobile_subscriber/dictionaries/dialing_and_country_codes'
+
 module MobileSubscriber
   module Detection
 
-    # Módulo que provee métodos de deteccion y validacion para MSISDN por el
+    # Módulo que provee métodos de detección y validacion para MSISDN por el
     # header de HTTP 'Msisdn':
-    #  - Vivo Brasil
+    # - Claro Brasil
+    # - Claro Chile
+    # - Claro Colombia
+    # - Claro Costa Rica
+    # - Claro República Dominicana
+    # - Claro Ecuador
+    # - Claro El Salvador
+    # - Claro Guatemala
+    # - Claro Nicaragua
+    # - Claro Panamá
+    # - Claro Paraguay
     module FromMsisdnHttpRequestHeader
 
       extend ActiveSupport::Concern
@@ -15,8 +27,8 @@ module MobileSubscriber
 
           isdn_attributes = nil
 
-          isdn_attributes = if msisdn = request.env[header_env_key] and msisdn.length >= 8
-
+          isdn_attributes = if msisdn = request.env[header_env_key] and msisdn.strip.length >= 8
+            msisdn.strip!
             detection_cues = {
               remote_ip: request.env["REMOTE_ADDR"],
               http_request_headers: { 'Msisdn' => msisdn }
@@ -28,12 +40,90 @@ module MobileSubscriber
             # TODO: Validar por IP, etc.
             case country_code
             when 'BR'
-              # Vivo BR (Claro):
+              # Claro Brasil
+              # TODO: Determinar correctamente el MNC (05, 38)
               {
                 id: msisdn,
                 mobile_country_code: "724",
-                mobile_network_code: "06"
-              }
+                mobile_network_code: "05"
+              }.merge(detection_cues: detection_cues)
+            when 'CL'
+              # Claro Chile
+              {
+                id: msisdn,
+                mobile_country_code: "730",
+                mobile_network_code: "03"
+              }.merge(detection_cues: detection_cues)
+            when 'CO'
+              # Claro Colombia
+              {
+                id: msisdn,
+                mobile_country_code: "732",
+                mobile_network_code: "101"
+              }.merge(detection_cues: detection_cues)
+            when 'CR'
+              # Claro Costa Rica
+              {
+                id: msisdn,
+                mobile_country_code: "712",
+                mobile_network_code: "03"
+              }.merge(detection_cues: detection_cues)
+            when 'DO'
+              # Claro Dominicana:
+              {
+                id: msisdn,
+                mobile_country_code: "370",
+                mobile_network_code: "02"
+              }.merge(detection_cues: detection_cues)
+            when 'EC'
+              # Claro Ecuador:
+              {
+                id: msisdn,
+                mobile_country_code: "740",
+                mobile_network_code: "01"
+              }.merge(detection_cues: detection_cues)
+            when 'SV'
+              # Claro El Salvador:
+              {
+                id: msisdn,
+                mobile_country_code: "706",
+                mobile_network_code: "01"
+              }.merge(detection_cues: detection_cues)
+            when 'GT'
+              # Claro Guatemala:
+              {
+                id: msisdn,
+                mobile_country_code: "704",
+                mobile_network_code: "01"
+              }.merge(detection_cues: detection_cues)
+            when 'HN'
+              # Claro Honduras:
+              {
+                id: msisdn,
+                mobile_country_code: "708",
+                mobile_network_code: "001"
+              }.merge(detection_cues: detection_cues)
+            when 'NI'
+              # Claro Nicaragua:
+              {
+                id: msisdn,
+                mobile_country_code: "710",
+                mobile_network_code: "21"
+              }.merge(detection_cues: detection_cues)
+            when 'PA'
+              # Claro Panamá:
+              {
+                id: msisdn,
+                mobile_country_code: "714",
+                mobile_network_code: "03"
+              }.merge(detection_cues: detection_cues)
+            when 'PY'
+              # Claro Paraguay:
+              {
+                id: msisdn,
+                mobile_country_code: "744",
+                mobile_network_code: "02"
+              }.merge(detection_cues: detection_cues)
             end
 
           end

data/lib/mobile_subscriber/detection/from_x_nokia_msisdn_http_request_header.rb

@@ -1,3 +1,4 @@
+require 'mobile_subscriber/dictionaries/dialing_and_country_codes'
 module MobileSubscriber
   module Detection
 
@@ -14,7 +15,8 @@ module MobileSubscriber
           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
+          isdn_attributes = if msisdn = request.env[header_env_key] and msisdn.strip.length >= 8
+            msisdn.strip!
             detection_cues = {
               remote_ip: request.env["REMOTE_ADDR"],
               http_request_headers: { 'X-Nokia-Msisdn' => msisdn }

data/lib/mobile_subscriber/detection/from_x_up_calling_line_id_http_request_header.rb

@@ -1,3 +1,4 @@
+require 'mobile_subscriber/dictionaries/dialing_and_country_codes'
 module MobileSubscriber
   module Detection
 
@@ -19,8 +20,8 @@ module MobileSubscriber
           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
-            
+          isdn_attributes = if msisdn = request.env[header_env_key] and msisdn.strip.length >= 8
+            msisdn.strip!
             detection_cues = {
               remote_ip: request.env["REMOTE_ADDR"],
               http_request_headers: { header_name => msisdn }

data/lib/mobile_subscriber/detection/from_x_up_ch_msisdn_http_request_header.rb

@@ -1,8 +1,9 @@
+require 'mobile_subscriber/dictionaries/dialing_and_country_codes'
 module MobileSubscriber
   module Detection
 
     # Módulo que provee métodos de deteccion y validacion para MSISDN's de:
-    # - Claro Brasil
+    # - Vivo Brasil
     module FromXUpChMsisdnHttpRequestHeader
 
       extend ActiveSupport::Concern
@@ -12,8 +13,8 @@ module MobileSubscriber
           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
-
+          isdn_attributes = if msisdn = request.env[header_env_key] and msisdn.strip.length >= 8
+            msisdn.strip!
             detection_cues = {
               remote_ip: request.env["REMOTE_ADDR"],
               http_request_headers: { 'X-Up-Ch-Msisdn' => msisdn }
@@ -25,11 +26,12 @@ module MobileSubscriber
             # TODO: Validar por IP, etc.
             case country_code
             when 'BR'
-              # Claro BR (Claro):
+              # Vivo:
+              # TODO: Determinar el MNC correcto (06, 10, 11, 23)
               {
                 id: msisdn,
                 mobile_country_code: "724",
-                mobile_network_code: "05"
+                mobile_network_code: "06"
               }.merge(detection_cues: detection_cues)
             end
 

data/lib/mobile_subscriber/detection/from_x_up_subno_http_request_header.rb

@@ -0,0 +1,48 @@
+require 'mobile_subscriber/dictionaries/dialing_and_country_codes'
+module MobileSubscriber
+  module Detection
+
+    # Módulo que provee métodos de deteccion y validacion para MSISDN por el
+    # header de HTTP 'Msisdn':
+    #  - Comcel Colombia
+    module FromXUpSubnoHttpRequestHeader
+
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def extract_from_x_up_subno_http_request_header(request)
+          header_name = 'X-Up-Subno'
+          header_env_key = "HTTP_#{header_name.gsub('-','_').upcase}"
+
+          isdn_attributes = nil
+
+          isdn_attributes = if msisdn = request.env[header_env_key] and msisdn.strip.length >= 8
+            msisdn.strip!
+            detection_cues = {
+              remote_ip: request.env["REMOTE_ADDR"],
+              http_request_headers: { header_name => msisdn }
+            }
+
+            country_code = MobileSubscriber::DIALING_COUNTRY_CODES[msisdn[0,2]]
+
+            # Determinar la procedencia del MSISDN
+            # TODO: Validar por IP, etc.
+            case country_code
+            when 'CO'
+              # Comcel Colombia
+              {
+                id: msisdn,
+                mobile_country_code: "732",
+                mobile_network_code: "101"
+              }.merge(detection_cues: detection_cues)
+            end
+
+          end
+
+          isdn_attributes
+        end
+      end
+
+    end
+  end
+end

data/lib/mobile_subscriber/isdn.rb

@@ -11,8 +11,9 @@ module MobileSubscriber
 
     include MobileSubscriber::Detection::FromMsisdnHttpRequestHeader
     include MobileSubscriber::Detection::FromXNokiaMsisdnHttpRequestHeader
-    include MobileSubscriber::Detection::FromXUpChMsisdnHttpRequestHeader
     include MobileSubscriber::Detection::FromXUpCallingLineIdHttpRequestHeader
+    include MobileSubscriber::Detection::FromXUpChMsisdnHttpRequestHeader
+    include MobileSubscriber::Detection::FromXUpSubnoHttpRequestHeader
 
     def initialize(attributes={})
       @id                   = attributes.delete :id
@@ -60,7 +61,7 @@ module MobileSubscriber
     def self.new_from_request(request)
       detected_attributes = self.methods.select do |x|
         x.to_s =~ /\Aextract_from_(\w+)_http_request_header\z/i
-      end.reduce(nil) do |attrs, detection_method|
+      end.sort.reduce(nil) do |attrs, detection_method|
         attrs = self.send detection_method, request unless attrs.present?
         attrs
       end

data/lib/mobile_subscriber/version.rb

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

data/spec/detection/from_msisdn_http_request_header_spec.rb

@@ -0,0 +1,48 @@
+require "spec_helper"
+
+describe MobileSubscriber::Detection::FromMsisdnHttpRequestHeader do
+
+  include described_class::ClassMethods
+
+  let :test_request do
+    build :mobile_request_from_claro_brasil
+  end
+
+  describe "the returned object of self.extract_from_msisdn_http_request_header" do
+
+    subject do
+      extract_from_msisdn_http_request_header test_request
+    end
+
+    context "when given a request made from Claro Brasil" do
+      let(:test_request) { build :mobile_request_from_claro_brasil }
+
+      include_examples "of detection of msisdn from a valid brazilian mobile network http request"
+
+      it "has a :mobile_network_code value of '05' or '38'" do
+        expect(subject[:mobile_network_code]).to match /05|38/i
+      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 Colomobia" 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
+  end
+
+end

data/spec/detection/from_x_nokia_msisdn_http_request_header_spec.rb

@@ -0,0 +1,35 @@
+require "spec_helper"
+
+describe MobileSubscriber::Detection::FromXNokiaMsisdnHttpRequestHeader do
+
+  include described_class::ClassMethods
+
+  describe "the returned object of self.extract_from_msisdn_http_request_header" do
+
+    subject do
+      extract_from_x_nokia_msisdn_http_request_header test_request
+    end
+
+    context "when given a request made from Telcel México" do
+      let(:test_request) { build :mobile_request_from_telcel_mexico }
+
+      include_examples "of detection of msisdn from a valid mexican mobile network http request"
+
+      it "has a :mobile_network_code value of '020'" do
+        expect(subject[:mobile_network_code]).to eq '020'
+      end
+    end
+
+    context "when given a request made from Claro Argentina" do
+      let(:test_request) { build :mobile_request_from_claro_argentina }
+
+      include_examples "of detection of msisdn from a valid argentinian mobile network http request"
+
+      # TODO: Bad test... we need to test for each network code, if it can be determined:
+      it "has a :mobile_network_code value of '310', '320', or '330'" do
+        expect(subject[:mobile_network_code]).to match /310|320|330/
+      end
+    end
+  end
+
+end

data/spec/factories/requests.rb

@@ -49,9 +49,30 @@ FactoryGirl.define do
     factory :mobile_request_from_claro_brasil do
       initialize_with do
         new build(:common_mobile_request_env).merge(
-          "REMOTE_ADDR"           =>  "187.26.59.4",
-          "REMOTE_HOST"           =>  "187.26.59.4",
-          "HTTP_X_UP_CH_MSISDN"   =>  "5500000000000"
+          "REMOTE_ADDR" =>  "201.23.176.202",
+          "REMOTE_HOST" =>  "201.23.176.202",
+          "HTTP_MSISDN" =>  "5500000000000"
+        )
+      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",
+          "REMOTE_HOST" =>  "191.116.39.114",
+          "HTTP_MSISDN" =>  "56024445202"
+        )
+      end
+    end
+
+    factory :mobile_request_from_claro_colombia do
+      initialize_with do
+        new build(:common_mobile_request_env).merge(
+          "REMOTE_ADDR" =>  "200.26.137.100",
+          "REMOTE_HOST" =>  "200.26.137.100",
+          "HTTP_MSISDN" =>  "57000000000"
         )
       end
     end
@@ -67,6 +88,16 @@ FactoryGirl.define do
       end
     end
 
+    factory :mobile_request_from_vivo_brasil do
+      initialize_with do
+        new build(:common_mobile_request_env).merge(
+          "REMOTE_ADDR"           =>  "187.26.59.4",
+          "REMOTE_HOST"           =>  "187.26.59.4",
+          "HTTP_X_UP_CH_MSISDN"   =>  "5500000000000"
+        )
+      end
+    end
+
 
   end
 end

data/spec/models/isdn_spec.rb

@@ -109,6 +109,24 @@ describe MobileSubscriber::ISDN do
       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/
@@ -168,6 +186,22 @@ describe MobileSubscriber::ISDN do
 
     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
@@ -183,20 +217,19 @@ describe MobileSubscriber::ISDN do
       end
     end
 
-    context "from a request made from Claro Perú" do
+    context "from a request made from Claro Chile" do
 
       subject do
-        described_class.new_from_request(build :mobile_request_from_claro_peru)
+        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 peruvian mobile network"
+      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 'América Móvil Perú'" do
-        expect(subject.mobile_network_operator).to eq 'América Móvil Perú'
+      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

data/spec/shared_examples/of_msisdn_detection_from_http_request.rb

@@ -0,0 +1,84 @@
+require "spec_helper"
+
+shared_examples "of detection of msisdn from a valid mobile network http request" do
+  it "is not nil" do
+    expect(subject).not_to be_nil
+  end
+  it "is not blank" do
+    expect(subject).not_to be_blank
+  end
+
+  it "has an :id key" do
+    expect(subject).to have_key :id
+  end
+  it "has a non-blank :id value" do
+    expect(subject[:id]).not_to be_blank
+  end
+
+  it "has an :mobile_country_code key" do
+    expect(subject).to have_key :mobile_country_code
+  end
+  it "has a non-blank :mobile_country_code value" do
+    expect(subject[:mobile_country_code]).not_to be_blank
+  end
+
+  it "has an :mobile_network_code key" do
+    expect(subject).to have_key :mobile_network_code
+  end
+  it "has a non-blank :mobile_network_code value" do
+    expect(subject[:mobile_network_code]).not_to be_blank
+  end
+end
+
+shared_examples "of detection of msisdn from a valid argentinian 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 '54'" do
+    expect(subject[:id]).to match /\A54/
+  end
+  it "has a :mobile_country_code value of '722'" do
+    expect(subject[:mobile_country_code]).to eq '722'
+  end
+end
+
+shared_examples "of detection of msisdn from a valid mexican 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 '52'" do
+    expect(subject[:id]).to match /\A52/
+  end
+  it "has a :mobile_country_code value of '334'" do
+    expect(subject[:mobile_country_code]).to eq '334'
+  end
+end
+
+shared_examples "of detection of msisdn from a valid brazilian 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 '55'" do
+    expect(subject[:id]).to match /\A55/
+  end
+
+  it "has a :mobile_country_code value of '724'" do
+    expect(subject[:mobile_country_code]).to eq '724'
+  end
+end
+
+shared_examples "of detection of msisdn from a valid chilean 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 '56'" do
+    expect(subject[:id]).to match /\A56/
+  end
+
+  it "has a :mobile_country_code value of '730'" do
+    expect(subject[:mobile_country_code]).to eq '730'
+  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
+    expect(subject[:id]).to match /\A57/
+  end
+
+  it "has a :mobile_country_code value of '732'" do
+    expect(subject[:mobile_country_code]).to eq '732'
+  end
+end

data/spec/spec_helper.rb

@@ -67,13 +67,11 @@ RSpec.configure do |config|
 
   config.raise_errors_for_deprecations!
 
-
-
   # Allow to use the FactoryGirl methods (build, create, build_stubbed)
   # directly on specs, instead of prefacing them with "FactoryGirl":
   config.include FactoryGirl::Syntax::Methods
 
-
   Dir["spec/factories/*.rb"].each { |f| load f }
+  Dir["spec/shared_examples/*.rb"].each { |f| load f }
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobile-subscriber
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha3
+  version: 0.0.1.alpha4
 platform: ruby
 authors:
 - Roberto Quintanilla
@@ -117,6 +117,7 @@ files:
 - 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/detection/from_x_up_subno_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
@@ -124,9 +125,12 @@ files:
 - lib/mobile_subscriber/version.rb
 - mobile-subscriber.gemspec
 - mobile_subscriber.thor
+- spec/detection/from_msisdn_http_request_header_spec.rb
+- spec/detection/from_x_nokia_msisdn_http_request_header_spec.rb
 - spec/factories/requests.rb
 - spec/mobile_subscriber_spec.rb
 - spec/models/isdn_spec.rb
+- spec/shared_examples/of_msisdn_detection_from_http_request.rb
 - spec/spec_helper.rb
 - templates/mobile_and_iso_country_codes.rb.erb
 - templates/operator_data.rb.erb
@@ -155,7 +159,10 @@ signing_key:
 specification_version: 4
 summary: Mobile MSISDN detection & validation.
 test_files:
+- spec/detection/from_msisdn_http_request_header_spec.rb
+- spec/detection/from_x_nokia_msisdn_http_request_header_spec.rb
 - spec/factories/requests.rb
 - spec/mobile_subscriber_spec.rb
 - spec/models/isdn_spec.rb
+- spec/shared_examples/of_msisdn_detection_from_http_request.rb
 - spec/spec_helper.rb