easy-resources 0.10.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29cce503c0d0908bb6a5bd6816fda1add2f38ae73e9b69eb4fb1f81e0106c3d4
-  data.tar.gz: d5e6499693d14816b6d986fb7c892b9cec455d4d22216e5cac9d47d8b9211fb9
+  metadata.gz: 73b8b62272d316495b8965f0e417f2b311e5fbe12de71dd73c11f6c4de73fb08
+  data.tar.gz: c7611434906239211072702fc74c0b162fab3605d3cb6e52d2189e54a0389559
 SHA512:
-  metadata.gz: 54620a9d039d0932dd32be642445592340f0d7ad1b3c943f909a76b84f133ea29ed78faaf18697d9f9e9d17cc50569a504310ee9fb5ed68b2c791f63a8721f82
-  data.tar.gz: f472afbf20f03bf5828040e0283df010bb1f86540fc6fd2231abcdfbd96af4e0a0eb9726cd40992379c9c478fe0e17a5a2a04d7e24b793a4136e7de655686c3a
+  metadata.gz: 0df08d01925bbf03516218add41fb05ccd0843edd3ef3067339605f288708e0a4b1c75aab5f279a5ce1f35b2104210ca9edaaaa49dda6dfb7d27b6246e39a71e
+  data.tar.gz: e50f75ca41fd866d9df80e07759c087b58272cb31449f8b309713c52c7a5de5442e146343a1caa91828a6e000ab9b61c76ec3387efd2904d983afb00717f28c6

data/CHANGELOG.md

@@ -5,6 +5,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [1.0.2] - 2024-02-27
+### Added
+- EWA's extra_env_variables hash | [@lukas](https://git.easy.cz/lukas)
+- Chain and Chroma images to EasyWebApplication | [@jiri.vojta](https://git.easy.cz/jiri.vojta)
+
+## [1.0.0] - 2023-07-03
+### Changed
+- update activeresources
+
 ## [0.10.1] - 2021-09-03
 ### Added
 - rexml gem as a dependency (because of XML requests)

data/lib/easy/resources/redmine/easy_web_application.rb

@@ -18,6 +18,9 @@ module Easy
           expire_at: :date,
           custom_repository: :boolean,
           custom_domain: :boolean,
+          internal_user_limit: :integer,
+          chromadb_docker_image: :string,
+          easy_ai_chain_docker_image: :string,
         }
 
         belongs_to :easy_contact, class_name: 'Easy::Resources::Redmine::EasyContact'
@@ -45,6 +48,14 @@ module Easy
           custom_fields.find { |cf| cf.internal_name == "application_updates_on_request" }&.cast_value
         end
 
+        # @return [Hash]
+        def extra_env_variables
+          value = attributes["extra_env_variables"] || {}
+          return value.attributes if value.respond_to? :attributes
+
+          value
+        end
+
       end
     end
   end

data/lib/easy/resources/redmine/redmine_base.rb

@@ -28,7 +28,7 @@ module Easy
           # Parse value of TOTAL amount of entities from headers or response
           # @return [Integer]
           def retrieve_total(response)
