motor-admin 0.2.26 → 0.2.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04b8a3962312d6df6ee3d75c0ad988f5b3e2011fcc4eacaedc2263739c4b8478
-  data.tar.gz: c034290e1752bff06ea29a2ca2be696576dd46bcbb6f97a22917173e9911c5c0
+  metadata.gz: acd8302f343dd0ce3ccad39dd408dc90e7582fb63133cf0abfb3fa1112899cb8
+  data.tar.gz: 21dc6ca6b743b0499e8bf3b314465be503cfcc6ce789bd2653f8e278e72b38dc
 SHA512:
-  metadata.gz: 56e2836e3a8723e313a0af989ccb5aa7d8577f6c5982cdc05825ed1ec4061db90a35776e329c4bdcdf4c736405ffeb4d2268131b857bbbd1cab19bdcff34a88f
-  data.tar.gz: a05ce55494fc28825dba93861888aca1c563df270670af2e048828f35db51a0296a263d2211f772d12e5905da7da60458756ef554a1cd1fe83084f938bc6d9c7
+  metadata.gz: c277ba2eee535baf91c0959d42187e76b0aff57cb24129c1d79917fca6259c2ed2a0b5f59b9fe289dbad1877fc17d7ea3bde2678cf686b5f98ecf558fbe0b0e6
+  data.tar.gz: 3ff35c6aa910c27771f108dd9a6fbedb73efd57f5a16890ef8589fcce4d733f41b584a1a4f6e79faa9554e964e17eb2aa1ff1bc38655ed9c5acb2f9a3520e6ef

data/lib/motor/build_schema/load_from_rails.rb

@@ -116,13 +116,20 @@ module Motor
       end
 
       def build_table_column(column, model, default_attrs)
+        access_type =
+          if model.primary_key == column.name
+            ColumnAccessTypes::READ_ONLY
+          else
+            COLUMN_NAME_ACCESS_TYPES.fetch(column.name, ColumnAccessTypes::READ_WRITE)
+          end
+
         {
           name: column.name,
           display_name: Utils.humanize_column_name(model.human_attribute_name(column.name)),
           column_type: fetch_column_type(column, model),
           column_source: ColumnSources::TABLE,
           is_array: column.array?,
-          access_type: COLUMN_NAME_ACCESS_TYPES.fetch(column.name, ColumnAccessTypes::READ_WRITE),
+          access_type: access_type,
           default_value: default_attrs[column.name],
           validators: fetch_validators(model, column.name),
           reference: nil,

data/lib/motor/resources/fetch_configured_model.rb

@@ -5,6 +5,8 @@ module Motor
     module FetchConfiguredModel
       CACHE_HASH = HashWithIndifferentAccess.new
 
+      HAS_AND_BELONGS_TO_MANY_JOIN_MODEL_PREFIX = 'HABTM_'
+
       module_function
 
       def call(model, cache_key:)
@@ -130,13 +132,8 @@ module Motor
       end
 
       def configure_reflection_classes(klass, cache_key)
-        klass.reflections.each do |key, ref|
-          begin
-            next unless ref.klass
-            next if ref.klass.anonymous?
-          rescue StandardError
-            next
-          end
+        klass._reflections.each do |key, ref|
+          next unless configure_reflection_class?(ref)
 
           ref_dup = ref.dup
 
@@ -146,11 +143,9 @@ module Motor
             ref_dup.instance_variable_set(:@klass, call(ref.klass, cache_key: cache_key))
           end
 
-          klass.reflections[key] = ref_dup
+          klass._reflections[key] = ref_dup
         end
 
-        klass._reflections = klass.reflections
-
         klass
       end
 
@@ -203,6 +198,19 @@ module Motor
         end
       end
 
+      def configure_reflection_class?(ref)
+        begin
+          return false unless ref.klass
+        rescue StandardError
+          return false
+        end
+
+        return false if ref.klass.anonymous?
+        return false if ref.klass.name.demodulize.starts_with?(HAS_AND_BELONGS_TO_MANY_JOIN_MODEL_PREFIX)
+
+        true
+      end
+
       def sti_model?(model)
         !model.superclass.abstract_class && model.columns_hash[model.inheritance_column.to_s]
       end

data/lib/motor/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.26
+  version: 0.2.27
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-16 00:00:00.000000000 Z
+date: 2021-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter