data_maker 2.3.3 → 2.3.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/data_maker/cn/address.rb +8 -13
- data/lib/data_maker/version.rb +1 -1
- data/spec/lib/data_maker/data_maker_spec.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 32e8c82f895f0dafe395d00d9b6445c44dd2b34c
|
|
4
|
+
data.tar.gz: a377267a749b69a3bdd3688ecae86f107a2c55b1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 49a5b5a7b006b7d9f1352900adc1fd44d61373472d0210a573b60aa8af53cc51a4fa08c7005abf8621ea7b7e5385ab2e2b3e3718fa88012fc041bd391aea3dce
|
|
7
|
+
data.tar.gz: dfdae5b9c90e3f7427c3958e93c9d49eca7115dd8912d9eb594e5482973f39985e75f2d153cdb7643a94390bb22333d5121f85cec7de0f2a3ef447be114cbcf1
|
|
@@ -69,17 +69,15 @@ module DataMaker
|
|
|
69
69
|
|
|
70
70
|
def address_string
|
|
71
71
|
generate
|
|
72
|
-
translate
|
|
73
72
|
build_address
|
|
74
73
|
end
|
|
75
74
|
|
|
76
75
|
def address_struct
|
|
77
76
|
generate
|
|
78
|
-
translate
|
|
79
77
|
OpenStruct.new(street_address: street_address,
|
|
80
|
-
city: city,
|
|
81
|
-
district: district,
|
|
82
|
-
province: province,
|
|
78
|
+
city: translate('city', city),
|
|
79
|
+
district: translate('district', district),
|
|
80
|
+
province: translate('province', province),
|
|
83
81
|
postal_code: postal_code
|
|
84
82
|
)
|
|
85
83
|
end
|
|
@@ -96,12 +94,9 @@ module DataMaker
|
|
|
96
94
|
|
|
97
95
|
private
|
|
98
96
|
|
|
99
|
-
def translate
|
|
97
|
+
def translate(prefix, value)
|
|
100
98
|
DataMaker::Config.locale = locale
|
|
101
|
-
|
|
102
|
-
values.each do |key, value|
|
|
103
|
-
self.send("#{key}=", DataMaker.translate(['data_maker', 'address', key, value].join(".")))
|
|
104
|
-
end
|
|
99
|
+
DataMaker.translate(['data_maker', 'address', prefix, value].join("."))
|
|
105
100
|
end
|
|
106
101
|
|
|
107
102
|
def validate
|
|
@@ -155,9 +150,9 @@ module DataMaker
|
|
|
155
150
|
def build_address
|
|
156
151
|
address = []
|
|
157
152
|
address << street_address
|
|
158
|
-
address << city
|
|
159
|
-
address << district
|
|
160
|
-
address << province
|
|
153
|
+
address << translate('city', city)
|
|
154
|
+
address << translate('district', district) unless district.nil?
|
|
155
|
+
address << translate('province', province)
|
|
161
156
|
address << postal_code
|
|
162
157
|
address.compact.join(", ")
|
|
163
158
|
end
|
data/lib/data_maker/version.rb
CHANGED
|
@@ -5,7 +5,7 @@ RSpec.describe DataMaker do
|
|
|
5
5
|
|
|
6
6
|
describe "#VERSION" do
|
|
7
7
|
# For each iteration of a version this would always get changed.
|
|
8
|
-
let(:current_version) { "2.3.
|
|
8
|
+
let(:current_version) { "2.3.4" }
|
|
9
9
|
|
|
10
10
|
it { expect(described_class).to be_const_defined(:VERSION) }
|
|
11
11
|
it { expect(described_class::VERSION).to eq(current_version) }
|