Merge b93b440 into 05bfade

README.rst

@@ -5,6 +5,10 @@
     :target: https://coveralls.io/github/chinapnr/fishbase?branch=master
 .. image:: https://readthedocs.org/projects/fishbase/badge/?version=latest
     :target: https://fishbase.readthedocs.io/en/latest/?badge=latest
+.. image:: https://ci.appveyor.com/api/projects/status/ecskod12wy8fvkxu?svg=true
+    :target: https://ci.appveyor.com/project/itaa/fishbase
+
+
 
 简介
 ====

fishbase/fish_random.py

@@ -10,7 +10,7 @@
 from fishbase.fish_common import get_random_str
 
 
-# v1.0.15 edit by Hu Jun #163
+# v1.1.5 edit by Hu Jun #163
 def gen_string_by_range(min_length, max_length, prefix=None, suffix=None):
     """
     指定一个前后缀以及字符串长度，返回随机生成带有前后缀及指定长度的字符串
@@ -55,3 +55,60 @@ def gen_string_by_range(min_length, max_length, prefix=None, suffix=None):
     random_str = ''.join([prefix, init_rand_str, suffix])
 
     return random_str
+
+
+# v1.1.5 add by Jia Chunying #171
+def gen_name(family_name=None, gender=None, length=None):
+    """
+    指定姓氏、性别、长度，返回随机人名，也可不指定生成随机人名
+
+    :param:
+        * family_name: (string) 姓
+        * gender: (string) 性别 "01" 男性， "00" 女性, 默认 None: 随机
+        * length: (int) 大于等于 2 小于等于 10 的整数, 默认 None: 随机 2 或者 3
+
+    :return:
+        * random_str: (string) 随机人名
+
+    举例如下::
+
+        print('--- gen_name demo ---')
+        print(gen_name())
+        print(gen_name("赵","01", 3))
+        print('---')
+
+    执行结果::
+        --- gen_name demo ---
+        师艺
+        赵群腾
+        ---
+
+    """
+    family_word = "赵钱孙李周吴郑王冯陈褚卫蒋沈韩杨朱秦尤许何吕施张孔曹严华金魏陶姜戚谢邹喻柏水窦章云苏潘葛奚范彭郎鲁韦昌马苗凤花" \
+                  "方俞任袁柳酆鲍史唐费廉岑薛雷贺倪汤滕殷罗毕郝邬安常乐于时傅皮卞齐康伍余元卜顾孟平黄和穆萧尹姚邵湛汪祁毛禹狄米贝" \
+                  "明臧计伏成戴谈宋茅庞熊纪舒屈项祝董梁杜阮蓝闵席季麻强贾路娄危江童颜郭梅盛林刁钟徐邱骆高夏蔡田樊胡凌霍虞万支柯咎" \
+                  "管卢莫经房裘缪干解应宗宣丁贲邓郁单杭洪包诸左石崔吉钮龚程嵇邢滑裴陆荣翁荀羊於惠甄魏加封芮羿储靳汲邴糜松井段富巫" \
+                  "乌焦巴弓牧隗山谷车侯宓蓬全郗班仰秋仲伊宫宁仇栾暴甘钭厉戎祖武符刘姜詹束龙叶幸司韶郜黎蓟薄印宿白怀蒲台从鄂索咸籍" \
+                  "赖卓蔺屠蒙池乔阴郁胥能苍双闻莘党翟谭贡劳逄姬申扶堵冉宰郦雍却璩桑桂濮牛寿通边扈燕冀郏浦尚农温别庄晏柴瞿阎充慕连" \
+                  "茹习宦艾鱼容向古易慎戈廖庚终暨居衡步都耿满弘匡国文寇广禄阙东殴殳沃利蔚越夔隆师巩厍聂晁勾敖融冷訾辛阚那简饶空曾" \
+                  "毋沙乜养鞠须丰巢关蒯相查后江红游竺权逯盖益桓公万俟司马上官欧阳夏侯诸葛闻人东方赫连皇甫尉迟公羊澹台公冶宗政濮阳" \
+                  "淳于仲孙太叔申屠公孙乐正轩辕令狐钟离闾丘长孙慕容鲜于宇文司徒司空亓官司寇仉督子车颛孙端木巫马公西漆雕乐正壤驷公" \
+                  "良拓拔夹谷宰父谷粱晋楚阎法汝鄢涂钦段干百里东郭南门呼延归海羊舌微生岳帅缑亢况后有琴梁丘左丘东门西门商牟佘佴伯赏" \
+                  "南宫墨哈谯笪年爱阳佟第五言福百家姓续"
+
+    name_dict = {"00": "秀娟英华慧巧美娜静淑惠珠翠雅芝玉萍红娥玲芬芳燕彩春菊兰凤洁梅琳素云莲真环雪荣爱妹霞香月莺媛艳瑞凡佳嘉琼勤珍"
+                       "贞莉桂娣叶璧璐娅琦晶妍茜秋珊莎锦黛青倩婷姣婉娴瑾颖露瑶怡婵雁蓓纨仪荷丹蓉眉君琴蕊薇菁梦岚苑婕馨瑗琰韵融园艺"
+                       "咏卿聪澜纯毓悦昭冰爽琬茗羽希宁欣飘育滢馥筠柔竹霭凝晓欢霄枫芸菲寒伊亚宜可姬舒影荔枝思丽",
+                 "01": "伟刚勇毅俊峰强军平保东文辉力明永健世广志义兴良海山仁波宁贵福生龙元全国胜学祥才发武新利清飞彬富顺信子杰涛昌"
+                       "成康星光天达安岩中茂进林有坚和彪博诚先敬震振壮会思群豪心邦承乐绍功松善厚庆磊民友裕河哲江超浩亮政谦亨奇固之"
+                       "轮翰朗伯宏言若鸣朋斌梁栋维启克伦翔旭鹏泽晨辰士以建家致树炎德行时泰盛雄琛钧冠策腾楠榕风航弘"}
+
+    if family_name is None:
+        family_name = random.choice(family_word)
+    if gender is None or gender not in ['00', '01']:
+        gender = random.choice(['00', '01'])
+    if length is None or length not in [2, 3, 4, 5, 6, 7, 8, 9, 10]:
+        length = random.choice([2, 3])
+    name = "".join([random.choice(name_dict[gender]) for _ in range(length - 1)])
+    full_name = "{family_name}{name}".format(family_name=family_name, name=name)
+    return full_name

test/test_random.py

@@ -22,3 +22,12 @@ def test_gen_string_by_range_02(self):
 
         with pytest.raises(ValueError):
             gen_string_by_range(10, 4, prefix='fishbase_')
+
+    def test_gen_name(self):
+        full_name = gen_name()
+        assert isinstance(full_name, str)
+        assert 2 <= len(full_name) <= 3
+        full_name_2 = gen_name("赵", "01", 3)
+        assert isinstance(full_name_2, str)
+        assert len(full_name_2) == 3
+        assert full_name_2.startswith("赵")