data_maker 2.5.3 → 2.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90e54723fedcd31758a2c3857541909c60f18482
-  data.tar.gz: 2f1e78aa9885594c1bbab19b76327955131c651d
+  metadata.gz: 61c4eb3a2da9d26d67f1ceb43f35c5cf8e4bb16e
+  data.tar.gz: e1c68574b5a44b6eb22bb591493bbbe99441f627
 SHA512:
-  metadata.gz: d625122130ebe0e76c9267bda031f5271f33b9415607694cf8d012b7d72b7f787ac8fe30314dccfce329ba13c408a085570c24ff8c81a31764d305f897f7bea3
-  data.tar.gz: 07b973dfb8e035bcce73d0a8016d4131b0c1391a7d64f68aa22051cd2de1343832629b4e8fc8adc9eea117b9f603f464b880afeac30bc2e5481cbebdff697516
+  metadata.gz: 45ed6341b4df32fffb110726acb415751de0abbd4bcd016b6d743799f3a84779ea963217a2a6e39858c835b98286bfa31631c00eab44b285d57794433d698b30
+  data.tar.gz: 43c87fa2374daa7e813e5effbd8f931b56c6b7cd5a5b3a540aa8347472887252bfa701afbad7ce49c55df8721b2d5b07e6f6358c161e36f2b2c2e25c6a6181cc

data/data_maker.gemspec

@@ -29,11 +29,11 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'pry-byebug', '~> 3.1.0'
   gem.add_development_dependency 'pry-rescue', '~> 1.4.0'
   gem.add_development_dependency 'pry-stack_explorer', '~> 0.4.9.0'
-  gem.add_development_dependency 'phonelib', '~> 0.4.0'
   gem.add_development_dependency 'hashie', '~> 3.4.1'
 
   gem.add_runtime_dependency 'i18n', '~> 0.7.0'
   gem.add_runtime_dependency 'pry', '~> 0.10.0'
+  gem.add_runtime_dependency 'phonelib', '~> 0.5.4'
 
   gem.post_install_message = "To test out the generator execute command data_maker-console"
 
@@ -446,7 +446,7 @@ Gem::Specification.new do |gem|
     lib/data_maker/data/cn/employment/job_titles
     lib/data_maker/data/cn/name/first_names
     lib/data_maker/data/cn/name/last_names
-    lib/data_maker/data/cn/phone_number/landline_phone_prefixes
+    lib/data_maker/data/cn/phone_number/fixed_line_phone_prefixes
     lib/data_maker/data/cn/phone_number/mobile_phone_prefixes
     lib/data_maker/data/cn/provinces_chinese
     lib/data_maker/locales/zh.employment.yml

data/lib/data_maker/cn/phone_number.rb

@@ -4,16 +4,17 @@ module DataMaker
       extend ModuleUtilities
 
       def self.mobile
-        number = PhoneNumberGenerator.new("mobile")
-        number.generate
-      end
-
-      def self.landline
-        number = PhoneNumberGenerator.new("landline")
-        number.generate
+        loop do
+          number = PhoneNumberGenerator.generate("mobile")
+          break number if Phonelib.valid_for_country?(number, 'CN')
+        end
       end
 
-      def self.phone_number
+      def self.fixed_line
+        loop do
+          number = PhoneNumberGenerator.generate("fixed_line")
+          break number if Phonelib.valid_for_country?(number, 'CN')
+        end
       end
 
       class PhoneNumberGenerator
@@ -21,16 +22,9 @@ module DataMaker
           self.format = format
         end
 
-        def mobile_prefix
-          prefix = DataMaker::CN::PhoneNumber::MOBILE_PHONE_PREFIXES.sample
-          raise StandardError, "You're file is empty!" if prefix.length == 0
-          prefix
-        end
-
-        def landline_prefix
-          prefix = DataMaker::CN::PhoneNumber::LANDLINE_PHONE_PREFIXES.sample
-          raise StandardError, "You're file is empty!" if prefix.length == 0
-          prefix
+        def self.generate(format)
+          inst = new(format)
+          inst.generate
         end
 
         def generate_masks(mask_length = 1)
@@ -41,16 +35,14 @@ module DataMaker
         def generate
           if format == "mobile"
             phone_prefix = mobile_prefix
