ar_virtual_field 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96ceb9c69afbfc00eb75bc1691516f8ad7c3cb2aea3a4e51bd2fc9beac2bbd81
-  data.tar.gz: d124facbe4f4ca52e3eb2272c057883e5805db4219466f34792347d36d99257e
+  metadata.gz: ffc1272f024fe7a86c06dbe98014598a79749c0e3f0b3f73aabc1abc93371e1a
+  data.tar.gz: 53662047fab832aafbcba2c18852bdea1938c27d79544a2346f0b242ef822cc0
 SHA512:
-  metadata.gz: 11b6d4800d29f4ffbae7db65c65919d77aa55550ee05b29567aa4d8a58bc3da68bbb3f49d2b4d1f59f03a42979ad5b7693629c7f12902a78e5558a5ed4123eab
-  data.tar.gz: 1e2f0e7fdb8e74a606ad6859ff8d3cd7703f94ea551a4f65ae80290e0185bc87dc17b1e59d2eee2298c560aeace5c1bf38053cd7b4a260dad6383c7b7173c113
+  metadata.gz: 195918203bffe10d882d03a950b8b89181b5cfdcebdbe700838883f006750c56fdd47c46b3ec184ea4a69155d70c0b2e49c367591e2027294bdaddfa856a9a78
+  data.tar.gz: 89de4af73dc65462a02fd4dc966fe518373c11b23b0dc2e21e6e1979932123868dcd65afbe55ea9d8cb434db6e85495444fe9b4490cfa9665411e26c857c06cd

data/README.md

@@ -14,7 +14,7 @@ gem 'ar_virtual_field'
 
 ## Usage
 
-### Defining a Virtual Field
+### Defining a virtual field
 
 To define a virtual field, use the virtual_field method in your model:
 
@@ -29,7 +29,7 @@ virtual_field :virtual_attribute,
 Parameters:
   - `name`: The name of the virtual field.
   - `scope`: A lambda defining a scope that fetches the virtual field value (optional).
-  - `select`: SQL selection logic (can be a `string | arel_node` or a lambda returning an SQL `string | arel_node`) to define how the field is computed.
+  - `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).
 
@@ -42,43 +42,32 @@ class User < ApplicationRecord
     select: -> { "COUNT(orders.id)" },
     get: -> { orders.count },
     default: 0
+
+  virtual_field :fullname,
+    select: -> { "name || surname" },
+    get: -> { "#{name}#{surname}" }
 end
-```
 
-### Using the scope in queries:
-```ruby
-users_with_orders = User.with_total_orders
+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
 ```
 
-### Scopes and Querying:
+### Scopes and querying:
 
  - `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(total_orders: 5)
+User.with_total_orders.where(ArVirtualField[:total_orders] => 5)
 ```
 
 This will include the total_orders virtual field in the SQL query and allow filtering by it.
 
-### Also it can be used without scope:
-
-```ruby
-class User < ApplicationRecord
-  virtual_field :fullname,
-    select: -> { "name || surname" },
-    get: -> { "#{name}#{surname}" }
-end
-```
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com//ar_virtual_field. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com//ar_virtual_field/blob/main/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/emfy0/ar_virtual_field. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/emfy0/ar_virtual_field/blob/main/CODE_OF_CONDUCT.md).
 
 ## License
 
@@ -86,4 +75,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the ArVirtualField project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com//ar_virtual_field/blob/main/CODE_OF_CONDUCT.md).
+Everyone interacting in the ArVirtualField project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/emfy0/ar_virtual_field/blob/main/CODE_OF_CONDUCT.md).

data/lib/ar_virtual_field/version.rb

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

data/lib/ar_virtual_field.rb

@@ -1,4 +1,6 @@
-# frozen_string_literal: true
+# frozen_string_litera: true
+
+require "active_record"
 
 module ArVirtualField
   module HelperMethods
@@ -9,6 +11,22 @@ module ArVirtualField
 
       relation.select(*values)
     end
+
+    def self.table_name(name)
+      sanitize_table_name("#{name}_outer")
+    end
+
+    def self.table_with_column(name)
+      sanitize_table_name("#{name}_outer.#{name}")
+    end
+
+    def self.sanitize_table_name(table)
+      ActiveRecord::Base.connection.quote_table_name(table)
+    end
+  end
+
+  def self.[](field)
+    Arel.sql(HelperMethods.table_with_column(field))
   end
 
   def virtual_field(name, scope: nil, select:, get:, default: nil)
@@ -31,9 +49,14 @@ module ArVirtualField
       scope(scope_name, scope)
 
       scope(:"with_#{name}", -> do
-        scope_query = current_class.send(scope_name).select(select_lambda.().as(name), "#{table_name}.id")
-        new_scope = joins("LEFT JOIN (#{scope_query.to_sql}) #{name}_outer ON #{name}_outer.id = #{table_name}.id")
-        HelperMethods.select_append(new_scope, "#{name}_outer.#{name} AS #{name}")
+        scope_query = current_class
+          .send(scope_name)
+          .select(select_lambda.().as(name), "#{table_name}.id")
+
+        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
+        SQL
       end)
     else
       scope(:"with_#{name}", -> do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar_virtual_field
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Pavel Egorov