roo_on_rails 2.0.0.pre.pre.1 → 2.0.0.pre.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: a4a968e2ff69efa8eb45c0f65fdffb7757380e33eebe83198772b6b9af46b551
-  data.tar.gz: 5aca90417ecd87f7cb731727f349e1d1fc87dc59aa31aa90ffb5117992b12ca7
+SHA1:
+  metadata.gz: cd0078f99de5de6df13bb2f3432826fe10ce2a42
+  data.tar.gz: 39dc8387999e301ae72bd79f478abea4ae254425
 SHA512:
-  metadata.gz: c82c6ede1abab6b2fa49e0b9aa32f3ccb616455057b0ba2de86ec89c20c00907accdd3898fb9f6ca76cba53750e8b125ba6b16b78b98a63cbc014e380cc64b49
-  data.tar.gz: '039ecd9984d930c9312272246aea2a06acc9cd5e32e52330935b27de9b296d14a68077bef753996b957eb2020bc02915af0723f3d75423f456d5c3801468b5e5'
+  metadata.gz: de9ad52a69426d76ceffaa4441a96b12c5d9ac304f739d8fd96fef6c0ffd3c593544b3424435785e4e327952067616e01b983ddd0e9b71e945a10b3e7a2c535d
+  data.tar.gz: a86864238bffd84afa3c799086c7171498bb2437e8c17cd654dc92a419cf67ee6e8754fe3833da04004fa8f00c10365031bafc6280181083ecf0035b0e266ab2

data/.circleci/config.yml.erb

@@ -32,7 +32,7 @@ jobs:
       - image: postgres:9.6-alpine
         environment:
           PGDATA: /dev/shm/pgdata
-      - image: redis:3-alpine
+      - image: redis:4-alpine
     steps:
       - checkout
 

data/Appraisals

@@ -1,24 +1,29 @@
 appraise 'rails-4' do
   gem 'rails', '~> 4.2'
-  gem 'sqlite3'
+  gem 'sqlite3', '~> 1.3.6'
   gem 'pg', '~> 0.11'
+  gem 'sprockets', '~>3.0'
+  gem 'rake', '13.0.1'
 end
 
 appraise 'rails-5' do
   gem 'rails', '~> 5.0.0'
-  gem 'sqlite3'
+  gem 'sqlite3', '~> 1.3.6'
   gem 'pg', '~> 0.18'
+  gem 'rake', '13.0.1'
 end
 
 appraise 'rails-5-1' do
   gem 'rails', '~> 5.1.0'
-  gem 'sqlite3'
+  gem 'sqlite3', '~> 1.3.6'
   gem 'pg', '~> 0.18'
+  gem 'rake', '13.0.1'
 end
 
 appraise 'rails-5-2' do
   gem 'rails', '~> 5.2.0'
   gem 'bootsnap', '>= 1.1.0', require: false
-  gem 'sqlite3'
+  gem 'sqlite3', '~> 1.3.6'
   gem 'pg', '~> 0.18'
+  gem 'rake', '13.0.1'
 end

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v2.0.0-pre.2
+
+Features:
+
+- Removes routemaster
+
 # v2.0.0-pre.1
 
 Features:

data/README.md

@@ -30,7 +30,6 @@
   - [Datadog Integration](#datadog-integration)
     - [Heroku metrics](#heroku-metrics)
     - [Custom application metrics](#custom-application-metrics)
-  - [Routemaster Client](#routemaster-client)
   - [API Authentication](#api-authentication)
 - [Command features](#command-features)
   - [Usage](#usage)
@@ -302,16 +301,6 @@ The following tags will automatically be added to all your metrics and their val
   * `HOPPER_APP_NAME`+`HOPPER_ECS_CLUSTER_NAME` – automatically set by Hopper (e.g. `notifications-staging`);
   * Defaults to `unknown`.
 
-### Routemaster Client
-
-When `ROUTEMASTER_ENABLED` is set to `true` we attempt to configure [`routemaster-client`](https://github.com/deliveroo/routemaster-client) on your application. In order for this to happen, set the following environment variables:
-
-* `ROUTEMASTER_URL` – the full URL of your Routemaster application (mandatory)
-* `ROUTEMASTER_UUID` – the UUID of your application, e.g. `logistics-dashboard` (mandatory)
-* `ROUTEMASTER_VERIFY_SSL` – set to false if your Routemaster application is not served with a valid cert. (optional)
-
-If you then want to enable the publishing of events onto the event bus, you need to set `ROUTEMASTER_PUBLISHING_ENABLED` to `true` and implement publishers as needed. An example of how to do this is detailed in [`README.routemaster_client.md`](README.routemaster_client.md).
-
 ### API Authentication
 
 RooOnRails provides a concern which will make adding rotatable API authentication to your service a breeze:

data/lib/roo_on_rails.rb

@@ -12,6 +12,5 @@ if defined?(Rails)
   require 'roo_on_rails/railties/sidekiq_integration'
   require 'roo_on_rails/railties/rake_tasks'
   require 'roo_on_rails/railties/google_oauth'
-  require 'roo_on_rails/railties/routemaster'
   require 'roo_on_rails/railties/roo_identity'
 end

data/lib/roo_on_rails/config.rb

@@ -25,14 +25,6 @@ module RooOnRails
         ENV.fetch('GOOGLE_AUTH_CONTROLLER')
       end
 
-      def routemaster_enabled?
-        enabled? 'ROUTEMASTER_ENABLED', default: false
-      end
-
-      def routemaster_publishing_enabled?
-        enabled? 'ROUTEMASTER_PUBLISHING_ENABLED', default: false
-      end
-
       private
 
       ENABLED_PATTERN = /\A(YES|TRUE|ON|1)\Z/i

data/lib/roo_on_rails/default.env

@@ -6,10 +6,6 @@ GOOGLE_AUTH_PATH_PREFIX=/auth
 GOOGLE_AUTH_CONTROLLER=sessions
 RACK_SERVICE_TIMEOUT=10
 RACK_WAIT_TIMEOUT=30
-ROUTEMASTER_URL=''
-ROUTEMASTER_UUID=''
-ROUTEMASTER_ENABLED=false
-ROUTEMASTER_PUBLISHING_ENABLED=false
 SIDEKIQ_ENABLED=true
 SIDEKIQ_THREADS=25
 SIDEKIQ_DATABASE_REAPING_FREQUENCY=10

data/lib/roo_on_rails/version.rb

@@ -1,3 +1,3 @@
 module RooOnRails
-  VERSION = '2.0.0-pre.1'.freeze
+  VERSION = '2.0.0-pre.2'.freeze
 end

data/roo_on_rails.gemspec

@@ -23,18 +23,18 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'dotenv-rails', '~> 2.1'
   spec.add_runtime_dependency 'rails', '>= 3.2.22', '< 5.3'
+  spec.add_runtime_dependency 'sprockets', '~>3.0'
   spec.add_runtime_dependency 'platform-api', '~> 2.0'
   spec.add_runtime_dependency 'hashie', '~> 3.4'
   spec.add_runtime_dependency 'rack-timeout', '>= 0.4.0'
   spec.add_runtime_dependency 'rack-ssl-enforcer'
   spec.add_runtime_dependency 'octokit'
   spec.add_runtime_dependency 'hirefire-resource'
-  spec.add_runtime_dependency 'sidekiq'
+  spec.add_runtime_dependency 'sidekiq', '< 6.0.0'
   spec.add_runtime_dependency 'dogstatsd-ruby'
   spec.add_runtime_dependency 'omniauth-google-oauth2'
   spec.add_runtime_dependency 'faraday'
   spec.add_runtime_dependency 'faraday_middleware'
-  spec.add_runtime_dependency 'routemaster-client'
   spec.add_runtime_dependency 'json-jwt', '~> 1.8'
 
   spec.add_development_dependency 'bundler'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roo_on_rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.pre.1
+  version: 2.0.0.pre.pre.2
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 2020-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv-rails
@@ -44,6 +44,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.3'
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: platform-api
   requirement: !ruby/object:Gem::Requirement
@@ -132,16 +146,16 @@ dependencies:
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: dogstatsd-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -198,20 +212,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: routemaster-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: json-jwt
   requirement: !ruby/object:Gem::Requirement
@@ -390,7 +390,6 @@ files:
 - LICENSE.txt
 - README.google_oauth2.md
 - README.md
-- README.routemaster_client.md
 - Rakefile
 - appraise
 - bin/console
@@ -447,12 +446,7 @@ files:
 - lib/roo_on_rails/railties/logging.rb
 - lib/roo_on_rails/railties/rake_tasks.rb
 - lib/roo_on_rails/railties/roo_identity.rb
-- lib/roo_on_rails/railties/routemaster.rb
 - lib/roo_on_rails/railties/sidekiq_integration.rb
-- lib/roo_on_rails/routemaster/lifecycle_events.rb
-- lib/roo_on_rails/routemaster/publish_lifecycle_events.rb
-- lib/roo_on_rails/routemaster/publisher.rb
-- lib/roo_on_rails/routemaster/publishers.rb
 - lib/roo_on_rails/shell.rb
 - lib/roo_on_rails/sidekiq/loader.rb
 - lib/roo_on_rails/sidekiq/metrics_worker.rb
@@ -484,7 +478,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Scaffolding for building services

data/README.routemaster_client.md

@@ -1,103 +0,0 @@
-## Using the Routemaster Client feature
-
-[`routemaster-client`](https://github.com/deliveroo/routemaster-client) comes as a dependency of `roo_on_rails` with a basic implementation of lifecycle event publishers.
-
-This code example assumes that you are using the latest version of the [`roo_on_rails`](https://github.com/deliveroo/roo_on_rails) gem and that you have set the correct environment variables for Routemaster Client to work on your app, as explained in the main [`README.md`](https://github.com/deliveroo/roo_on_rails#routemaster-client) file.
-
-It also assumes that your app has an API for the resources you want to publish lifecycle events for, with matching routes and an `API_HOST` environment variable set.
-
-### Setup lifecycle events for your models
-
-You can use publish events on create, update, and destroy by including the `PublishLifecycleEvents` module:
-
-```ruby
-# app/models/order.rb
-require 'roo_on_rails/routemaster/publish_lifecycle_events'
-
-class Order < ApplicationRecord
-  include RooOnRails::Routemaster::PublishLifecycleEvents
-
-  # ...
-end
-```
-
-If you need more control over which events are published you can use the base module `LifecycleEvents` and specify them explicitly:
-
-```ruby
-# app/models/rider.rb
-require 'roo_on_rails/routemaster/lifecycle_events'
-
-class Rider < ApplicationRecord
-  include RooOnRails::Routemaster::LifecycleEvents
-
-  publish_lifecycle_events :create, :destroy
-
-  # ...
-end
-```
-
-### Create publishers for lifecycle events
-
-We have now configured our models to publish lifecycle events to Routemaster, but it won't send anything until you have enabled publishing and created matching publishers. Let's start with creating an `ApplicationPublisher` that we can use as our default.
-
-```ruby
-# app/publishers/application_publisher.rb
-require 'roo_on_rails/routemaster/publisher'
-
-class ApplicationPublisher < RooOnRails::Routemaster::Publisher
-  include Rails.application.routes.url_helpers
-
-  def url
-    url_helper = :"api_#{model.class.name.underscore}_url"
-    public_send(url_helper, model.id, host: ENV.fetch('API_HOST'), protocol: 'https')
-  end
-
-  # Add your method overrides here if needed
-end
-```
-
-If different behaviour is needed for specific models then you can override the defaults in their publishers:
-
-```ruby
-# app/publishers/order_publisher.rb
-class OrderPublisher < ApplicationPublisher
-  def async?
-    true
-  end
-end
-```
-
-and
-
-```ruby
-# app/publishers/rider_publisher.rb
-class RiderPublisher < ApplicationPublisher
-  def topic
-    'a_different_rider_topic'
-  end
-end
-```
-
-`#publish?`, `#topics`, `#async?`, `#data` and `#timestamp` can be overriden; see [the `Publisher` class](lib/roo_on_rails/routemaster/publisher.rb) for the default implementations.
-
-### Register the publishers with Routemaster
-
-The final step is to tell Routemaster that these publishers exist, so that it can listen to their events. We're going to do this in an initialiser:
-
-```ruby
-# config/initilizers/routemaster.rb
-require 'roo_on_rails/routemaster/publishers'
-
-PUBLISHERS = [
-  OrderPublisher,
-  RiderPublisher
-].freeze
-
-RooOnRails::Routemaster::Publishers.register_default(ApplicationPublisher)
-PUBLISHERS.each do |publisher|
-  model_class = publisher.to_s.gsub("Publisher", "").constantize
-  RooOnRails::Routemaster::Publishers.register(publisher, model_class: model_class)
-end
-```
-
-We should now be all set for our app to publish lifecycle events for all our models onto the event bus, with special behaviour for `orders` and `riders`, so that other apps can listen to them.

data/lib/roo_on_rails/railties/routemaster.rb

@@ -1,42 +0,0 @@
-require 'roo_on_rails/config'
-
-module RooOnRails
-  module Railties
-    class Routemaster < Rails::Railtie
-      initializer 'roo_on_rails.routemaster' do
-        Rails.logger.with initializer: 'roo_on_rails.routemaster' do |log|
-          next unless Config.routemaster_enabled?
-          log.debug 'loading'
-
-          abort 'Aborting: ROUTEMASTER_URL and ROUTEMASTER_UUID are required' if bus_details_missing?
-
-          require 'routemaster/client'
-
-          ::Routemaster::Client.configure do |config|
-            config.url = routemaster_url
-            config.uuid = routemaster_uuid
-            config.verify_ssl = routemaster_verify_ssl
-          end
-        end
-      end
-
-      private
-
-      def bus_details_missing?
-        routemaster_url.blank? || routemaster_uuid.blank?
-      end
-
-      def routemaster_url
-        ENV.fetch('ROUTEMASTER_URL')
-      end
-
-      def routemaster_uuid
-        ENV.fetch('ROUTEMASTER_UUID')
-      end
-
-      def routemaster_verify_ssl
-        ENV.fetch('ROUTEMASTER_VERIFY_SSL', 'true') != 'false'
-      end
-    end
-  end
-end

data/lib/roo_on_rails/routemaster/lifecycle_events.rb

@@ -1,63 +0,0 @@
-require 'active_support/concern'
-require 'roo_on_rails/routemaster/publishers'
-
-module RooOnRails
-  module Routemaster
-    module LifecycleEvents
-      extend ActiveSupport::Concern
-
-      ACTIVE_RECORD_TO_ROUTEMASTER_EVENT_MAP = {
-        create: :created,
-        update: :updated,
-        destroy: :deleted,
-        noop: :noop
-      }.freeze
-      private_constant :ACTIVE_RECORD_TO_ROUTEMASTER_EVENT_MAP
-
-      def publish_lifecycle_event(event)
-        publish_event(event, force_publish: false)
-      end
-
-      def publish_lifecycle_event!(event)
-        publish_event(event, force_publish: true)
-      end
-
-      private
-
-      def publish_event(event, force_publish:)
-        publishers = Routemaster::Publishers.for(self, routemaster_event_type(event))
-        publishers.each do |publisher|
-          begin
-            publisher.publish!(force_publish: force_publish)
-          rescue => e
-            Raven.report_exception(e) if defined?(Raven)
-          end
-        end
-      end
-
-      def routemaster_event_type(event)
-        ACTIVE_RECORD_TO_ROUTEMASTER_EVENT_MAP[event].tap do |type|
-          raise "invalid lifecycle event '#{event}'" unless type
-        end
-      end
-
-      %i(create update destroy noop).each do |event|
-        define_method("publish_lifecycle_event_on_#{event}") do
-          publish_lifecycle_event(event)
-        end
-      end
-
-      module ClassMethods
-        def publish_lifecycle_events(*events)
-          events = events.any? ? events : %i(create update destroy)
-          events.each do |event|
-            after_commit(
-              :"publish_lifecycle_event_on_#{event}",
-              on: event
-            )
-          end
-        end
-      end
-    end
-  end
-end

data/lib/roo_on_rails/routemaster/publish_lifecycle_events.rb

@@ -1,13 +0,0 @@
-require 'active_support/concern'
-require 'roo_on_rails/routemaster/lifecycle_events'
-
-module RooOnRails
-  module Routemaster
-    module PublishLifecycleEvents
-      extend ActiveSupport::Concern
-      include LifecycleEvents
-
-      included(&:publish_lifecycle_events)
-    end
-  end
-end

data/lib/roo_on_rails/routemaster/publisher.rb

@@ -1,74 +0,0 @@
-require 'roo_on_rails/config'
-require 'routemaster/client'
-
-module RooOnRails
-  module Routemaster
-    class Publisher
-      attr_reader :model, :event
-
-      def initialize(model, event, client: ::Routemaster::Client)
-        @model = model
-        @event = event
-        @client = client
-      end
-
-      def publish?
-        noop? || @model.new_record? || @model.previous_changes.any?
-      end
-
-      def will_publish?(force_publish: false)
-        Config.routemaster_publishing_enabled? && (force_publish || publish?)
-      end
-
-      def publish!(force_publish: false)
-        return unless will_publish?(force_publish: force_publish)
-        @client.send(
-          @event,
-          topic,
-          url,
-          async: async?,
-          data: stringify_keys(data),
-          t: timestamp && (timestamp.to_f * 1000).to_i
-        )
-      end
-
-      def topic
-        @model.class.name.tableize
-      end
-
-      def url
-        raise NotImplementedError
-      end
-
-      def async?
-        false
-      end
-
-      def data
-        nil
-      end
-
-      def timestamp
-        return @model.created_at if created? && @model.respond_to?(:created_at)
-        return @model.updated_at if (updated? || created?) && @model.respond_to?(:updated_at)
-        nil
-      end
-
-      %i(created updated deleted noop).each do |event_type|
-        define_method :"#{event_type}?" do
-          @event.to_sym == event_type
-        end
-      end
-
-      private
-
-      def stringify_keys(hash)
-        return hash if hash.nil? || hash.empty?
-
-        hash.each_with_object({}) do |(k, v), h|
-          h[k.to_s] = v.is_a?(Hash) ? stringify_keys(v) : v
-        end
-      end
-    end
-  end
-end

data/lib/roo_on_rails/routemaster/publishers.rb

@@ -1,27 +0,0 @@
-module RooOnRails
-  module Routemaster
-    module Publishers
-      @default_publishers = []
-      @publishers = {}
-
-      def self.register_default(publisher_class)
-        @default_publishers << publisher_class
-      end
-
-      def self.register(publisher_class, model_class:)
-        @publishers[model_class.name] ||= Set.new
-        @publishers[model_class.name] << publisher_class
-      end
-
-      def self.for(model, event)
-        publisher_classes = @publishers[model.class.name] || @default_publishers
-        publisher_classes.map { |c| c.new(model, event) }
-      end
-
-      def self.clear
-        @default_publishers = []
-        @publishers = {}
-      end
-    end
-  end
-end