-            phone_number_max_length = 11
+            max_length = 11
             prefix_length = phone_prefix.length
-            mask_length = phone_number_max_length - prefix_length
+            mask_length = max_length - prefix_length
           end
 
-          if format == "landline"
-            phone_prefix = landline_prefix
-            phone_number_max_length = eleven_digit_rule?(phone_prefix) ? 11 : 10
-            prefix_length = phone_prefix.length
-            mask_length = phone_number_max_length - prefix_length
+          if format == "fixed_line"
+            phone_prefix, length = *landline_prefix.split(",")
+            mask_length = length.to_i
           end
 
           masks = generate_masks(mask_length)
@@ -67,44 +59,14 @@ module DataMaker
 
         attr_accessor :format
 
-        def eleven_digit_rule?(prefix)
-          [
-            '10',
-            '311',
-            '371',
-            '377',
-            '379',
-            '411',
-            '431',
-            '432',
-            '451',
-            '510',
-            '512',
-            '513',
-            '515',
-            '516',
-            '519',
-            '527',
-            '531',
-            '532',
-            '551',
-            '571',
-            '573',
-            '577',
-            '579',
-            '591',
-            '595',
-            '731',
-            '754',
-            '755',
-            '757',
-            '760',
-            '769',
-            '791',
-            '851',
-            '871',
-            '898'
-          ].include?(prefix)
+        private
+
+        def mobile_prefix
+          DataMaker::CN::PhoneNumber::MOBILE_PHONE_PREFIXES.sample
+        end
+
+        def landline_prefix
+          DataMaker::CN::PhoneNumber::FIXED_LINE_PHONE_PREFIXES.sample
         end
       end
     end

data/lib/data_maker/data/cn/phone_number/fixed_line_phone_prefixes

@@ -0,0 +1,323 @@
+10,8
+21,8
+22,8
+23,8
+24,8
+25,8
+27,8
+28,8
+29,8
+20,8
+311,8
+312,7
+313,7
+314,7
+315,7
+316,7
+317,7
+318,7
+319,7
+310,7
+335,7
+351,7
+352,7
+353,7
+354,7
+355,7
+356,7
+357,7
+358,7
+359,7
+350,7
+349,7
+371,8
+372,7
+373,7
+374,7
+375,7
+376,7
+377,8
+379,8
+370,7
+391,7
+392,7
+393,7
+394,7
+395,7
+396,7
+398,7
+411,7
+412,7
+415,7
+416,7
+417,7
+418,7
+419,7
+421,7
+427,7
+429,7
+431,8
+432,7
+433,7
+434,7
+435,7
+436,7
+437,7
+438,7
+439,7
+440,7
+451,8
+452,7
+453,7
+454,7
+455,7
+456,7
+457,7
+458,7
+459,7
+464,7
+467,7
+468,7
+469,7
+471,7
+472,7
+473,7
+474,7
+475,7
+476,7
+477,7
+478,7
+479,7
+470,7
+482,7
+483,7
+511,7
+512,7
+513,8
+514,7
+515,7
+516,7
+517,7
+518,7
+519,7
+510,7
+523,7
+527,7
+531,8
+532,8
+533,7
+534,7
+535,7
+536,7
+537,7
+538,7
+539,7
+530,7
+543,7
+546,7
+551,8
+552,7
+553,7
+554,7
+555,7
+556,7
+557,7
+558,7
+559,7
+550,7
+561,7
+562,7
+563,7
+564,7
+566,7
+571,8
+572,7
+573,8
+574,8
+575,8
+576,8
+577,8
+578,7
+579,8
+570,7
+580,7
+591,8
+592,7
+593,7
+594,7
+595,8
+596,7
+597,7
+598,7
+599,7
+631,7
+632,7
+633,7
+634,7
+635,7
+662,7
+663,7
+668,7
+660,7
+691,7
+692,7
+711,7
+712,7
+713,7
+714,7
+715,7
+716,7
+717,7
+718,7
+719,7
+710,7
+722,7
+724,7
+728,7
+731,8
+734,7
+735,7
+736,7
+737,7
+738,7
+739,7
+730,7
+743,7
+744,7
+745,7
+746,7
+751,7
+752,7
+753,7
+754,8
+755,8
+756,7
+757,8
+758,7
+759,7
+750,7
+760,8
+762,7
+763,7
+766,7
+768,7
+769,8
+771,7
+772,7
+773,7
+774,7
+775,7
+776,7
+777,7
+778,7
+779,7
+770,7
+791,8
+792,7
+793,7
+794,7
+795,7
+796,7
+797,7
+798,7
+799,7
+790,7
+701,7
+812,7
+813,7
+816,7
+817,7
+818,7
+825,7
+826,7
+827,7
+831,7
+832,7
+833,7
+834,7
+835,7
+836,7
+837,7
+838,7
+839,7
+830,7
+851,8
+854,7
+855,7
+856,7
+857,7
+858,7
+859,7
+871,8
+872,7
+873,7
+874,7
+875,7
+876,7
+877,7
+878,7
+879,7
+870,7
+883,7
+886,7
+887,7
+888,7
+891,7
+892,7
+893,7
+894,7
+895,7
+896,7
+897,7
+898,7
+911,7
+912,7
+913,7
+914,7
+915,7
+916,7
+917,7
+919,7
+931,7
+932,7
+933,7
+934,7
+935,7
+936,7
+937,7
+938,7
+939,7
+930,7
+941,7
+943,7
+951,7
+952,7
+953,7
+954,7
+955,7
+971,7
+972,7
+973,7
+974,7
+975,7
+976,7
+977,7
+978,7
+979,7
+970,7
+991,7
+992,7
+993,7
+994,7
+995,7
+996,7
+997,7
+998,7
+999,7
+990,7
+901,7
+902,7
+903,7
+906,7
+908,7
+909,7

data/lib/data_maker/version.rb

@@ -1,3 +1,3 @@
 module DataMaker
-  VERSION = '2.5.3'
+  VERSION = '2.5.4'
 end

data/spec/lib/data_maker/cn/address_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'ostruct'
 
 RSpec.describe DataMaker::CN::Address do
   describe "#self.street_address" do

data/spec/lib/data_maker/cn/phone_number_spec.rb

@@ -1,87 +1,25 @@
 require 'spec_helper'
 
 RSpec.describe DataMaker::CN::PhoneNumber do
-
   before :each do
     Phonelib.default_country = 'CN'
   end
 
   describe "#self.mobile" do
-    it "generates a valid mobile number" do
-      number = described_class.mobile
-      expect(Phonelib.valid?(number)).to be_truthy
+    it "generates a valid mobile_line number" do
+      10000.times do
+        number = described_class.mobile
+        expect(Phonelib.valid?(number)).to be_truthy
+      end
     end
   end
 
   describe "#self.landline" do
-    it "generates a valid landline number" do
-      number = described_class.landline
-      expect(Phonelib.valid?(number)).to be_truthy
-    end
-  end
-
-  describe "::GeneratePhoneNumber" do
-    let(:generate_phone_number) { described_class::PhoneNumberGenerator.new(format) }
-    let(:format) { ["mobile", "landline"].sample }
-
-    describe "#mobile_prefix" do
-      let(:mobile_prefix) { generate_phone_number.mobile_prefix }
-
-      # context "when MobilePhonePrefix.empty? is true" do
-      #   before :each do
-      #   end
-
-      #   it "raises an error" do
-      #     expect { mobile_prefix }.to raise_error
-      #   end
-      # end
-
-      context "when MobilePhonePrefix.empty? is false" do
-        it "returns a sample" do
-          expect(mobile_prefix).to_not be_empty
-        end
-      end
-    end
-
-    describe "#generate_number" do
-      let(:generate) { generate_phone_number.generate }
-
-      it "generates a valid phone number" do
-        number = generate
+    it "generates a valid fixed_line number" do
+      10000.times do
+        number = described_class.fixed_line
         expect(Phonelib.valid?(number)).to be_truthy
       end
-
-      context "when format is mobile" do
-        let(:format) { "mobile" }
-
-        it "generates an 11 digit number" do
-          expect(generate.length).to eq(11)
-        end
-      end
-
-      context "when format is landline" do
-        let(:format) { "landline" }
-
-        context "when eleven_digit_rule? is true" do
-          before :each do
-            allow(generate_phone_number).to receive(:eleven_digit_rule?).and_return(true)
-          end
-
-          it "generates an 11 digit number" do
-            expect(generate.length).to eq(11)
-          end
-        end
-
-        context "when eleven_digit_rule? is false" do
-          before :each do
-            allow(generate_phone_number).to receive(:eleven_digit_rule?).and_return(false)
-          end
-
-          it "generates an 10 digit number" do
-            expect(generate.length).to eq(10)
-          end
-        end
-      end
     end
   end
 end

data/spec/lib/data_maker/data_maker_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe DataMaker do
 
   describe "#VERSION" do
     # For each iteration of a version this would always get changed.
-    let(:current_version) { "2.5.3" }
+    let(:current_version) { "2.5.4" }
 
     it { expect(described_class).to be_const_defined(:VERSION) }
     it { expect(described_class::VERSION).to eq(current_version) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_maker
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.5.4
 platform: ruby
 authors:
 - Kareem Gan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
@@ -109,61 +109,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.4.9.0
 - !ruby/object:Gem::Dependency
-  name: phonelib
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 3.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 3.4.1
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.1
-  type: :development
+        version: 0.7.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: phonelib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.5.4
 description: |2
      Data generation using yml files from different sources. This was originally forked from faker and ffaker gem
      respecetively.
@@ -575,7 +575,7 @@ files:
 - lib/data_maker/data/cn/employment/job_titles
 - lib/data_maker/data/cn/name/first_names
 - lib/data_maker/data/cn/name/last_names
-- lib/data_maker/data/cn/phone_number/landline_phone_prefixes
+- lib/data_maker/data/cn/phone_number/fixed_line_phone_prefixes
 - lib/data_maker/data/cn/phone_number/mobile_phone_prefixes
 - lib/data_maker/data/cn/provinces_chinese
 - lib/data_maker/locales/zh.employment.yml

data/lib/data_maker/data/cn/phone_number/landline_phone_prefixes

@@ -1,322 +0,0 @@
-10
-21
-22
-23
-24
-25
-27
-28
-29
-20
-311
-312
-313
-314
-315
-316
-317
-318
-319
-310
-335
-351
-352
-353
-354
-355
-356
-357
-358
-359
-350
-349
-371
-372
-373
-374
-375
-376
-377
-379
-370
-391
-392
-393
-394
-395
-396
-398
-411
-412
-415
-416
-417
-418
-419
-421
-427
-429
-431
-432
-433
-434
-435
-436
-437
-438
-439
-440
-451
-452
-453
-454
-455
-456
-457
-458
-459
-464
-467
-468
-469
-471
-472
-473
-474
-475
-476
-477
-478
-479
-470
-482
-483
-511
-512
-513
-514
-515
-516
-517
-518
-519
-510
-523
-527
-531
-532
-533
-534
-535
-536
-537
-538
-539
-530
-543
-546
-552
-553
-554
-555
-556
-557
-558
-559
-550
-561
-562
-563
-564
-566
-571
-572
-573
-574
-575
-576
-577
-578
-579
-570
-580
-591
-592
-593
-594
-595
-596
-597
-598
-599
-631
-632
-633
-634
-635
-662
-663
-668
-660
-691
-692
-711
-712
-713
-714
-715
-716
-717
-718
-719
-710
-722
-724
-728
-731
-734
-735
-736
-737
-738
-739
-730
-743
-744
-745
-746
-751
-752
-753
-754
-755
-756
-757
-758
-759
-750
-760
-762
-763
-766
-768
-769
-771
-772
-773
-774
-775
-776
-777
-778
-779
-770
-791
-792
-793
-794
-795
-796
-797
-798
-799
-790
-701
-812
-813
-816
-817
-818
-825
-826
-827
-831
-832
-833
-834
-835
-836
-837
-838
-839
-830
-851
-854
-855
-856
-857
-858
-859
-871
-872
-873
-874
-875
-876
-877
-878
-879
-870
-883
-886
-887
-888
-891
-892
-893
-894
-895
-896
-897
-898
-911
-912
-913
-914
-915
-916
-917
-919
-931
-932
-933
-934
-935
-936
-937
-938
-939
-930
-941
-943
-951
-952
-953
-954
-955
-971
-972
-973
-974
-975
-976
-977
-978
-979
-970
-991
-992
-993
-994
-995
-996
-997
-998
-999
-990
-901
-902
-903
-906
-908
-909