mobile-subscriber 1.0.0.alpha4 → 1.0.0.alpha5

data/spec/shared_examples/identity_detection_in_honduras.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+
+shared_examples "of mobile subcriber identity detection from a valid honduran mobile network http request" do
+  
+  it "the msisdn starts with '504'" do
+    expect(subject.msisdn).to start_with '504'
+  end
+  it "the mobile country code is '708'" do
+    expect(subject.mobile_country_code).to eq '708'
+  end
+end

data/spec/shared_examples/identity_detection_in_mexico.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+
+shared_examples "of mobile subcriber identity detection from a valid mexican mobile network http request" do
+  
+  it "the msisdn starts with '52'" do
+    expect(subject.msisdn).to start_with '52'
+  end
+  it "the mobile country code is '334'" do
+    expect(subject.mobile_country_code).to eq '334'
+  end
+end

data/spec/shared_examples/identity_detection_in_nicaragua.rb

@@ -0,0 +1,12 @@
+require "spec_helper"
+
+shared_examples "of mobile subcriber identity detection from a valid nicaraguan mobile network http request" do
+  
+  it "the msisdn starts with '505'" do
+    expect(subject.msisdn).to start_with '505'
+  end
+
+  it "the mobile country code is '710'" do
+    expect(subject.mobile_country_code).to eq '710'
+  end
+end

data/spec/shared_examples/identity_detection_in_panama.rb

@@ -0,0 +1,12 @@
+require "spec_helper"
+
+shared_examples "of mobile subcriber identity detection from a valid panamanian mobile network http request" do
+  
+  it "the msisdn starts with '507'" do
+    expect(subject.msisdn).to start_with '507'
+  end
+
+  it "the mobile country code is '714'" do
+    expect(subject.mobile_country_code).to eq '714'
+  end
+end

data/spec/shared_examples/identity_detection_in_peru.rb

@@ -0,0 +1,12 @@
+require "spec_helper"
+
+shared_examples "of mobile subcriber identity detection from a valid peruvian mobile network http request" do
+  
+  it "the msisdn starts with '51'" do
+    expect(subject.msisdn).to start_with '51'
+  end
+
+  it "the mobile country code is '716'" do
+    expect(subject.mobile_country_code).to eq '716'
+  end
+end

data/spec/shared_examples/identity_detection_in_puerto_rico.rb

@@ -0,0 +1,14 @@
+require "spec_helper"
+
+shared_examples "of mobile subcriber identity detection from a valid puerto rican mobile network http request" do
+
+
+
+  it "the msisdn starts with '1787'" do
+    expect(subject.msisdn).to start_with '1'
+  end
+
+  it "the mobile country code is '330'" do
+    expect(subject.mobile_country_code).to eq '330'
+  end
+end

data/spec/shared_examples/of_msisdn_detection_from_http_request.rb

@@ -1,192 +1,7 @@
 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 guatemalan 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 '502'" do
-    expect(subject[:id]).to match /\A502/
-  end
-  it "has a :mobile_country_code value of '704'" do
-    expect(subject[:mobile_country_code]).to eq '704'
-  end
-end
-
-shared_examples "of detection of msisdn from a valid honduran 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 '504'" do
-    expect(subject[:id]).to match /\A504/
-  end
-  it "has a :mobile_country_code value of '708'" do
-    expect(subject[:mobile_country_code]).to eq '708'
-  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 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 puerto 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 '1'" do
-    expect(subject[:id]).to match /\A1/
-  end
-
-  it "has a :mobile_country_code value of '330'" do
-    expect(subject[:mobile_country_code]).to eq '330'
-  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
-
-shared_examples "of detection of msisdn from a valid ecuadorian 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 '593'" do
-    expect(subject[:id]).to match /\A593/
-  end
-
-  it "has a :mobile_country_code value of '740'" do
-    expect(subject[:mobile_country_code]).to eq '740'
-  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
-    expect(subject[:id]).to match /\A51/
-  end
-
-  it "has a :mobile_country_code value of '716'" do
-    expect(subject[:mobile_country_code]).to eq '716'
+shared_examples "of mobile subcriber identity detection from a valid mobile network http request" do
+  it "is present" do
+    expect(subject).to be_present
   end
 end

data/templates/dialing_and_country_codes.rb.erb

@@ -0,0 +1,20 @@
+module MobileSubscriber
+
+  # Country Dialing => ISO codes:
+  DIALING_COUNTRY_CODES = {
+
+    # Codes collected from http://countrycode.org
+<% @country_code_data.each do |d| %>
+    '<%= d[:dialing_code] %>' => '<%= d[:iso_code_2] %>', # <%= d[:country_name] %>
+<% end %>
+
+    # TODO: Block 1 countries:
+    '1787' => 'PR',
+
+    # Special cases:
+    # Boy! Caribbean Islands' codes do get messy!
+    '1829' => 'DO', # Dominican Republic Overlay 1
+    '1849' => 'DO', # Dominican Republic Overlay 2
+
+  }.freeze
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobile-subscriber
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha4
+  version: 1.0.0.alpha5
 platform: ruby
 authors:
 - Roberto Quintanilla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -113,34 +113,46 @@ files:
 - build-docker.sh
 - fig.yml
 - lib/mobile-subscriber.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/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
 - lib/mobile_subscriber/dictionaries/operator_data.rb
+- lib/mobile_subscriber/http/known_imsi_headers.rb
+- lib/mobile_subscriber/http/known_msisdn_headers.rb
+- lib/mobile_subscriber/http/request_info.rb
 - lib/mobile_subscriber/identity.rb