-            (response['Total'] || response.body[/total_count[:="]+(\d+)/] && Regexp.last_match(1)).to_i
+            (response['Total'] || (response.body[/total_count[:="]+(\d+)/] && Regexp.last_match(1))).to_i
           end
 
           def get_all(**params, &block)

data/lib/easy/resources/version.rb

@@ -1,7 +1,7 @@
 module Easy
   module Resources
 
-    VERSION = '0.10.1'
+    VERSION = '1.0.2'
 
   end
 end

data/spec/fixtures/files/easy_web_application/show.json

@@ -49,6 +49,10 @@
         "value": "0"
       }
     ],
-    "plugins": []
+    "plugins": [],
+    "extra_env_variables": {
+      "OPENAI_API_KEY": "secret-key",
+      "EASY_AI_JWT_SECRET": "token0001"
+    }
   }
 }

data/spec/fixtures/files/easy_web_application/show.xml

@@ -21,4 +21,5 @@
   </custom_fields>
   <created_at>2018-03-22T09:10:47Z</created_at>
   <updated_at>2018-05-24T10:55:28Z</updated_at>
+  <extra_env_variables OPENAI_API_KEY="secret-key" EASY_AI_JWT_SECRET="token0001"/>
 </easy_web_application>

data/spec/fixtures/files/easy_web_application/without_extra_env_variables.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<easy_web_application>
+  <id>65739</id>
+  <easy_external_id>3955</easy_external_id>
+  <application_type>trial</application_type>
+  <url>lukas.easyproject.cz</url>
+  <status>running</status>
+  <monitored>false</monitored>
+  <version>2017.1.3 (03.02)</version>
+  <easy_server id="22" host_name="bigdemo.cz" type="application" server_type="bigdemo"/>
+  <author id="14" name="Anonymní"/>
+  <internal_user_limit>0</internal_user_limit>
+  <git_repository type="string">git@git.easy.cz:package.git</git_repository>
+  <custom_fields type="array">
+    <custom_field id="695" name="Move on-request" internal_name="application_move_on_request" field_format="bool">
+      <value>1</value>
+    </custom_field>
+    <custom_field id="463" name="Updates on-request" internal_name="application_updates_on_request" field_format="bool">
+      <value>0</value>
+    </custom_field>
+  </custom_fields>
+  <created_at>2018-03-22T09:10:47Z</created_at>
+  <updated_at>2018-05-24T10:55:28Z</updated_at>
+</easy_web_application>

data/spec/models/easy-resources/redmine/easy_web_application_spec.rb

@@ -67,4 +67,31 @@ RSpec.describe Easy::Resources::Redmine::EasyWebApplication do
       is_expected.to be_falsey
     end
   end
+
+  describe "#extra_env_variables" do
+    subject { find_entity.extra_env_variables }
+    it { is_expected.to be_a Hash }
+
+    it "check hash in json" do
+      expect(find_entity.as_json["easy_web_application"]).to include("extra_env_variables" => { "EASY_AI_JWT_SECRET" => "token0001", "OPENAI_API_KEY" => "secret-key" })
+    end
+
+    it "if ewa has no extra_env_Variables yet" do
+      ewa = find_entity("without_extra_env_variables")
+      expect(ewa.extra_env_variables).to eq({})
+    end
+  end
+
+  describe "#extra_env_variables=" do
+    let(:entity) { find_entity }
+    before { entity.extra_env_variables = { "CHAIN_LIMIT" => "two-hands" } }
+
+    it "should be a hash" do
+      expect(entity.extra_env_variables).to be_a Hash
+    end
+
+    it "check hash in json" do
+      expect(entity.as_json["easy_web_application"]).to include("extra_env_variables" => { "CHAIN_LIMIT" => "two-hands" })
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy-resources
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Petr
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-03 00:00:00.000000000 Z
+date: 2024-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activeresource-response
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -204,6 +204,7 @@ files:
 - spec/fixtures/files/easy_web_application/with_easy_contact.xml
 - spec/fixtures/files/easy_web_application/with_easy_crm_case.xml
 - spec/fixtures/files/easy_web_application/with_ewaa.xml
+- spec/fixtures/files/easy_web_application/without_extra_env_variables.xml
 - spec/fixtures/files/easy_web_hook/index.xml
 - spec/fixtures/files/easy_web_hook/show.xml
 - spec/fixtures/files/issue.json
@@ -252,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.19
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: ActiveResources connectors for Easy Project / Easy Redmine
@@ -278,6 +279,7 @@ test_files:
 - spec/fixtures/files/easy_web_application/with_easy_contact.xml
 - spec/fixtures/files/easy_web_application/with_easy_crm_case.xml
 - spec/fixtures/files/easy_web_application/with_ewaa.xml
+- spec/fixtures/files/easy_web_application/without_extra_env_variables.xml
 - spec/fixtures/files/easy_web_hook/index.xml
 - spec/fixtures/files/easy_web_hook/show.xml
 - spec/fixtures/files/issue/show.xml