lib/telephone_number/number.rb in telephone_number-0.1.0 vs lib/telephone_number/number.rb in telephone_number-0.2.0

@@ -1,27 +1,59 @@
 module TelephoneNumber
   class Number
     include TelephoneNumber::Parser
+    include TelephoneNumber::Formatter
 
-    attr_reader :original_number, :country, :e164_number, :national_number
+    attr_reader :original_number, :normalized_number, :country, :country_data
 
     def initialize(number, country)
       return unless number && country
 
-      @original_number = sanitize(number)
+      @original_number = sanitize(number).freeze
       @country = country.upcase.to_sym
-      @national_number, @e164_number = extract_number_types(@original_number, @country)
+      @country_data = PhoneData.phone_data[@country]
+
+      # normalized_number is basically a "best effort" at national number without
+      # any formatting. This is what we will use to derive formats, validations and
+      # basically anything else that uses google data
+      @normalized_number = build_normalized_number
     end
 
     def valid_types
-      @valid_types ||= validate(e164_number, country)
+      @valid_types ||= validate
     end
 
     def valid?(keys = [])
       keys.empty? ? !valid_types.empty? : !(valid_types & keys.map(&:to_sym)).empty?
     end
 
+    def national_number(formatted: true)
+      if formatted
+        @formatted_national_number ||= build_national_number
+      else
+        @unformatted_national_number ||= build_national_number(formatted: false)
+      end
+    end
+
+    def e164_number(formatted: true)
+      if formatted
+        @formatted_e164_number ||= build_e164_number
+      else
+        @e164_number ||= build_e164_number(formatted: false)
+      end
+    end
+
+    def international_number(formatted: true)
+      if formatted
+        @formatted_international_number ||= build_international_number
+      else
+        @international_number ||= build_international_number(formatted: false)
+      end
+    end
+
+    private
+
     def format
-      @format ||= extract_format(national_number, country)
+      @format ||= extract_format
     end
   end
 end