roqua-support 0.3.3 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24fe6b6328c7e8a57bbd3de088117e34d320f9ddc6aaa4954334dcfe5a934d35
-  data.tar.gz: 6429dbcedaea67f7b8581afca9181fb6854fd467f01ce01d403cf55a8c9b19b2
+  metadata.gz: 0104ee377feaa85014f2a233e86c618a08de92e7b55cd273fe7832f491f070b4
+  data.tar.gz: 7c04430ab277f7c69cb0d1cf8d54a0901cb127460b2b68e3b91ad3c01b171204
 SHA512:
-  metadata.gz: 308371f74905c87008b9a6d91989614fa18d058b75ba3c55f934d17ac68947d0fa0fe1d582bf9b9a67cc2da595d83e446505a10bbd9da285919808c9a729c645
-  data.tar.gz: 9a2ae0fef0524d771e5306045db5fb4d2172a6e48647355c8a271d1216d39ededf08e89824c123bf14dd561c29898c7a18338efc897ba3143860098dc0a56ea8
+  metadata.gz: da8540ad9f35f3738485ec3f58b28ba14c2a330ae6ae2cd4d1bfefbe46206f0c7c8b842053829dcf4e668d57c03890137f2536c559d805d51ba1c04755daf58c
+  data.tar.gz: 01a31a8402b496e30298ceda86e2ebcbf06eb09d7453e9a56a681f159335eab03d3436487e4bb138afbe027990a1c4747acf0c3d06756a4d3ae56749144635da

data/.gitlab-ci.yml

@@ -2,63 +2,31 @@ variables:
   RAILS_ENV: "test"
 
 before_script:
+  - if [ -x "$(command -v apk)" ]; then apk add sqlite-dev; fi
   - export BUNDLE_PATH=$CI_PROJECT_DIR/.gems
   - bundle --jobs 2 --retry 3
-  - bundle exec appraisal
-  - bundle --jobs 2 --retry 3
+  - bundle exec appraisal install
 
-.ruby_23: &ruby_23
-  image: registry.roqua.nl/roqua/roqua-build-images:ruby-2.3-rails-base-test
-  cache:
-    key: ruby_23
-    paths:
-      - .gems
 
-.ruby_24: &ruby_24
-  image: registry.roqua.nl/roqua/roqua-build-images:ruby-2.4-rails-base-test
+.ruby_27: &ruby_27
+  image: registry.roqua.nl/roqua/docker-base-images:ruby-2.7-builder
   cache:
-    key: ruby_24
+    key: ruby_27
     paths:
       - .gems
 
-.ruby_25: &ruby_25
-  image: registry.roqua.nl/roqua/docker-base-images:ruby-2.5
-  cache:
-    key: ruby_25
-    paths:
-      - .gems
-
-rails_50_ruby_24:
-  <<: *ruby_24
-  script:
-    - bundle exec appraisal rails50 bundle exec rspec
-
-rails_50_ruby_25:
-  <<: *ruby_25
-  script:
-    - bundle exec appraisal rails50 bundle exec rspec
 
-rails_51_ruby_24:
-  <<: *ruby_24
-  script:
-    - bundle exec appraisal rails51 bundle exec rspec
-
-rails_51_ruby_25:
-  <<: *ruby_25
-  script:
-    - bundle exec appraisal rails51 bundle exec rspec
-
-rails_52_ruby_24:
-  <<: *ruby_24
+rails_52_ruby_27:
+  <<: *ruby_27
   script:
     - bundle exec appraisal rails52 bundle exec rspec
 
-rails_52_ruby_25:
-  <<: *ruby_25
+rails_60_ruby_27:
+  <<: *ruby_27
   script:
-    - bundle exec appraisal rails52 bundle exec rspec
+    - bundle exec appraisal rails60 bundle exec rspec
 
-rails_60_ruby_25:
-  <<: *ruby_25
+rails_61_ruby_27:
+  <<: *ruby_27
   script:
