russian_phone 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16d06f62f45a61c5481be6b1889d0615e889301b
-  data.tar.gz: f36afbcdd5309dd268eb4b008e2639e1c56bb163
+  metadata.gz: de2b1c829af8ca3af5a9e976e456ab5a543c3089
+  data.tar.gz: 38063084067c0c3683d12a1f579fb130ab2dad3a
 SHA512:
-  metadata.gz: 7f09c65d39d1aee28f8fbfb1d5b9fd47a21e05ab1da62cd7fcfe38401eeaa14e228937ecb9123e06678afd716d5d96fde22a170fb4c0394a84eb8d515c686ca5
-  data.tar.gz: e89db6ae486c9068a29f8523f1cb76a1b5c6966c3eb8e50cbc421af14a1373b30b7c1782f7324508d0b6e67341ff4bf8b888b6eec143f1101599ac4bb50a3a2e
+  metadata.gz: a76aa835d65eccdbcd6734342a0856c729868a3b6c361b26d9c82fb67bc6d08fd9a25fe1dc7ea0c8f1b3b2f08a36af70069b9c855274adbff5468eb01858deeb
+  data.tar.gz: b63665d691b789c1c7b3e40a0a4b2edd4d1879d2bfef7ad454bc6fa8bac2db870b994a237e3174aa3e42b7db5c532dc41eba6ac618cc867a253eb49323016841

data/lib/russian_phone/number.rb

@@ -1,294 +1,292 @@
-# coding: utf-8
-
-module RussianPhone
-  class Number
-    attr_accessor :phone, :options
-
-    def initialize(phone, options = {})
-      @options = self.class.process_options(options)
-      @phone = phone.to_s
-    end
-
-    def ==(other)
-      if other.class == self.class
-        # (other.phone == self.phone && other.options == self.options)
-        other.to_s == to_s
-      elsif other.class == String
-        parsed = RussianPhone::Number.new(other)
-        parsed.to_s == to_s
-        # parsed.phone == self.phone && parsed.options == self.options
-      else
-        false
-      end
-    end
-
-    def coerce(something)
-      [self, something]
-    end
-
-    def parse(field)
-      data = self.class.parse(@phone, @options)
-      return nil if data.nil?
-
-      if data.has_key? :subscriber
-        @subscriber = data[:subscriber].to_s
-        @city = data[:city].to_s
-        @country = data[:country].to_s
-        @extra = data[:extra].to_s
-      end
-
-      data.has_key?(field) ? data[field] : nil
-    end
-
-    def valid?
-      @valid ||= !(country.nil? || city.nil? || subscriber.nil? || country == '' || city == ''  || subscriber == '')
-    end
-
-    def blank?
-      @phone.strip == ''
-    end
-
-    def empty?
-      @phone.strip == ''
-    end
-
-    def subscriber
-      @subscriber ||= parse(:subscriber)
-    end
-
-    def city_allowed?
-      options[:allowed_cities].nil? || options[:allowed_cities].include?(city)
-    end
-
-    def city
-      @city ||= parse(:city)
-    end
-    alias_method :area, :city
-
-    def country
-      @country ||= parse(:country)
-    end
-
-    def extra
-      @extra ||= parse(:extra)
-    end
-
-    def split(format, number)
-      number = number.dup
-      format.inject([]) do |result, size|
-        result << number.slice!(0..size-1)
-        return result if number.empty?
-        result
-      end
-    end
-
-    def format
-      if subscriber.length == 7
-        split([3, 2, 2], subscriber)
-      elsif subscriber.length == 6
-        split([2, 2, 2], subscriber)
-      elsif subscriber.length == 5
-        split([1, 2, 2], subscriber)
-      else
-        []
-      end
-    end
-    
-    def formatted_area
-      area.nil? ? '' : "(#{area})"
-    end
-    
-    def formatted_subscriber
-      subscriber.nil? ? '' : format.join('-')
-    end
-    
-    def full
-      if valid?
-        if free? && extra == ''
-        "8-#{area}-#{formatted_subscriber}"
-        else
-        "+#{country} #{formatted_area} #{formatted_subscriber}#{extra == '' ? '' : ' ' + extra}"
-        end
-      else
-        ''
-      end
-    end
-
-    def clean
-      "#{country}#{area}#{subscriber}"
-    end
-
-    def cell?
-      Codes.cell_codes.include?(area)
-    end
-
-    def free?
-      area == '800'
-    end
-
-    # alias_method(:to_s, :full)
-    # alias_method(:inspect, :full)
-
-    def to_s
-      valid? ? full : @phone
-    end
-
-
-    def inspect
-      # '"' + full + '"'
-      '"' + to_s + '"'
-    end
-
-    #def mongoize
-    #  @phone
-    #end
-    # alias_method(:as_json, :mongoize)
-
-    alias_method(:as_json, :to_s)
-    alias_method(:mongoize, :to_s)
-
-    class << self
-      def clean(string)
-        string.tr('^0-9', '')
-      end
-
-      #def _extract(string, subscriber_digits, code_digits)
-      #  [string[-(subscriber_digits + code_digits), code_digits], string[-subscriber_digits,subscriber_digits]]
-      #end
-
-      def _extract(string, subscriber_digits, code_digits)
-        [string[0, code_digits], string[code_digits, subscriber_digits]]
-      end
-
-      def extract(string, subscriber_digits, code_digits)
-        _extract(clean(string), subscriber_digits, code_digits)
-      end
-
-      def _extra(string, position)
-        i = 0
-        digits = 0
-
-        string.each_char do |char|
-          if char.match(/[0-9]/)
-            digits += 1
-          end
-          i += 1
-          # puts "#{char} #{digits} #{i} #{position}"
-          if digits >= position
-            return string[i..-1].strip
-          end
-        end
-
-        ''
-      end
-
-      def country_code(string)
-        clean(string)[-10, 1]
-      end
-
-      def process_options(opts = {})
-        opts = {
-            default_country: 7,
-            default_city: nil,
-            allowed_cities: nil,
-        }.merge(opts)
-
-        opts[:default_country] = opts[:default_country].to_s unless opts[:default_country].nil?
-        opts[:default_city]    = opts[:default_city].to_s    unless opts[:default_city].nil?
-        opts[:allowed_cities]  = opts[:allowed_cities].map { |c| c.to_s } unless opts[:allowed_cities].nil?
-
-        opts
-      end
-
-      def parse(string, opts = {})
-        return string if string.class.name == 'RussianPhone::Number'
-
-        opts = process_options(opts)
-
-        if string.class.name == 'Array'
-          string = string.join('')
-        else
-          string = string.to_s
-        end
-
-        clean_string = clean(string)
-
-        if clean_string.length < 10
-          if opts[:default_city].nil?
-            return nil
-          elsif clean_string.length > 7
-            # Телефон слишком длинный для телефона без кода города
-            return nil
-          else
-            if Codes.codes_for(clean_string.length).include? opts[:default_city]
-              return {country: opts[:default_country], city: opts[:default_city], subscriber: clean_string}
-            else
-              # Количество цифр в телефоне не соответствует количеству цифр местных номеров города
-              return nil
-            end
-          end
-        end
-
-        extra_after = 10
-
-        if clean_string.length > 10 && string.starts_with?('+7') || string.starts_with?('8 ') || string.starts_with?('8(') || string.starts_with?('8-')
-          clean_string[0] = ''
-          extra_after += 1
-        end
-
-        if clean_string.length == 11 && string.starts_with?('7')
-          clean_string[0] = ''
-          extra_after += 1
-        end
-
-        if clean_string.length == 11 && string.starts_with?('8')
-          clean_string[0] = ''
-          extra_after += 1
-        end
-
-        # handles stuff like 89061010101 д. 123
-        if string.split(' ').length > 1 && string.split(/\D/)[0].length > 10
-          if string.starts_with?('7')
-            clean_string[0] = ''
-            extra_after += 1
-          end
-
-          if string.starts_with?('8')
-            clean_string[0] = ''
-            extra_after += 1
-          end
-        end
-
-        # handle 7906123-12-12 доб 123
-        if clean_string.length > 10 && extra_after == 10 && (clean_string[0] == '7' || clean_string[0] == '8')
-          result = ''
-          string.split(/\D/).each do |segm|
-            result += segm
-            break if result.length >= 10
-          end
-          if result.length > 10
-            clean_string[0] = ''
-            extra_after += 1
-          end
-        end
-
-        code_3_digit, phone_7_digit = _extract(clean_string, 7, 3)
-        if code_3_digit == '800' || Codes.cell_codes.include?(code_3_digit) || Codes.ndcs_with_7_subscriber_digits.include?(code_3_digit)
-          return {country: opts[:default_country], city: code_3_digit, subscriber: phone_7_digit, extra: _extra(string, extra_after)}
-        end
-
-        code_4_digit, phone_6_digit = _extract(clean_string, 6, 4)
-        if Codes.ndcs_with_6_subscriber_digits.include? code_4_digit
-          return {country: opts[:default_country], city: code_4_digit, subscriber: phone_6_digit, extra: _extra(string, extra_after)}
-        end
-
-        code_5_digit, phone_5_digit = _extract(clean_string, 5, 5)
-        if Codes.ndcs_with_5_subscriber_digits.include? code_5_digit
-          return {country: opts[:default_country], city: code_5_digit, subscriber: phone_5_digit, extra: _extra(string, extra_after)}
-        end
-
-        return {country: opts[:default_country], city: code_3_digit, subscriber: phone_7_digit, extra: _extra(string, extra_after)}
-      end
-    end
-  end
+# coding: utf-8
+
+module RussianPhone
+  class Number
+    attr_accessor :phone, :options
+
+    def initialize(phone, options = {})
+      @options = self.class.process_options(options)
+      @phone = phone.to_s
+    end
+
+    def ==(other)
+      if other.class == self.class
+        # (other.phone == self.phone && other.options == self.options)
+        other.to_s == to_s
+      elsif other.class == String
+        parsed = RussianPhone::Number.new(other)
+        parsed.to_s == to_s
+        # parsed.phone == self.phone && parsed.options == self.options
+      else
+        false
+      end
+    end
+
+    def coerce(something)
+      [self, something]
+    end
+
+    def parse(field)
+      data = self.class.parse(@phone, @options)
+      return nil if data.nil?
+
+      if data.has_key? :subscriber
+        @subscriber = data[:subscriber].to_s
+        @city = data[:city].to_s
+        @country = data[:country].to_s
+        @extra = data[:extra].to_s
+      end
+
+      data.has_key?(field) ? data[field] : nil
+    end
+
+    def valid?
+      @valid ||= !(country.nil? || city.nil? || subscriber.nil? || country == '' || city == ''  || subscriber == '')
+    end
+
+    def blank?
+      @phone.strip == ''
+    end
+
+    def empty?
+      @phone.strip == ''
+    end
+
+    def subscriber
+      @subscriber ||= parse(:subscriber)
+    end
+
+    def city_allowed?
+      options[:allowed_cities].nil? || options[:allowed_cities].include?(city)
+    end
+
+    def city
+      @city ||= parse(:city)
+    end
+    alias_method :area, :city
+
+    def country
+      @country ||= parse(:country)
+    end
+
+    def extra
+      @extra ||= parse(:extra)
+    end
+
+    def split(format, number)
+      number = number.dup
+      format.inject([]) do |result, size|
+        result << number.slice!(0..size-1)
+        return result if number.empty?
+        result
+      end
+    end
+
+    def format
+      if subscriber.length == 7
+        split([3, 2, 2], subscriber)
+      elsif subscriber.length == 6
+        split([2, 2, 2], subscriber)
+      elsif subscriber.length == 5
+        split([1, 2, 2], subscriber)
+      else
+        []
+      end
+    end
+    
+    def formatted_area
+      area.nil? ? '' : "(#{area})"
+    end
+    
+    def formatted_subscriber
+      subscriber.nil? ? '' : format.join('-')
+    end
+    
+    def full
+      if valid?
+        if free? && extra == ''
+        "8-#{area}-#{formatted_subscriber}"
+        else
+        "+#{country} #{formatted_area} #{formatted_subscriber}#{extra == '' ? '' : ' ' + extra}"
+        end
+      else
+        ''
+      end
+    end
+
+    def clean
+      "#{country}#{area}#{subscriber}"
+    end
+
+    def cell?
+      Codes.cell_codes.include?(area)
+    end
+
+    def free?
+      area == '800'
+    end
+
+    # alias_method(:to_s, :full)
+    # alias_method(:inspect, :full)
+
+    def to_s
+      valid? ? full : @phone
+    end
+
+
+    def inspect
+      # '"' + full + '"'
+      '"' + to_s + '"'
+    end
+
+    def as_json(options = {})
+      to_s
+    end
+
+    alias_method(:mongoize, :to_s)
+
+    class << self
+      def clean(string)
+        string.tr('^0-9', '')
+      end
+
+      #def _extract(string, subscriber_digits, code_digits)
+      #  [string[-(subscriber_digits + code_digits), code_digits], string[-subscriber_digits,subscriber_digits]]
+      #end
+
+      def _extract(string, subscriber_digits, code_digits)
+        [string[0, code_digits], string[code_digits, subscriber_digits]]
+      end
+
+      def extract(string, subscriber_digits, code_digits)
+        _extract(clean(string), subscriber_digits, code_digits)
+      end
+
+      def _extra(string, position)
+        i = 0
+        digits = 0
+
+        string.each_char do |char|
+          if char.match(/[0-9]/)
+            digits += 1
+          end
+          i += 1
+          # puts "#{char} #{digits} #{i} #{position}"
+          if digits >= position
+            return string[i..-1].strip
+          end
+        end
+
+        ''
+      end
+
+      def country_code(string)
+        clean(string)[-10, 1]
+      end
+
+      def process_options(opts = {})
+        opts = {
+            default_country: 7,
+            default_city: nil,
+            allowed_cities: nil,
+        }.merge(opts)
+
+        opts[:default_country] = opts[:default_country].to_s unless opts[:default_country].nil?
+        opts[:default_city]    = opts[:default_city].to_s    unless opts[:default_city].nil?
+        opts[:allowed_cities]  = opts[:allowed_cities].map { |c| c.to_s } unless opts[:allowed_cities].nil?
+
+        opts
+      end
+
+      def parse(string, opts = {})
+        return string if string.class.name == 'RussianPhone::Number'
+
+        opts = process_options(opts)
+
+        if string.class.name == 'Array'
+          string = string.join('')
+        else
+          string = string.to_s
+        end
+
+        clean_string = clean(string)
+
+        if clean_string.length < 10
+          if opts[:default_city].nil?
+            return nil
+          elsif clean_string.length > 7
+            # Телефон слишком длинный для телефона без кода города
+            return nil
+          else
+            if Codes.codes_for(clean_string.length).include? opts[:default_city]
+              return {country: opts[:default_country], city: opts[:default_city], subscriber: clean_string}
+            else
+              # Количество цифр в телефоне не соответствует количеству цифр местных номеров города
+              return nil
+            end
+          end
+        end
+
+        extra_after = 10
+
+        if clean_string.length > 10 && string.starts_with?('+7') || string.starts_with?('8 ') || string.starts_with?('8(') || string.starts_with?('8-')
+          clean_string[0] = ''
+          extra_after += 1
+        end
+
+        if clean_string.length == 11 && string.starts_with?('7')
+          clean_string[0] = ''
+          extra_after += 1
+        end
+
+        if clean_string.length == 11 && string.starts_with?('8')
+          clean_string[0] = ''
+          extra_after += 1
+        end
+
+        # handles stuff like 89061010101 д. 123
+        if string.split(' ').length > 1 && string.split(/\D/)[0].length > 10
+          if string.starts_with?('7')
+            clean_string[0] = ''
+            extra_after += 1
+          end
+
+          if string.starts_with?('8')
+            clean_string[0] = ''
+            extra_after += 1
+          end
+        end
+
+        # handle 7906123-12-12 доб 123
+        if clean_string.length > 10 && extra_after == 10 && (clean_string[0] == '7' || clean_string[0] == '8')
+          result = ''
+          string.split(/\D/).each do |segm|
+            result += segm
+            break if result.length >= 10
+          end
+          if result.length > 10
+            clean_string[0] = ''
+            extra_after += 1
+          end
+        end
+
+        code_3_digit, phone_7_digit = _extract(clean_string, 7, 3)
+        if code_3_digit == '800' || Codes.cell_codes.include?(code_3_digit) || Codes.ndcs_with_7_subscriber_digits.include?(code_3_digit)
+          return {country: opts[:default_country], city: code_3_digit, subscriber: phone_7_digit, extra: _extra(string, extra_after)}
+        end
+
+        code_4_digit, phone_6_digit = _extract(clean_string, 6, 4)
+        if Codes.ndcs_with_6_subscriber_digits.include? code_4_digit
+          return {country: opts[:default_country], city: code_4_digit, subscriber: phone_6_digit, extra: _extra(string, extra_after)}
+        end
+
+        code_5_digit, phone_5_digit = _extract(clean_string, 5, 5)
+        if Codes.ndcs_with_5_subscriber_digits.include? code_5_digit
+          return {country: opts[:default_country], city: code_5_digit, subscriber: phone_5_digit, extra: _extra(string, extra_after)}
+        end
+
+        return {country: opts[:default_country], city: code_3_digit, subscriber: phone_7_digit, extra: _extra(string, extra_after)}
+      end
+    end
+  end
 end

data/lib/russian_phone/version.rb

@@ -1,3 +1,3 @@
 module RussianPhone
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: russian_phone
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - GlebTv