-- lib/mobile_subscriber/isdn.rb
 - 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/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/factories/mobile_requests.rb
+- spec/factories/mobile_requests_from_claro.rb
+- spec/factories/mobile_requests_from_iusacell.rb
+- spec/factories/mobile_requests_from_movistar.rb
+- spec/factories/mobile_requests_from_telcel.rb
+- spec/factories/mobile_requests_from_vivo.rb
+- spec/features/claro_user_detection_spec.rb
+- spec/features/iusacell_user_detection_spec.rb
+- spec/features/movistar_user_detection_spec.rb
+- spec/features/telcel_user_detection_spec.rb
 - spec/mobile_subscriber_spec.rb
-- spec/models/isdn_spec.rb
+- spec/models/identity_spec.rb
+- spec/shared_examples/identity_detection_in_argentina.rb
+- spec/shared_examples/identity_detection_in_brazil.rb
+- spec/shared_examples/identity_detection_in_chile.rb
+- spec/shared_examples/identity_detection_in_colombia.rb
+- spec/shared_examples/identity_detection_in_costa_rica.rb
+- spec/shared_examples/identity_detection_in_dominican_republic.rb
+- spec/shared_examples/identity_detection_in_ecuador.rb
+- spec/shared_examples/identity_detection_in_el_salvador.rb
+- spec/shared_examples/identity_detection_in_guatemala.rb
+- spec/shared_examples/identity_detection_in_honduras.rb
+- spec/shared_examples/identity_detection_in_mexico.rb
+- spec/shared_examples/identity_detection_in_nicaragua.rb
+- spec/shared_examples/identity_detection_in_panama.rb
+- spec/shared_examples/identity_detection_in_peru.rb
+- spec/shared_examples/identity_detection_in_puerto_rico.rb
 - spec/shared_examples/of_msisdn_detection_from_http_request.rb
 - spec/spec_helper.rb
+- templates/dialing_and_country_codes.rb.erb
 - templates/mobile_and_iso_country_codes.rb.erb
 - templates/operator_data.rb.erb
 homepage: ''
@@ -168,14 +180,32 @@ 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/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/factories/mobile_requests.rb
+- spec/factories/mobile_requests_from_claro.rb
+- spec/factories/mobile_requests_from_iusacell.rb
+- spec/factories/mobile_requests_from_movistar.rb
+- spec/factories/mobile_requests_from_telcel.rb
+- spec/factories/mobile_requests_from_vivo.rb
+- spec/features/claro_user_detection_spec.rb
+- spec/features/iusacell_user_detection_spec.rb
+- spec/features/movistar_user_detection_spec.rb
+- spec/features/telcel_user_detection_spec.rb
 - spec/mobile_subscriber_spec.rb
-- spec/models/isdn_spec.rb
+- spec/models/identity_spec.rb
+- spec/shared_examples/identity_detection_in_argentina.rb
+- spec/shared_examples/identity_detection_in_brazil.rb
+- spec/shared_examples/identity_detection_in_chile.rb
+- spec/shared_examples/identity_detection_in_colombia.rb
+- spec/shared_examples/identity_detection_in_costa_rica.rb
+- spec/shared_examples/identity_detection_in_dominican_republic.rb
+- spec/shared_examples/identity_detection_in_ecuador.rb
+- spec/shared_examples/identity_detection_in_el_salvador.rb
+- spec/shared_examples/identity_detection_in_guatemala.rb
+- spec/shared_examples/identity_detection_in_honduras.rb
+- spec/shared_examples/identity_detection_in_mexico.rb
+- spec/shared_examples/identity_detection_in_nicaragua.rb
+- spec/shared_examples/identity_detection_in_panama.rb
+- spec/shared_examples/identity_detection_in_peru.rb
+- spec/shared_examples/identity_detection_in_puerto_rico.rb
 - spec/shared_examples/of_msisdn_detection_from_http_request.rb
 - spec/spec_helper.rb

data/lib/mobile_subscriber/detection/from_msisdn_http_request_header.rb

@@ -1,48 +0,0 @@
-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 'Msisdn':
-  # - Claro Brasil
-  # - Claro República Dominicana
-  # - Claro Ecuador
-  # - Claro Paraguay
-  module FromMsisdnHttpRequestHeader
-
-    def extract_from_msisdn_http_request_header(http_request_info)
-      if msisdn = http_request_info.headers['Msisdn'] and msisdn.length >= 8
-
-        country_code = (
-          MobileSubscriber::DIALING_COUNTRY_CODES[msisdn[0,2]] ||
-          MobileSubscriber::DIALING_COUNTRY_CODES[msisdn[0,3]] ||
-          MobileSubscriber::DIALING_COUNTRY_CODES[msisdn[0,4]]     # Dominican Republic
-        )
-
-        # Determine the Network Operator (MCC + MNC tuple):
-        # TODO: Validate IP ranges, additional headers, etc.
-        network_id_tuple = case country_code
-        when 'BR' # Claro Brasil
-          # TODO: Determine (if possible) the MNC (05, 38)
-          { mcc: "724", mnc: "05"  }
-        when 'DO' # Claro Dominicana:
-          { mcc: "370", mnc: "02"  }
-        when 'EC' # Claro Ecuador:
-          { mcc: "740", mnc: "01"  }
-        when 'PY' # Claro Paraguay:
-          { mcc: "744", mnc: "02"  }
-        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