-    - bundle exec appraisal rails60 bundle exec rspec
+    - bundle exec appraisal rails61 bundle exec rspec

data/Appraisals

@@ -1,26 +1,15 @@
-appraise "rails42" do
-  gem "activesupport", "~> 4.2.10"
-  gem 'sqlite3', '~> 1.3.6'
-end
-
-appraise "rails50" do
-  gem "activesupport", "~> 5.0.0"
-  gem 'sqlite3', '~> 1.3.6'
-end
-
-appraise "rails51" do
-  gem "activesupport", "~> 5.1.0"
-  gem 'sqlite3', '~> 1.3.6'
-end
-
 appraise "rails52" do
+  gem "active_interaction", "~> 3.0"
   gem "activesupport", "~> 5.2.0"
-  gem 'sqlite3', '~> 1.3.6'
+  gem 'appsignal', '~> 2.9.8' # test each minor versions we support
+end
+
+appraise "rails60" do
+  gem "activesupport", "~> 6.0.0"
+  gem 'appsignal', '~> 2.10.6'
 end
 
-if RUBY_VERSION.to_f >= 2.5
-  appraise "rails60" do
-    gem "activesupport", "~> 6.0.0"
-    gem 'sqlite3', '~> 1.4'
-  end
+appraise "rails61" do
+  gem "activesupport", "~> 6.1.0"
+  gem 'appsignal', '~> 3.0.0'
 end

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 0.4.1
+
+* Add timezone to logging timestamps. Use milliseconds instead of microseconds precision. 
+
+## 0.4.0
+
+* Remove support for ruby 2.5 and 2.6
+* Add stripped_string type (attributes api)
+* Add support for appsignal v3
+* Add support for active_interaction v4
+
+## 0.3.5
+
+* Update AppSignal gauge for every minute the probe runs
+
+## 0.3.4
+
+* gemspec and tests: Removed rails 4.2 and 5.0, remove ruby 2.3 and 2.4, added ruby 2.6, allow appsignal 2.10
+
 ## 0.3.3
 
 * Added support for hl7 namespace when reporting errors

data/Gemfile

@@ -4,12 +4,12 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'appraisal'
-gem 'roqua_styleguide', git: 'https://gitlab.roqua.nl/roqua/styleguide.git'
+# fix so long as we support ruby 2.6 and ealier.
+gem 'roqua_styleguide', git: 'https://gitlab.roqua.nl/roqua/styleguide.git', ref: '9662550'
 
 group :test do
+  gem 'sqlite3'
   gem 'actionpack', '>= 4.0'
-  gem 'active_interaction', '~> 3.0'
-  gem 'appsignal', '~> 2.9.8'
   gem 'climate_control' # For ENV modification in specs
   gem 'combustion', '~> 1.1.1'
   gem 'fakefs', require: 'fakefs/safe'

data/Gemfile.lock

@@ -1,79 +1,82 @@
 GIT
   remote: https://gitlab.roqua.nl/roqua/styleguide.git
-  revision: e1fbbb611484e295719ed91c4eef889753ac8d8f
+  revision: 9662550201987db20c03e300eddb34d8ad035613
+  ref: 9662550
   specs:
-    roqua_styleguide (0.0.6)
-      rubocop (~> 0.50.0)
+    roqua_styleguide (0.0.8)
+      rubocop (~> 0.90.0)
+      rubocop-rails
 
 PATH
   remote: .
   specs:
-    roqua-support (0.3.3)
-      active_interaction (~> 3.0)
-      activesupport (>= 3.2, < 6.1)
-      appsignal (~> 2.9.8)
+    roqua-support (0.4.1)
+      active_interaction (>= 3.0, < 5.0)
+      activesupport (>= 5.2, < 6.2)
+      appsignal (>= 2.9, < 3.1)
       naught (~> 1.0)
       with_advisory_lock (~> 3.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.0.1)
-      actionview (= 5.0.1)
-      activesupport (= 5.0.1)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
+    actionpack (6.0.2.2)
+      actionview (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.1)
-      activesupport (= 5.0.1)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.0.2.2)
+      activesupport (= 6.0.2.2)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    active_interaction (3.4.0)
-      activemodel (>= 4, < 6)
-    activemodel (5.0.1)
-      activesupport (= 5.0.1)
-    activerecord (5.0.1)
-      activemodel (= 5.0.1)
-      activesupport (= 5.0.1)
-      arel (~> 7.0)
-    activesupport (5.0.1)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    active_interaction (4.0.5)
+      activemodel (>= 5, < 7)
+      activesupport (>= 5, < 7)
+    activemodel (6.0.2.2)
+      activesupport (= 6.0.2.2)
+    activerecord (6.0.2.2)
+      activemodel (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
+    activesupport (6.0.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    appraisal (2.1.0)
+      zeitwerk (~> 2.2)
+    appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
-    appsignal (2.9.8)
+    appsignal (3.0.13)
       rack
-    arel (7.1.4)
-    ast (2.3.0)
-    builder (3.2.3)
+    ast (2.4.2)
+    builder (3.2.4)
     climate_control (0.2.0)
-    coderay (1.1.1)
-    combustion (1.1.1)
+    coderay (1.1.2)
+    combustion (1.1.2)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
-    concurrent-ruby (1.0.4)
-    delayed_job (4.1.4)
-      activesupport (>= 3.0, < 5.2)
-    delayed_job_active_record (4.1.2)
-      activerecord (>= 3.0, < 5.2)
+    concurrent-ruby (1.1.8)
+    crass (1.0.6)
+    delayed_job (4.1.8)
+      activesupport (>= 3.0, < 6.1)
+    delayed_job_active_record (4.1.4)
+      activerecord (>= 3.0, < 6.1)
       delayed_job (>= 3.0, < 5)
     diff-lcs (1.3)
-    erubis (2.7.0)
-    fakefs (0.15.0)
-    ffi (1.9.17)
+    erubi (1.9.0)
+    fakefs (1.2.2)
+    ffi (1.12.2)
     formatador (0.2.5)
-    guard (2.14.0)
+    guard (2.16.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
@@ -82,106 +85,113 @@ GEM
     guard-rspec (4.2.10)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
-    i18n (0.7.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    loofah (2.0.3)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    loofah (2.5.0)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    lumberjack (1.0.11)
-    method_source (0.8.2)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    lumberjack (1.2.4)
+    method_source (1.0.0)
+    mini_portile2 (2.4.0)
+    minitest (5.14.4)
     naught (1.1.0)
     nenv (0.3.0)
-    nokogiri (1.7.0.1)
-      mini_portile2 (~> 2.1.0)
-    notiffany (0.1.1)
+    nokogiri (1.10.9)
+      mini_portile2 (~> 2.4.0)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.12.0)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (2.0.7)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-dom-testing (2.0.2)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.0.1)
-      actionpack (= 5.0.1)
-      activesupport (= 5.0.1)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.2)
-      rake
-    rake (12.1.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
-    responders (2.3.0)
-      railties (>= 4.2.0, < 5.1)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+      thor (>= 0.20.3, < 2.0)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    regexp_parser (2.1.1)
+    responders (3.0.0)
+      actionpack (>= 5.0)
+      railties (>= 5.0)
+    rexml (3.2.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-instrumentation-matcher (0.0.4)
+      rspec-support (~> 3.9.0)
+    rspec-instrumentation-matcher (0.0.9)
       activesupport
       rspec-expectations
-    rspec-mocks (3.5.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    rubocop (0.50.0)
+      rspec-support (~> 3.9.0)
+    rspec-rails (4.0.0)
+      actionpack (>= 4.2)
+      activesupport (>= 4.2)
+      railties (>= 4.2)
+      rspec-core (~> 3.9)
+      rspec-expectations (~> 3.9)
+      rspec-mocks (~> 3.9)
+      rspec-support (~> 3.9)
+    rspec-support (3.9.3)
+    rubocop (0.90.0)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 3.0)
+      parser (>= 2.7.1.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.3.0, < 1.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.3)
-    ruby_dep (1.5.0)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.8.0)
+      parser (>= 2.7.1.5)
+    rubocop-rails (2.9.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 0.90.0, < 2.0)
+    ruby-progressbar (1.11.0)
     shellany (0.0.1)
-    slop (3.6.0)
-    thor (0.19.4)
-    thread_safe (0.3.5)
+    sqlite3 (1.4.2)
+    thor (1.0.1)
+    thread_safe (0.3.6)
     timecop (0.9.1)
-    tzinfo (1.2.2)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.7.0)
     with_advisory_lock (3.2.0)
       activerecord (>= 3.2)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   actionpack (>= 4.0)
-  active_interaction (~> 3.0)
   appraisal
-  appsignal (~> 2.9.8)
   bundler (~> 2.0)
   climate_control
   combustion (~> 1.1.1)
@@ -196,6 +206,7 @@ DEPENDENCIES
   rspec (>= 2.12.0, < 4.0)
   rspec-instrumentation-matcher
   rspec-rails
+  sqlite3
   timecop
 
 BUNDLED WITH

data/README.md

@@ -104,6 +104,29 @@ class ApiAreaController < ApplicationController
   ...
 ```
 
+### Types
+
+In initializer:
+
+```ruby
+require 'roqua/type'
+```
+
+In models:
+
+```ruby
+# strip whitespace and nil if blank.
+attribute :firstname, :stripped_string
+# strip, but don't nil if blank.
+attribute :firstname, :stripped_string, allow_empty: true 
+```
+
+#### option 2
+
+`require 'roqua/type/stripped_string'`
+
+`attribute :firstname, Roqua::Type::StrippedString.new(allow_empty: true)`
+
 # Delayed Job activity monitoring
 
 To add monitoring of whether Delayed Job keeps picking up jobs or checking for new jobs, add the following line to an initializer:

data/gemfiles/rails52.gemfile

@@ -3,17 +3,17 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "roqua_styleguide", :git => "https://gitlab.roqua.nl/roqua/styleguide.git"
+gem "roqua_styleguide", git: "https://gitlab.roqua.nl/roqua/styleguide.git", ref: "9662550"
+gem "active_interaction", "~> 3.0"
 gem "activesupport", "~> 5.2.0"
-gem "sqlite3", "~> 1.3.6"
+gem "appsignal", "~> 2.9.8"
 
 group :test do
+  gem "sqlite3"
   gem "actionpack", ">= 4.0"
-  gem "active_interaction", "~> 3.0"
-  gem "appsignal", "~> 2.9.8"
   gem "climate_control"
   gem "combustion", "~> 1.1.1"
-  gem "fakefs", :require => "fakefs/safe"
+  gem "fakefs", require: "fakefs/safe"
   gem "guard-rspec", "~> 4.2.6"
   gem "responders"
   gem "rspec-instrumentation-matcher"
@@ -21,4 +21,4 @@ group :test do
   gem "pry"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails60.gemfile

@@ -3,17 +3,16 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "roqua_styleguide", :git => "https://gitlab.roqua.nl/roqua/styleguide.git"
+gem "roqua_styleguide", git: "https://gitlab.roqua.nl/roqua/styleguide.git", ref: "9662550"
 gem "activesupport", "~> 6.0.0"
-gem "sqlite3", "~> 1.4"
+gem "appsignal", "~> 2.10.6"
 
 group :test do
+  gem "sqlite3"
   gem "actionpack", ">= 4.0"
-  gem "active_interaction", "~> 3.0"
-  gem "appsignal", "~> 2.9.8"
   gem "climate_control"
   gem "combustion", "~> 1.1.1"
-  gem "fakefs", :require => "fakefs/safe"
+  gem "fakefs", require: "fakefs/safe"
   gem "guard-rspec", "~> 4.2.6"
   gem "responders"
   gem "rspec-instrumentation-matcher"
@@ -21,4 +20,4 @@ group :test do
   gem "pry"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/{rails50.gemfile → rails61.gemfile}

@@ -3,17 +3,16 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "roqua_styleguide", :git => "https://gitlab.roqua.nl/roqua/styleguide.git"
-gem "activesupport", "~> 5.0.0"
-gem "sqlite3", "~> 1.3.6"
+gem "roqua_styleguide", git: "https://gitlab.roqua.nl/roqua/styleguide.git", ref: "9662550"
+gem "activesupport", "~> 6.1.0"
+gem "appsignal", "~> 3.0.0"
 
 group :test do
+  gem "sqlite3"
   gem "actionpack", ">= 4.0"
-  gem "active_interaction", "~> 3.0"
-  gem "appsignal", "~> 2.9.8"
   gem "climate_control"
   gem "combustion", "~> 1.1.1"
-  gem "fakefs", :require => "fakefs/safe"
+  gem "fakefs", require: "fakefs/safe"
   gem "guard-rspec", "~> 4.2.6"
   gem "responders"
   gem "rspec-instrumentation-matcher"
@@ -21,4 +20,4 @@ group :test do
   gem "pry"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/lib/roqua/core_ext/active_interaction/filters/date_time_as_unix_extension.rb

@@ -1,11 +1,11 @@
 # allow datetimes to be given as unix times for activeinteractions
 module RoquaDateTimeAsUnixFilterExtension
-  def cast(value, interaction)
+  def cast(value, interaction, **options)
     case value
     when Numeric, /^[0-9]+$/
       Time.at(value.to_i).to_datetime
     when ''
-      super(nil, interaction)
+      super(nil, interaction, **options)
     else
       super
     end
@@ -15,12 +15,12 @@ ActiveInteraction::DateTimeFilter.include RoquaDateTimeAsUnixFilterExtension
 
 # allow datetimes to be given as unix times as string
 module RoquaTimeAsUnixFilterExtension
-  def cast(value, interaction)
+  def cast(value, interaction, **options)
     case value
     when /^[0-9]+$/
       Time.at(value.to_i)
     when ''
-      super(nil, interaction)
+      super(nil, interaction, **options)
     else
       super
     end

data/lib/roqua/logging/roqua_logging_railtie.rb

@@ -7,6 +7,8 @@ class RoquaLoggingRailtie < Rails::Railtie
     def configure
       Roqua.logger = ActiveSupport::Logger.new(output_stream).tap do |logger|
         logger.formatter = Logger::Formatter.new
+        # Set the datetime_format to include timezone and use milliseconds instead of microseconds
+        logger.formatter.datetime_format = '%Y-%m-%dT%H:%M:%S.%L%z '
       end
 
       require 'roqua/support/request_logger'

data/lib/roqua/scheduling/scheduler.rb

@@ -11,6 +11,8 @@ class Roqua::Scheduling::Scheduler
           raise ex if Rails.env.test?
         end
       end
+
+      Appsignal.increment_counter("scheduler.completed", 1)
     end
   end
 
@@ -27,7 +29,10 @@ class Roqua::Scheduling::Scheduler
   end
 
   def advisory_lock_name
-    "#{ActiveRecord::Base.connection_config[:database]}_cron_lock"
+    db_name = ActiveRecord::Base.respond_to?(:connection_db_config) \
+              ? ActiveRecord::Base.connection_db_config.database
+              : ActiveRecord::Base.connection_config[:database]
+    "#{db_name}_cron_lock"
   end
 
   private

data/lib/roqua/support/errors.rb

@@ -82,7 +82,10 @@ module Roqua
             current_transaction.set_tags(labels)
             current_transaction.add_exception(exception)
           else
-            Appsignal.send_error exception, labels, namespace
+            Appsignal.send_error exception do |transaction|
+              transaction.set_tags labels
+              transaction.set_namespace namespace
+            end
           end
         end
       end

data/lib/roqua/type/stripped_string.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+# Strips whitespace and make nil when string becomes empty.
+module Roqua
+  module Type
+    class StrippedString < ActiveModel::Type::ImmutableString
+      # taken from strip_attributes gem
+      # Unicode invisible and whitespace characters. The POSIX character class
+      # [:space:] corresponds to the Unicode class Z ("separator"). We also
+      # include the following characters from Unicode class C ("control"), which
+      # are spaces or invisible characters that make no sense at the start or end
+      # of a string:
+      #   U+180E MONGOLIAN VOWEL SEPARATOR
+      #   U+200B ZERO WIDTH SPACE
+      #   U+200C ZERO WIDTH NON-JOINER
+      #   U+200D ZERO WIDTH JOINER
+      #   U+2060 WORD JOINER
+      #   U+FEFF ZERO WIDTH NO-BREAK SPACE
+      MULTIBYTE_WHITE = "\u180E\u200B\u200C\u200D\u2060\uFEFF"
+      MULTIBYTE_SPACE = /[[:space:]#{MULTIBYTE_WHITE}]/.freeze
+
+      def initialize(allow_empty: false)
+        super()
+        @allow_empty = allow_empty
+      end
+
+      def cast(value)
+        return unless value
+        value = super(value).gsub(/\A#{MULTIBYTE_SPACE}+|#{MULTIBYTE_SPACE}+\z/, "").freeze
+        value.blank? && !@allow_empty ? nil : value
+      end
+    end
+  end
+end

data/lib/roqua/type.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require "active_model/type"
+
+require_relative "./type/stripped_string"
+
+ActiveRecord::Type.register(:stripped_string, Roqua::Type::StrippedString)

data/lib/roqua/validators/subset_validator.rb

@@ -6,7 +6,7 @@ class SubsetValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     return unless value
     unless value.all? { |element| options.fetch(:of).include? element }
-      record.errors[attribute] << (options[:message] || I18n.t('errors.messages.subset'))
+      record.errors.add attribute, (options[:message] || I18n.t('errors.messages.subset'))
     end
   end
 end

data/lib/roqua-support/version.rb

@@ -1,5 +1,5 @@
 module Roqua
   module Support
-    VERSION = '0.3.3'.freeze
+    VERSION = '0.4.1'.freeze
   end
 end

data/roqua-support.gemspec

@@ -18,11 +18,12 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'active_interaction', '~> 3.0'
-  gem.add_dependency 'activesupport', '>= 3.2', '< 6.1'
+  gem.required_ruby_version = '>= 2.7'
+  gem.add_dependency 'active_interaction', '>= 3.0', '< 5.0'
+  gem.add_dependency 'activesupport', '>= 5.2', '< 6.2'
   gem.add_dependency 'naught', '~> 1.0'
   gem.add_dependency 'with_advisory_lock', '~> 3.2'
-  gem.add_dependency 'appsignal', '~> 2.9.8'
+  gem.add_dependency 'appsignal', '>= 2.9', '< 3.1'
 
   gem.add_development_dependency 'bundler', '~> 2.0'
   gem.add_development_dependency 'delayed_job_active_record'

data/spec/roqua/logging/roqua_logging_railtie_spec.rb

@@ -27,6 +27,12 @@ Rspec.describe RoquaLoggingRailtie do
         ActiveSupport::Logger.logger_outputs_to?(Roqua.logger.logger, STDOUT)
       ).to be_truthy
     end
+
+    it 'logs using a datetimeformat including timezone' do
+      time = Time.zone.local(2021,10,10,16,13)
+      got = Roqua.logger.logger.formatter.call 'INFO', time, 'progname', '{}'
+      expect(got).to match(/I, \[2021-10-10T16:13:00.000\+0000 #\d+]  INFO -- progname: {}/)
+    end
   end
 
   context 'when RAILS_LOG_TO_STDOUT_USING_ROQUA_LOGGER is blank' do

data/spec/roqua/scheduling/scheduler_spec.rb

@@ -51,7 +51,7 @@ describe Roqua::Scheduling::Scheduler do
   end
 
   it 'generates a database specific advisory lock name' do
-    expect(ActiveRecord::Base.connection_config[:database]).to eql(':memory:')
+    # expect(ActiveRecord::Base.connection_config[:database]).to eql(':memory:')
     expect(subject.advisory_lock_name).to eql ':memory:_cron_lock'
   end
 
@@ -86,6 +86,7 @@ describe Roqua::Scheduling::Scheduler do
     end
 
     it 'counts task calls' do
+      expect(Appsignal).to receive(:increment_counter).with('scheduler.completed', 1)
       expect(Appsignal).to receive(:increment_counter).with('scheduler.run_task.completed', 1, task_name: 'hourly')
       subject.ping
     end

data/spec/roqua/support/errors_spec.rb

@@ -94,6 +94,7 @@ describe 'Error reporting' do
     let(:transaction) { double("transaction") }
 
     before do
+      Appsignal.config = Appsignal::Config.new(Dir.pwd, "test")
       allow(Appsignal).to receive(:active?).and_return(true)
       allow(Appsignal).to receive(:is_ignored_exception?).and_return(false)
       allow(Appsignal).to receive(:agent).and_return(agent)
@@ -105,16 +106,21 @@ describe 'Error reporting' do
     end
 
     it 'defaults to a background job' do
-      expect(Appsignal).to receive(:send_error).with(exception, {}, Appsignal::Transaction::BACKGROUND_JOB)
+      transaction = Appsignal::Transaction.new(SecureRandom.uuid, Appsignal::Transaction::FRONTEND, nil)
+      expect(Appsignal).to receive(:send_error).with(exception).and_yield(transaction)
       Roqua::Support::Errors.report exception
+      expect(transaction.namespace).to eq Appsignal::Transaction::BACKGROUND_JOB
     end
 
     it 'it will send an error under the provided category' do
+      transaction = Appsignal::Transaction.new(SecureRandom.uuid, Appsignal::Transaction::FRONTEND, nil)
       expect(Appsignal)
         .to receive(:send_error)
-        .with(exception, {a: 'b'}, Appsignal::Transaction::HTTP_REQUEST)
+        .with(exception).and_yield(transaction)
 
       Roqua::Support::Errors.report exception, a: 'b', namespace: :web
+      expect(transaction.namespace).to eq Appsignal::Transaction::HTTP_REQUEST
+      expect(transaction.tags).to eq a: 'b'
     end
 
     describe 'when a current transaction is present' do

data/spec/roqua/type/stripped_string_spec.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'roqua/type/stripped_string'
+
+RSpec.describe Roqua::Type::StrippedString do
+  let(:cls) do
+    Class.new(ActiveRecord::Base) do
+      self.table_name = 'delayed_jobs'
+
+      attribute :locked_by, Roqua::Type::StrippedString.new
+      attribute :queue, Roqua::Type::StrippedString.new(allow_empty: true)
+    end
+  end
+
+  it "strips whitespace from outside and not inside" do
+    expect(described_class.new.cast("   some name   \n  \t \u180E\u200B\u200C\u200D\u2060\uFEFF ")).to eq "some name"
+  end
+
+  it "nils empty values by default" do
+    expect(described_class.new.cast(" \n \t ")).to eq nil
+  end
+
+  it "keeps value empty if allow_empty is true" do
+    expect(described_class.new(allow_empty: true).cast(" \n \t ")).to eq ""
+  end
+
+  it "works on active_record" do
+    instance = cls.new(locked_by: "  \n  \t ", queue: "  \n  \t ", cron: "  \n  \t ")
+    expect(instance.locked_by).to be_nil
+    expect(instance.queue).to eq ""
+    expect(instance.cron).to eq "  \n  \t "
+  end
+end

metadata

@@ -1,49 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: roqua-support
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.1
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2021-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_interaction
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: naught
   requirement: !ruby/object:Gem::Requirement
@@ -76,16 +82,22 @@ dependencies:
   name: appsignal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.9.8
+        version: '2.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.9'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.9.8
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -182,11 +194,9 @@ files:
 - README.md
 - Rakefile
 - circle.yml
-- gemfiles/rails42.gemfile
-- gemfiles/rails50.gemfile
-- gemfiles/rails51.gemfile
 - gemfiles/rails52.gemfile
 - gemfiles/rails60.gemfile
+- gemfiles/rails61.gemfile
 - lib/roqua-support.rb
 - lib/roqua-support/railtie.rb
 - lib/roqua-support/version.rb
@@ -220,6 +230,8 @@ files:
 - lib/roqua/support/request_logger.rb
 - lib/roqua/support/stats.rb
 - lib/roqua/support/stats/hosted_graphite_backend.rb
+- lib/roqua/type.rb
+- lib/roqua/type/stripped_string.rb
 - lib/roqua/validators/subset_validator.rb
 - roqua-support.gemspec
 - spec/internal/config/balancer_state
@@ -246,6 +258,7 @@ files:
 - spec/roqua/support/request_logger_spec.rb
 - spec/roqua/support/stats_spec.rb
 - spec/roqua/support_spec.rb
+- spec/roqua/type/stripped_string_spec.rb
 - spec/roqua/validators/subset_validator_spec.rb
 - spec/spec_helper.rb
 - styleguide/ruby/rubocop.yml
@@ -261,15 +274,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Helper objects and proxies used by a lot of RoQua applications
@@ -298,5 +310,6 @@ test_files:
 - spec/roqua/support/request_logger_spec.rb
 - spec/roqua/support/stats_spec.rb
 - spec/roqua/support_spec.rb
+- spec/roqua/type/stripped_string_spec.rb
 - spec/roqua/validators/subset_validator_spec.rb
 - spec/spec_helper.rb

data/gemfiles/rails42.gemfile

@@ -1,24 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "roqua_styleguide", :git => "https://gitlab.roqua.nl/roqua/styleguide.git"
-gem "activesupport", "~> 4.2.10"
-gem "sqlite3", "~> 1.3.6"
-
-group :test do
-  gem "actionpack", ">= 4.0"
-  gem "active_interaction", "~> 3.0"
-  gem "appsignal", "~> 2.9.8"
-  gem "climate_control"
-  gem "combustion", "~> 1.1.1"
-  gem "fakefs", :require => "fakefs/safe"
-  gem "guard-rspec", "~> 4.2.6"
-  gem "responders"
-  gem "rspec-instrumentation-matcher"
-  gem "rspec-rails"
-  gem "pry"
-end
-
-gemspec :path => "../"

data/gemfiles/rails51.gemfile

@@ -1,24 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "roqua_styleguide", :git => "https://gitlab.roqua.nl/roqua/styleguide.git"
-gem "activesupport", "~> 5.1.0"
-gem "sqlite3", "~> 1.3.6"
-
-group :test do
-  gem "actionpack", ">= 4.0"
-  gem "active_interaction", "~> 3.0"
-  gem "appsignal", "~> 2.9.8"
-  gem "climate_control"
-  gem "combustion", "~> 1.1.1"
-  gem "fakefs", :require => "fakefs/safe"
-  gem "guard-rspec", "~> 4.2.6"
-  gem "responders"
-  gem "rspec-instrumentation-matcher"
-  gem "rspec-rails"
-  gem "pry"
-end
-
-gemspec :path => "../"