motor-admin 0.1.39 → 0.1.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e0ab742c32ae1b59bfa12c6eb1f838e5d379cb5a964521fe7f345de5fabf953
-  data.tar.gz: 9f018c3475ae06b4104e35f30774c80b2098a8a23b7fa3a8e4ac35df089ee98e
+  metadata.gz: c650dcb3b3585c6776bb7ece77590fe9e69e5c64323dfa7827870f11203afe09
+  data.tar.gz: 4e9e8e62612c93686c1c5ed2532b14a260e44078830302f7155e49a45a0b6a66
 SHA512:
-  metadata.gz: '0651978240824b17dc1f379047faf9f5c5a393b9bebe6e37ae692a606630a300454a2c56c88173383defef451787555006d355fe26c2dd38173f0ece03e116a0'
-  data.tar.gz: b15c006847a5c9dcea315741ccc3a46e3a2bba49ab05d2aceab44c75a530ba0f5fad79067aae0b8e31abad9cda105a827cbdb892d93fd1c2c1fe72a2f62a8637
+  metadata.gz: a8325df21f414fc4dfb5e61173ca94312662012d3a3ba12cb128a6c7c91d88b0cc97bfb344d8466500f43fd28bc6c3195eaa662e11ddb4c3333fbe1257611ad2
+  data.tar.gz: 787be19b2a2407237060341ff623e20f40a86fc5a76ce075e75c1dd62fbede8bbd94dd7a0312072cd60af12571c9dcf7edf2afe7e088e6c75267893156cd8482

data/app/models/motor/alert.rb

@@ -7,8 +7,8 @@ module Motor
     belongs_to :query
     belongs_to :author, polymorphic: true, optional: true
 
-    has_many :alert_locks
-    has_many :taggable_tags, as: :taggable
+    has_many :alert_locks, dependent: :destroy
+    has_many :taggable_tags, as: :taggable, dependent: :destroy
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
 
     serialize :preferences, HashSerializer

data/app/models/motor/dashboard.rb

@@ -6,7 +6,7 @@ module Motor
 
     belongs_to :author, polymorphic: true, optional: true
 
-    has_many :taggable_tags, as: :taggable
+    has_many :taggable_tags, as: :taggable, dependent: :destroy
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
 
     serialize :preferences, HashSerializer

data/app/models/motor/form.rb

@@ -6,7 +6,7 @@ module Motor
 
     belongs_to :author, polymorphic: true, optional: true
 
-    has_many :taggable_tags, as: :taggable
+    has_many :taggable_tags, as: :taggable, dependent: :destroy
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
 
     serialize :preferences, HashSerializer

data/app/models/motor/query.rb

@@ -6,8 +6,9 @@ module Motor
 
     belongs_to :author, polymorphic: true, optional: true
 
-    has_many :taggable_tags, as: :taggable
+    has_many :taggable_tags, as: :taggable, dependent: :destroy
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
+    has_many :alerts, dependent: :destroy
 
     serialize :preferences, HashSerializer
 

data/lib/motor/admin.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'motor/configs/sync_middleware'
-
 module Motor
   class Admin < ::Rails::Engine
     initializer 'motor.startup_message' do
@@ -31,9 +29,11 @@ module Motor
     end
 
     initializer 'motor.configs.sync_middleware' do
-      if Motor::Configs::SyncMiddleware::ACCESS_KEY.present?
-        Rails.application.config.middleware.insert_before(0, Motor::Configs::SyncMiddleware)
-      end
+      next if Motor::Configs::SYNC_ACCESS_KEY.blank?
+
+      require 'motor/configs/sync_middleware'
+
+      Rails.application.config.middleware.insert_after(Rails::Rack::Logger, Motor::Configs::SyncMiddleware)
     end
 
     initializer 'motor.filter_params' do

data/lib/motor/alerts/persistance.rb

@@ -43,25 +43,31 @@ module Motor
         retry
       end
 
-      def update_from_params!(alert, params)
+      def update_from_params!(alert, params, force_replace: false)
         tag_ids = alert.tags.ids
 
         alert = assign_attributes(alert, params)
 
-        raise NameAlreadyExists if name_already_exists?(alert)
+        raise NameAlreadyExists if !force_replace && name_already_exists?(alert)
         raise InvalidInterval unless alert.cron
 
         ApplicationRecord.transaction do
