foobara-active-record-type 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3499a493db193b496a20ae4dd0d1dd1d7ad5193701346ee2de9abc397b107ff9
-  data.tar.gz: 59db77d01419543a0230aecb0d5f49aa6f1ba541bb820d7ffd743ee41211d2ea
+  metadata.gz: be73fbca7fffeee0f67d261c388d9389c98220d6db6748a3ba349e67d210567c
+  data.tar.gz: af657447cb5eddd2722cd3b30940e721d91d4357c64ed6e78485cf9934567705
 SHA512:
-  metadata.gz: a72802f7ae7ef65f5174285ae4dde77f7876b3463ea3d6a69bc7366a91838b5e1a22b94a8c6352b3725755195121855f391a30163378ceb065cfd16c6d9b9622
-  data.tar.gz: b49ed2b61b22d34e1b0179c841e2deb05ac5b0886fa71826bcb781f1572e6c52323ed729cd2ae7b058d5e078a184fb872e8dff4329fdd8184c557f7ef15332f0
+  metadata.gz: 3a9a10892d969e0a6eb51dc5a34e57bb056f3ec16a1499fa16545b1bcfd5cebb9d4f140d66921d85107e1c7d83742c5890fd9d4373ad2a094d71cb235e309171
+  data.tar.gz: 06ec78753cf3bfff0e476b8b276f2f4d6e933a8fa4a6b0c62161a2a4e26470eb838f4528b44fccd7ecdb8c03917385d34b7c777171bc767ec142cc2c3613025f

data/CHANGELOG.md

@@ -1,10 +1,14 @@
-## [0.0.3]
+## [0.0.5] - 2025-01-21
+
+- Make use of ModelAttributeHelpers
+
+## [0.0.3] - 2025-01-17
 
 - Fix problem where the first time a type is declared via an
   active record class it has a complex declaration hash instead of a simple
   registered class lookup
 
-## [0.0.1]
+## [0.0.1] - 2025-01-03
 
 - Release as a gem
 

data/lib/foobara/active_record_type.rb

@@ -18,6 +18,8 @@ module Foobara
         )
 
         BuiltinTypes.install_type_declaration_extensions_for(ExtendActiveRecordTypeDeclaration)
+
+        ActiveRecord::Base.include Foobara::ModelAttributeHelpers::Concerns::AttributeHelpers
       end
 
       def reset_all

data/src/active_record_foobara_methods.rb

@@ -3,6 +3,23 @@ module ActiveRecordFoobaraMethods
 
   class_methods do
     attr_accessor :foobara_type, :foobara_attributes_type
+
+    # TODO: implement this or figure out how to re-use the methods from Entity/Model
+    def foobara_associations
+      {}
+    end
+
+    def foobara_primary_key_attribute
+      primary_key
+    end
+
+    def foobara_primary_key_type
+      return @foobara_primary_key_type if @foobara_primary_key_type
+
+      domain = foobara_type.foobara_domain
+      declaration = Foobara::ActiveRecordType.column_name_to_foobara_type_declaration(self, primary_key)
+      @foobara_primary_key_type = domain.foobara_type_from_declaration(declaration)
+    end
   end
 end
 

data/src/active_record_type.rb

@@ -0,0 +1,36 @@
+module Foobara
+  module ActiveRecordType
+    class << self
+      def column_name_to_foobara_type_declaration(active_record_class, name)
+        column = column_from_name(active_record_class, name)
+        column_to_foobara_type_declaration(column)
+      end
+
+      def column_to_foobara_type_declaration(column)
+        column_type = column.sql_type_metadata.type
+
+        type_declaration = case column_type
+                           when :integer, :string, :datetime
+                             column_type
+                           else
+                             # :nocov:
+                             raise ArgumentError, "Not sure how to convert #{column_type} to a foobara type symbol"
+                             # :nocov:
+                           end
+
+        # defaults and required will be handled further up
+        if column.null
+          { type: type_declaration, allow_nil: true }
+        else
+          type_declaration
+        end
+      end
+
+      def column_from_name(active_record_class, name)
+        active_record_class.columns.find do |column|
+          column.name == name
+        end
+      end
+    end
+  end
+end

data/src/extend_active_record_type_declaration/active_record_base_class_desugarizer.rb

@@ -28,23 +28,7 @@ module Foobara
         end
 
         def column_to_foobara_type_declaration(column)
-          column_type = column.sql_type_metadata.type
-
-          type_declaration = case column_type
-                             when :integer, :string, :datetime
-                               column_type
-                             else
-                               # :nocov:
-                               raise ArgumentError, "Not sure how to convert #{column_type} to a foobara type symbol"
-                               # :nocov:
-                             end
-
-          # defaults and required will be handled further up
-          if column.null
-            { type: type_declaration, allow_nil: true }
-          else
-            type_declaration
-          end
+          ActiveRecordType.column_to_foobara_type_declaration(column)
         end
 
         def active_record_class_to_attributes_declaration(active_record_class)
@@ -74,9 +58,7 @@ module Foobara
         end
 
         def column_from_name(active_record_class, name)
-          active_record_class.columns.find do |column|
-            column.name == name
-          end
+          ActiveRecordType.column_from_name(active_record_class, name)
         end
 
         def priority

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foobara-active-record-type
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Miles Georgi
 bindir: bin
 cert_chain: []
-date: 2025-01-18 00:00:00.000000000 Z
+date: 2025-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -50,6 +50,7 @@ files:
 - lib/foobara/active_record_type.rb
 - src/active_record_foobara_methods.rb
 - src/active_record_thunk.rb
+- src/active_record_type.rb
 - src/casters/hash.rb
 - src/casters/primary_key.rb
 - src/extend_active_record_type_declaration.rb