Merge pull request #193 from kbrock/nitpicks

Nitpicks

Author: jrafanie

lib/active_record/virtual_attributes/virtual_fields.rb

@@ -191,6 +191,7 @@ def grouped_records
           # rubocop:enable Lint/AmbiguousOperatorPrecedence
 
           # branched.rb 7.0
+          # rubocop:disable Style/MultilineBlockChain
           def preloaders_for_reflection(reflection, reflection_records)
             reflection_records.group_by do |record|
               # begin virtual_attributes changes
@@ -212,6 +213,7 @@ def preloaders_for_reflection(reflection, reflection_records)
             end
           end
         end)
+        # rubocop:enable Style/MultilineBlockChain
       end
     end
   end

lib/active_record/virtual_attributes/virtual_reflections.rb

@@ -14,12 +14,12 @@ def virtual_has_one(name, uses: nil, **options)
           add_virtual_reflection(reflection, name, uses)
         end
 
-        def virtual_has_many(name, uses: nil, source: nil, through: nil, **options)
+        def virtual_has_many(name, uses: nil, source: name, through: nil, **options)
           define_method(:"#{name.to_s.singularize}_ids") do
             records = send(name)
             records.respond_to?(:ids) ? records.ids : records.collect(&:id)
           end
-          define_delegate(name, source || name, :to => through, :allow_nil => true, :default => []) if through
+          define_delegate(name, source, :to => through, :allow_nil => true, :default => []) if through
           reflection = ActiveRecord::Associations::Builder::HasMany.build(self, name, nil, options)
           add_virtual_reflection(reflection, name, uses)
         end

spec/db/models.rb

@@ -116,7 +116,7 @@ def book_with_most_bookmarks
   virtual_has_many :famous_co_authors, :uses => [:book_with_most_bookmarks, {:books => :co_authors}]
 
   def self.create_with_books(count)
-    create!(:name => "foo").tap { |author| author.create_books(count) }
+    create!(:name => "foo", :blurb => "blah blah blah").tap { |author| author.create_books(count) }
   end
 
   def create_books(count, create_attrs = {})
@@ -147,6 +147,9 @@ class Book < VirtualTotalTestBase
   virtual_delegate :name, :to => :author, :prefix => true, :type => :string
   # this tests delegates to named child attribute
   virtual_delegate :author_name2, :to => "author.name", :type => :string
+  # delegate without a prefix
+  virtual_delegate :blurb, :to => :author, :type => :string
+
   # delegate to a polymorphic
   virtual_delegate :description, :to => :current_photo, :prefix => true, :type => :string, :allow_nil => true
 

spec/db/schema.rb

@@ -7,6 +7,7 @@
     t.integer  "teacher_id", :index => true
     t.string   "name"
     t.string   "nickname"
+    t.string   "blurb"
   end
 
   create_table "books", :force => true do |t|

spec/spec_helper.rb

@@ -5,8 +5,7 @@
   end
 end
 
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
-
+$LOAD_PATH.unshift File.expand_path("../../lib", __dir__)
 require "bundler/setup"
 require "active_record/virtual_attributes"
 require "active_record/virtual_attributes/rspec"

spec/virtual_includes_spec.rb

@@ -5,6 +5,8 @@
 
   let(:author_name) { "foo" }
   let(:book_name) { "bar" }
+  let(:blurb_text) { "blah blah blah" }
+
   # NOTE: each of the 1 authors has an array of books. so this value is [[Book, Book]]
   let(:named_books) { [Book.where.not(:name => nil).order(:id).load] }
 
@@ -41,8 +43,8 @@
     end
 
     it "preloads virtual_attribute (:uses => :author, :uses => :author)" do
-      expect(Book.includes(:author_name, :author_name2)).to preload_values(:author_name, author_name)
-      expect(Book.includes(:author_name2 => {})).to preload_values(:author_name, author_name)
+      expect(Book.includes(:author_name, :blurb)).to preload_values(:author_name, author_name)
+      expect(Book.includes(:author_name => {})).to preload_values(:blurb, blurb_text)
     end
 
     it "preloads virtual_attribute (:uses => :upper_author_name) (:uses => :author_name)" do
@@ -526,7 +528,7 @@
     end
 
     it "handles hash form of delegates" do
-      expect(Book.replace_virtual_fields([{:author_name => {}}, {:author_name2 => {}}])).to eq([:author, :author])
+      expect(Book.replace_virtual_fields([{:author_name => {}}, {:blurb => {}}])).to eq([:author, :author])
     end
 
     it "handles non-'includes' virtual_attributes" do