webhookdb 1.0.2 → 1.1.0

data/lib/webhookdb/spec_helpers/service.rb

@@ -423,6 +423,11 @@ module Webhookdb::SpecHelpers::Service
       super
     end
 
+    def delete(uri, params={}, env={}, &)
+      env, params = make_json_request(env, params)
+      super
+    end
+
     def make_json_request(env, params)
       env["CONTENT_TYPE"] ||= "application/json"
       params = Webhookdb::Json.encode(params) if env["CONTENT_TYPE"] == "application/json" && !params.is_a?(String)

data/lib/webhookdb/spec_helpers/shared_examples_for_columns.rb

@@ -27,7 +27,7 @@ RSpec.shared_examples "a service column converter" do |isomorphic_proc|
   end
 end
 
-RSpec.shared_examples "a service column defaulter" do |isomorphic_proc|
+RSpec.shared_examples "a service column defaulter" do |isomorphic_proc, ruby: true, sql: true|
   let(:resource) { nil }
   let(:event) { nil }
   let(:enrichment) { nil }
@@ -37,20 +37,32 @@ RSpec.shared_examples "a service column defaulter" do |isomorphic_proc|
   let(:expected_query) { nil }
   let(:db) { Webhookdb::Postgres::Model.db }
 
-  it "returns expected value using ruby proc" do
-    v = isomorphic_proc.ruby.call(resource:, event:, enrichment:, service_integration:)
-    expect(v).to expected
+  if ruby
+    it "returns expected value using ruby proc" do
+      v = isomorphic_proc.ruby.call(resource:, event:, enrichment:, service_integration:)
+      expect(v).to expected
+    end
+  else
+    it "is not implemented for ruby" do
+      expect { isomorphic_proc.ruby.call }.to raise_error(NotImplementedError)
+    end
   end
 
-  it "returns expected value using sql proc" do
-    e = isomorphic_proc.sql.call(service_integration:)
-    if expected_query.respond_to?(:match)
-      expect(db.select(e).sql).to match(expected_query)
-    elsif expected_query
-      expect(db.select(e).sql).to eq(expected_query)
-    else
-      v = db.select(e).first.to_a[0][1]
-      expect(v).to expected
+  if sql
+    it "returns expected value using sql proc" do
+      e = isomorphic_proc.sql.call(service_integration:)
+      if expected_query.respond_to?(:match)
+        expect(db.select(e).sql).to match(expected_query)
+      elsif expected_query
+        expect(db.select(e).sql).to eq(expected_query)
+      else
+        v = db.select(e).first.to_a[0][1]
+        expect(v).to expected
+      end
+    end
+  else
+    it "is not implemented for sql" do
+      expect { isomorphic_proc.sql.call }.to raise_error(NotImplementedError)
     end
   end
 end

data/lib/webhookdb/spec_helpers/whdb.rb

@@ -136,4 +136,11 @@ module Webhookdb::SpecHelpers::Whdb
     raise "Must provide :replicator or have :svc available" if replicator.nil?
     return replicator.admin_dataset { |ds| ds.where(pk: row.fetch(:pk)).update(fields) }
   end
+
+  RSpec::Matchers.define(:be_a_uuid) do
+    match do |v|
+      uuid = /\A[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\z/i
+      v =~ uuid
+    end
+  end
 end

data/lib/webhookdb/sync_target.rb

@@ -55,7 +55,7 @@ class Webhookdb::SyncTarget < Webhookdb::Postgres::Model(:sync_targets)
 
     after_configured do
       if Webhookdb::RACK_ENV == "test"
-        safename = ENV["USER"].gsub(/[^A-Za-z]/, "")
+        safename = ENV.fetch("USER", "root").gsub(/[^A-Za-z]/, "")
         self.default_schema = "synctest_#{safename}"
       end
     end

data/lib/webhookdb/tasks/specs.rb

@@ -10,13 +10,15 @@ module Webhookdb::Tasks
     def initialize
       super()
       namespace :specs do
-        desc "Run API integration tests"
+        desc "Run API integration tests in the 'integration' folder of this gem. " \
+             "To run your own tests, create a task similar to this one, " \
+             "that calls Webhookdb::SpecHelpers::Citest.run_tests."
         task :integration do
           require "rspec/core"
           require "slack-notifier"
           require "webhookdb/spec_helpers/integration"
           require "webhookdb/spec_helpers/citest"
-          Webhookdb::SpecHelpers::Citest.run_tests("integration")
+          Webhookdb::SpecHelpers::Citest.run_tests(Webhookdb::SpecHelpers::Citest::INTEGRATION_TESTS_DIR)
         end
 
         desc "The release process needs to finish quickly, so start the integration tests in another dyno."

data/lib/webhookdb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Webhookdb
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/lib/webhookdb.rb

@@ -10,7 +10,21 @@ require "phony"
 
 require "webhookdb/json"
 
+if ENV["DOCKER_DEV"]
+  # If DOCKER_DEV is set, replace 'localhost' urls with 'host.docker.internal'.
+  ENV.each do |k, v|
+    begin
+      localhost = URI(v).host == "localhost"
+    rescue StandardError
+      next
+    end
+    next unless localhost
+    ENV[k] = v.gsub("localhost", "host.docker.internal")
+  end
+end
+
 if (heroku_app = ENV.fetch("MERGE_HEROKU_ENV", nil))
+  # If MERGE_HEROKU_ENV, merge all of its environment vars into the current env
   text = `heroku config -j --app=#{heroku_app}`
   json = Oj.load(text)
   json.each do |k, v|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webhookdb
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - WebhookDB
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2024-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -248,6 +248,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
@@ -724,6 +738,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.4'
+- !ruby/object:Gem::Dependency
+  name: uuidx
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: warden
   requirement: !ruby/object:Gem::Requirement
@@ -824,6 +852,7 @@ files:
 - db/migrations/035_synchronous_backfill.rb
 - db/migrations/036_oauth.rb
 - db/migrations/037_oauth_used.rb
+- db/migrations/038_webhookdb_api_key.rb
 - integration/async_spec.rb
 - integration/auth_spec.rb
 - integration/database_spec.rb
@@ -975,8 +1004,8 @@ files:
 - lib/webhookdb/microsoft_calendar.rb
 - lib/webhookdb/nextpax.rb
 - lib/webhookdb/oauth.rb
-- lib/webhookdb/oauth/front.rb
-- lib/webhookdb/oauth/intercom.rb
+- lib/webhookdb/oauth/front_provider.rb
+- lib/webhookdb/oauth/intercom_provider.rb
 - lib/webhookdb/oauth/session.rb
 - lib/webhookdb/organization.rb
 - lib/webhookdb/organization/alerting.rb
@@ -1014,6 +1043,7 @@ files:
 - lib/webhookdb/replicator/front_conversation_v1.rb
 - lib/webhookdb/replicator/front_marketplace_root_v1.rb
 - lib/webhookdb/replicator/front_message_v1.rb
+- lib/webhookdb/replicator/front_signalwire_message_channel_app_v1.rb
 - lib/webhookdb/replicator/front_v1_mixin.rb
 - lib/webhookdb/replicator/github_issue_comment_v1.rb
 - lib/webhookdb/replicator/github_issue_v1.rb