easy-resources 0.10.0 → 1.0.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 78e3ee85bb308efe3d49df5e230984860f8be924ee8f5dabcb89db87691c8736
4
- data.tar.gz: 550563403efc65b6927927af2c8542794497a629057d25964f8a3d04b06ad0bf
3
+ metadata.gz: 73b8b62272d316495b8965f0e417f2b311e5fbe12de71dd73c11f6c4de73fb08
4
+ data.tar.gz: c7611434906239211072702fc74c0b162fab3605d3cb6e52d2189e54a0389559
5
5
  SHA512:
6
- metadata.gz: 35679557ec16ff9a221fd9ad59b36c723a52a3d7ead9fe2834be5c558c354dedd12f5f9d417c0efa063b85f4c6ddc2d528adc393eddd4011bcbe1d1bdc3bc28c
7
- data.tar.gz: db430c848f60389dadf4e818e15c2e0fdbac0f0a7cc359d68decc4da45e65f3dea01b9e67ce5f95c0508b10f8d5f48f872bc19a9e0c6aed8964cfc975fab431c
6
+ metadata.gz: 0df08d01925bbf03516218add41fb05ccd0843edd3ef3067339605f288708e0a4b1c75aab5f279a5ce1f35b2104210ca9edaaaa49dda6dfb7d27b6246e39a71e
7
+ data.tar.gz: e50f75ca41fd866d9df80e07759c087b58272cb31449f8b309713c52c7a5de5442e146343a1caa91828a6e000ab9b61c76ec3387efd2904d983afb00717f28c6
data/CHANGELOG.md CHANGED
@@ -5,6 +5,21 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
5
5
  and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
6
6
 
7
7
  ## [Unreleased]
8
+ ## [1.0.2] - 2024-02-27
9
+ ### Added
10
+ - EWA's extra_env_variables hash | [@lukas](https://git.easy.cz/lukas)
11
+ - Chain and Chroma images to EasyWebApplication | [@jiri.vojta](https://git.easy.cz/jiri.vojta)
12
+
13
+ ## [1.0.0] - 2023-07-03
14
+ ### Changed
15
+ - update activeresources
16
+
17
+ ## [0.10.1] - 2021-09-03
18
+ ### Added
19
+ - rexml gem as a dependency (because of XML requests)
20
+ ### Changed
21
+ - .gitlab-ci.yml with Docker and ruby matrix support
22
+
8
23
  ## [0.10.0] - 2021-09-01
9
24
  ### Added
10
25
  - support ruby3.0
@@ -18,6 +18,9 @@ module Easy
18
18
  expire_at: :date,
19
19
  custom_repository: :boolean,
20
20
  custom_domain: :boolean,
21
+ internal_user_limit: :integer,
22
+ chromadb_docker_image: :string,
23
+ easy_ai_chain_docker_image: :string,
21
24
  }
22
25
 
23
26
  belongs_to :easy_contact, class_name: 'Easy::Resources::Redmine::EasyContact'
@@ -45,6 +48,14 @@ module Easy
45
48
  custom_fields.find { |cf| cf.internal_name == "application_updates_on_request" }&.cast_value
46
49
  end
47
50
 
51
+ # @return [Hash]
52
+ def extra_env_variables
53
+ value = attributes["extra_env_variables"] || {}
54
+ return value.attributes if value.respond_to? :attributes
55
+
56
+ value
57
+ end
58
+
48
59
  end
49
60
  end
50
61
  end
@@ -28,7 +28,7 @@ module Easy
28
28
  # Parse value of TOTAL amount of entities from headers or response
29
29
  # @return [Integer]
30
30
  def retrieve_total(response)
