motor-admin 0.1.15 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4b6ae30f7e0382a7ff6b56e04ef3de41396a89e0cff6c2595af76677af8685c
-  data.tar.gz: 8a6b99fd18067c6b535db0746eaef258da807a57d493e816b2c6b38396d716f9
+  metadata.gz: c6b8a4bcbd17fc0eed3b91dfac13285623adbfeda90a20a414193384070cccff
+  data.tar.gz: 303af4bb7f49abfd02dfe91c6aa03278e1d6572e1831e73cd60fcef0b2a96a29
 SHA512:
-  metadata.gz: d41941aa4ccefd944c9caa0403d25e91f08e1a6ca7bf3064d49f181a906c9fa052777543a113d0ea079c5d317595b34257a3d7b7ee4540ee79fce4c52e54d8b3
-  data.tar.gz: 5f224df7542462dd74fd22093688351d5edd3fdea2615d51df3aa3a33d5194d6917f28ffc2c53a0298fcdb9c2c56e88bb97d539b18116f81d08a355adac60458
+  metadata.gz: 144c32f7aa7902c4b2200fdde19b7487d1476856380c79b1d694d164227f98529b204a81f4bffcfc281a0951be13f585a9fe5ae57014bb66b38b94e49199b44b
+  data.tar.gz: 78b1501b59c676ecc389febca43eadc961514e3720fcc3256c6664086f60f5c0167973c7b19c7ce1a8705404b2111136872a683a451bd9633b21531bf59a06e0

data/lib/motor.rb

@@ -6,7 +6,6 @@ require 'js_regex'
 require 'fugit'
 require 'csv'
 require 'active_record/filter'
-require 'base64'
 
 module Motor
   PATH = Pathname.new(__dir__)
@@ -27,6 +26,18 @@ module Motor
     true
   end
 
+  def server?
+    defined?(::Rails::Server) ||
+      defined?(::Thin::Server) ||
+      defined?(::PhusionPassenger) ||
+      (defined?(::Puma) && File.basename($PROGRAM_NAME) == 'puma') ||
+      defined?(::Unicorn::HttpServer) ||
+      defined?(::Mongrel::HttpServer) ||
+      defined?(::WEBrick::VERSION) ||
+      defined?(JRuby::Rack::VERSION) ||
+      defined?(::Trinidad::Server)
+  end
+
   def development?
     ENV['MOTOR_DEVELOPMENT'].present?
   end

data/lib/motor/active_record_utils.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
+module ActiveRecordUtils
+end
+
 require_relative './active_record_utils/types'
 require_relative './active_record_utils/fetch_methods'
 require_relative './active_record_utils/defined_scopes_extension'
 require_relative './active_record_utils/active_storage_links_extension'
-
-module ActiveRecordUtils
-end

data/lib/motor/active_record_utils/types.rb

