phrase 4.24.0 → 4.25.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (63) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +16 -0
  3. data/README.md +7 -3
  4. data/docs/BranchComparison.md +23 -0
  5. data/docs/BranchComparisonChange.md +19 -0
  6. data/docs/BranchComparisonDiff.md +21 -0
  7. data/docs/BranchComparisonDiffConflictsValue.md +19 -0
  8. data/docs/BranchesApi.md +5 -4
  9. data/docs/Format.md +20 -20
  10. data/docs/FormatsApi.md +1 -1
  11. data/docs/Job.md +3 -1
  12. data/docs/JobDetails.md +2 -0
  13. data/docs/KeyCreateParameters.md +1 -1
  14. data/docs/KeyUpdateParameters.md +1 -1
  15. data/docs/Locale.md +2 -0
  16. data/docs/LocaleCreateParameters.md +3 -1
  17. data/docs/LocaleDetails.md +2 -0
  18. data/docs/LocaleDownloadCreateParameters.md +4 -0
  19. data/docs/LocaleUpdateParameters.md +3 -1
  20. data/docs/LocalesApi.md +2 -2
  21. data/docs/ProjectCreateParameters.md +1 -1
  22. data/docs/ProjectUpdateParameters.md +1 -1
  23. data/docs/RepoSync.md +2 -0
  24. data/docs/RepoSyncCreateParameters.md +2 -0
  25. data/docs/ScreenshotUpdateParameters.md +1 -1
  26. data/docs/ScreenshotsApi.md +9 -9
  27. data/lib/phrase/api/branches_api.rb +5 -3
  28. data/lib/phrase/api/formats_api.rb +2 -2
  29. data/lib/phrase/api/locales_api.rb +2 -2
  30. data/lib/phrase/api/screenshots_api.rb +16 -12
  31. data/lib/phrase/models/branch_comparison.rb +224 -0
  32. data/lib/phrase/models/branch_comparison_change.rb +212 -0
  33. data/lib/phrase/models/branch_comparison_diff.rb +223 -0
  34. data/lib/phrase/models/branch_comparison_diff_conflicts_value.rb +209 -0
  35. data/lib/phrase/models/format.rb +60 -0
  36. data/lib/phrase/models/job.rb +16 -5
  37. data/lib/phrase/models/job_details.rb +12 -1
  38. data/lib/phrase/models/locale.rb +10 -1
  39. data/lib/phrase/models/locale_create_parameters.rb +14 -4
  40. data/lib/phrase/models/locale_details.rb +10 -1
  41. data/lib/phrase/models/locale_download_create_parameters.rb +21 -1
  42. data/lib/phrase/models/locale_update_parameters.rb +14 -4
  43. data/lib/phrase/models/repo_sync.rb +29 -1
  44. data/lib/phrase/models/repo_sync_create_parameters.rb +27 -1
  45. data/lib/phrase/version.rb +1 -1
  46. data/lib/phrase.rb +4 -0
  47. data/spec/api/branches_api_spec.rb +1 -1
  48. data/spec/api/formats_api_spec.rb +1 -1
  49. data/spec/api/screenshots_api_spec.rb +4 -4
  50. data/spec/models/branch_comparison_change_spec.rb +35 -0
  51. data/spec/models/branch_comparison_diff_conflicts_value_spec.rb +35 -0
  52. data/spec/models/branch_comparison_diff_spec.rb +41 -0
  53. data/spec/models/branch_comparison_spec.rb +47 -0
  54. data/spec/models/job_details_spec.rb +6 -0
  55. data/spec/models/job_spec.rb +6 -0
  56. data/spec/models/locale_create_parameters_spec.rb +6 -0
  57. data/spec/models/locale_details_spec.rb +6 -0
  58. data/spec/models/locale_download_create_parameters_spec.rb +12 -0
  59. data/spec/models/locale_spec.rb +6 -0
  60. data/spec/models/locale_update_parameters_spec.rb +6 -0
  61. data/spec/models/repo_sync_create_parameters_spec.rb +6 -0
  62. data/spec/models/repo_sync_spec.rb +6 -0
  63. metadata +18 -2
@@ -8,31 +8,31 @@ module Phrase
8
8
  @api_client = api_client
9
9
  end
10
10
  # Create a screenshot
11
- # Create a new screenshot.
11
+ # Creates a screenshot in a project to provide visual context for in-context translation. Attach translation keys to regions of the uploaded image so translators can see where each string appears in your UI. This endpoint accepts a multipart/form-data request with a binary file upload, unlike most Phrase API endpoints that use JSON. Use a multipart form client or the -F flag in curl rather than a JSON body. The screenshot name must be unique within the project (case-insensitive). When name is omitted, it is derived from the uploaded filename. The account must have the Screenshots feature enabled; requests to projects on accounts without it return 403. Creating a screenshot requires a token with the write scope and manage access to the project.
12
12
  # @param project_id [String] Project ID
13
+ # @param filename [File] Image file to upload. Accepted formats are JPEG (jpg/jpeg), GIF, and PNG. Maximum file size is 10 MB. Submitting an unsupported format or a file exceeding the size limit returns 422.
13
14
  # @param [Hash] opts the optional parameters
14
15
  # @option opts [String] :x_phrase_app_otp Two-Factor-Authentication token (optional)
15
16
  # @option opts [String] :branch specify the branch to use
16
- # @option opts [String] :name Name of the screenshot
17
- # @option opts [String] :description Description of the screenshot
18
- # @option opts [File] :filename Screenshot file
17
+ # @option opts [String] :name Display name for the screenshot. Must be unique within the project (case-insensitive). When omitted, the name is derived from the uploaded filename.
18
+ # @option opts [String] :description Optional free-text description of the screenshot.
19
19
  # @return [Screenshot]
20
- def screenshot_create(project_id, opts = {})
21
- data, _status_code, _headers = screenshot_create_with_http_info(project_id, opts)
20
+ def screenshot_create(project_id, filename, opts = {})
21
+ data, _status_code, _headers = screenshot_create_with_http_info(project_id, filename, opts)
22
22
  data
23
23
  end
24
24
 
25
25
  # Create a screenshot
26
- # Create a new screenshot.
26
+ # Creates a screenshot in a project to provide visual context for in-context translation. Attach translation keys to regions of the uploaded image so translators can see where each string appears in your UI. This endpoint accepts a multipart/form-data request with a binary file upload, unlike most Phrase API endpoints that use JSON. Use a multipart form client or the -F flag in curl rather than a JSON body. The screenshot name must be unique within the project (case-insensitive). When name is omitted, it is derived from the uploaded filename. The account must have the Screenshots feature enabled; requests to projects on accounts without it return 403. Creating a screenshot requires a token with the write scope and manage access to the project.
27
27
  # @param project_id [String] Project ID
28
+ # @param filename [File] Image file to upload. Accepted formats are JPEG (jpg/jpeg), GIF, and PNG. Maximum file size is 10 MB. Submitting an unsupported format or a file exceeding the size limit returns 422.
28
29
  # @param [Hash] opts the optional parameters
29
30
  # @option opts [String] :x_phrase_app_otp Two-Factor-Authentication token (optional)
30
31
  # @option opts [String] :branch specify the branch to use
31
- # @option opts [String] :name Name of the screenshot
32
- # @option opts [String] :description Description of the screenshot
33
- # @option opts [File] :filename Screenshot file
32
+ # @option opts [String] :name Display name for the screenshot. Must be unique within the project (case-insensitive). When omitted, the name is derived from the uploaded filename.
33
+ # @option opts [String] :description Optional free-text description of the screenshot.
34
34
  # @return [Array<(Response<(Screenshot)>, Integer, Hash)>] Response<(Screenshot)> data, response status code and response headers
35
- def screenshot_create_with_http_info(project_id, opts = {})
35
+ def screenshot_create_with_http_info(project_id, filename, opts = {})
36
36
  if @api_client.config.debugging
37
37
  @api_client.config.logger.debug 'Calling API: ScreenshotsApi.screenshot_create ...'
38
38
  end