+          archive_with_existing_name(alert) if force_replace
+
           alert.save!
         end
 
-        alert.touch if tag_ids.sort != alert.tags.reload.ids.sort && params[:updated_at].blank?
+        alert.touch if tags_changed?(tag_ids, alert) && params[:updated_at].blank?
 
         alert
       rescue ActiveRecord::RecordNotUnique
         retry
       end
 
+      def tags_changed?(previous_ids, alert)
+        previous_ids.sort != alert.tags.reload.ids.sort
+      end
+
       def assign_attributes(alert, params)
         alert.assign_attributes(params.slice(*ALERT_ATTRIBUTES))
         alert.preferences[:interval] = normalize_interval(alert.preferences[:interval])
@@ -70,6 +76,11 @@ module Motor
         Motor::Tags.assign_tags(alert, params[:tags])
       end
 
+      def archive_with_existing_name(alert)
+        Motor::Alert.where(['lower(name) = ? AND id != ?', alert.name.to_s.downcase, alert.id])
+                    .update_all(deleted_at: Time.current)
+      end
+
       def normalize_interval(interval)
         interval.to_s.gsub(NORMALIZE_INTERVAL_REGEXP, 'every ')
       end

data/lib/motor/configs.rb

@@ -4,6 +4,7 @@ module Motor
   module Configs
     FILE_PATH = 'config/motor.yml'
     SYNC_API_PATH = '/motor_configs_sync'
+    SYNC_ACCESS_KEY = ENV.fetch('MOTOR_SYNC_API_KEY', '')
   end
 end
 

data/lib/motor/configs/sync_from_file.rb

@@ -9,7 +9,7 @@ module Motor
 
       module_function
 
-      def call
+      def call(with_exception: false)
         MUTEXT.synchronize do
           file = Rails.root.join(FILE_PATH)
 
@@ -17,6 +17,8 @@ module Motor
             begin
               file.ctime
             rescue Errno::ENOENT
+              raise if with_exception
+
               nil
             end
 

data/lib/motor/configs/sync_from_hash.rb

@@ -100,7 +100,7 @@ module Motor
 
           next if record.updated_at >= attrs[:updated_at]
 
-          update_proc.call(record, attrs)
+          update_proc.call(record, attrs, force_replace: true)
         end
       end
 
@@ -108,7 +108,7 @@ module Motor
         create_items.each do |attrs|
           record = records_class.find_or_initialize_by(id: attrs[:id]).tap { |e| e.deleted_at = nil }
 
-          update_proc.call(record, attrs)
+          update_proc.call(record, attrs, force_replace: true)
         end
       end
 

data/lib/motor/configs/sync_middleware.rb

@@ -3,8 +3,6 @@
 module Motor
   module Configs
     class SyncMiddleware
-      ACCESS_KEY = ENV.fetch('MOTOR_SYNC_API_KEY', '')
-
       KeyNotSpecified = Class.new(StandardError)
       NotAuthenticated = Class.new(StandardError)
 
@@ -14,13 +12,15 @@ module Motor
 
       def call(env)
         if env['PATH_INFO'] == Motor::Configs::SYNC_API_PATH
-          authenticate!(env['QUERY_STRING'])
+          authenticate!(env['HTTP_X_AUTHORIZATION'])
 
           case env['REQUEST_METHOD']
           when 'GET'
             respond_with_configs
           when 'POST'
-            sync_configs(env['rack.input'].read)
+            input = env['rack.input']
+            input.rewind
+            sync_configs(input.read)
           else
             @app.call(env)
           end
@@ -35,14 +35,14 @@ module Motor
 
       private
 
-      def authenticate!(query_string)
-        raise KeyNotSpecified if ACCESS_KEY.blank?
-        raise NotAuthenticated if query_string.blank?
+      def authenticate!(token)
+        raise KeyNotSpecified if Motor::Configs::SYNC_ACCESS_KEY.blank?
+        raise NotAuthenticated if token.blank?
 
         is_token_valid =
           ActiveSupport::SecurityUtils.secure_compare(
-            Digest::SHA256.hexdigest(query_string),
-            Digest::SHA256.hexdigest("token=#{ACCESS_KEY}")
+            Digest::SHA256.hexdigest(token),
+            Digest::SHA256.hexdigest(Motor::Configs::SYNC_ACCESS_KEY)
           )
 
         raise NotAuthenticated unless is_token_valid