@@ -9,11 +9,15 @@ module Motor
       UNIFIED_TYPES = {
         'smallint' => 'integer',
         'int' => 'integer',
+        'int4' => 'integer',
         'int8' => 'integer',
         'int16' => 'integer',
         'bigint' => 'integer',
         'numeric' => 'float',
         'decimal' => 'float',
+        'float4' => 'float',
+        'float8' => 'float',
+        'float16' => 'float',
         'text' => 'string',
         'citext' => 'string',
         'jsonb' => 'json',

data/lib/motor/admin.rb

@@ -8,7 +8,7 @@ module Motor
 
     initializer 'motor.alerts.scheduler' do
       config.after_initialize do |_app|
-        next unless defined?(Rails::Server)
+        next unless Motor.server?
 
         Motor::Alerts::Scheduler::SCHEDULER_TASK.execute
       end

data/lib/motor/alerts.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative './alerts/scheduler'
-require_relative './alerts/scheduled_alerts_cache'
-require_relative './alerts/persistance'
-
 module Motor
   module Alerts
   end
 end
+
+require_relative './alerts/scheduler'
+require_relative './alerts/scheduled_alerts_cache'
+require_relative './alerts/persistance'

data/lib/motor/api_query.rb

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-require_relative './api_query/sort'
-require_relative './api_query/paginate'
-require_relative './api_query/filter'
-require_relative './api_query/search'
-require_relative './api_query/apply_scope'
-require_relative './api_query/build_meta'
-require_relative './api_query/build_json'
-
 module Motor
   module ApiQuery
     module_function
@@ -22,3 +14,11 @@ module Motor
     end
   end
 end
+
+require_relative './api_query/sort'
+require_relative './api_query/paginate'
+require_relative './api_query/filter'
+require_relative './api_query/search'
+require_relative './api_query/apply_scope'
+require_relative './api_query/build_meta'
+require_relative './api_query/build_json'

data/lib/motor/api_query/build_json.rb

@@ -49,27 +49,27 @@ module Motor
 
         params[:fields].each do |key, fields|
           fields = fields.split(',') if fields.is_a?(String)
-          reflection_class = model.reflections[key]&.klass
-          fields_hash = build_fields_hash(reflection_class || model, fields)
 
           if key == model_name || model_name.split('/').last == key
-            json_params.merge!(fields_hash)
+            json_params.merge!(build_fields_hash(model, fields))
           else
             hash = find_key_in_params(json_params, key)
 
+            fields_hash = build_fields_hash(model.reflections[key]&.klass, fields)
+
             hash.merge!(fields_hash)
           end
         end
       end
 
       def build_fields_hash(model, fields)
-        columns = model.columns.map(&:name)
+        columns = model ? model.columns.map(&:name) : []
         fields_hash = { 'only' => [], 'methods' => [] }
 
         fields.each_with_object(fields_hash) do |field, acc|
           if field.in?(columns)
             acc['only'] << field
-          elsif model.instance_methods.include?(field.to_sym)
+          elsif model.nil? || model.instance_methods.include?(field.to_sym)
             acc['methods'] << field
           end
         end

data/lib/motor/dashboards.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative './dashboards/persistance'
-
 module Motor
   module Dashboards
   end
 end
+
+require_relative './dashboards/persistance'

data/lib/motor/forms.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative './forms/persistance'
-
 module Motor
   module Forms
   end
 end
+
+require_relative './forms/persistance'

data/lib/motor/queries.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative './queries/run_query'
-require_relative './queries/persistance'
-require_relative './queries/postgresql_exec_query'
-
 module Motor
   module Queries
   end
 end
+
+require_relative './queries/run_query'
+require_relative './queries/persistance'
+require_relative './queries/postgresql_exec_query'

data/lib/motor/version.rb

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

data/ui/dist/manifest.json

@@ -5,6 +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.css": "main-80be7992f1d3b992e2dc.css",
-  "main.js": "main-80be7992f1d3b992e2dc.js"
+  "main-015cc9721345d5b8af80.css.gz": "main-015cc9721345d5b8af80.css.gz",
+  "main-015cc9721345d5b8af80.js.LICENSE.txt": "main-015cc9721345d5b8af80.js.LICENSE.txt",
+  "main-015cc9721345d5b8af80.js.gz": "main-015cc9721345d5b8af80.js.gz",
+  "main.css": "main-015cc9721345d5b8af80.css",
+  "main.js": "main-015cc9721345d5b8af80.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.21
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-30 00:00:00.000000000 Z
+date: 2021-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -213,8 +213,8 @@ files:
 - lib/motor/ui_configs.rb
 - lib/motor/version.rb
 - ui/dist/fonts/ionicons.woff2
-- ui/dist/main-729641083f64367ce9aa.css.gz
-- ui/dist/main-729641083f64367ce9aa.js.gz
+- ui/dist/main-015cc9721345d5b8af80.css.gz
+- ui/dist/main-015cc9721345d5b8af80.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: