ar_virtual_field 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c391b47a216fd9d3f4d88fded8000f516eb80cf8bcec72261ae11aba4db36da
-  data.tar.gz: b2c66124f49c5ab41911619a6bb035dda7654c221b8968bbba37625ad0137351
+  metadata.gz: d7a9c50d5fa5be76b750cd68d22f5fe8ca0c15e2eb88c099c5d73b6a2b728815
+  data.tar.gz: 6801aa54d664672c35977025215fd5d1c00f030c2f1c3ddc78ba2d54a72aea15
 SHA512:
-  metadata.gz: e7ff29785eeef3a6b1b1b77f7711fe0fb776304d7ab7e6f7b70028cd07f7be8d81a1b6b289c82a7be3ac852c4e41baea0cbe6f1be58a2e9ff68e1a9bde7a672a
-  data.tar.gz: fd45c9a488e01424d808e6b16647419eb74dc5a3094159ccce1992745f94bf03723da47849a6abe8d9bb851304d3e50949bfcbc42fe3957cbe0c2a72cd9ccb42
+  metadata.gz: '09e2c21db4d2d3d9ea91056ba87d355a6c2ff27a2a4c9119182164bf5f201c76602ef9bc28f9298497fee79c56b50010f8adf4523fde81e7a1c65a4d9c8e3799'
+  data.tar.gz: d99b66f81f0ea83605448fe246bb432a3cdb93db4a4d80eeecbe3a92836ff44ef701482b8d2bf3669a1ac2e9d8ab80245e7315daf66f03f1203ef4bc3aa3ccb8

data/README.md

@@ -39,12 +39,12 @@ Example:
 class User < ApplicationRecord
   virtual_field :total_orders,
     scope: -> { joins(:orders).group(:id) },
-    select: -> { "COUNT(orders.id)" },
+    select: "COUNT(orders.id)",
     get: -> { orders.count },
     default: 0
 
   virtual_field :fullname,
-    select: -> { "name || surname" },
+    select: "name || surname",
     get: -> { "#{name}#{surname}" }
 end
 
@@ -52,7 +52,7 @@ users_with_orders = User.with_total_orders # queries database once
 
 user = users_with_orders.first
 user.total_orders # => value computed by database
-user.fullname # => value computed by database
+user.fullname # => value computed by ruby
 ```
 
 ### Scopes and querying:
@@ -60,12 +60,9 @@ user.fullname # => value computed by database
  - `with_#{name}`: Automatically generated scope to include the virtual field in queries. You can use this scope in your ActiveRecord queries like so:
 
 ```ruby
-User.with_total_orders.where(ArVirtualField[:total_orders] => 5)
+User.with_total_orders.where(User.virtual_fields[:total_orders].eq(5))
 ```
 
-> [!WARNING]  
-> `ArVirtualField[]` doesn't sanitize its value itself, this example relies on `#where` sanitation, use with caution
-
 This will include the total_orders virtual field in the SQL query and allow filtering by it.
 
 ## Contributing

data/lib/ar_virtual_field/version.rb

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

data/lib/ar_virtual_field.rb

@@ -21,11 +21,21 @@ module ArVirtualField
     end
   end
 
-  def self.[](field)
-    Arel.sql(HelperMethods.table_with_column(field))
+  class FieldsData < Hash
+    def [](field)
+      statement = super(field.to_sym)
+      raise "Unknown virtual field `#{field}`" unless statement
+      statement.()
+    end
+  end
+
+  def virtual_fields
+    @ar_virtual_fields || FieldsData.new
   end
 
   def virtual_field(name, scope: nil, select:, get:, default: nil)
+    @ar_virtual_fields ||= FieldsData.new
+
     name = name.to_s
     current_class = self
     unwrap_arel_expression = -> (exp) { exp.is_a?(Arel::Nodes::NodeExpression) ? exp : Arel.sql(exp) }
@@ -40,6 +50,8 @@ module ArVirtualField
       end
 
     if scope
+      @ar_virtual_fields[name.to_sym] = -> { Arel.sql(HelperMethods.table_with_column(name)) }
+
       scope_name = :"_scope_#{name}"
 
       scope(scope_name, scope)
@@ -51,10 +63,16 @@ module ArVirtualField
 
         HelperMethods.select_append(joins(<<~SQL.squish), "#{HelperMethods.table_with_column(name)} AS #{name}")
           LEFT JOIN (#{scope_query.to_sql}) #{HelperMethods.table_name(name)}
-            ON #{HelperMethods.table_name(name)}.id = #{table_name}.id
+            ON #{
+              Array(primary_key).map do |pk|
+                "#{HelperMethods.table_name(name)}.#{pk} = #{table_name}.#{pk}"
+              end.join(' AND')
+            }
         SQL
       end)
     else
+      @ar_virtual_fields[name.to_sym] = -> { select_lambda.() }
+
       scope(:"with_#{name}", -> do
         HelperMethods.select_append(self, select_lambda.().as(name))
       end)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_virtual_field
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Pavel Egorov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-17 00:00:00.000000000 Z
+date: 2024-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Adds .virtual_field method to make it easy to define virtual fields
 email:
 - moonmeander47@ya.ru