ar_virtual_field 0.11.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc989e784f1fb95c3f84ab517f1d2a75bbe39dd534cd1d693ac0f888e475decb
-  data.tar.gz: 0cad4ea6c15483102bbb6fa3b2fd26193f8774ce7b0eac196770a876fe612377
+  metadata.gz: 54a2b022d2a554b686ac9dc2c2d0849a244c60d1d8811c2528ee31958837d6f0
+  data.tar.gz: 7fb5c86b8e5778120576fd0247e7dbc51a3a012f25730bef87efa111c242ff57
 SHA512:
-  metadata.gz: 816f4466ce0dd39ef8c37438ff32081468594ca4912a5145c48e94578dfaa45e694620fa61a2931e89bfff25d45c9e77ca1a9d9a02f4e900b011ce179796ea12
-  data.tar.gz: 4d17ee88027b35915b1aa35969dec64924c6e79c8a0ce1f8fbb48a8079c221f401abb5585322287c43da2dfb1915b61ac1a478a03504198f0d15b35e7504f503
+  metadata.gz: 2fab350ea04e2c2367f30d7a3550203353abfdd18aecd97f47e6c1bf5023ce7ed21db3ab5aee0113b380c0bffd90689c22563b31bfbf319fc264f68338fd0738
+  data.tar.gz: ed2bfd0a02456f01e304aa1aa4518d7579e22d3d325bfff509a8c88d1b846851c1d499462aa954aae80dde82f39ed5674775c079a264f14c40ffbec0f3282517

data/README.md

@@ -19,11 +19,11 @@ gem 'ar_virtual_field'
 To define a virtual field, use the virtual_field method in your model:
 
 ```ruby
-virtual_field :virtual_attribute, 
+virtual_field :virtual_attribute,
   scope: -> { joins(:related_model).where(related_models: { some_column: value }) },
   select: -> { "SUM(related_models.some_value)" },
   get: -> { calculate_some_value },
-  default: 0
+  default: '0'
 ```
 
 Parameters:
@@ -31,7 +31,7 @@ Parameters:
   - `scope`: A lambda defining a scope that fetches the virtual field value (optional).
   - `select`: SQL selection logic (can be a string or arel node or a lambda returning a string or arel_node) to define how the field is computed.
   - `get`: A method to retrieve the value of the virtual field when the field isn't fetched via SQL.
-  - `default`: A default value for the virtual field if the result is nil (optional).
+  - `default`: A default value(can be a string or arel node or a lambda returning a string or arel_node) for the virtual field if the result is nil (optional).
 
 Example:
 
@@ -41,7 +41,7 @@ class User < ApplicationRecord
     scope: -> { joins(:orders).group(:id) },
     select: "COUNT(orders.id)",
     get: -> { orders.count },
-    default: 0
+    default: '0'
 
   virtual_field :fullname,
     select: "name || surname",

data/lib/ar_virtual_field/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ArVirtualField
-  VERSION = "0.11.0"
+  VERSION = "1.0.1"
 end

data/lib/ar_virtual_field.rb

@@ -19,6 +19,22 @@ module ArVirtualField
     def self.table_with_column(name)
       "#{name}_outer.#{name}"
     end
+
+    def self.unwrap_arel_expression(exp)
+      Arel::Nodes::Grouping.new(
+        exp.is_a?(Arel::Nodes::NodeExpression) ? exp : Arel.sql(exp)
+      )
+    end
+
+    def self.wrap_to_lambda(exp)
+      case exp
+      when Proc
+        -> { HelperMethods.unwrap_arel_expression(exp.()) }
+      else
+        arel = HelperMethods.unwrap_arel_expression(exp)
+        -> { arel }
+      end
+    end
   end
 
   class FieldsData < Hash
@@ -38,20 +54,20 @@ module ArVirtualField
 
     name = name.to_s
     current_class = self
-    unwrap_arel_expression = -> (exp) {
-      Arel::Nodes::Grouping.new(
-        exp.is_a?(Arel::Nodes::NodeExpression) ? exp : Arel.sql(exp)
-      )
-    }
 
-    select_lambda =
-      case select
-      when Proc
-        -> { unwrap_arel_expression.(select.()) }
+    if default
+      default = HelperMethods.wrap_to_lambda(default)
+    end
+
+    select = HelperMethods.wrap_to_lambda(select)
+
+    select_lambda = -> do
+      if default
+        Arel::Nodes::NamedFunction.new('COALESCE', [select.(), default.()])
       else
-        arel = unwrap_arel_expression.(select)
-        -> { arel }
+        select.()
       end
+    end
 
     if scope
       @ar_virtual_fields[name.to_sym] = -> { Arel.sql(HelperMethods.table_with_column(name)) }
@@ -87,7 +103,7 @@ module ArVirtualField
     define_method(method_name, &get)
     define_method(name) do
       if ActiveRecord::Base.connection.query_cache_enabled
-        attributes.key?(name) ? (self[name] || default) : send(method_name)
+        attributes.key?(name) ? self[name] : send(method_name)
       else
         send(method_name)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_virtual_field
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Pavel Egorov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-07 00:00:00.000000000 Z
+date: 2025-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord