add 'coding' declaration into .py files

codeparser/codeparser/items.py

@@ -1,3 +1,4 @@
+#coding:utf-8
 from scrapy.item import Item, Field
 
 

codeparser/codeparser/pipelines.py

@@ -1,5 +1,7 @@
+#coding:utf-8
 from codes.models import Operator
 
+
 class ParserPipeline(object):
     def process_item(self, item, spider):
         operator = Operator(**item)

codeparser/codeparser/settings.py

@@ -1,3 +1,4 @@
+#coding:utf-8
 # Scrapy settings for parser project
 #
 # For simplicity, this file contains only the most important settings by

codeparser/codeparser/spiders/codes_spider.py

@@ -1,3 +1,4 @@
+#coding:utf-8
 import re
 from scrapy.spider import BaseSpider
 from codeparser.items import ParserItem

codes/forms.py

@@ -1,4 +1,25 @@
+#coding:utf-8
+import re
 from django import forms
 
+
+PHONE_CLEAN_REGEX = re.compile(r"\D")
 class PhoneForm(forms.Form):
-    phone = forms.CharField(max_length=20)
+    """
+    Form for check valid of phone number.
+    """
+    phone = forms.CharField(max_length=20)
+
+    def clean_phone(self):
+        """
+        Validate phone value
+        """
+        phone = self.cleaned_data["phone"]
+
+        phone_no = PHONE_CLEAN_REGEX.sub(r'', phone)
+
+        if len(phone_no) != 11:
+            raise forms.ValidationError(u"Invalid phone number")
+
+        return phone_no
+

codes/managers.py

@@ -0,0 +1,52 @@
+#coding:utf-8
+from django.db import models
+from utils.exceptions import OperatorNotFoundException
+
+
+class OperatorManager(models.Manager):
+    """
+    Manager class for operator model
+    """
+
+    def find(self, phone):
+        """
+        Find phone operator by full identical
+        """
+        country_code, cleaned = self._detect_phone_country(phone)
+        region_code, number = int(cleaned[:3]), int(cleaned[3:])
+
+        try:
+            operator = self.get(region_code=region_code, number_end_range__gte=number, number_start_range__lte=number)
+        except Exception, e:
+            return None
+        return operator
+
+    def find_by_range(self, phone):
+        """
+        Find phone operator by range identical
+        """
+        country_code, number = self._detect_phone_country(phone)
+
+        try:
+            operator = self.raw("""SELECT *, MAX(region_code) FROM codes_operator 
+                WHERE number_start_range <= %s AND number_end_range >= %s""", [number, number])[0]
+            if operator.pk is None:
+                raise OperatorNotFoundException
+        except IndexError:
+            raise OperatorNotFoundException
+
+        return operator
+
+    def _detect_phone_country(self, value):
+        """
+        Detect phone country by begin of number. If first number is 8 - number is RU
+        Return country and cleaned number.
+        """
+        phone_str = str(value)
+        if phone_str[0] in ['7', '8']:
+            return 'RU', phone_str[1:]
+
+        ### here need build logic of detect country
+
+        return 'RU', phone_str[1:]
+

codes/models.py

@@ -1,10 +1,13 @@
 # -*- coding: utf-8 -*-
 import re
+from .managers import OperatorManager
 from django.db import models
-from utils.exceptions import InvalidNumberException, OperatorNotFoundException
 
 
 class Operator(models.Model):
+    """
+    Model for desrcibe operator code info
+    """
     name = models.CharField(max_length=250)
     region_code = models.PositiveIntegerField()
     number_start_range = models.PositiveIntegerField()
@@ -13,40 +16,7 @@ class Operator(models.Model):
     region = models.CharField(max_length=250)
     country = models.CharField(max_length=4)
 
+    objects = OperatorManager()
+
     class Meta:
         ordering = ['region_code', 'number_end_range']
-
-    @staticmethod
-    def _get_cleaned_number(number):
-        cleaned = re.sub(r'\D', r'', number)
-
-        if len(cleaned) != 11:
-            raise InvalidNumberException
-        return cleaned
-
-    @classmethod
-    def find(cls, phone):
-        cleaned = cls._get_cleaned_number(phone)
-        region_code = int(cleaned[1:4])
-        number = int(cleaned[4:])
-        region_operators = cls.objects.filter(region_code=region_code)
-        try:
-            operator = region_operators.filter(number_end_range__gte=number)[0]
-            if not operator.number_start_range <= number:
-                return None
-        except IndexError:
-            return None
-        return operator
-
-    @classmethod
-    def find_by_range(cls, phone):
-        number = cls._get_cleaned_number(phone)[1:]  # Убираем 8 с начала
-
-        try:
-            operator = cls.objects.raw(
-                'select *, max(region_code) from codes_operator where number_start_range <= %s and \
-                number_end_range >= %s;', [number, number])[0]
-        except IndexError:
-            raise OperatorNotFoundException
-
-        return operator

codes/urls.py

@@ -0,0 +1,7 @@
+#coding:utf-8
+from django.conf.urls.defaults import patterns, url
+
+
+urlpatterns = patterns('codes.views',
+    url(r'^$', 'show_operator'),
+)

codes/views.py

@@ -1,44 +1,42 @@
+#coding:utf-8
+from forms import PhoneForm
+from models import Operator
 from utils import response_json
 from utils.exceptions import OperatorNotFoundException, InvalidNumberException
-from models import Operator
-from forms import PhoneForm
 
 
 def show_operator(request):
+    """
+    Process request for get phone number code
+    """
     try:
-        if request.method != 'POST':
-            form = PhoneForm(request.GET)
-        else:
-            form = PhoneForm(request.POST)
-        if form.is_valid():
-            phone = form.cleaned_data['phone']
-
-            operator = Operator.find(phone)
-
-            if not operator:
-                operator = Operator.find_by_range(phone)
-
-            if operator:
-                response = {
-                    'status': 0,
-                    'message': 'ok',
-                    'phone': phone,
-                    'operator': operator.name,
-                    'region': operator.region,
-                    'region_code': operator.region_code,
-                    'mobile': operator.mobile,
-                    'country': operator.country,
-                }
-            else:
-                raise OperatorNotFoundException
-
-        else:
+        form = PhoneForm(request.GET if request.method != 'POST' else request.POST)
+
+        if not form.is_valid():
             raise InvalidNumberException
 
+        phone = form.cleaned_data['phone']
+
+        operator = Operator.objects.find(phone) or Operator.objects.find_by_range(phone)
+
+        if not operator:
+            raise OperatorNotFoundException
+
+        response = {
+            'status': 0,
+            'message': 'ok',
+            'phone': phone,
+            'operator': operator.name,
+            'region': operator.region,
+            'region_code': operator.region_code,
+            'mobile': operator.mobile,
+            'country': operator.country,
+        }
+        return response_json(response)
+
     except (OperatorNotFoundException, InvalidNumberException), e:
         return response_json({'status': 1, 'message': e.msg, 'code':e.code})
 
     except Exception, e:
         return response_json({'status': 1, 'message': e})
 
-    return response_json(response)

scrapy_settings.py

@@ -1,3 +1,4 @@
+#coding:utf-8
 from settings import *
 
 

settings.py

@@ -1,4 +1,4 @@
-# Django settings for phonecodes project.
+#coding:utf-8
 import os
 project_path = os.path.abspath(os.path.dirname(__file__))
 

urls.py

@@ -1,6 +1,7 @@
+#coding:utf-8
 from django.conf.urls.defaults import patterns, include, url
 
 
 urlpatterns = patterns('',
-    url(r'^$', 'codes.views.show_operator'),
+    url(r'^',  include('codes.urls')),
 )

utils/__init__.py

@@ -1,3 +1,4 @@
+#coding:utf-8
 import json
 from django.http import HttpResponse
 

utils/exceptions.py

@@ -1,3 +1,4 @@
+#coding:utf-8
 class InvalidNumberException(Exception):
     code = 1
     msg = 'Invalid number.'