data/lib/motor/configs/sync_with_remote.rb

@@ -16,7 +16,7 @@ module Motor
       end
 
       def sync_from_remote!(remote_url, api_key)
-        response = Motor::NetHttpUtils.get(remote_url, { token: api_key })
+        response = Motor::NetHttpUtils.get(remote_url, {}, { 'X-Authorization' => api_key })
 
         raise ApiNotFound if response.is_a?(Net::HTTPNotFound)
         raise UnableToSync, [response.message, response.body].join(': ') unless response.is_a?(Net::HTTPSuccess)
@@ -29,7 +29,15 @@ module Motor
       def sync_to_remote!(remote_url, api_key)
         configs_hash = Motor::Configs::BuildConfigsHash.call
 
-        response = Motor::NetHttpUtils.post(remote_url, { token: api_key }, configs_hash.to_json)
+        response = Motor::NetHttpUtils.post(
+          remote_url,
+          {},
+          {
+            'X-Authorization' => api_key,
+            'Content-Type' => 'application/json'
+          },
+          configs_hash.to_json
+        )
 
         raise ApiNotFound if response.is_a?(Net::HTTPNotFound)
         raise UnableToSync, [response.message, response.body].join(': ') unless response.is_a?(Net::HTTPSuccess)

data/lib/motor/dashboards/persistance.rb

@@ -29,14 +29,16 @@ module Motor
         retry
       end
 
-      def update_from_params!(dashboard, params)
+      def update_from_params!(dashboard, params, force_replace: false)
         tag_ids = dashboard.tags.ids
 
         dashboard = assign_attributes(dashboard, params)
 
-        raise TitleAlreadyExists if title_already_exists?(dashboard)
+        raise TitleAlreadyExists if !force_replace && title_already_exists?(dashboard)
 
         ApplicationRecord.transaction do
+          archive_with_existing_name(dashboard) if force_replace
+
           dashboard.save!
         end
 
@@ -54,11 +56,16 @@ module Motor
         Motor::Tags.assign_tags(dashboard, params[:tags])
       end
 
+      def archive_with_existing_name(dashboard)
+        Motor::Dashboard.where(['lower(title) = ? AND id != ?', dashboard.title.to_s.downcase, dashboard.id])
+                        .update_all(deleted_at: Time.current)
+      end
+
       def title_already_exists?(dashboard)
         if dashboard.new_record?
-          Dashboard.exists?(['lower(title) = ?', dashboard.title.to_s.downcase])
+          Motor::Dashboard.exists?(['lower(title) = ?', dashboard.title.to_s.downcase])
         else
-          Dashboard.exists?(['lower(title) = ? AND id != ?', dashboard.title.to_s.downcase, dashboard.id])
+          Motor::Dashboard.exists?(['lower(title) = ? AND id != ?', dashboard.title.to_s.downcase, dashboard.id])
         end
       end
     end

data/lib/motor/forms/persistance.rb

@@ -29,14 +29,16 @@ module Motor
         retry
       end
 
-      def update_from_params!(form, params)
+      def update_from_params!(form, params, force_replace: false)
         tag_ids = form.tags.ids
 
         form = assign_attributes(form, params)
 
-        raise NameAlreadyExists if name_already_exists?(form)
+        raise NameAlreadyExists if !force_replace && name_already_exists?(form)
 
         ApplicationRecord.transaction do
+          archive_with_existing_name(form) if force_replace
+
           form.save!
         end
 
@@ -54,11 +56,16 @@ module Motor
         Motor::Tags.assign_tags(form, params[:tags])
       end
 
+      def archive_with_existing_name(form)
+        Motor::Form.where(['lower(name) = ? AND id != ?', form.name.to_s.downcase, form.id])
+                   .update_all(deleted_at: Time.current)
+      end
+
       def name_already_exists?(form)
         if form.new_record?
-          Form.exists?(['lower(name) = ?', form.name.to_s.downcase])
+          Motor::Form.exists?(['lower(name) = ?', form.name.to_s.downcase])
         else
-          Form.exists?(['lower(name) = ? AND id != ?', form.name.to_s.downcase, form.id])
+          Motor::Form.exists?(['lower(name) = ? AND id != ?', form.name.to_s.downcase, form.id])
         end
       end
     end

data/lib/motor/net_http_utils.rb

