cw_card_utils 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e5acadb2f17888059b69bf0a5c4c20d9e438375761bb8d56808a27c779a8b98
-  data.tar.gz: 413bce7c0c160022a65cd2a5720824b73b6bc00fec47489ca3ffb69f60403575
+  metadata.gz: e84c44da534cca5805a700be0bb4d6879e79331cd7661ebd26ade34ccdd21f6d
+  data.tar.gz: 2dbd8e194dc74cba381cfebd85563bf40e8b924be63f5da20c8afbd73d3372ea
 SHA512:
-  metadata.gz: 860bbc887b20638e8e8df36851c04b803e95b855dd5700df95efc883db136f4b733f5db29ad4b8af2bfcfbd87d4df694dbc2868bb49d2abed8f7b3873380b2f7
-  data.tar.gz: 329517e367d3d4cd2daa0862d47e951946e2bb88c980f88f124766ceeb6fcbce9e227e8aa03daf67d914ed7b9a6c9f2d8b2729e53e7f3e406f515a1704b38540
+  metadata.gz: 24c78700494fb3127867abda79718387c2563c4c4cc1f4c80fded769f14a198074fd86aadb43b24474c352b9f40a249b8434126cc6c27f03987b08b84edd08fb
+  data.tar.gz: 54bfabb464f898fe874310dfbabcfb18d47f64911a85e4db0f85bcc4b69eb7be8a9ab798b61871f43b1311af4bf344f3ae9863308043afa5214316c081f11db4

data/lib/cw_card_utils/curve_calculator.rb

@@ -4,9 +4,37 @@ module CwCardUtils
   class CurveCalculator
     def initialize(deck)
       @deck = deck
-      @deck_size = deck.size
+      @deck_size = @deck.count_without_lands
       @raw_curve = {}
       @normalized_curve = {}
+      @collapsed_normalized_curve = {}
+      @collapsed_curve = {}
+    end
+
+    def collapsed_curve
+      return @collapsed_curve if @collapsed_curve.values.any?
+
+      @collapsed_curve = {
+        '0-1' => 0,
+        '2'   => 0,
+        '3'   => 0,
+        '4'   => 0,
+        '5'   => 0,
+        '6+'  => 0
+      }
+      
+      curve.each do |cmc, count|
+        case cmc
+        when 0..1 then @collapsed_curve['0-1'] += count
+        when 2    then @collapsed_curve['2'] += count
+        when 3    then @collapsed_curve['3'] += count
+        when 4    then @collapsed_curve['4'] += count
+        when 5    then @collapsed_curve['5'] += count
+        else           @collapsed_curve['6+'] += count
+        end
+      end
+    
+      @collapsed_curve
     end
 
     def curve
@@ -15,10 +43,15 @@ module CwCardUtils
     end
 
     def normalized_curve
-      normalize_curve if @normalized_curve.empty?
+      normalize_curve if @normalized_curve.values.empty?
       @normalized_curve
     end
 
+    def collapsed_normalized_curve
+      normalize_collapsed_curve if @collapsed_normalized_curve.values.empty?
+     @collapsed_normalized_curve
+    end
+
     private
 
     def calculate_curve
@@ -44,7 +77,13 @@ module CwCardUtils
 
     def normalize_curve
       @normalized_curve = curve.sort_by { |cmc, _| cmc }.to_h.transform_values do |count|
-        (count / @deck_size.to_f).round(4)
+        (count / @deck.count_without_lands.to_f).round(4)
+      end
+    end
+
+    def normalize_collapsed_curve
+      @collapsed_normalized_curve =collapsed_curve.sort_by { |cmc, _| cmc }.to_h.transform_values do |count|
+        (count / @deck.count_without_lands.to_f).round(4)
       end
     end
   end

data/lib/cw_card_utils/decklist_parser.rb

@@ -82,13 +82,16 @@ module CwCardUtils
       def initialize(cmc_data_source)
         @main = []
         @sideboard = []
+        @lands = []
+        @x_to_cast = []
+        
         @cmc_data_source = cmc_data_source
       end
 
       def to_h
         {
-          mainboard: @main.map { |c| Card.new(c[:name], c[:count], @cmc_data_source).to_h },
-          sideboard: @sideboard.map { |c| Card.new(c[:name], c[:count], @cmc_data_source).to_h }
+          mainboard: @main.map(&:to_h),
+          sideboard: @sideboard.map(&:to_h),
         }
       end
 
@@ -110,40 +113,61 @@ module CwCardUtils
 
       def each(&block)
         @main.each do |c|
-          c = Card.new(c[:name], c[:count], @cmc_data_source)
           block.call(c)
         end
       end
 
       attr_reader :main, :sideboard
 
-      def add(card, target = :mainboard)
+      def add(c, target = :mainboard)
         reset_counters
+        card = Card.new(c[:name], c[:count], @cmc_data_source)
+
         if target == :mainboard
           @main << card
         else
           @sideboard << card
         end
+
+        if card.type == "Land"
+          @lands << card
+        elsif card.cmc.nil?
+          @x_to_cast << card
+        end
       end
 
       def reset_counters
         @mainboard_size = nil
         @sideboard_size = nil
+        @lands_count = nil
+        @x_to_cast_count = nil
         @cards_count = nil
       end
 
       def mainboard_size
-        @mainboard_size ||= main.sum { |card| card[:count] }
+        @mainboard_size ||= main.sum { |card| card.count }
       end
 
       def sideboard_size
-        @sideboard_size ||= sideboard.sum { |card| card[:count] }
+        @sideboard_size ||= sideboard.sum { |card| card.count }
+      end
+
+      def lands_count
+        @lands_count ||= @lands.sum { |card| card.count }
+      end
+
+      def x_to_cast_count
+        @x_to_cast_count ||= @x_to_cast.sum { |card| card.count }
       end
 
       def cards_count
         @cards_count ||= mainboard_size + sideboard_size
       end
 
+      def count_without_lands
+        @count_without_lands ||= cards_count - lands_count
+      end
+
       def size
         cards_count
       end

data/lib/cw_card_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CwCardUtils
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cw_card_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ryan Stenhouse
 bindir: exe
 cert_chain: []
-date: 2025-07-26 00:00:00.000000000 Z
+date: 2025-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json