type_balancer_rails 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8cb44e1021bb6681468e80eb02a256ced78b07e7dfbe825075743f84041925a
-  data.tar.gz: a4b24000bd076ba214c300c3fb6df31205aa2e5c902b18b283c927d8b3b3a2a2
+  metadata.gz: b638243aa1d2aa29637bf2696d7ce7e8625bed13c17bb73122ddb0d9f1356e6a
+  data.tar.gz: 4ac1aa33b569d4da75786e0a8a14ae35a5c2fb20fd3d86cdb1637ef630719809
 SHA512:
-  metadata.gz: 66f4ae2af899d916990f755ecd458a3a65e5ac4b3f2f0f0018162ab4a8e26a6bfa68ef2af3b035ec82fcbab4b4118b4b46fccaebb31e719e7842ccbd4ff694ab
-  data.tar.gz: 8bac8d9abd629d29ca25a49aae129c7ec546842c18903b674b441311cf01e9627350e3cc48ae6ee0f7c31f1d6ed59d072437b1db749e4b37fe9ec0a604d6d245
+  metadata.gz: 7fd6d6bcd22be7a11c2bd9d5181253c31f0df27966d7c4a68258c3a7e9b6690a42c4e7e4320d2ed543c4155caf2ae7a79e361202bf37661f2f6f6282f98ff29f
+  data.tar.gz: 22503105265aa58554a3e839d431ca3e4ac8d15f39c2b90a3099175cdd383bbdf4deb0982c97886a50ea6da71057258e308e8e4467ced627980c689dfd205f85

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## [Unreleased]
 
+## [0.2.0] - 2024-04-27
+
+- Refactored `balance_by_type` to only send `id` and type field to TypeBalancer for efficiency and clarity
+- Ensured robust ordering of returned records based on balanced ids (supports flat and nested balancer output)
+- Full TDD coverage for all new and refactored logic (unit and integration tests)
+- Added GitHub Actions workflow for automated gem releases on tag push
+
 ## [0.1.0] - 2025-04-10
 
 - Initial release

data/lib/type_balancer/rails/active_record_extension.rb

@@ -19,9 +19,15 @@ module TypeBalancer
       end
 
       class_methods do
-        def balance_by_type(options = {})
+        # Accepts either a symbol (type field) or options hash
+        def balance_by_type(type_field = nil, **options)
+          if type_field.is_a?(Hash)
+            options = type_field
+            type_field = options[:type_field]
+          end
+
           self.type_balancer_options = {
-            type_field: options[:type_field] || :type
+            type_field: type_field || options[:type_field] || :type
           }
 
           return [] unless respond_to?(:all)

data/lib/type_balancer/rails/collection_methods.rb

@@ -23,31 +23,44 @@ module TypeBalancer
         records = to_a
         return empty_relation if records.empty?
 
-        # Get type field from options or model configuration
         type_field = fetch_type_field(options)
-
-        # Balance records using TypeBalancer
-        balanced = TypeBalancer.balance(records, type_field: type_field)
-        return empty_relation if balanced.nil?
-
-        # Handle pagination if requested
-        if options[:page] || options[:per_page]
-          page = (options[:page] || 1).to_i
-          per_page = (options[:per_page] || 20).to_i
-          offset = (page - 1) * per_page
-          balanced = balanced[offset, per_page] || []
+        # Map to array of hashes with only id and type
+        id_and_type_hashes = records.map do |record|
+          { id: record.id, type: record.send(type_field) }
         end
+        balanced = TypeBalancer.balance(id_and_type_hashes, type_field: :type)
+        return empty_relation if balanced.nil?
 
-        # Return as relation
-        TestRelation.new(balanced)
+        paged = apply_pagination(balanced, options)
+        build_result(paged)
       end
 
-      def all_records = to_a
-
       private
 
+      def apply_pagination(records, options)
+        return records unless options[:page] || options[:per_page]
+
+        page      = (options[:page] || 1).to_i
+        per_page  = (options[:per_page] || 20).to_i
+        offset    = (page - 1) * per_page
+        records[offset, per_page] || []
+      end
+
+      def build_result(balanced)
+        # Flatten in case balanced is a nested array
+        ids = balanced.flatten.map { |h| h[:id] }
+        # Map back to original records (works for both AR and TestRelation)
+        records_by_id = to_a.index_by(&:id)
+        ordered = ids.map { |id| records_by_id[id] }
+        self.class.new(ordered)
+      end
+
       def empty_relation
-        TestRelation.new([])
+        if klass.respond_to?(:none)
+          klass.none
+        else
+          []
+        end
       end
 
       def fetch_type_field(options)

data/lib/type_balancer/rails/version.rb

@@ -2,6 +2,6 @@
 
 module TypeBalancer
   module Rails
-    VERSION = '0.1.2'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: type_balancer_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Carl Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-26 00:00:00.000000000 Z
+date: 2025-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Rails integration for type_balancer