literal 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c4292f514f586e16d0d477cc57e9a8b1f38771a8124f9ed933b67aa167550a0
-  data.tar.gz: 48dc63568c23368fb5c1577a57833720ca272c2aeca24dfc33e26271ed378497
+  metadata.gz: bfccfa4acf4ec640c3a47a2bab9d34aec7295a29abc387a20e81f6fb3beb085b
+  data.tar.gz: a5a029b15bfc36d930338fc5c2dd6b52abdab0ad1315d54725d2ad90e681bb97
 SHA512:
-  metadata.gz: d79162f89f5088923b2a18ffb2d77214401e18f2d992d2535ab85a4f73b0adbf4430bf385dd846f860e7c0c984508bd6a4d48296a13883fefdb1eb8ef0ac51eb
-  data.tar.gz: d0cbebd25520b382b6ea73d22b9b2120b15831d7b51d6b2deb99bfd2adaa1c53cfeadbf4b6c3f7af6e97ea634991c49fe5e49d559c2efcf228ec2e9fe942daf1
+  metadata.gz: 9207d8ba24e146a2d9400c640b6d4c5d6fa97694d95097cf86ac09ebedf16613daa7b1cd4b7946b447809d71aef2e3dca8cd805c59902e3744d00d5b10da37a1
+  data.tar.gz: f02700e76bd9a65ef3d3885f3c79984cec164ac47af50f153bb034026d71576926245bc7a481f728c46ea6410a984d45d97d217d16ed1b34b6bf72233179033b

data/lib/literal/rails/active_record_relation_patch.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Literal::Rails
+	module ActiveRecordRelationPatch
+		def Relation(model)
+			RelationType.new(model)
+		end
+	end
+end

data/lib/literal/rails/relation_type.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Literal::Rails
+	class RelationType
+		def initialize(model_class)
+			unless Class === model_class && model_class < ActiveRecord::Base
+				raise Literal::TypeError.new(
+						context: Literal::TypeError::Context.new(
+							expected: ActiveRecord::Base, actual: model_class
+						)
+					)
+			end
+
+			@model_class = model_class
+		end
+
+		def inspect = "ActiveRecord::Relation(#{@model_class.name})"
+
+		def ===(value)
+			case value
+				when ActiveRecord::Relation, ActiveRecord::Associations::CollectionProxy, ActiveRecord::AssociationRelation
+					@model_class == value.model || value.model < @model_class
+				else
+					false
+			end
+		end
+	end
+end

data/lib/literal/railtie.rb

@@ -1,15 +1,42 @@
 # frozen_string_literal: true
 
+module Literal::Rails
+	if defined?(::ActiveJob)
+		require_relative "rails/enum_serializer"
+	end
+
+	if defined?(::ActiveRecord::Relation)
+		require_relative "rails/relation_type"
+		require_relative "rails/active_record_relation_patch"
+		::ActiveRecord.extend(ActiveRecordRelationPatch)
+	end
+end
+
 class Literal::Railtie < Rails::Railtie
-	initializer "literal.register_literal_enum_type" do
-		[ActiveRecord::Type, ActiveModel::Type].each do |registry|
-			registry.register(:literal_enum) do |name, type:|
+	if defined?(::ActiveModel::Type)
+		require_relative "rails/enum_type"
+		require_relative "rails/flags_type"
+
+		initializer "literal.register_active_model_types" do
+			ActiveModel::Type.register(:literal_enum) do |name, type:|
 				Literal::Rails::EnumType.new(type)
 			end
 
-			registry.register(:literal_flags) do |name, type:|
+			ActiveModel::Type.register(:literal_flags) do |name, type:|
 				Literal::Rails::FlagsType.new(type)
 			end
 		end
+
+		if defined?(::ActiveRecord::Type)
+			initializer "literal.register_active_record_types" do
+				ActiveRecord::Type.register(:literal_enum) do |name, type:|
+					Literal::Rails::EnumType.new(type)
+				end
+
+				ActiveRecord::Type.register(:literal_flags) do |name, type:|
+					Literal::Rails::FlagsType.new(type)
+				end
+			end
+		end
 	end
 end

data/lib/literal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Literal
-	VERSION = "1.7.0"
+	VERSION = "1.7.1"
 end

data/lib/literal.rb

@@ -5,6 +5,9 @@ require_relative "literal/version"
 
 module Literal
 	Loader = Zeitwerk::Loader.for_gem.tap do |loader|
+		loader.ignore("#{__dir__}/literal/rails")
+		loader.ignore("#{__dir__}/literal/railtie.rb")
+
 		loader.inflector.inflect(
 			"json_data_type" => "JSONDataType"
 		)
@@ -123,4 +126,4 @@ module Literal
 	end
 end
 
-require_relative "literal/rails" if defined?(Rails)
+require_relative "literal/railtie" if defined?(Rails)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: literal
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Joel Drapper
@@ -54,11 +54,11 @@ files:
 - lib/literal/properties/data_schema.rb
 - lib/literal/properties/schema.rb
 - lib/literal/property.rb
-- lib/literal/rails.rb
+- lib/literal/rails/active_record_relation_patch.rb
 - lib/literal/rails/enum_serializer.rb
 - lib/literal/rails/enum_type.rb
 - lib/literal/rails/flags_type.rb
-- lib/literal/rails/patches/active_record.rb
+- lib/literal/rails/relation_type.rb
 - lib/literal/railtie.rb
 - lib/literal/result.rb
 - lib/literal/set.rb

data/lib/literal/rails/patches/active_record.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecord
-	class RelationType
-		def initialize(model_class)
-			unless Class === model_class && model_class < ActiveRecord::Base
-				raise Literal::TypeError.new(
-					context: Literal::TypeError::Context.new(
-						expected: ActiveRecord::Base, actual: model_class
-					)
-				)
-			end
-
-			@model_class = model_class
-		end
-
-		def inspect = "ActiveRecord::Relation(#{@model_class.name})"
-
-		def ===(value)
-			case value
-			when ActiveRecord::Relation, ActiveRecord::Associations::CollectionProxy, ActiveRecord::AssociationRelation
-				@model_class == value.model || value.model < @model_class
-			else
-				false
-			end
-		end
-	end
-
-	def self.Relation(model)
-		RelationType.new(model)
-	end
-end

data/lib/literal/rails.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "railtie"
-require_relative "rails/patches/active_record"
-
-module Literal::Rails
-end