ar_virtual_field 0.11.0 → 1.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bc989e784f1fb95c3f84ab517f1d2a75bbe39dd534cd1d693ac0f888e475decb
4
- data.tar.gz: 0cad4ea6c15483102bbb6fa3b2fd26193f8774ce7b0eac196770a876fe612377
3
+ metadata.gz: 1d194e101e0b3a130c12bc06a51379de261e0e57dafd118492383048af768c6a
4
+ data.tar.gz: ea906b4039f95176535b765fafc438aa95f8c7933575a2f4477e242e8203dda3
5
5
  SHA512:
6
- metadata.gz: 816f4466ce0dd39ef8c37438ff32081468594ca4912a5145c48e94578dfaa45e694620fa61a2931e89bfff25d45c9e77ca1a9d9a02f4e900b011ce179796ea12
7
- data.tar.gz: 4d17ee88027b35915b1aa35969dec64924c6e79c8a0ce1f8fbb48a8079c221f401abb5585322287c43da2dfb1915b61ac1a478a03504198f0d15b35e7504f503
6
+ metadata.gz: a013511eb25261677a2a593b1dfd28e60b8f7620a23c1f59f213984c42341b44cfe5cd0e40b028a50d1259657bc24e0215811b2105931ed23b6269fcc12e7ddb
7
+ data.tar.gz: edbfc3f31cf25aafad70d46b5d74720e12cc2dd53915eb1d393d068199b7c0142b4de57c1ff99a9620337a81a55487f45fbbdd98a4bdce6227c4694b0b2c6354
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module ArVirtualField
4
- VERSION = "0.11.0"
4
+ VERSION = "1.0.0"
5
5
  end
@@ -19,6 +19,22 @@ module ArVirtualField
19
19
  def self.table_with_column(name)
20
20
  "#{name}_outer.#{name}"
21
21
  end
22
+
23
+ def self.unwrap_arel_expression(exp)
24
+ Arel::Nodes::Grouping.new(
25
+ exp.is_a?(Arel::Nodes::NodeExpression) ? exp : Arel.sql(exp)
26
+ )
27
+ end
28
+
29
+ def self.wrap_to_lambda(exp)
30
+ case exp
31
+ when Proc
32
+ -> { HelperMethods.unwrap_arel_expression(exp.()) }
33
+ else
34
+ arel = HelperMethods.unwrap_arel_expression(exp)
35
+ -> { arel }
36
+ end
37
+ end
22
38
  end
23
39
 
24
40
  class FieldsData < Hash
@@ -38,20 +54,20 @@ module ArVirtualField
38
54
 
39
55
  name = name.to_s
40
56
  current_class = self
41
- unwrap_arel_expression = -> (exp) {
42
- Arel::Nodes::Grouping.new(
43
- exp.is_a?(Arel::Nodes::NodeExpression) ? exp : Arel.sql(exp)
44
- )
45
- }
46
57
 
47
- select_lambda =
48
- case select
49
- when Proc
50
- -> { unwrap_arel_expression.(select.()) }
58
+ if default
59
+ default = HelperMethods.wrap_to_lambda(default)
60
+ end
61
+
62
+ select = HelperMethods.wrap_to_lambda(select)
63
+
64
+ select_lambda = -> do
65
+ if default
66
+ Arel::Nodes::NamedFunction.new('COALESCE', [select.(), default.()])
51
67
  else
52
- arel = unwrap_arel_expression.(select)
53
- -> { arel }
68
+ select.()
54
69
  end
70
+ end
55
71
 
56
72
  if scope
57
73
  @ar_virtual_fields[name.to_sym] = -> { Arel.sql(HelperMethods.table_with_column(name)) }
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ar_virtual_field
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.11.0
4
+ version: 1.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pavel Egorov
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2025-04-07 00:00:00.000000000 Z
11
+ date: 2025-05-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord