type_balancer_rails 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57e73c24c2f2b4fab4f8cf8588cfe74a2be42f2392ff39195f7cb2021d8640f7
-  data.tar.gz: 2268520c561f4747aa76fd9913f8b33e05ba629ae7829a8bd863a2c58107c1e5
+  metadata.gz: 9c4859dc726a940a595ec48b50f3f57b676a713284985a567cae18b7b9e3fbaf
+  data.tar.gz: 685d88e62604917c4d848cdaa3ab9ed8bb9e3dea603ff801e69053dd5f46e01d
 SHA512:
-  metadata.gz: 7c8d71e437fc6ed17b3549581397e890b1d8e6ba0eb69161d9760d739dd0c32ba44765db7f7e2b215db6d96a59273064801bc8a0eea8f88f268745eb34c2f30a
-  data.tar.gz: db58f0c79fd64b464d5756e8636abcc6c79c4c7efdc1466ac7ea3578a0a498ede362eefd589779683fbb22488cf9dea5ec3759ac302b0024f0c8e1bd8dfba590
+  metadata.gz: 13cc2051f82762ff5c6b1b2c9c3c4b61f59760b88765a2927888e163a2b5ed878818eb0995c52f9aac534e30df48bd16eb0d1df581594f7a854029cf7fbd21bc
+  data.tar.gz: 6ecf0a7791776aa4260a6a213567f462e1be228d4ef706edb873a65734c7bf1dad4a0e48520e14b3e2b9c071a1c390acf827dcc9f4e33f4b79fa8ec88348b82a

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## [Unreleased]
 
+## [0.2.4] - 2025-04-29
+
+- Fixed critical ActiveRecord extension compatibility issue with `all` method
+- Improved ActiveRecord integration by properly maintaining method signatures
+- Enhanced test coverage for ActiveRecord core functionality
+- Ensured compatibility with internal ActiveRecord operations like `reload`
+
 ## [0.2.3] - 2025-04-29
 
 - Fixed issue with returning correctly balance items

data/example/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    type_balancer_rails (0.2.2)
+    type_balancer_rails (0.2.4)
       activerecord (>= 7.0, < 9.0)
       activesupport (>= 7.0, < 9.0)
       type_balancer (~> 0.1, >= 0.1.4)

data/example/spec/fixtures/contents.yml

@@ -0,0 +1,19 @@
+# Skewed distribution for demoing balancing on two fields
+<% 1.upto(30) do |i| %>
+news_video_<%= i %>:
+  title: "News Video <%= i %>"
+  category: news
+  content_type: video
+<% end %>
+<% 1.upto(15) do |i| %>
+blog_article_<%= i %>:
+  title: "Blog Article <%= i %>"
+  category: blog
+  content_type: article
+<% end %>
+<% 1.upto(5) do |i| %>
+tutorial_image_<%= i %>:
+  title: "Tutorial Image <%= i %>"
+  category: tutorial
+  content_type: image
+<% end %> 

data/example/spec/fixtures/posts.yml

@@ -0,0 +1,16 @@
+# Skewed distribution for demoing balancing
+<% 1.upto(35) do |i| %>
+video_post_<%= i %>:
+  title: "Video Post <%= i %>"
+  media_type: "video"
+<% end %>
+<% 1.upto(10) do |i| %>
+article_post_<%= i %>:
+  title: "Article Post <%= i %>"
+  media_type: "article"
+<% end %>
+<% 1.upto(5) do |i| %>
+image_post_<%= i %>:
+  title: "Image Post <%= i %>"
+  media_type: "image"
+<% end %> 

data/example/spec/models/content_spec.rb

@@ -16,4 +16,36 @@ RSpec.describe Content, type: :model do
     expect(balanced).not_to eq(original)
     expect(balanced.uniq.sort).to contain_exactly('article', 'image', 'video')
   end
+
+  describe 'type balancing with real records' do
+    before do
+      described_class.delete_all
+      @content1 = described_class.create!(title: 'Content 1', content_type: 'blog')
+      @content2 = described_class.create!(title: 'Content 2', content_type: 'news')
+      @content3 = described_class.create!(title: 'Content 3', content_type: 'blog')
+    end
+
+    after do
+      described_class.delete_all
+    end
+
+    it 'works with dynamic type field configuration' do
+      # Test with content_type field
+      balanced = described_class.all.balance_by_type(type_field: :content_type)
+      expect(balanced.map(&:content_type)).to eq([ 'news', 'blog', 'blog' ])
+
+      # Test with where clause
+      blogs = described_class.where(content_type: 'blog').balance_by_type(type_field: :content_type)
+      expect(blogs.count).to eq(2)
+    end
+
+    it 'works with complex queries and dynamic type field' do
+      result = described_class.where(content_type: [ 'blog', 'news' ])
+                     .order(:title)
+                     .limit(2)
+                     .balance_by_type(type_field: :content_type)
+      expect(result.length).to eq(2)
+      expect(result.map(&:content_type)).to include('blog', 'news')
+    end
+  end
 end

data/example/spec/models/post_spec.rb

@@ -9,4 +9,47 @@ RSpec.describe Post, type: :model do
     expect(balanced).not_to eq(original)
     expect(balanced.uniq.sort).to contain_exactly('article', 'image', 'video')
   end
+
+  describe 'type balancing with real records' do
+    let(:video_post) { described_class.create!(title: 'Post 1', media_type: 'video') }
+    let(:article_post) { described_class.create!(title: 'Post 2', media_type: 'article') }
+    let(:another_video_post) { described_class.create!(title: 'Post 3', media_type: 'video') }
+
+    before do
+      described_class.delete_all
+      video_post; article_post; another_video_post  # Create the records
+    end
+
+    after do
+      described_class.delete_all
+    end
+
+    it 'works with basic ActiveRecord methods' do
+      # Test .all
+      balanced = described_class.all.balance_by_type
+      expect(balanced.map(&:media_type)).to eq([ 'article', 'video', 'video' ])
+
+      # Test .where
+      videos = described_class.where(media_type: 'video').balance_by_type
+      expect(videos.count).to eq(2)
+
+      # Test .order
+      ordered = described_class.order(:title).balance_by_type
+      expect(ordered.map(&:title)).to contain_exactly('Post 1', 'Post 2', 'Post 3')
+    end
+
+    it 'works with reload' do
+      post = video_post.reload
+      expect(post.media_type).to eq('video')
+    end
+
+    it 'works with complex queries' do
+      result = described_class.where(media_type: [ 'video', 'article' ])
+                  .order(:title)
+                  .limit(2)
+                  .balance_by_type
+      expect(result.length).to eq(2)
+      expect(result.map(&:media_type)).to include('video', 'article')
+    end
+  end
 end

data/lib/type_balancer/rails/active_record_extension.rb

@@ -9,12 +9,15 @@ module TypeBalancer
       extend ActiveSupport::Concern
 
       included do
-        class << self
-          def all
-            relation = super
-            relation.extend(TypeBalancer::Rails::CollectionMethods)
-            relation
-          end
+        # TODO: Future Enhancement - Lazy Loading of CollectionMethods
+        # Currently, CollectionMethods is included globally as soon as any model extends ActiveRecordExtension.
+        # This could be optimized to only include CollectionMethods when balance_by_type is first called on a model.
+        # This would make the extension truly opt-in at the model level and prevent unnecessary inclusion
+        # in models that don't use type balancing.
+
+        # Only include CollectionMethods if it hasn't been included yet
+        unless ActiveRecord::Relation.included_modules.include?(TypeBalancer::Rails::CollectionMethods)
+          ActiveRecord::Relation.include(TypeBalancer::Rails::CollectionMethods)
         end
       end
 
@@ -35,7 +38,6 @@ module TypeBalancer
           relation = all
           return [] unless relation.is_a?(ActiveRecord::Relation)
 
-          relation.extend(CollectionMethods)
           relation.balance_by_type(options)
         end
 

data/lib/type_balancer/rails/version.rb

@@ -2,6 +2,6 @@
 
 module TypeBalancer
   module Rails
-    VERSION = '0.2.3'
+    VERSION = '0.2.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: type_balancer_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Carl Smith
@@ -154,6 +154,8 @@ files:
 - example/spec/controllers/posts_controller_spec.rb
 - example/spec/features/contents_balancing_spec.rb
 - example/spec/features/posts_balancing_spec.rb
+- example/spec/fixtures/contents.yml
+- example/spec/fixtures/posts.yml
 - example/spec/models/content_spec.rb
 - example/spec/models/post_spec.rb
 - example/spec/rails_helper.rb