ar_virtual_field 0.10.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: 37c2f6c3a915e35bc97e08e870940a07c867ce985dbe45e78b21797d40161acd
4
- data.tar.gz: b230aac610a72310d56db8a074cb10e9c9fb19c99f3bd32a8b398b7d34473dd7
3
+ metadata.gz: 1d194e101e0b3a130c12bc06a51379de261e0e57dafd118492383048af768c6a
4
+ data.tar.gz: ea906b4039f95176535b765fafc438aa95f8c7933575a2f4477e242e8203dda3
5
5
  SHA512:
6
- metadata.gz: 66a22de0b4143d35f1edd9d9ade22e29560fb4a33b50f235c320f3e2459bbf639100006797cc0b134478431b0513a054b7e1bb2d5a253ea95629db3d3f266831
7
- data.tar.gz: c26fdb44be918bc59a50ba08786f180dd692171fa5a1fa16c078052b02f2ea16be60ff7c93e340276188ab3aff07c56e90e810a20c151adb0411bf890057e309
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.10.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,16 +54,20 @@ module ArVirtualField
38
54
 
39
55
  name = name.to_s
40
56
  current_class = self
41
- unwrap_arel_expression = -> (exp) { exp.is_a?(Arel::Nodes::NodeExpression) ? exp : Arel.sql(exp) }
42
57
 
43
- select_lambda =
44
- case select
45
- when Proc
46
- -> { 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.()])
47
67
  else
48
- arel = unwrap_arel_expression.(select)
49
- -> { arel }
68
+ select.()
50
69
  end
70
+ end
51
71
 
52
72
  if scope
53
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.10.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: 2024-12-11 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
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
84
84
  - !ruby/object:Gem::Version
85
85
  version: '0'
86
86
  requirements: []
87
- rubygems_version: 3.4.19
87
+ rubygems_version: 3.5.22
88
88
  signing_key:
89
89
  specification_version: 4
90
90
  summary: Provide an easy mechanism to define virtual fields within an ActiveRecord