@@ -40,6 +40,10 @@ module Phrase
40
40
  if @api_client.config.client_side_validation && project_id.nil?
41
41
  fail ArgumentError, "Missing the required parameter 'project_id' when calling ScreenshotsApi.screenshot_create"
42
42
  end
43
+ # verify the required parameter 'filename' is set
44
+ if @api_client.config.client_side_validation && filename.nil?
45
+ fail ArgumentError, "Missing the required parameter 'filename' when calling ScreenshotsApi.screenshot_create"
46
+ end
43
47
  # resource path
44
48
  local_var_path = '/projects/{project_id}/screenshots'.sub('{' + 'project_id' + '}', CGI.escape(project_id.to_s))
45
49
 
@@ -56,10 +60,10 @@ module Phrase
56
60
 
57
61
  # form parameters
58
62
  form_params = opts[:form_params] || {}
63
+ form_params['filename'] = filename
59
64
  form_params['branch'] = opts[:'branch'] if !opts[:'branch'].nil?
60
65
  form_params['name'] = opts[:'name'] if !opts[:'name'].nil?
61
66
  form_params['description'] = opts[:'description'] if !opts[:'description'].nil?
62
- form_params['filename'] = opts[:'filename'] if !opts[:'filename'].nil?
63
67
 
64
68
  # http body (model)
65
69
  post_body = opts[:body]
