easy-resources 0.7.5 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bcec7bc4db468222969c7a9b38799d9f57b708cbdd7c200944e83661eeb50b0
-  data.tar.gz: bc31ac728c4126e1d6cdbacbc425dd260c0449d105e38042cc4603d4c764f866
+  metadata.gz: 92eda89013e1a2ec9408d3bdcf01887646a4873974e1e0ff5688ce588872e3d6
+  data.tar.gz: 8ff8f00de0fe5691eba2b604413a21592d6feb57ea7c8818233319c843369412
 SHA512:
-  metadata.gz: ad330da90a52c3069baadd8217df2cdf7e9b10d31ad1e33c94f3253bae65f3a2710d8f9c03910b7f5642cb56dccfe8ba87db2aa4a052bb44df6b24768676b0f8
-  data.tar.gz: db3332dc3a1c93f72272d316a4e8f7261e417076d61f16f46bdef2939e01648db88a69a8c3510de0a095206571a587e7adb3510ed12daa65f824b32b3d344731
+  metadata.gz: 9d6e022176f9f63387bf93f72d335e6c7cfe8fd3859d7d6fe41cbb10fcf9b650fa8342c98ce7eaf6366c4e0991fd5e24eaf10356e35477323c1bfa39ff907210
+  data.tar.gz: e3ca719a309508ee046b4a98aaf0a15ece961bf2c08bf0f1c1ddb5b5664f190b07f75964bd5bceea98b35d2c78a40ecf3e7af0d4f93ae50c4ba3c45c898b9c59

data/CHANGELOG.md

@@ -0,0 +1,60 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+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]
+## [0.9.0] - 2021-06-08
+### Added
+- CustomField resource
+- rubocop linter
+- improve gemspec metadata
+### Changed
+- dummy upgrade to rails 6
+- update dev dependencies
+
+## [0.8.2] - 2021-03-05
+### Added
+- ruby 3 compatibility
+
+## [0.8.1] - 2020-06-08
+### Fixed
+- Retrieve (Easy)Redmine total entities from response if headers missing
+- Validation error messages parser from XML
+
+## [0.8.0] - 2020-04-28
+### Added
+- TimeEntry
+- EasyAttendance
+## [0.7.5] - 2020-03-06
+### Added
+- EasyServer `status` alias for `server_status`
+## [0.7.5] - 2020-01-17
+### Added
+- aasm_event into EasyWebApplication scheme
+- notes into EasyWebApplication scheme
+## [0.7.4] - 2019-09-02
+### Added
+- Easy Web Application add belongs_to Issue
+## [0.7.2] - 2019-08-29
+### Added
+- Easy Web Hook model
+## [0.7.1] - 2019-07-11
+### Added
+- configuration from Oauth2 token
+### Fixed
+- api_key is changed to class_attribute
+## [0.6.3] - 2019-07-08
+### Fixed
+- cached headers
+## [0.6.2] - 2019-05-14
+### Added
+- alias url in server resource
+## [0.6.1] - 2019-04-03
+### Added
+- this file
+- User resource in Redmine
+- 100% code coverage :)
+### Changed
+- README

data/README.md