31
- (response['Total'] || response.body[/total_count[:="]+(\d+)/] && Regexp.last_match(1)).to_i
31
+ (response['Total'] || (response.body[/total_count[:="]+(\d+)/] && Regexp.last_match(1))).to_i
32
32
  end
33
33
 
34
34
  def get_all(**params, &block)
@@ -1,7 +1,7 @@
1
1
  module Easy
2
2
  module Resources
3
3
 
4
- VERSION = '0.10.0'
4
+ VERSION = '1.0.2'
5
5
 
6
6
  end
7
7
  end
@@ -2,6 +2,8 @@ require "activeresource"
2
2
  require "activeresource-response"
3
3
 
4
4
  require "easy/resources/railtie"
5
+ require "rexml"
6
+ require "rexml/document"
5
7
 
6
8
  module Easy
7
9
 
@@ -49,6 +49,10 @@
49
49
  "value": "0"
50
50
  }
51
51
  ],
52
- "plugins": []
52
+ "plugins": [],
53
+ "extra_env_variables": {
54
+ "OPENAI_API_KEY": "secret-key",
55
+ "EASY_AI_JWT_SECRET": "token0001"
56
+ }
53
57
  }
54
58
  }
@@ -21,4 +21,5 @@
21
21
  </custom_fields>
22
22
  <created_at>2018-03-22T09:10:47Z</created_at>
23
23
  <updated_at>2018-05-24T10:55:28Z</updated_at>
24
+ <extra_env_variables OPENAI_API_KEY="secret-key" EASY_AI_JWT_SECRET="token0001"/>
24
25
  </easy_web_application>
@@ -0,0 +1,24 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <easy_web_application>
3
+ <id>65739</id>
4
+ <easy_external_id>3955</easy_external_id>
5
+ <application_type>trial</application_type>
6
+ <url>lukas.easyproject.cz</url>
7
+ <status>running</status>
8
+ <monitored>false</monitored>
9
+ <version>2017.1.3 (03.02)</version>
10
+ <easy_server id="22" host_name="bigdemo.cz" type="application" server_type="bigdemo"/>
11
+ <author id="14" name="Anonymní"/>
12
+ <internal_user_limit>0</internal_user_limit>
13
+ <git_repository type="string">git@git.easy.cz:package.git</git_repository>
14
+ <custom_fields type="array">
15
+ <custom_field id="695" name="Move on-request" internal_name="application_move_on_request" field_format="bool">
16
+ <value>1</value>
17
+ </custom_field>
18
+ <custom_field id="463" name="Updates on-request" internal_name="application_updates_on_request" field_format="bool">
19
+ <value>0</value>
20
+ </custom_field>
21
+ </custom_fields>
22
+ <created_at>2018-03-22T09:10:47Z</created_at>
23
+ <updated_at>2018-05-24T10:55:28Z</updated_at>
24
+ </easy_web_application>
@@ -67,5 +67,31 @@ RSpec.describe Easy::Resources::Redmine::EasyWebApplication do
67
67
  is_expected.to be_falsey
68
68
  end
69
69
  end
70
-
70
+
71
+ describe "#extra_env_variables" do
72
+ subject { find_entity.extra_env_variables }
73
+ it { is_expected.to be_a Hash }
74
+
75
+ it "check hash in json" do
76
+ expect(find_entity.as_json["easy_web_application"]).to include("extra_env_variables" => { "EASY_AI_JWT_SECRET" => "token0001", "OPENAI_API_KEY" => "secret-key" })
77
+ end
78
+
79
+ it "if ewa has no extra_env_Variables yet" do
80
+ ewa = find_entity("without_extra_env_variables")
81
+ expect(ewa.extra_env_variables).to eq({})
82
+ end
83
+ end
84
+
85
+ describe "#extra_env_variables=" do
86
+ let(:entity) { find_entity }
87
+ before { entity.extra_env_variables = { "CHAIN_LIMIT" => "two-hands" } }
88
+
89
+ it "should be a hash" do
90
+ expect(entity.extra_env_variables).to be_a Hash
91
+ end
92
+
93
+ it "check hash in json" do
94
+ expect(entity.as_json["easy_web_application"]).to include("extra_env_variables" => { "CHAIN_LIMIT" => "two-hands" })
95
+ end
96
+ end
71
97
  end
data/spec/spec_helper.rb CHANGED
@@ -4,6 +4,7 @@ SimpleCov.start 'rails' do
4
4
  add_filter '/bin'
5
5
  add_filter '/lib/easy/resources/spec_helper'
6
6
  add_filter '/lib/easy/resources/version'
7
+ add_filter '/spec/dummy'
7
8
  add_filter '/vendor'
8
9
  end
9
10
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: easy-resources
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.10.0
4
+ version: 1.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Petr
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2021-09-01 00:00:00.000000000 Z
12
+ date: 2024-02-27 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activeresource
@@ -17,28 +17,28 @@ dependencies:
17
17
  requirements:
18
18
  - - "~>"
19
19
  - !ruby/object:Gem::Version
20
- version: '5.1'
20
+ version: '6.0'
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
25
  - - "~>"
26
26
  - !ruby/object:Gem::Version
27
- version: '5.1'
27
+ version: '6.0'
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: activeresource-response
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
32
  - - "~>"
33
33
  - !ruby/object:Gem::Version
34
- version: '1.2'
34
+ version: '1.4'
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
39
  - - "~>"
40
40
  - !ruby/object:Gem::Version
41
- version: '1.2'
41
+ version: '1.4'
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: railties
44
44
  requirement: !ruby/object:Gem::Requirement
@@ -53,6 +53,20 @@ dependencies:
53
53
  - - ">="
54
54
  - !ruby/object:Gem::Version
55
55
  version: '0'
56
+ - !ruby/object:Gem::Dependency
57
+ name: rexml
58
+ requirement: !ruby/object:Gem::Requirement
59
+ requirements:
60
+ - - "~>"
61
+ - !ruby/object:Gem::Version
62
+ version: 3.2.5
63
+ type: :runtime
64
+ prerelease: false
65
+ version_requirements: !ruby/object:Gem::Requirement
66
+ requirements:
67
+ - - "~>"
68
+ - !ruby/object:Gem::Version
69
+ version: 3.2.5
56
70
  - !ruby/object:Gem::Dependency
57
71
  name: easy-configuration
58
72
  requirement: !ruby/object:Gem::Requirement
@@ -190,6 +204,7 @@ files:
190
204
  - spec/fixtures/files/easy_web_application/with_easy_contact.xml
191
205
  - spec/fixtures/files/easy_web_application/with_easy_crm_case.xml
192
206
  - spec/fixtures/files/easy_web_application/with_ewaa.xml
207
+ - spec/fixtures/files/easy_web_application/without_extra_env_variables.xml
193
208
  - spec/fixtures/files/easy_web_hook/index.xml
194
209
  - spec/fixtures/files/easy_web_hook/show.xml
195
210
  - spec/fixtures/files/issue.json
@@ -238,57 +253,58 @@ required_rubygems_version: !ruby/object:Gem::Requirement
238
253
  - !ruby/object:Gem::Version
239
254
  version: '0'
240
255
  requirements: []
241
- rubygems_version: 3.2.16
256
+ rubygems_version: 3.3.26
242
257
  signing_key:
243
258
  specification_version: 4
244
259
  summary: ActiveResources connectors for Easy Project / Easy Redmine
245
260
  test_files:
246
- - spec/spec_helper.rb
247
- - spec/models/easy-resources/redmine/custom_field_spec.rb
248
- - spec/models/easy-resources/redmine/project_spec.rb
249
- - spec/models/easy-resources/redmine/easy_crm_case_spec.rb
250
- - spec/models/easy-resources/redmine/easy_contact_spec.rb
251
- - spec/models/easy-resources/redmine/issue_spec.rb
252
- - spec/models/easy-resources/redmine/time_entry_spec.rb
253
- - spec/models/easy-resources/redmine/redmine_base_spec.rb
254
- - spec/models/easy-resources/redmine/easy_web_hook_spec.rb
255
- - spec/models/easy-resources/redmine/easy_web_application_activity_spec.rb
256
- - spec/models/easy-resources/redmine/easy_web_application_spec.rb
257
- - spec/models/easy-resources/redmine/easy_server_spec.rb
258
- - spec/models/easy-resources/redmine/errors_spec.rb
259
- - spec/models/easy-resources/redmine/user_spec.rb
260
- - spec/models/easy-resources/redmine/easy_attendance_spec.rb
261
- - spec/models/easy-resources/resource_spec.rb
262
- - spec/support/active_resource.rb
263
- - spec/support/fixtures.rb
264
- - spec/support/redmine_active_resource.rb
265
261
  - spec/easy_resources_spec.rb
266
- - spec/fixtures/files/easy_web_hook/index.xml
267
- - spec/fixtures/files/easy_web_hook/show.xml
268
- - spec/fixtures/files/easy_contact/show.xml
269
- - spec/fixtures/files/time_entry/show.xml
270
- - spec/fixtures/files/time_entry/invalid_update.xml
271
- - spec/fixtures/files/custom_field/datetime.xml
272
262
  - spec/fixtures/files/custom_field/bool.xml
273
- - spec/fixtures/files/custom_field/float.xml
274
263
  - spec/fixtures/files/custom_field/date.xml
264
+ - spec/fixtures/files/custom_field/datetime.xml
265
+ - spec/fixtures/files/custom_field/float.xml
275
266
  - spec/fixtures/files/custom_field/int.xml
276
267
  - spec/fixtures/files/custom_field/string.xml
277
- - spec/fixtures/files/easy_crm_case.json
278
- - spec/fixtures/files/easy_crm_case/show.xml
279
- - spec/fixtures/files/project.json
280
- - spec/fixtures/files/issue.json
281
- - spec/fixtures/files/user/show.xml
282
- - spec/fixtures/files/project/show.xml
283
- - spec/fixtures/files/issue/show.xml
268
+ - spec/fixtures/files/easy_attendance/show.xml
269
+ - spec/fixtures/files/easy_contact/show.xml
284
270
  - spec/fixtures/files/easy_contact.json
271
+ - spec/fixtures/files/easy_crm_case/show.xml
272
+ - spec/fixtures/files/easy_crm_case.json
285
273
  - spec/fixtures/files/easy_server/index.xml
286
274
  - spec/fixtures/files/easy_server/show.xml
287
- - spec/fixtures/files/easy_attendance/show.xml
288
275
  - spec/fixtures/files/easy_web_application/index.xml
289
- - spec/fixtures/files/easy_web_application/with_ewaa.xml
290
- - spec/fixtures/files/easy_web_application/with_custom_fields.xml
276
+ - spec/fixtures/files/easy_web_application/show.json
291
277
  - spec/fixtures/files/easy_web_application/show.xml
278
+ - spec/fixtures/files/easy_web_application/with_custom_fields.xml
292
279
  - spec/fixtures/files/easy_web_application/with_easy_contact.xml
293
280
  - spec/fixtures/files/easy_web_application/with_easy_crm_case.xml
294
- - spec/fixtures/files/easy_web_application/show.json
281
+ - spec/fixtures/files/easy_web_application/with_ewaa.xml
282
+ - spec/fixtures/files/easy_web_application/without_extra_env_variables.xml
283
+ - spec/fixtures/files/easy_web_hook/index.xml
284
+ - spec/fixtures/files/easy_web_hook/show.xml
285
+ - spec/fixtures/files/issue/show.xml
286
+ - spec/fixtures/files/issue.json
287
+ - spec/fixtures/files/project/show.xml
288
+ - spec/fixtures/files/project.json
289
+ - spec/fixtures/files/time_entry/invalid_update.xml
290
+ - spec/fixtures/files/time_entry/show.xml
291
+ - spec/fixtures/files/user/show.xml
292
+ - spec/models/easy-resources/redmine/custom_field_spec.rb
293
+ - spec/models/easy-resources/redmine/easy_attendance_spec.rb
294
+ - spec/models/easy-resources/redmine/easy_contact_spec.rb
295
+ - spec/models/easy-resources/redmine/easy_crm_case_spec.rb
296
+ - spec/models/easy-resources/redmine/easy_server_spec.rb
297
+ - spec/models/easy-resources/redmine/easy_web_application_activity_spec.rb
298
+ - spec/models/easy-resources/redmine/easy_web_application_spec.rb
299
+ - spec/models/easy-resources/redmine/easy_web_hook_spec.rb
300
+ - spec/models/easy-resources/redmine/errors_spec.rb
301
+ - spec/models/easy-resources/redmine/issue_spec.rb
302
+ - spec/models/easy-resources/redmine/project_spec.rb
303
+ - spec/models/easy-resources/redmine/redmine_base_spec.rb
304
+ - spec/models/easy-resources/redmine/time_entry_spec.rb
305
+ - spec/models/easy-resources/redmine/user_spec.rb
306
+ - spec/models/easy-resources/resource_spec.rb
307
+ - spec/spec_helper.rb
308
+ - spec/support/active_resource.rb
309
+ - spec/support/fixtures.rb
310
+ - spec/support/redmine_active_resource.rb