@@ -4,24 +4,25 @@ module Motor
   module NetHttpUtils
     module_function
 
-    def get(url, params = {})
-      request = build_request(Net::HTTP::Get, url, params, nil)
+    def get(url, params = {}, headers = {})
+      request = build_request(Net::HTTP::Get, url, params, headers, nil)
 
       execute_request(request)
     end
 
-    def post(url, params = {}, body = '')
-      request = build_request(Net::HTTP::Post, url, params, body)
+    def post(url, params = {}, headers = {}, body = '')
+      request = build_request(Net::HTTP::Post, url, params, headers, body)
 
       execute_request(request)
     end
 
-    def build_request(method_class, url, params, body)
+    def build_request(method_class, url, params, headers, body)
       uri = URI(url)
       uri.query = params.to_query
 
       request = method_class.new(uri)
       request.body = body if body.present?
+      headers.each { |key, value| request[key] = value }
 
       request
     end

data/lib/motor/queries/persistance.rb

@@ -29,14 +29,16 @@ module Motor
         retry
       end
 
-      def update_from_params!(query, params)
+      def update_from_params!(query, params, force_replace: false)
         tag_ids = query.tags.ids
 
         query = assign_attributes(query, params)
 
-        raise NameAlreadyExists if name_already_exists?(query)
+        raise NameAlreadyExists if !force_replace && name_already_exists?(query)
 
         ApplicationRecord.transaction do
+          archive_with_existing_name(query) if force_replace
+
           query.save!
         end
 
@@ -54,6 +56,11 @@ module Motor
         Motor::Tags.assign_tags(query, params[:tags])
       end
 
+      def archive_with_existing_name(query)
+        Motor::Query.where(['lower(name) = ? AND id != ?', query.name.to_s.downcase, query.id])
+                    .update_all(deleted_at: Time.current)
+      end
+
       def name_already_exists?(query)
         if query.new_record?
           Query.exists?(['lower(name) = ?', query.name.to_s.downcase])

data/lib/motor/tasks/motor.rake

@@ -9,6 +9,14 @@ namespace :motor do
     puts '✅ configs/motor.yml has been updated'
   end
 
+  desc 'Load configs from configs/motor.yml file'
+
+  task load: :environment do
+    Motor::Configs::SyncFromFile.call(with_exception: true)
+
+    puts '✅ configs have been loaded from configs/motor.yml'
+  end
+
   desc 'Synchronize configs with remote application'
 
   task sync: :environment do

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.1.39'
+  VERSION = '0.1.40'
 end

data/ui/dist/manifest.json

@@ -5,9 +5,9 @@
   "fonts/ionicons.ttf?v=3.0.0-alpha.3": "fonts/ionicons.ttf",
   "fonts/ionicons.woff2?v=3.0.0-alpha.3": "fonts/ionicons.woff2",
   "fonts/ionicons.woff?v=3.0.0-alpha.3": "fonts/ionicons.woff",
-  "main-e443f49b386b119ff25a.css.gz": "main-e443f49b386b119ff25a.css.gz",
-  "main-e443f49b386b119ff25a.js.LICENSE.txt": "main-e443f49b386b119ff25a.js.LICENSE.txt",
-  "main-e443f49b386b119ff25a.js.gz": "main-e443f49b386b119ff25a.js.gz",
-  "main.css": "main-e443f49b386b119ff25a.css",
-  "main.js": "main-e443f49b386b119ff25a.js"
+  "main-57d82791202293600221.css.gz": "main-57d82791202293600221.css.gz",
+  "main-57d82791202293600221.js.LICENSE.txt": "main-57d82791202293600221.js.LICENSE.txt",
+  "main-57d82791202293600221.js.gz": "main-57d82791202293600221.js.gz",
+  "main.css": "main-57d82791202293600221.css",
+  "main.js": "main-57d82791202293600221.js"
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.39
+  version: 0.1.40
 platform: ruby
 authors:
 - Pete Matsyburka
@@ -242,8 +242,8 @@ files:
 - lib/motor/tasks/motor.rake
 - lib/motor/version.rb
 - ui/dist/fonts/ionicons.woff2
-- ui/dist/main-e443f49b386b119ff25a.css.gz
-- ui/dist/main-e443f49b386b119ff25a.js.gz
+- ui/dist/main-57d82791202293600221.css.gz
+- ui/dist/main-57d82791202293600221.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: