type_balancer 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f73ec86fddfda3cd22f19b0081824a8a488e1a47359976e32eb6b999074b92a3
-  data.tar.gz: f25f85b6caeeeb3a5f8012ae295b96ae02413e4b4342aba946438bbcbb9eb063
+  metadata.gz: 6c93fa5dcb75821b9f9ea3340f06ca63d67f84781bcf90f13ac089abac7283b7
+  data.tar.gz: fbfadcf9eed52f9f82a5f0a99f05fe3801c8529c32735f3d2eac5b0d42648a4b
 SHA512:
-  metadata.gz: c8895eea255feccab33cd33ba70d9bfb486a4ff9108ba1a828d1be72b501db1635cb35d5aab574298923533d1080c29d7b45a50bb8d1547ffdacfd882dc4d491
-  data.tar.gz: '09f755338981a1523cae4eddc3468b17d7693b9183e7039b7e81f1d24bd6beab29133d9d9a797487ea3745195f3f4e577311c89258b41fa237bd63cc3fb63cd2'
+  metadata.gz: 316f4c79fb96b3ff7362a61a4524f2d08e67be712b23f6c1a6f36d4b24332ae58266ce2fbd6dd39a7deea190f9f2f9e965c0bafe94443dd24be571ed62f302fd
+  data.tar.gz: 054a3439add0798dc20593ace1681734fbed87f4d162baeb9e41b6f672cbbb43c7c2b17cd67a92d2c1a4a047b9418707139c2168cdcbde08a105376af53eb39e

data/CHANGELOG.md

@@ -1,11 +1,23 @@
 # Changelog
 
-## [0.1.2] - 2024-04-11
+## [0.1.4] - 2025-04-29
+
+### Fixed
+- Fixed issue with providing a custom type field
+
+## [0.1.3] - 2025-04-27
+
+### Fixed
+- Fixed type balancing behavior to properly handle edge cases where type ratios need to be maintained while respecting original collection order
+- Enhanced position calculation to ensure consistent type distribution across the balanced collection
+- Improved test coverage to verify correct type ratio preservation
+
+## [0.1.2] - 2025-04-11
 
 - Re-release of 0.1.1 due to RubyGems.org publishing issue
 - No functional changes from 0.1.1
 
-## [0.1.1] - 2024-03-XX
+## [0.1.1] - 2025-04-10
 
 ### Refactoring
 - Major refactoring of core components to follow SOLID principles:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    type_balancer (0.1.3)
+    type_balancer (0.1.4)
 
 GEM
   remote: https://rubygems.org/

data/examples/quality.rb

@@ -23,6 +23,7 @@ class QualityChecker
     check_available_positions_edge_cases
     check_balance_method_robust
     check_real_world_feed
+    check_custom_type_field
 
     print_summary
     exit(@issues.empty? ? 0 : 1)
@@ -328,6 +329,28 @@ class QualityChecker
     puts "  Balanced items with custom order: #{ordered_result.map { |i| i[:type] }.inspect}"
   end
 
+  def check_custom_type_field
+    @examples_run += 1
+    puts "\nCustom Type Field Example:"
+    data = [
+      { category: 'A', payload: 1 },
+      { category: 'B', payload: 2 },
+      { category: 'C', payload: 3 },
+      { category: 'A', payload: 4 }
+    ]
+    balanced = TypeBalancer.balance(data, type_field: :category)
+    found = balanced.map { |i| i[:category] }.uniq.sort
+    expected = %w[A B C]
+    if found == expected
+      @examples_passed += 1
+      puts "#{GREEN}Custom field respected: #{found.inspect}#{RESET}"
+    else
+      record_issue("Expected #{expected.inspect}, got #{found.inspect}")
+      puts "#{RED}Custom field test failed: #{found.inspect}#{RESET}"
+    end
+    print_section_table('custom_type_field', 1, found == expected ? 1 : 0)
+  end
+
   def print_summary
     puts "\n#{'-' * 50}"
     puts 'Quality Check Summary:'

data/lib/type_balancer/balancer.rb

@@ -3,6 +3,7 @@
 require_relative 'ratio_calculator'
 require_relative 'batch_processing'
 require_relative 'position_calculator'
+require_relative 'type_extractor_registry'
 
 module TypeBalancer
   # Handles balancing of items across batches based on type ratios
@@ -10,9 +11,11 @@ module TypeBalancer
     # Initialize a new Balancer instance
     #
     # @param types [Array<String>, nil] Optional types
+    # @param type_field [Symbol] Field to use for type extraction (default: :type)
     # @param type_order [Array<String>, nil] Optional order of types
-    def initialize(types = nil, type_order: nil)
+    def initialize(types = nil, type_field: :type, type_order: nil)
       @types = Array(types) if types
+      @type_field = type_field
       @type_order = type_order
       validate_types! if @types
     end
@@ -23,7 +26,18 @@ module TypeBalancer
     # @return [Array] Balanced items
     def call(collection)
       validate_collection!(collection)
-      items_by_type = group_items_by_type(collection)
+      extractor = TypeExtractorRegistry.get(@type_field)
+
+      begin
+        items_by_type = extractor.group_by_type(collection)
+      rescue TypeBalancer::Error => e
+        raise TypeBalancer::Error, "Cannot access type field '#{@type_field}': #{e.message}"
+      end
+
+      # Remove nil types and validate
+      items_by_type.delete(nil)
+      raise TypeBalancer::Error, "Cannot access type field '#{@type_field}'" if items_by_type.empty?
+
       validate_types_in_collection!(items_by_type)
 
       target_counts = calculate_target_counts(items_by_type)
@@ -70,24 +84,7 @@ module TypeBalancer
       raise TypeBalancer::Error, "Invalid type(s): #{invalid_types.join(', ')}" if invalid_types.any?
     end
 
-    def group_items_by_type(collection)
-      collection.group_by do |item|
-        extract_type(item)
-      end
-    end
-
-    def extract_type(item)
-      return item[:type] || item['type'] || raise(TypeBalancer::Error, 'Cannot access type field') if item.is_a?(Hash)
-
-      begin
-        item.type
-      rescue NoMethodError
-        raise TypeBalancer::Error, 'Cannot access type field'
-      end
-    end
-
     def calculate_target_counts(items_by_type)
-      items_by_type.values.sum(&:size)
       items_by_type.transform_values(&:size)
     end
 

data/lib/type_balancer/type_extractor.rb

@@ -20,10 +20,15 @@ module TypeBalancer
       if item.respond_to?(@type_field)
         item.send(@type_field)
       elsif item.respond_to?(:[])
-        item[@type_field] || item[@type_field.to_s]
+        value = item[@type_field] || item[@type_field.to_s]
+        raise TypeBalancer::Error, "Cannot access type field '#{@type_field}' on item #{item.inspect}" if value.nil?
+
+        value
       else
-        raise Error, "Cannot access type field '#{@type_field}' on item #{item}"
+        raise TypeBalancer::Error, "Cannot access type field '#{@type_field}' on item #{item.inspect}"
       end
+    rescue NoMethodError, TypeError
+      raise TypeBalancer::Error, "Cannot access type field '#{@type_field}' on item #{item.inspect}"
     end
   end
 end

data/lib/type_balancer/type_extractor_registry.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module TypeBalancer
+  # Registry to memoize TypeExtractor per type_field in thread/request scope
+  class TypeExtractorRegistry
+    STORAGE_KEY = :type_balancer_extractors
+
+    def self.get(type_field)
+      cache[type_field] ||= TypeExtractor.new(type_field)
+    end
+
+    def self.clear!
+      Thread.current[STORAGE_KEY] = nil
+    end
+
+    def self.cache
+      Thread.current[STORAGE_KEY] ||= {}
+    end
+  end
+end

data/lib/type_balancer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TypeBalancer
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/type_balancer.rb

@@ -6,6 +6,8 @@ require_relative 'type_balancer/balancer'
 require_relative 'type_balancer/ratio_calculator'
 require_relative 'type_balancer/batch_processing'
 require 'type_balancer/position_calculator'
+require_relative 'type_balancer/type_extractor'
+require_relative 'type_balancer/type_extractor_registry'
 
 module TypeBalancer
   class Error < StandardError; end
@@ -33,31 +35,27 @@ module TypeBalancer
     # Input validation
     raise EmptyCollectionError, 'Collection cannot be empty' if items.empty?
 
-    # Extract and validate types
-    types = extract_types(items, type_field)
-    raise Error, "Invalid type field: #{type_field}" if types.empty?
-
-    # Group items by type
-    items.group_by { |item| extract_type(item, type_field) }
+    # Use centralized extractor
+    extractor = TypeExtractorRegistry.get(type_field)
+    begin
+      types = extractor.extract_types(items)
+      raise Error, "Invalid type field: #{type_field}" if types.empty?
+    rescue Error => e
+      raise Error, "Cannot access type field '#{type_field}': #{e.message}"
+    end
 
-    # Initialize balancer with type order if provided
-    balancer = Balancer.new(types, type_order: type_order)
+    # Initialize balancer with type order and type field
+    balancer = Balancer.new(types, type_field: type_field, type_order: type_order)
 
     # Balance items
     balancer.call(items)
   end
 
+  # Backward compatibility methods
   def self.extract_types(items, type_field)
-    items.map { |item| extract_type(item, type_field) }.uniq
-  end
-
-  def self.extract_type(item, type_field)
-    if item.is_a?(Hash)
-      item[type_field] || item[type_field.to_s]
-    else
-      item.public_send(type_field)
-    end
-  rescue NoMethodError
-    nil
+    TypeExtractorRegistry.get(type_field).extract_types(items)
+  rescue Error
+    # For backward compatibility, return array with nil for inaccessible type fields
+    [nil]
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: type_balancer
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Carl Smith
 bindir: exe
 cert_chain: []
-date: 2025-04-28 00:00:00.000000000 Z
+date: 2025-04-29 00:00:00.000000000 Z
 dependencies: []
 description: Balances types in collections by ensuring each type appears a similar
   number of times
@@ -56,6 +56,7 @@ files:
 - lib/type_balancer/ratio_calculator.rb
 - lib/type_balancer/sequential_filler.rb
 - lib/type_balancer/type_extractor.rb
+- lib/type_balancer/type_extractor_registry.rb
 - lib/type_balancer/version.rb
 - type_balancer.gemspec
 homepage: https://github.com/llwebconsulting/type_balancer