Merge pull request #196 from 3scale/generic-http-adapter

Generic HTTP adapter
3scale · Jun 4, 2019 · 464cd87 · 464cd87
2 parents 817fda9 + ac2eaec
commit 464cd87
Show file tree

Hide file tree

Showing 39 changed files with 1,301 additions and 472 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,7 +4,7 @@ jobs:
   build:
     working_directory: /home/circleci/zync
     docker:
-      - image: circleci/ruby:2.4.4
+      - image: circleci/ruby:2.4.6
       - image: circleci/postgres:10-alpine-ram
     environment:
         RAILS_ENV: test
@@ -22,20 +22,32 @@ jobs:
             - zync-bundle-{{ arch }}-{{ .Branch }}
             - zync-branch-{{ arch }}-master
 
-      - run: bundle install --deployment --path vendor/bundle --jobs $(grep -c processor /proc/cpuinfo) --retry 3
-      - run: BUNDLE_WITHOUT=development:test bundle exec bin/rails runner --environment=production 'puts Rails.env'
+      - run:
+          name: bundle install
+          command: |
+            gem install bundler --version=2.0.1
+            bundle install --deployment --path vendor/bundle --jobs $(grep -c processor /proc/cpuinfo) --retry 3
+      - run:
+          name: boot zync
+          command: BUNDLE_WITHOUT=development:test bundle exec bin/rails runner --environment=production 'puts Rails.env'
 
       - save_cache:
           key: zync-bundle-{{ arch }}-{{ checksum "Gemfile.lock" }}
           paths:
             - vendor/bundle
 
-      - run: bundle exec bin/rake db:wait db:setup
-
-      - run: |
-          bundle exec bin/rails test $(circleci tests glob "test/**/*_test.rb" | circleci tests split --split-by=timings)
-      - run: |
-          bundle exec license_finder
+      - run:
+          name: rails db:setup
+          command: bundle exec bin/rails db:wait db:setup
+
+      - run:
+          name: rails test
+          command: |
+            bundle exec bin/rails test $(circleci tests glob "test/**/*_test.rb" | circleci tests split --split-by=timings)
+      - run:
+          name: license_finder
+          command: |
+            bundle exec license_finder
 
       - store_test_results:
           path: test/reports

diff --git a/Gemfile b/Gemfile
@@ -10,6 +10,8 @@ end
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.2.3'
 gem 'pg', '>= 0.20'
+gem 'schema_plus_enums'
+
 # Use Puma as the app server
 gem 'puma', '~> 3.12'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
@@ -61,6 +63,8 @@ group :development, :test do
 
   gem 'license_finder', '~> 5.8'
   gem 'license_finder_xml_reporter', git: 'https://github.com/3scale/license_finder_xml_reporter.git', tag: '1.0.0'
+
+  gem 'httplog'
 end
 
 group :development do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -90,11 +90,16 @@ GEM
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     hashdiff (0.3.8)
+    httplog (1.3.0)
+      rack (>= 1.0)
+      rainbow (>= 2.0.0)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     interception (0.5)
+    its-it (1.3.0)
     json (2.1.0)
     jwt (2.1.0)
+    key_struct (0.4.2)
     license_finder (5.8.0)
       bundler
       rubyzip
@@ -126,6 +131,8 @@ GEM
       builder
       minitest (>= 5.0)
       ruby-progressbar
+    modware (0.1.3)
+      key_struct (~> 0.4)
     msgpack (1.2.10)
     multi_json (1.13.1)
     multi_xml (0.6.0)
@@ -195,6 +202,7 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
+    rainbow (3.0.0)
     rake (12.3.2)
     request_store (1.4.1)
       rack (>= 1.4)
@@ -204,6 +212,17 @@ GEM
     ruby-progressbar (1.10.0)
     rubyzip (1.2.2)
     safe_yaml (1.0.4)
+    schema_monkey (2.1.5)
+      activerecord (>= 4.2)
+      modware (~> 0.1)
+    schema_plus_core (2.2.3)
+      activerecord (~> 5.0)
+      its-it (~> 1.2)
+      schema_monkey (~> 2.1)
+    schema_plus_enums (0.1.8)
+      activerecord (>= 4.2, < 5.3)
+      its-it (~> 1.2)
+      schema_plus_core
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -266,6 +285,7 @@ DEPENDENCIES
   bugsnag-capistrano (< 2)
   codecov
   httpclient!
+  httplog
   license_finder (~> 5.8)
   license_finder_xml_reporter!
   lograge
@@ -283,6 +303,7 @@ DEPENDENCIES
   que-web
   rails (~> 5.2.3)
   responders (~> 2.4.1)
+  schema_plus_enums
   spring
   tzinfo-data
   validate_url
@@ -292,4 +313,4 @@ DEPENDENCIES
   yabeda-rails
 
 BUNDLED WITH
-   1.17.1
+   2.0.1