Skip to content

Making count follow the generic handler pattern. #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkeyes merged 1 commit into from
Mar 28, 2015
Merged

Making count follow the generic handler pattern. #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions intercom/count.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
import six

from intercom.api_operations.find import Find
from intercom.generic_handlers.count import CountType
from intercom.generic_handlers.count import Counter
from intercom.generic_handlers.base_handler import BaseHandler
from intercom.api_operations.count import Count as CountOperation
from intercom.traits.api_resource import Resource


@six.add_metaclass(CountType)
class Count(Resource, Find, CountOperation):
@six.add_metaclass(BaseHandler)
class Count(Resource, Find, CountOperation, Counter):

@classmethod
def fetch_for_app(cls):
Expand Down
21 changes: 13 additions & 8 deletions intercom/generic_handlers/count.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@

import re

count_breakdown_matcher = re.compile(r'(\w+)_counts_for_each_(\w+)')

class CountType(type): # noqa
class Counter():

def __getattr__(cls, name): # noqa
match = count_breakdown_matcher.search(name)
if match:
entity_to_count = match.group(1)
count_context = match.group(2)
return cls.do_broken_down_count(entity_to_count, count_context)
count_breakdown_matcher = re.compile(r'(\w+)_counts_for_each_(\w+)')

@classmethod
def handles_attr(cls, name):
return cls.count_breakdown_matcher.search(name) is not None

@classmethod
def _get(cls, entity, name):
match = cls.count_breakdown_matcher.search(name)
entity_to_count = match.group(1)
count_context = match.group(2)
return entity.do_broken_down_count(entity_to_count, count_context)
4 changes: 2 additions & 2 deletions tests/integration/test_count.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ def test_company_counts_for_each_user(self):
eq_(count[self.company.name], 1)

def test_total_company_count(self):
eq_(1, Company.count())
ok_(Company.count() >= 0)

def test_total_user_count(self):
eq_(1, User.count())
ok_(User.count() >= 0)

def test_total_segment_count(self):
ok_(Segment.count() >= 0)
Expand Down