@@ -13,7 +13,7 @@ Allow communicate via API with (Easy)Redmine applications.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'easy_resources'
+gem 'easy-resources'
 ```
 
 And then execute:

data/lib/easy/resource.rb

@@ -2,26 +2,29 @@ module Easy
   class Resource < ActiveResource::Base
 
     def self.configure(conf)
-      if conf.is_a?(::Hash)
+      case conf
+      when ::Hash
         if conf[:url].present? && conf[:token].present?
           configure_bearer(conf[:url], conf[:token])
         elsif conf[:url].present?
           self.site = conf[:url]
         end
-      elsif conf.is_a?(::OAuth2::AccessToken)
+      when ::OAuth2::AccessToken
         configure_bearer(conf.client.site, conf.token)
+      else
+        # do nothing, unknown configuration
       end
     end
 
     def self.configure_bearer(url, token)
-      self.site                    = url
-      self.connection.auth_type    = :bearer
-      self.connection.bearer_token = token
+      self.site = url
+      connection.auth_type = :bearer
+      connection.bearer_token = token
     end
 
     def becomes(entity_class)
-      model            = entity_class.new
-      model.attributes = self.attributes
+      model = entity_class.new
+      model.attributes = attributes
       model
     end
 

data/lib/easy/resources.rb

@@ -4,12 +4,17 @@ require "activeresource-response"
 require "easy/resources/railtie"
 
 module Easy
+
   autoload :Resource, "easy/resource"
 
   module Resources
     module Redmine
 
+      autoload :Errors, "easy/resources/redmine/errors"
+
+      autoload :CustomField, "easy/resources/redmine/custom_field"
       autoload :RedmineBase, "easy/resources/redmine/redmine_base"
+      autoload :EasyAttendance, "easy/resources/redmine/easy_attendance"
       autoload :EasyContact, "easy/resources/redmine/easy_contact"
       autoload :EasyCrmCase, "easy/resources/redmine/easy_crm_case"
       autoload :EasyServer, "easy/resources/redmine/easy_server"
@@ -19,7 +24,9 @@ module Easy
       autoload :Issue, "easy/resources/redmine/issue"
       autoload :Project, "easy/resources/redmine/project"
       autoload :User, "easy/resources/redmine/user"
+      autoload :TimeEntry, "easy/resources/redmine/time_entry"
 
     end
   end
+
 end

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

@@ -0,0 +1,36 @@
+module Easy
+  module Resources
+    module Redmine
+      class CustomField < RedmineBase
+        self.element_name = 'custom_field'
+
+        self.schema = {
+          id: :integer,
+          name: :string,
+          internal_name: :string,
+          value: :string,
+          field_format: :string,
+        }
+
+        # @return formatted value based on **field_format**
+        def cast_value
+          case field_format
+          when "bool"
+            value.to_s =~ /1|true/i ? true : false
+          when "float", "amount"
+            value.to_f
+          when "int"
+            value.to_i
+          when "date"
+            Date.parse value
+          when "datetime"
+            DateTime.parse value
+          else
+            value
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+module Easy
+  module Resources
+    module Redmine
+      class EasyAttendance < RedmineBase
+        self.element_name = 'easy_attendance'
+
+        belongs_to :user, class_name: 'Easy::Resources::Redmine::User'
+
+      end
+    end
+  end
+end

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

@@ -2,7 +2,6 @@ module Easy
   module Resources
     module Redmine
       class EasyContact < RedmineBase
-
         self.element_name = 'easy_contact'
 
         def name

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

@@ -2,7 +2,6 @@ module Easy
   module Resources
     module Redmine
       class EasyCrmCase < RedmineBase
-
         self.element_name = 'easy_crm_case'
 
         belongs_to :project, class_name: 'Easy::Resources::Redmine::Project'

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

@@ -2,15 +2,33 @@ module Easy
   module Resources
     module Redmine
       class EasyServer < RedmineBase
-
         self.element_name = 'easy_server'
 
         has_many :easy_web_applications, class_name: 'Easy::Resources::Redmine::EasyWebApplication'
 
+        self.schema = {
+          host_name: :string,
+          server_type: :string,
+          server_status: :string
+        }
+
+        # Alias for +host_name+ attribute
+        # @return [String]
         def url
           host_name
         end
 
+        # Alias for +server_status+ attribute
+        # @return [String]
+        def status
+          server_status
+        end
+
+        # @param [String] name of status
+        def status=(name)
+          self.server_status = name
+        end
+
       end
     end
   end

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

@@ -2,7 +2,6 @@ module Easy
   module Resources
     module Redmine
       class EasyWebApplication < RedmineBase
-
         self.element_name = 'easy_web_application'
 
         self.schema = {
@@ -13,7 +12,7 @@ module Easy
           easy_crm_case_id: :integer,
           easy_contact_id: :integer,
           aasm_event: :string,
-          notes: :string
+          notes: :string,
         }
 
         belongs_to :easy_contact, class_name: 'Easy::Resources::Redmine::EasyContact'
@@ -21,6 +20,7 @@ module Easy
         belongs_to :easy_server, class_name: 'Easy::Resources::Redmine::EasyServer'
         belongs_to :issue, class_name: 'Easy::Resources::Redmine::Issue'
 
+        has_many :custom_fields, class_name: 'Easy::Resources::Redmine::CustomField'
         has_many :easy_web_application_activities, class_name: 'Easy::Resources::Redmine::EasyWebApplicationActivity'
         has_one :easy_web_application_activity, class_name: 'Easy::Resources::Redmine::EasyWebApplicationActivity'
 
@@ -28,6 +28,18 @@ module Easy
           url
         end
 
+        # @!group ESko specific custom_fields
+
+        # @return [Boolean,nil]
+        def application_moves_on_request?
+          custom_fields.find { |cf| cf.internal_name == "application_move_on_request" }&.cast_value
+        end
+
+        # @return [Boolean,nil]
+        def application_updates_on_request?
+          custom_fields.find { |cf| cf.internal_name == "application_updates_on_request" }&.cast_value
+        end
+
       end
     end
   end

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

@@ -2,7 +2,6 @@ module Easy
   module Resources
     module Redmine
       class EasyWebApplicationActivity < RedmineBase
-
         self.element_name = 'easy_web_application_activity'
 
         belongs_to :easy_web_application, class_name: 'Easy::Resources::Redmine::EasyWebApplication'

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

@@ -2,7 +2,6 @@ module Easy
   module Resources
     module Redmine
       class EasyWebHook < RedmineBase
-
         self.element_name = 'easy_web_hook'
 
       end

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

@@ -0,0 +1,20 @@
+module Easy
+  module Resources
+    module Redmine
+      class Errors < ::ActiveResource::Errors
+
+        # Redmine in XML responses specify type="array" on Errors
+        # It cause that `Hash.from_xml` already parsed errors as a Array
+        def from_xml(xml, save_cache = false)
+          array = begin
+            Array.wrap(Hash.from_xml(xml)["errors"])
+          rescue StandardError
+            []
+          end
+          from_array array, save_cache
+        end
+
+      end
+    end
+  end
+end

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

@@ -2,7 +2,6 @@ module Easy
   module Resources
     module Redmine
       class Issue < RedmineBase
-
         self.element_name = 'issue'
 
         belongs_to :project, class_name: 'Easy::Resources::Redmine::Project'

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

@@ -2,7 +2,6 @@ module Easy
   module Resources
     module Redmine
       class Project < RedmineBase
-
         self.element_name = 'project'
 
       end

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

@@ -2,10 +2,9 @@ module Easy
   module Resources
     module Redmine
       class RedmineBase < ::Easy::Resource
-
         self.include_root_in_json = true
         self.format               = :xml
-        self.add_response_method :http_response
+        add_response_method :http_response
 
         class_attribute :api_key
 
@@ -26,10 +25,16 @@ module Easy
             h
           end
 
+          # 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
+          end
+
           def get_all(**params, &block)
             records      = results = all(params: params)
             response     = results.http_response
-            total        = response['Total'].to_i
+            total        = retrieve_total(response)
             current_page = 1
 
             while records.any?
@@ -46,6 +51,11 @@ module Easy
           end
 
         end
+
+        def errors
+          @errors ||= Errors.new(self)
+        end
+
       end
     end
   end

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

@@ -0,0 +1,14 @@
+module Easy
+  module Resources
+    module Redmine
+      class TimeEntry < RedmineBase
+        self.element_name = 'time_entry'
+
+        belongs_to :project, class_name: 'Easy::Resources::Redmine::Project'
+        belongs_to :issue, class_name: 'Easy::Resources::Redmine::Issue'
+        belongs_to :user, class_name: 'Easy::Resources::Redmine::User'
+
+      end
+    end
+  end
+end

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

@@ -2,7 +2,6 @@ module Easy
   module Resources
     module Redmine
       class User < RedmineBase
-
         self.element_name = 'user'
 
         def name

data/lib/easy/resources/spec_helper.rb

@@ -1,2 +1,2 @@
-x = File.expand_path('../../../../', __FILE__)
-Dir["#{x}/spec/support/**/*.rb"].sort.each { |f| require f }
+gem_dir = File.expand_path('../../..', __dir__)
+Dir["#{gem_dir}/spec/support/**/*.rb"].sort.each { |f| require f }

data/lib/easy/resources/version.rb

@@ -1,5 +1,7 @@
 module Easy
   module Resources
-    VERSION = '0.7.5'
+
+    VERSION = '0.9.0'
+
   end
 end

data/spec/easy_resources_spec.rb

@@ -6,7 +6,6 @@ RSpec.describe Easy::Resources do
   end
 
   describe '.configure' do
-
     context "Easy::Resources::Redmine::RedmineBase" do
       it "Easy::Resources::Redmine::RedmineBase" do
         expect(Easy::Resources::Redmine::RedmineBase).to receive(:api_key=).with("xx1")
@@ -14,7 +13,5 @@ RSpec.describe Easy::Resources do
         Easy::Resources::Redmine::RedmineBase.configure api_key: "xx1", url: "https://test.dummy"
       end
     end
-
   end
-
 end

data/spec/fixtures/files/custom_field/bool.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<custom_field id="1" name="Move on-request" internal_name="application_move_on_request" field_format="bool">
+  <value>1</value>
+</custom_field>

data/spec/fixtures/files/custom_field/date.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<custom_field id="1" name="Next action" field_format="date">
+  <value>2020-06-24</value>
+</custom_field>

data/spec/fixtures/files/custom_field/datetime.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<custom_field id="1" name="Next action" field_format="datetime">
+  <value>2020-06-24 22:00:00</value>
+  <local_datetime>2020-06-25T00:00:00+02:00</local_datetime>
+</custom_field>

data/spec/fixtures/files/custom_field/float.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<custom_field id="1" name="Next action" field_format="float">
+  <value>24</value>
+</custom_field>

data/spec/fixtures/files/custom_field/int.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<custom_field id="1" name="Next action" field_format="int">
+  <value></value>
+</custom_field>

data/spec/fixtures/files/custom_field/string.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<custom_field id="1" name="Next action" field_format="text">
+  <value>word</value>
+</custom_field>

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

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><easy_attendance><id>509</id><user id="17" name="Steve Helpdesk Dispatcher"/><arrival>2020-02-05T07:45:00+01:00</arrival><departure>2020-04-28T22:30:38+02:00</departure><easy_attendance_activity id="1" name="Office"/><locked>false</locked><arrival_user_ip>66.249.79.144</arrival_user_ip><departure_user_ip></departure_user_ip><range/><created_at>2020-02-05T07:32:19+01:00</created_at><updated_at>2020-02-05T07:32:19+01:00</updated_at><description/><need_approve>false</need_approve><limit_exceeded>false</limit_exceeded><hours>0.0</hours><easy_external_id/></easy_attendance>

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

@@ -11,6 +11,14 @@
   <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/fixtures/files/easy_web_hook/index.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<easy_web_hooks total_count="12" offset="0" limit="25" type="array">
+  <easy_web_hook>
+    <id>1</id>
+    <url>https://hooks.integromat.com/super-secret-hash</url>
+    <status>inactive</status>
+    <entity_type>Issue</entity_type>
+    <action>create</action>
+    <author id="1" name="Manager"/>
+    <api_includes>[]</api_includes>
+    <created_at>2017-08-18T11:56:53Z</created_at>
+    <updated_at>2019-08-29T07:44:16Z</updated_at>
+  </easy_web_hook>
+  <easy_web_hook>
+    <id>3</id>
+    <url>https://hooks.zapier.com/hooks/catch/hookID/hookSecret/</url>
+    <status>inactive</status>
+    <entity_type>Project</entity_type>
+    <action>destroy</action>
+    <author id="5" name="Admin"/>
+    <project id="7" name="Reporting"/>
+    <api_includes>[issue_categories]</api_includes>
+    <created_at>2019-06-19T11:41:22Z</created_at>
+    <updated_at>2019-06-19T11:41:22Z</updated_at>
+  </easy_web_hook>
+</easy_web_hooks>

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

@@ -0,0 +1,11 @@
+<easy_web_hook>
+  <id>1</id>
+  <url>https://hooks.integromat.com/super-secret-hash</url>
+  <status>inactive</status>
+  <entity_type>Issue</entity_type>
+  <action>create</action>
+  <author id="1" name="Manager"/>
+  <api_includes>[]</api_includes>
+  <created_at>2017-08-18T11:56:53Z</created_at>
+  <updated_at>2019-08-29T07:44:16Z</updated_at>
+</easy_web_hook>

data/spec/fixtures/files/time_entry/invalid_update.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<errors type="array">
+  <error>Projekt je neplatné</error>
+</errors>

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<time_entry>
+  <id>509</id>
+  <project id="110" name="Partner Program Implementation"/>
+  <user id="5" name="Manager Manager"/>
+  <activity id="1" name="Work"/>
+  <hours>4.0</hours>
+  <comments></comments>
+  <spent_on>2020-03-04</spent_on>
+  <easy_range_from/>
+  <easy_range_to/>
+  <easy_external_id/>
+  <entity_id>110</entity_id>
+  <entity_type>Project</entity_type>
+  <created_on>2020-03-04T15:03:56Z</created_on>
+  <updated_on>2020-03-04T15:03:56Z</updated_on>
+  <easy_is_billable>true</easy_is_billable>
+  <easy_billed>false</easy_billed>
+  <custom_fields type="array">
+    <custom_field id="105" name="test" internal_name="" field_format="list">
+      <value/>
+    </custom_field>
+  </custom_fields>
+</time_entry>

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

@@ -0,0 +1,31 @@
+RSpec.describe Easy::Resources::Redmine::CustomField do
+  include_context "redmine active resource shares" do
+    let(:entity_name) { 'custom_field' }
+  end
+
+  let(:entity) { find_entity }
+
+  describe "#cast_value" do
+    subject { entity.cast_value }
+    context "with datetime" do
+      let(:entity) { find_entity "datetime" }
+      it { is_expected.to be_a DateTime }
+    end
+    context "with date" do
+      let(:entity) { find_entity "date" }
+      it { is_expected.to be_a Date }
+    end
+    context "with int" do
+      let(:entity) { find_entity "int" }
+      it { is_expected.to eq 0 }
+    end
+    context "with float" do
+      let(:entity) { find_entity "float" }
+      it { is_expected.to eq 24.0 }
+    end
+    context "with text" do
+      let(:entity) { find_entity "string" }
+      it { is_expected.not_to be_blank }
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+RSpec.describe Easy::Resources::Redmine::EasyAttendance do
+  include_context "redmine active resource shares" do
+    let(:entity_name) { 'easy_attendance' }
+  end
+
+  it 'get' do
+    expect(find_entity.arrival).not_to be_empty
+  end
+
+  it 'has user' do
+    expect(find_entity.user).to be_a Easy::Resources::Redmine::User
+  end
+end

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

@@ -22,5 +22,4 @@ RSpec.describe Easy::Resources::Redmine::EasyContact do
   # it '#demo?' do
   #   expect(find_entity.demo?).to be_falsey
   # end
-
 end

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

@@ -3,7 +3,6 @@ RSpec.describe Easy::Resources::Redmine::EasyCrmCase do
     let(:entity_name) { 'easy_crm_case' }
   end
 
-
   it 'get crm case' do
     expect(find_entity.name).not_to be_empty
   end
@@ -15,5 +14,4 @@ RSpec.describe Easy::Resources::Redmine::EasyCrmCase do
   it 'crm case has customer' do
     expect(find_entity.customer).to be_a Easy::Resources::Redmine::EasyContact
   end
-
 end

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

@@ -0,0 +1,15 @@
+RSpec.describe Easy::Resources::Redmine::EasyServer do
+  include_context "redmine active resource shares" do
+    let(:entity_name) { 'easy_server' }
+  end
+
+  it "#status" do
+    expect(find_entity.status).to eq "running"
+  end
+
+  it "#status=" do
+    subject = find_entity
+    subject.status = "stopped"
+    expect(subject.server_status).to eq "stopped"
+  end
+end

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

@@ -2,5 +2,4 @@ RSpec.describe Easy::Resources::Redmine::EasyWebApplicationActivity do
   include_context "redmine active resource shares" do
     let(:entity_name) { 'easy_web_application_activity' }
   end
-
 end

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

@@ -16,7 +16,7 @@ RSpec.describe Easy::Resources::Redmine::EasyWebApplication do
   end
 
   it 'get ewa' do
-    expect(find_entity.attributes).to include *%w[id url git_repository version application_type created_at]
+    expect(find_entity.attributes).to include(*%w[id url git_repository version application_type created_at])
     expect(find_entity.git_branch).to be_nil
     expect(find_entity.name).not_to be_empty
   end
@@ -29,7 +29,6 @@ RSpec.describe Easy::Resources::Redmine::EasyWebApplication do
   include_examples "optional reference", :easy_contact
 
   describe ".get_all" do
-
     it "with block" do
       stub_xml(path: "easy_web_applications.xml", source_file: "index", response_headers: { 'Total' => '4' })
       stub_xml(path: "easy_web_applications.xml?page=2", source_file: "index")
@@ -53,7 +52,18 @@ RSpec.describe Easy::Resources::Redmine::EasyWebApplication do
       subject.easy_web_application_activities_attributes = { activities_count_in_day: 13 }
       subject.save
     end
-
   end
 
+  describe "application_moves_on_request?" do
+    subject { find_entity.application_moves_on_request? }
+    it "should be true" do
+      is_expected.to be_truthy
+    end
+  end
+  describe "application_updates_on_request?" do
+    subject { find_entity.application_updates_on_request? }
+    it "should be false" do
+      is_expected.to be_falsey
+    end
+  end
 end

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

@@ -0,0 +1,9 @@
+RSpec.describe Easy::Resources::Redmine::EasyWebHook do
+  include_context "redmine active resource shares" do
+    let(:entity_name) { 'easy_web_hook' }
+  end
+
+  it "#status" do
+    expect(find_entity.status).to eq "inactive"
+  end
+end

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

@@ -0,0 +1,14 @@
+RSpec.describe Easy::Resources::Redmine::Errors do
+  include_context "redmine active resource shares" do
+    let(:entity_name) { 'time_entry' }
+  end
+
+  it 'invalid request' do
+    stub_xml source_file: "invalid_update", path: "#{entity_name.pluralize}.xml", method: :post, status: 422, request_body: { hours: 8.0, user_id: 1 }.to_xml(root: "time_entry")
+
+    time_entry = Easy::Resources::Redmine::TimeEntry.new hours: 8.0, user_id: 1
+    expect(time_entry.save).to eq false
+    expect(time_entry.errors).to be_a described_class
+    expect(time_entry.errors.full_messages).to eq ["Projekt je neplatné"]
+  end
+end

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

@@ -3,7 +3,6 @@ RSpec.describe Easy::Resources::Redmine::Issue do
     let(:entity_name) { 'issue' }
   end
 
-
   it 'get issue' do
     expect(find_entity.subject).not_to be_empty
   end
@@ -11,5 +10,4 @@ RSpec.describe Easy::Resources::Redmine::Issue do
   it 'issue has project' do
     expect(find_entity.project).to be_a Easy::Resources::Redmine::Project
   end
-
 end

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

@@ -3,9 +3,7 @@ RSpec.describe Easy::Resources::Redmine::Project do
     let(:entity_name) { 'project' }
   end
 
-
   it 'get project' do
     expect(find_entity.name).not_to be_empty
   end
-
 end

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

@@ -1,5 +1,4 @@
 RSpec.describe Easy::Resources::Redmine::RedmineBase do
-
   it 'no configuration specify' do
     described_class.site = nil
     described_class.api_key = nil
@@ -15,5 +14,4 @@ RSpec.describe Easy::Resources::Redmine::RedmineBase do
       expect(described_class.headers).to include "X-Redmine-API-Key" => "xxxx"
     end
   end
-
 end

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

@@ -0,0 +1,13 @@
+RSpec.describe Easy::Resources::Redmine::TimeEntry do
+  include_context "redmine active resource shares" do
+    let(:entity_name) { 'time_entry' }
+  end
+
+  it 'get' do
+    expect(find_entity.spent_on).not_to be_empty
+  end
+
+  it 'has project' do
+    expect(find_entity.project).to be_a Easy::Resources::Redmine::Project
+  end
+end

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

@@ -3,7 +3,6 @@ RSpec.describe Easy::Resources::Redmine::User do
     let(:entity_name) { 'user' }
   end
 
-
   it 'get user' do
     expect(find_entity.mail).not_to be_empty
   end
@@ -15,5 +14,4 @@ RSpec.describe Easy::Resources::Redmine::User do
   # it 'issue has project' do
   #   expect(find_entity.project).to be_a Easy::Resources::Redmine::Project
   # end
-
 end

data/spec/models/easy-resources/resource_spec.rb

@@ -1,6 +1,7 @@
 class DummyResource < Easy::Resource
   self.site = "easyredmine.com"
   self.format = :json
+
 end
 RSpec.describe Easy::Resource do
   subject { DummyResource.new({ id: 1 }, true) }
@@ -22,7 +23,6 @@ RSpec.describe Easy::Resource do
       expect(subject).to receive(:patch).with nil, {}, value.to_xml(root: "dummy-resource")
       subject.update_column :att, 1
     end
-
   end
 
   describe "#patch" do
@@ -39,4 +39,4 @@ RSpec.describe Easy::Resource do
       subject.patch "deployed"
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,8 +1,10 @@
 ENV["RAILS_ENV"] = "test"
 require "simplecov"
 SimpleCov.start 'rails' do
-  add_filter 'lib/easy/resources/spec_helper'
-  add_filter 'lib/easy/resources/version'
+  add_filter '/bin'
+  add_filter '/lib/easy/resources/spec_helper'
+  add_filter '/lib/easy/resources/version'
+  add_filter '/vendor'
 end
 
 require "bundler/setup"
@@ -16,7 +18,6 @@ require "active_resource_response/http_mock"
 Dir["./spec/support/**/*.rb"].sort.each { |f| require f }
 
 RSpec.configure do |config|
-
   # Disable RSpec exposing methods globally on `Module` and `main`
   config.disable_monkey_patching!
 
@@ -24,4 +25,3 @@ RSpec.configure do |config|
     c.syntax = :expect
   end
 end
-

data/spec/support/active_resource.rb

@@ -2,7 +2,7 @@ RSpec.shared_context "active resource shares", shared_context: :metadata do
   let(:site) { 'https://test.dummy' }
   let(:api_key) { 'secret' }
 
-  let(:entity_name) {}
+  let(:entity_name) { "" }
 
   before(:each) do
     ActiveResource::HttpMock.reset!
@@ -17,13 +17,13 @@ RSpec.shared_context "active resource shares", shared_context: :metadata do
   # @param [Hash] options @see #stub_easy_resource_request
   def stub_json(**options)
     options[:format] = "json"
-    stub_resource_request(options)
+    stub_resource_request(**options)
   end
 
   # @param [Hash] options @see #stub_easy_resource_request
   def stub_xml(**options)
     options[:format] = "xml"
-    stub_resource_request(options)
+    stub_resource_request(**options)
   end
 
   # @param [String] format XML or JSON

data/spec/support/redmine_active_resource.rb

@@ -9,13 +9,13 @@ RSpec.shared_context "redmine active resource shares", shared_context: :metadata
   # @param [Hash] options @see #stub_easy_resource_request
   def stub_json(**options)
     options[:format] = "json"
-    stub_easy_resource_request(options)
+    stub_easy_resource_request(**options)
   end
 
   # @param [Hash] options @see #stub_easy_resource_request
   def stub_xml(**options)
     options[:format] = "xml"
-    stub_easy_resource_request(options)
+    stub_easy_resource_request(**options)
   end
 
   def stub_easy_resource_request(format:, path:, **options)
@@ -25,4 +25,4 @@ RSpec.shared_context "redmine active resource shares", shared_context: :metadata
     options[:path] = path
     stub_resource_request options
   end
-end
+end

metadata

@@ -1,57 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: easy-resources
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.9.0
 platform: ruby
 authors:
-- petr
-autorequire: 
+- Petr
+- Lukáš
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2021-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: activeresource
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
-  name: activeresource
+  name: activeresource-response
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: activeresource-response
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: easy-configuration
   requirement: !ruby/object:Gem::Requirement
@@ -66,88 +67,116 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: easy_style
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 1.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
-description: Description of Easy::Resources.
+        version: '3.13'
+description: Define common Active::Resources for Redmine / Easy Redmine and Easy Project
+  entities.
 email:
 - petr@easy.cz
+- lukas@easy.cz
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - MIT-LICENSE
 - README.md
 - Rakefile
 - lib/easy/resource.rb
 - lib/easy/resources.rb
 - lib/easy/resources/railtie.rb
+- lib/easy/resources/redmine/custom_field.rb
+- lib/easy/resources/redmine/easy_attendance.rb
 - lib/easy/resources/redmine/easy_contact.rb
 - lib/easy/resources/redmine/easy_crm_case.rb
 - lib/easy/resources/redmine/easy_server.rb
 - lib/easy/resources/redmine/easy_web_application.rb
 - lib/easy/resources/redmine/easy_web_application_activity.rb
 - lib/easy/resources/redmine/easy_web_hook.rb
+- lib/easy/resources/redmine/errors.rb
 - lib/easy/resources/redmine/issue.rb
 - lib/easy/resources/redmine/project.rb
 - lib/easy/resources/redmine/redmine_base.rb
+- lib/easy/resources/redmine/time_entry.rb
 - lib/easy/resources/redmine/user.rb
 - lib/easy/resources/spec_helper.rb
 - lib/easy/resources/version.rb
 - spec/easy_resources_spec.rb
+- spec/fixtures/files/custom_field/bool.xml
+- spec/fixtures/files/custom_field/date.xml
+- spec/fixtures/files/custom_field/datetime.xml
+- spec/fixtures/files/custom_field/float.xml
+- spec/fixtures/files/custom_field/int.xml
+- spec/fixtures/files/custom_field/string.xml
+- spec/fixtures/files/easy_attendance/show.xml
 - spec/fixtures/files/easy_contact.json
 - spec/fixtures/files/easy_contact/show.xml
 - spec/fixtures/files/easy_crm_case.json
@@ -161,64 +190,90 @@ 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_hook/index.xml
+- spec/fixtures/files/easy_web_hook/show.xml
 - spec/fixtures/files/issue.json
 - spec/fixtures/files/issue/show.xml
 - spec/fixtures/files/project.json
 - spec/fixtures/files/project/show.xml
+- spec/fixtures/files/time_entry/invalid_update.xml
+- spec/fixtures/files/time_entry/show.xml
 - spec/fixtures/files/user/show.xml
+- spec/models/easy-resources/redmine/custom_field_spec.rb
+- spec/models/easy-resources/redmine/easy_attendance_spec.rb
 - spec/models/easy-resources/redmine/easy_contact_spec.rb
 - spec/models/easy-resources/redmine/easy_crm_case_spec.rb
+- spec/models/easy-resources/redmine/easy_server_spec.rb
 - spec/models/easy-resources/redmine/easy_web_application_activity_spec.rb
 - spec/models/easy-resources/redmine/easy_web_application_spec.rb
+- spec/models/easy-resources/redmine/easy_web_hook_spec.rb
+- spec/models/easy-resources/redmine/errors_spec.rb
 - spec/models/easy-resources/redmine/issue_spec.rb
 - spec/models/easy-resources/redmine/project_spec.rb
 - spec/models/easy-resources/redmine/redmine_base_spec.rb
+- spec/models/easy-resources/redmine/time_entry_spec.rb
 - spec/models/easy-resources/redmine/user_spec.rb
 - spec/models/easy-resources/resource_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_resource.rb
 - spec/support/fixtures.rb
 - spec/support/redmine_active_resource.rb
-homepage: https://www.easysoftware.com
+homepage: https://git.easy.cz/easy/resources
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.2.16
+signing_key:
 specification_version: 4
-summary: Summary of Easy::Resources.
+summary: ActiveResources connectors for Easy Project / Easy Redmine
 test_files:
 - spec/spec_helper.rb
+- spec/models/easy-resources/redmine/custom_field_spec.rb
 - spec/models/easy-resources/redmine/project_spec.rb
 - spec/models/easy-resources/redmine/easy_crm_case_spec.rb
 - spec/models/easy-resources/redmine/easy_contact_spec.rb
 - spec/models/easy-resources/redmine/issue_spec.rb
+- spec/models/easy-resources/redmine/time_entry_spec.rb
 - spec/models/easy-resources/redmine/redmine_base_spec.rb
+- spec/models/easy-resources/redmine/easy_web_hook_spec.rb
 - spec/models/easy-resources/redmine/easy_web_application_activity_spec.rb
 - spec/models/easy-resources/redmine/easy_web_application_spec.rb
+- spec/models/easy-resources/redmine/easy_server_spec.rb
+- spec/models/easy-resources/redmine/errors_spec.rb
 - spec/models/easy-resources/redmine/user_spec.rb
+- spec/models/easy-resources/redmine/easy_attendance_spec.rb
 - spec/models/easy-resources/resource_spec.rb
 - spec/support/active_resource.rb
 - spec/support/fixtures.rb
 - spec/support/redmine_active_resource.rb
 - spec/easy_resources_spec.rb
+- spec/fixtures/files/easy_web_hook/index.xml
+- spec/fixtures/files/easy_web_hook/show.xml
 - spec/fixtures/files/easy_contact/show.xml
+- spec/fixtures/files/time_entry/show.xml
+- spec/fixtures/files/time_entry/invalid_update.xml
+- spec/fixtures/files/custom_field/datetime.xml
+- spec/fixtures/files/custom_field/bool.xml
+- spec/fixtures/files/custom_field/float.xml
+- spec/fixtures/files/custom_field/date.xml
+- spec/fixtures/files/custom_field/int.xml
+- spec/fixtures/files/custom_field/string.xml
 - spec/fixtures/files/easy_crm_case.json
 - spec/fixtures/files/easy_crm_case/show.xml
 - spec/fixtures/files/project.json
@@ -229,6 +284,7 @@ test_files:
 - spec/fixtures/files/easy_contact.json
 - spec/fixtures/files/easy_server/index.xml
 - spec/fixtures/files/easy_server/show.xml
+- spec/fixtures/files/easy_attendance/show.xml
 - spec/fixtures/files/easy_web_application/index.xml
 - spec/fixtures/files/easy_web_application/with_ewaa.xml
 - spec/fixtures/files/easy_web_application/with_custom_fields.xml