motor-admin 0.1.29 → 0.1.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f18c5fae6ca2c70b739f68d0a9b45f456b6c9f9592b4c44d216210a067b2e33
-  data.tar.gz: 4a65316ecce576b9de027fe93ff14bf9307826269af771fbfc9a7bbf3699f051
+  metadata.gz: 97e438ff28fa0c1532dc6e732da194852c6be1374040947297093abeb32d5ded
+  data.tar.gz: 36fabae905bc320122b67e15d27bc9d34025b5b183822a2fc21420a5395a896c
 SHA512:
-  metadata.gz: f51029e47fe84f67f34ced365523f2214c44986f241ad35a77405f067a556bbca8ca124cb09812b007a709101729ae3dfc35aa94284c46dbbf2f63a990459001
-  data.tar.gz: 555b5570c50258d3ee00a317795868cee3281e0d3675d894e25773f26977d21d40781b031a4e3835469fa580d39b3e1ba5b87f11dcad83986b0bd144f612bc5c
+  metadata.gz: c35efea7e04d6fa2d85587508dd1828e4cbe253b8a07c5f1b28f8a7c5112c184af4910dc9b889db55930d48353c60d23fecd10718a61a4a2b1dd07acd58df2f4
+  data.tar.gz: 103000ffc82b09b09a48416ea348ecde3537056c330fc26d41f48c2f96be84fddf7f6fd688573d526efcf2e74b64bdde2d45db19de3fc4a3f48e76debef38dc0

data/app/controllers/motor/data_controller.rb

@@ -86,6 +86,8 @@ module Motor
         self,
         options
       ).load_and_authorize_resource
+    rescue ActiveRecord::RecordNotFound
+      head :not_found
     rescue StandardError => e
       render json: { errors: [e.message] }, status: :unprocessable_entity
     end
@@ -107,6 +109,8 @@ module Motor
       else
         render json: { message: 'Unknown association' }, status: :not_found
       end
+    rescue ActiveRecord::RecordNotFound
+      head :not_found
     rescue StandardError => e
       render json: { errors: [e.message] }, status: :unprocessable_entity
     end

data/app/models/motor/query.rb

@@ -10,5 +10,13 @@ module Motor
     serialize :preferences, HashSerializer
 
     scope :active, -> { where(deleted_at: nil) }
+
+    def result(variables_hash = {})
+      result = Motor::Queries::RunQuery.call(self, variables_hash: variables_hash)
+      column_names = result.columns.pluck(:name)
+
+      result.data.map { |row| column_names.zip(row).to_h }
+    end
+    alias run result
   end
 end

data/app/views/motor/alerts_mailer/alert_email.html.erb

@@ -77,7 +77,7 @@
             <% if @query_result.data.length > 1 %>
               <p style="margin: 7px 0; float: left">Showing <%= @query_result.data.first(40).size %> of <%= @query_result.data.size %> rows</p>
             <% end %>
-            <a href="<%= Motor::Admin.routes.url_helpers.motor_ui_query_url(@alert.query, { host: 'localhost:3000'}.merge(Rails.application.config.action_mailer.default_url_options || {})) %>" target="blank" style="margin: 7px 0; float: right">Open query </a>
+            <a href="<%= Motor::Admin.routes.url_helpers.motor_ui_query_url(@alert.query, { host: 'localhost:3000' }.merge(Rails.application.config.action_mailer.default_url_options || {})) %>" target="blank" style="margin: 7px 0; float: right">Open query </a>
             <table class="main" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #ffffff; border-radius: 3px;">
               <tr>
                 <td class="wrapper" style="font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 20px; max-width: 0px; overflow: scroll">

data/config/routes.rb

@@ -47,15 +47,4 @@ Motor::Admin.routes.draw do
   end
 end
 
-Motor::Api.routes.draw do
-  namespace :motor, path: '' do
-    resources :resources, path: '/:resource',
-                          only: %i[index show update create destroy],
-                          controller: 'data' do
-      put '/:method', to: 'data#execute'
-      resources :association, path: '/:association',
-                              only: %i[index create],
-                              controller: 'data'
-    end
-  end
-end
+ActiveSupport::Notifications.instrument('motor.routes.loaded')

data/lib/generators/motor/install_generator.rb

@@ -16,6 +16,8 @@ module Motor
 
       def copy_migration
         migration_template 'install.rb', 'db/migrate/install_motor_admin.rb'
+
+        route "mount Motor::Admin => '/motor_admin'"
       end
     end
   end

data/lib/motor.rb

@@ -45,7 +45,6 @@ end
 
 require 'motor/version'
 require 'motor/admin'
-require 'motor/api'
 require 'motor/assets'
 require 'motor/build_schema'
 require 'motor/api_query'

data/lib/motor/admin.rb

@@ -2,6 +2,32 @@
 
 module Motor
   class Admin < ::Rails::Engine
+    initializer 'motor.startup_message' do
+      ActiveSupport::Notifications.subscribe('motor.routes.loaded') do
+        next unless Motor.server?
+
+        if Rails.application.routes.url_helpers.respond_to?(:motor_admin_path)
+          url =
+            begin
+              Rails.application.routes.url_helpers.motor_admin_url
+            rescue ArgumentError
+              Rails.application.routes.url_helpers.motor_admin_path
+            end
+
+          puts
+          puts "⚡ Motor::Admin is starting under #{url}"
+        else
+          puts
+          puts '⚠️  Motor::Admin is not mounted.'
+          puts 'Add the following line to your config/routes.rb:'
+          puts
+          puts "    mount Motor::Admin => '/admin'"
+        end
+
+        puts
+      end
+    end
+
     initializer 'motor.filter_params' do
       Rails.application.config.filter_parameters += %i[io]
     end

data/lib/motor/api_query/filter.rb

@@ -34,20 +34,29 @@ module Motor
 
       def normalize_filter_hash(hash)
         hash.each_with_object({}) do |(action, value), acc|
-          acc[action] =
+          new_action, new_value =
             if value.is_a?(Hash)
-              normalize_filter_hash(value)
+              [action, normalize_filter_hash(value)]
             else
-              normalize_action_value(action, value)
+              normalize_action(action, value)
             end
+
+          acc[new_action] = new_value
+
+          acc
         end
       end
 
-      def normalize_action_value(action, value)
-        if %w[like ilike].include?(action)
-          value.sub(LIKE_FILTER_VALUE_REGEXP, '%\1%')
+      def normalize_action(action, value)
+        case action
+        when 'contains'
+          ['ilike', value.sub(LIKE_FILTER_VALUE_REGEXP, '%\1%')]
+        when 'starts_with'
+          ['ilike', value.sub(LIKE_FILTER_VALUE_REGEXP, '\1%')]
+        when 'ends_with'
+          ['ilike', value.sub(LIKE_FILTER_VALUE_REGEXP, '%\1')]
         else
-          value
+          [action, value]
         end
       end
     end

data/lib/motor/build_schema.rb

@@ -48,8 +48,8 @@ module Motor
 
     DEFAULT_TABS = [
       {
-        name: 'summary',
-        display_name: 'Summary',
+        name: 'details',
+        display_name: 'Details',
         tab_type: 'default',
         preferences: {},
         visible: true

data/lib/motor/tags.rb

@@ -21,7 +21,8 @@ module Motor
     end
 
     def remove_missing_tags(taggable, tags)
-      tags_to_remove = taggable.tags.reject { |tt| tt.name.downcase.in?(tags) }
+      downcase_tags = tags.map(&:downcase)
+      tags_to_remove = taggable.tags.reject { |tt| tt.name.downcase.in?(downcase_tags) }
 
       taggable.tags -= tags_to_remove
 

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.1.29'
+  VERSION = '0.1.35'
 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-482137e0bc1ba9f875dc.css.gz": "main-482137e0bc1ba9f875dc.css.gz",
-  "main-482137e0bc1ba9f875dc.js.LICENSE.txt": "main-482137e0bc1ba9f875dc.js.LICENSE.txt",
-  "main-482137e0bc1ba9f875dc.js.gz": "main-482137e0bc1ba9f875dc.js.gz",
-  "main.css": "main-482137e0bc1ba9f875dc.css",
-  "main.js": "main-482137e0bc1ba9f875dc.js"
+  "main-03c3b1d3390877206e02.css.gz": "main-03c3b1d3390877206e02.css.gz",
+  "main-03c3b1d3390877206e02.js.LICENSE.txt": "main-03c3b1d3390877206e02.js.LICENSE.txt",
+  "main-03c3b1d3390877206e02.js.gz": "main-03c3b1d3390877206e02.js.gz",
+  "main.css": "main-03c3b1d3390877206e02.css",
+  "main.js": "main-03c3b1d3390877206e02.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.35
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-07 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -183,7 +183,6 @@ files:
 - lib/motor/alerts/persistance.rb
 - lib/motor/alerts/scheduled_alerts_cache.rb
 - lib/motor/alerts/scheduler.rb
-- lib/motor/api.rb
 - lib/motor/api_query.rb
 - lib/motor/api_query/apply_scope.rb
 - lib/motor/api_query/build_json.rb
@@ -215,8 +214,8 @@ files:
 - lib/motor/ui_configs.rb
 - lib/motor/version.rb
 - ui/dist/fonts/ionicons.woff2
-- ui/dist/main-482137e0bc1ba9f875dc.css.gz
-- ui/dist/main-482137e0bc1ba9f875dc.js.gz
+- ui/dist/main-03c3b1d3390877206e02.css.gz
+- ui/dist/main-03c3b1d3390877206e02.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses:

data/lib/motor/api.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module Motor
-  class Api < ::Rails::Engine
-  end
-end