fix infinite recursion on fab_icon

Author: fabiommendes

.travis.yml

@@ -7,8 +7,8 @@ matrix:
  include:
  - env: TOXENV=py36
  python: 3.6
- - env: TOXENV=py37
- python: 3.7
+# - env: TOXENV=py37
+# python: 3.7
  - env: TOXENV=flake8
  python: 3.6
 

MANIFEST.in

@@ -1,7 +1,4 @@
 include INSTALL.rst
 include README.rst
 include LICENSE
-include VERSION
 include requirements.txt
-include tasks.py
-recursive-include src/bricks/ *.js

src/hyperpython/components/icons.py

@@ -9,7 +9,7 @@ def icon(icon, href=None, icon_class=lambda x: x, **kwargs):
  If an href attribute is passed, it wraps the results into a anchor link.
  """
  if href:
- return a(_icon(icon, href=href, **kwargs))
+ return a(_icon(icon, **kwargs), href=href)
  return i(**kwargs).add_class(icon_class(icon))
 
 
@@ -19,14 +19,16 @@ def fa_icon(icon, href=None, collection=None, **kwargs):
  """
  if collection is None:
  collection = FA_COLLECTIONS.get(icon, 'fa')
+ if href:
+ return a(fa_icon(icon, collection=collection, **kwargs), href=href)
  return _icon(icon, href, lambda x: [collection, f'fa-{icon}'], **kwargs)
 
 
 def fab_icon(icon, href=None, **kwargs):
  """
  Font awesome brands icon.
  """
- return fab_icon(icon, href, collection='fab', **kwargs)
+ return fa_icon(icon, href, collection='fab', **kwargs)
 
 
 _icon = icon

tests/test_components.py

@@ -1,8 +1,11 @@
 import pytest
 
 from hyperpython import Text
-from hyperpython.components import hyperlink, render_html, render, html_table, html_list, html_map
-from hyperpython.components.hyperlinks import split_link, a_or_p, a_or_span
+from hyperpython.components import (
+ hyperlink, render_html, render, html_table, html_list, html_map, a_or_p,
+ a_or_span, fab_icon, fa_icon,
+)
+from hyperpython.components.hyperlinks import split_link
 
 
 class CustomType:
@@ -91,3 +94,15 @@ def test_render_html_list(self):
  def test_render_html_map(self):
  assert (html_map({'foo': 'bar'}, class_='foo').__html__()
  == '<dl class="foo"><dt>foo</dt><dd>bar</dd></dl>')
+
+
+class TestIcons:
+ def test_render_font_awesome_icons(self):
+ assert str(fa_icon('user')) == '<i class="fa fa-user"></i>'
+ assert str(fa_icon('github')) == '<i class="fab fa-github"></i>'
+ assert str(fab_icon('github')) == '<i class="fab fa-github"></i>'
+
+ def test_render_icon_with_link(self):
+ assert str(fa_icon('user', href='#')) == '<a href="#"><i class="fa fa-user"></i></a>'
+ assert str(fa_icon('github', href='#')) == '<a href="#"><i class="fab fa-github"></i></a>'
+ assert str(fab_icon('github', href='#')) == '<a href="#"><i class="fab fa-github"></i></a>'