@@ -0,0 +1,224 @@
1
+ require 'date'
2
+
3
+ module Phrase
4
+ # Comparison result of a branch against its base branch. Top-level properties correspond to resource types. Each resource type lists changes made in the base branch (`base_changes`), changes made in the feature branch (`head_changes`), and conflicting entries (`conflicts`).
5
+ class BranchComparison
6
+ attr_accessor :translation_keys
7
+
8
+ attr_accessor :translations
9
+
10
+ attr_accessor :locales
11
+
12
+ attr_accessor :tags
13
+
14
+ # Attribute mapping from ruby-style variable name to JSON key.
15
+ def self.attribute_map
16
+ {
17
+ :'translation_keys' => :'translation_keys',
18
+ :'translations' => :'translations',
19
+ :'locales' => :'locales',
20
+ :'tags' => :'tags'
21
+ }
22
+ end
23
+
24
+ # Attribute type mapping.
25
+ def self.openapi_types
26
+ {
27
+ :'translation_keys' => :'BranchComparisonDiff',
28
+ :'translations' => :'BranchComparisonDiff',
29
+ :'locales' => :'BranchComparisonDiff',
30
+ :'tags' => :'BranchComparisonDiff'
31
+ }
32
+ end
33
+
34
+ # List of attributes with nullable: true
35
+ def self.openapi_nullable
36
+ Set.new([
37
+ ])
38
+ end
39
+
40
+ # Initializes the object
41
+ # @param [Hash] attributes Model attributes in the form of hash
42
+ def initialize(attributes = {})
43
+ if (!attributes.is_a?(Hash))
44
+ fail ArgumentError, "The input argument (attributes) must be a hash in `Phrase::BranchComparison` initialize method"
45
+ end
46
+
47
+ # check to see if the attribute exists and convert string to symbol for hash key
48
+ attributes = attributes.each_with_object({}) { |(k, v), h|
49
+ if (!self.class.attribute_map.key?(k.to_sym))
50
+ fail ArgumentError, "`#{k}` is not a valid attribute in `Phrase::BranchComparison`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
51
+ end
52
+ h[k.to_sym] = v
53
+ }
54
+
55
+ if attributes.key?(:'translation_keys')
56
+ self.translation_keys = attributes[:'translation_keys']
57
+ end
58
+
59
+ if attributes.key?(:'translations')
60
+ self.translations = attributes[:'translations']
61
+ end
62
+
63
+ if attributes.key?(:'locales')
64
+ self.locales = attributes[:'locales']
65
+ end
66
+
67
+ if attributes.key?(:'tags')
68
+ self.tags = attributes[:'tags']
69
+ end
70
+ end
71
+
72
+ # Show invalid properties with the reasons. Usually used together with valid?
73
+ # @return Array for valid properties with the reasons
74
+ def list_invalid_properties
75
+ invalid_properties = Array.new
76
+ invalid_properties
77
+ end
78
+
79
+ # Check to see if the all the properties in the model are valid
80
+ # @return true if the model is valid
81
+ def valid?
82
+ true
83
+ end
84
+
85
+ # Checks equality by comparing each attribute.
86
+ # @param [Object] Object to be compared
87
+ def ==(o)
88
+ return true if self.equal?(o)
89
+ self.class == o.class &&
90
+ translation_keys == o.translation_keys &&
91
+ translations == o.translations &&
92
+ locales == o.locales &&
93
+ tags == o.tags
94
+ end
95
+
96
+ # @see the `==` method
97
+ # @param [Object] Object to be compared
98
+ def eql?(o)
99
+ self == o
100
+ end
101
+
102
+ # Calculates hash code according to all attributes.
103
+ # @return [Integer] Hash code
104
+ def hash
105
+ [translation_keys, translations, locales, tags].hash
106
+ end
107
+
108
+ # Builds the object from hash
109
+ # @param [Hash] attributes Model attributes in the form of hash
110
+ # @return [Object] Returns the model itself
111
+ def self.build_from_hash(attributes)
112
+ new.build_from_hash(attributes)
113
+ end
114
+
115
+ # Builds the object from hash
116
+ # @param [Hash] attributes Model attributes in the form of hash
117
+ # @return [Object] Returns the model itself
118
+ def build_from_hash(attributes)
119
+ return nil unless attributes.is_a?(Hash)
120
+ self.class.openapi_types.each_pair do |key, type|
121
+ if type =~ /\AArray<(.*)>/i
122
+ # check to ensure the input is an array given that the attribute
123
+ # is documented as an array but the input is not
124
+ if attributes[self.class.attribute_map[key]].is_a?(Array)
125
+ self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
126
+ end
127
+ elsif !attributes[self.class.attribute_map[key]].nil?
128
+ self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
129
+ end # or else data not found in attributes(hash), not an issue as the data can be optional
130
+ end
131
+
132
+ self
133
+ end
134
+
135
+ # Deserializes the data based on type
136
+ # @param string type Data type
137
+ # @param string value Value to be deserialized
138
+ # @return [Object] Deserialized data
139
+ def _deserialize(type, value)
140
+ case type.to_sym
141
+ when :DateTime
142
+ DateTime.parse(value)
143
+ when :Date
144
+ Date.parse(value)
145
+ when :Time
146
+ Time.parse(value)
147
+ when :String
148
+ value.to_s
149
+ when :Integer
150
+ value.to_i
151
+ when :Float
152
+ value.to_f
153
+ when :Boolean
154
+ if value.to_s =~ /\A(true|t|yes|y|1)\z/i
155
+ true
156
+ else
157
+ false
158
+ end
159
+ when :Object
160
+ # generic object (usually a Hash), return directly
161
+ value
162
+ when /\AArray<(?<inner_type>.+)>\z/
163
+ inner_type = Regexp.last_match[:inner_type]
164
+ value.map { |v| _deserialize(inner_type, v) }
165
+ when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
166
+ k_type = Regexp.last_match[:k_type]
167
+ v_type = Regexp.last_match[:v_type]
168
+ {}.tap do |hash|
169
+ value.each do |k, v|
170
+ hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
171
+ end
172
+ end
173
+ else # model
174
+ Phrase.const_get(type).build_from_hash(value)
175
+ end
176
+ end
177
+
178
+ # Returns the string representation of the object
179
+ # @return [String] String presentation of the object
180
+ def to_s
181
+ to_hash.to_s
182
+ end
183
+
184
+ # to_body is an alias to to_hash (backward compatibility)
185
+ # @return [Hash] Returns the object in the form of hash
186
+ def to_body
187
+ to_hash
188
+ end
189
+
190
+ # Returns the object in the form of hash
191
+ # @return [Hash] Returns the object in the form of hash
192
+ def to_hash
193
+ hash = {}
194
+ self.class.attribute_map.each_pair do |attr, param|
195
+ value = self.send(attr)
196
+ if value.nil?
197
+ is_nullable = self.class.openapi_nullable.include?(attr)
198
+ next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
199
+ end
200
+
201
+ hash[param] = _to_hash(value)
202
+ end
203
+ hash
204
+ end
205
+
206
+ # Outputs non-array value in the form of hash
207
+ # For object, use to_hash. Otherwise, just return the value
208
+ # @param [Object] value Any valid value
209
+ # @return [Hash] Returns the value in the form of hash
210
+ def _to_hash(value)
211
+ if value.is_a?(Array)
212
+ value.compact.map { |v| _to_hash(v) }
213
+ elsif value.is_a?(Hash)
214
+ {}.tap do |hash|
215
+ value.each { |k, v| hash[k] = _to_hash(v) }
216
+ end
217
+ elsif value.respond_to? :to_hash
218
+ value.to_hash
219
+ else
220
+ value
221
+ end
222
+ end
223
+ end
224
+ end
@@ -0,0 +1,212 @@
1
+ require 'date'
2
+
3
+ module Phrase
4
+ # A single resource change. `from` holds the state before the change (null when the resource was added). `to` holds the state after (null when the resource was deleted). Fields depend on the resource type.
5
+ class BranchComparisonChange
6
+ attr_accessor :from
7
+
8
+ attr_accessor :to
9
+
10
+ # Attribute mapping from ruby-style variable name to JSON key.
11
+ def self.attribute_map
12
+ {
13
+ :'from' => :'from',
14
+ :'to' => :'to'
15
+ }
16
+ end
17
+
18
+ # Attribute type mapping.
19
+ def self.openapi_types
20
+ {
21
+ :'from' => :'Hash<String, Object>',
22
+ :'to' => :'Hash<String, Object>'
23
+ }
24
+ end
25
+
26
+ # List of attributes with nullable: true
27
+ def self.openapi_nullable
28
+ Set.new([
29
+ :'from',
30
+ :'to'
31
+ ])
32
+ end
33
+
34
+ # Initializes the object
35
+ # @param [Hash] attributes Model attributes in the form of hash
36
+ def initialize(attributes = {})
37
+ if (!attributes.is_a?(Hash))
38
+ fail ArgumentError, "The input argument (attributes) must be a hash in `Phrase::BranchComparisonChange` initialize method"
39
+ end
40
+
41
+ # check to see if the attribute exists and convert string to symbol for hash key
42
+ attributes = attributes.each_with_object({}) { |(k, v), h|
43
+ if (!self.class.attribute_map.key?(k.to_sym))
44
+ fail ArgumentError, "`#{k}` is not a valid attribute in `Phrase::BranchComparisonChange`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
45
+ end
46
+ h[k.to_sym] = v
47
+ }
48
+
49
+ if attributes.key?(:'from')
50
+ if (value = attributes[:'from']).is_a?(Hash)
51
+ self.from = value
52
+ end
53
+ end
54
+
55
+ if attributes.key?(:'to')
56
+ if (value = attributes[:'to']).is_a?(Hash)
57
+ self.to = value
58
+ end
59
+ end
60
+ end
61
+
62
+ # Show invalid properties with the reasons. Usually used together with valid?
63
+ # @return Array for valid properties with the reasons
64
+ def list_invalid_properties
65
+ invalid_properties = Array.new
66
+ invalid_properties
67
+ end
68
+
69
+ # Check to see if the all the properties in the model are valid
70
+ # @return true if the model is valid
71
+ def valid?
72
+ true
73
+ end
74
+
75
+ # Checks equality by comparing each attribute.
76
+ # @param [Object] Object to be compared
77
+ def ==(o)
78
+ return true if self.equal?(o)
79
+ self.class == o.class &&
80
+ from == o.from &&
81
+ to == o.to
82
+ end
83
+
84
+ # @see the `==` method
85
+ # @param [Object] Object to be compared
86
+ def eql?(o)
87
+ self == o
88
+ end
89
+
90
+ # Calculates hash code according to all attributes.
91
+ # @return [Integer] Hash code
92
+ def hash
93
+ [from, to].hash
94
+ end
95
+
96
+ # Builds the object from hash
97
+ # @param [Hash] attributes Model attributes in the form of hash
98
+ # @return [Object] Returns the model itself
99
+ def self.build_from_hash(attributes)
100
+ new.build_from_hash(attributes)
101
+ end
102
+
103
+ # Builds the object from hash
104
+ # @param [Hash] attributes Model attributes in the form of hash
105
+ # @return [Object] Returns the model itself
106
+ def build_from_hash(attributes)
107
+ return nil unless attributes.is_a?(Hash)
108
+ self.class.openapi_types.each_pair do |key, type|
109
+ if type =~ /\AArray<(.*)>/i
110
+ # check to ensure the input is an array given that the attribute
111
+ # is documented as an array but the input is not
112
+ if attributes[self.class.attribute_map[key]].is_a?(Array)
113
+ self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
114
+ end
115
+ elsif !attributes[self.class.attribute_map[key]].nil?
116
+ self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
117
+ end # or else data not found in attributes(hash), not an issue as the data can be optional
118
+ end
119
+
120
+ self
121
+ end
122
+
123
+ # Deserializes the data based on type
124
+ # @param string type Data type
125
+ # @param string value Value to be deserialized
126
+ # @return [Object] Deserialized data
127
+ def _deserialize(type, value)
128
+ case type.to_sym
129
+ when :DateTime
130
+ DateTime.parse(value)
131
+ when :Date
132
+ Date.parse(value)
133
+ when :Time
134
+ Time.parse(value)
135
+ when :String
136
+ value.to_s
137
+ when :Integer
138
+ value.to_i
139
+ when :Float
140
+ value.to_f
141
+ when :Boolean
142
+ if value.to_s =~ /\A(true|t|yes|y|1)\z/i
143
+ true
144
+ else
145
+ false
146
+ end
147
+ when :Object
148
+ # generic object (usually a Hash), return directly
149
+ value
150
+ when /\AArray<(?<inner_type>.+)>\z/
151
+ inner_type = Regexp.last_match[:inner_type]
152
+ value.map { |v| _deserialize(inner_type, v) }
153
+ when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
154
+ k_type = Regexp.last_match[:k_type]
155
+ v_type = Regexp.last_match[:v_type]
156
+ {}.tap do |hash|
157
+ value.each do |k, v|
158
+ hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
159
+ end
160
+ end
161
+ else # model
162
+ Phrase.const_get(type).build_from_hash(value)
163
+ end
164
+ end
165
+
166
+ # Returns the string representation of the object
167
+ # @return [String] String presentation of the object
168
+ def to_s
169
+ to_hash.to_s
170
+ end
171
+
172
+ # to_body is an alias to to_hash (backward compatibility)
173
+ # @return [Hash] Returns the object in the form of hash
174
+ def to_body
175
+ to_hash
176
+ end
177
+
178
+ # Returns the object in the form of hash
179
+ # @return [Hash] Returns the object in the form of hash
180
+ def to_hash
181
+ hash = {}
182
+ self.class.attribute_map.each_pair do |attr, param|
183
+ value = self.send(attr)
184
+ if value.nil?
185
+ is_nullable = self.class.openapi_nullable.include?(attr)
186
+ next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
187
+ end
188
+
189
+ hash[param] = _to_hash(value)
190
+ end
191
+ hash
192
+ end
193
+
194
+ # Outputs non-array value in the form of hash
195
+ # For object, use to_hash. Otherwise, just return the value
196
+ # @param [Object] value Any valid value
197
+ # @return [Hash] Returns the value in the form of hash
198
+ def _to_hash(value)
199
+ if value.is_a?(Array)
200
+ value.compact.map { |v| _to_hash(v) }
201
+ elsif value.is_a?(Hash)
202
+ {}.tap do |hash|
203
+ value.each { |k, v| hash[k] = _to_hash(v) }
204
+ end
205
+ elsif value.respond_to? :to_hash
206
+ value.to_hash
207
+ else
208
+ value
209
+ end
210
+ end
211
+ end
212
+ end