cw_card_utils 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33af01174c18c349d5ecadd729ff82f228645e4d7de70345e031483a9b6e4aeb
-  data.tar.gz: d95e60dcf30519bdeca9ca86ab04c727e2b76c1a6de990417bd21bbe41e7ad26
+  metadata.gz: 23145f32617794cf1af83523bf179d6d9260cc75251a24207ae6ea6ce0274599
+  data.tar.gz: 7cd65b1d7e93b8f9c2438df235d77c44e294d543ff1f22e8b0aa16efb5e51192
 SHA512:
-  metadata.gz: dfa2f46a027dda4ffd67bdace956049c47bdc3a009a70f36ade4c722939d38658d05bf8adf57d85753442e44a71f6aeb12a247579277e1ecd38ce17de846bd9e
-  data.tar.gz: b0e79425dc4ce0d47788cba711c19e80554cf1a89eb63b695cbb03fa2ba0286b2e451cc20364a3b3344fd97cb0f5a56db16ba3464e90a341563fcf58ec245b1d
+  metadata.gz: 556bc7d3c4dc4d87b752d2923eba061b23356a6e2330f33691e34ee215d7cdd9e6148cd8c4a9082ddbcda179ffd68bef162d0bc6e11c25db3bc05b95589f83d9
+  data.tar.gz: e81abacff1c5dae3476a1ffb9e6a779105546f7a020edcc36fb463082842645a784e922d89660c2e779c4ceaa1d51dadf14b84ed4ae33d6326fe7188ab1135b7

data/README.md

@@ -1,50 +1,79 @@
 # CwCardUtils
 
-TODO: Delete this and the text below, and describe your gem
-
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/cw_card_utils`. To experiment with that code, run `bin/console` for an interactive prompt.
+A Ruby gem for analyzing Magic: The Gathering decklists and calculating various metrics.
 
 ## Installation
 
-TODO: Replace `UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG` with your gem name right after releasing it to RubyGems.org. Please do not do it earlier due to security reasons. Alternatively, replace this section with instructions to install your gem from git if you don't plan to release to RubyGems.org.
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'cw_card_utils'
+```
 
-Install the gem and add to the application's Gemfile by executing:
+And then execute:
 
 ```bash
-bundle add UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
+bundle install
 ```
 
-If bundler is not being used to manage dependencies, install the gem by executing:
+## Configuration
 
-```bash
-gem install UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
+You can configure the card data source used by the library:
+
+```ruby
+# In a Rails initializer (config/initializers/cw_card_utils.rb)
+CwCardUtils.configure do |config|
+  config.card_data_source = MyCustomDataSource.new
+end
+
+# Or set it directly
+CwCardUtils.card_data_source = MyCustomDataSource.new
 ```
 
+The default data source is `CwCardUtils::ScryfallCmcData.instance`, which loads card data from a local JSON file.
+
 ## Usage
 
-TODO: Write usage instructions here
+### Basic Deck Parsing
 
-## Development
+```ruby
+require 'cw_card_utils'
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+# Parse a decklist
+decklist = <<~DECK
+  4 Lightning Bolt
+  4 Mountain
+  2 Shock
+DECK
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+deck = CwCardUtils::DecklistParser::Parser.new(decklist).parse
 
-## Contributing
+# Access deck information
+puts deck.mainboard_size  # => 10
+puts deck.color_identity  # => ["R"]
+puts deck.archetype      # => :aggro
+```
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/cw_card_utils. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/cw_card_utils/blob/main/CODE_OF_CONDUCT.md).
+### Custom Data Sources
 
-## License
+You can implement your own card data source by inheriting from `CwCardUtils::CardDataSource`:
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+```ruby
+class MyCustomDataSource < CwCardUtils::CardDataSource
+  def find_card(name)
+    # Your implementation here
+    # Should return a hash with card data or nil
+  end
+end
 
-## Code of Conduct
+# Configure the library to use your data source
+CwCardUtils.card_data_source = MyCustomDataSource.new
+```
 
-Everyone interacting in the CwCardUtils project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/cw_card_utils/blob/main/CODE_OF_CONDUCT.md).
+## Development
 
-## Included Data
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-This gem includes [bulk data from Scryfall][1] to provide fallback for the curve calculator. For production
-or real-life usage, this should use your own data store. 
+## Contributing
 
-[1]: https://scryfall.com/docs/api/bulk-data
+Bug reports and pull requests are welcome on GitHub at https://github.com/cracklingwit/cw_card_utils.

data/lib/cw_card_utils/deck_comparator.rb

@@ -90,7 +90,7 @@ module CwCardUtils
 
     def extract_synergy_pairs(deck)
       synergy_cards = deck.main.select do |card|
-        (card.tags & [:synergistic_finisher, :tribal_synergy, :scaling_threat]).any?
+        card.tags.intersect?([:synergistic_finisher, :tribal_synergy, :scaling_threat])
       end
       return [] if synergy_cards.size < 2
       synergy_cards.map(&:name).combination(2).to_a

data/lib/cw_card_utils/decklist_parser/card.rb

@@ -4,11 +4,11 @@ module CwCardUtils
   module DecklistParser
     # A Card is a single card in a deck.
     class Card
-      def initialize(name, count, cmc_data_source = CwCardUtils::ScryfallCmcData.instance)
+      def initialize(name, count, cmc_data_source = nil)
         @name = name
         @count = count
         @tags = []
-        @cmc_data_source = cmc_data_source
+        @cmc_data_source = cmc_data_source || CwCardUtils.card_data_source
       end
 
       attr_reader :name, :count, :cmc_data_source

data/lib/cw_card_utils/decklist_parser/parser.rb

@@ -6,9 +6,9 @@ module CwCardUtils
     class Parser
       attr_reader :deck
 
-      def initialize(decklist, cmc_data_source = CwCardUtils::ScryfallCmcData.instance)
+      def initialize(decklist, cmc_data_source = nil)
         @decklist = decklist.is_a?(IO) ? decklist.read : decklist
-        @deck = Deck.new(cmc_data_source)
+        @deck = Deck.new(cmc_data_source || CwCardUtils.card_data_source)
       end
 
       def inspect

data/lib/cw_card_utils/scryfall_cmc_data.rb

@@ -79,9 +79,9 @@ module CwCardUtils
 
   # Represents a card with Scryfall data
   class ScryfallCard
-    def initialize(name, data_source = ScryfallCmcData.instance)
+    def initialize(name, data_source = nil)
       @name = name
-      @data = data_source.find_card(@name) || {}
+      @data = (data_source || CwCardUtils.card_data_source).find_card(@name) || {}
     end
 
     def cmc

data/lib/cw_card_utils/synergy_probability.rb

@@ -10,22 +10,27 @@ module CwCardUtils
 
     # Probability of drawing at least one of the target cards
     def prob_single(target_names, draws)
-      total_copies = count_copies(target_names)
-      1 - hypergeometric(@deck_size - total_copies, draws).to_f / hypergeometric(@deck_size, draws)
+      targets = Array(target_names).uniq
+      draws_clamped = clamp_draws(draws)
+      total_copies = count_copies(targets)
+      total = hypergeometric(@deck_size, draws_clamped).to_f
+      prob = 1 - hypergeometric(@deck_size - total_copies, draws_clamped).to_f / total
+      prob.clamp(0.0, 1.0)
     end
 
     # Probability of drawing ALL cards in the targets list (synergy pair/trio)
     def prob_combo(target_names, draws)
-      case target_names.size
+      targets = Array(target_names).uniq
+      case targets.size
       when 1
-        prob_single(target_names, draws)
+        prob_single(targets, draws)
       when 2
-        prob_two_card_combo(target_names, draws)
+        prob_two_card_combo(targets, draws)
       when 3
-        prob_three_card_combo(target_names, draws)
+        prob_three_card_combo(targets, draws)
       else
         # For >3 cards, fallback to approximation
-        approx_combo(target_names, draws)
+        approx_combo(targets, draws)
       end
     end
 
@@ -33,60 +38,70 @@ module CwCardUtils
 
     # Exact for 2-card combos
     def prob_two_card_combo(names, draws)
-      copies_a = count_copies([names[0]])
-      copies_b = count_copies([names[1]])
+      draws_clamped = clamp_draws(draws)
 
-      total = hypergeometric(@deck_size, draws).to_f
+      copies_a = copies_by_name[names[0]]
+      copies_b = copies_by_name[names[1]]
+
+      total = hypergeometric(@deck_size, draws_clamped).to_f
 
       # Probability missing A
-      miss_a = hypergeometric(@deck_size - copies_a, draws) / total
+      miss_a = hypergeometric(@deck_size - copies_a, draws_clamped) / total
       # Probability missing B
-      miss_b = hypergeometric(@deck_size - copies_b, draws) / total
+      miss_b = hypergeometric(@deck_size - copies_b, draws_clamped) / total
       # Probability missing both
-      miss_both = hypergeometric(@deck_size - (copies_a + copies_b), draws) / total
+      miss_both = hypergeometric(@deck_size - (copies_a + copies_b), draws_clamped) / total
 
       # Inclusion–exclusion
-      [1 - (miss_a + miss_b - miss_both), 0].max
+      prob = 1 - (miss_a + miss_b - miss_both)
+      prob.clamp(0.0, 1.0)
     end
 
     # Exact for 3-card combos
     def prob_three_card_combo(names, draws)
-      copies_a = count_copies([names[0]])
-      copies_b = count_copies([names[1]])
-      copies_c = count_copies([names[2]])
+      draws_clamped = clamp_draws(draws)
+
+      copies_a = copies_by_name[names[0]]
+      copies_b = copies_by_name[names[1]]
+      copies_c = copies_by_name[names[2]]
 
-      total = hypergeometric(@deck_size, draws).to_f
+      total = hypergeometric(@deck_size, draws_clamped).to_f
 
-      miss_a = hypergeometric(@deck_size - copies_a, draws) / total
-      miss_b = hypergeometric(@deck_size - copies_b, draws) / total
-      miss_c = hypergeometric(@deck_size - copies_c, draws) / total
+      miss_a = hypergeometric(@deck_size - copies_a, draws_clamped) / total
+      miss_b = hypergeometric(@deck_size - copies_b, draws_clamped) / total
+      miss_c = hypergeometric(@deck_size - copies_c, draws_clamped) / total
 
-      miss_ab = hypergeometric(@deck_size - (copies_a + copies_b), draws) / total
-      miss_ac = hypergeometric(@deck_size - (copies_a + copies_c), draws) / total
-      miss_bc = hypergeometric(@deck_size - (copies_b + copies_c), draws) / total
+      miss_ab = hypergeometric(@deck_size - (copies_a + copies_b), draws_clamped) / total
+      miss_ac = hypergeometric(@deck_size - (copies_a + copies_c), draws_clamped) / total
+      miss_bc = hypergeometric(@deck_size - (copies_b + copies_c), draws_clamped) / total
 
-      miss_abc = hypergeometric(@deck_size - (copies_a + copies_b + copies_c), draws) / total
+      miss_abc = hypergeometric(@deck_size - (copies_a + copies_b + copies_c), draws_clamped) / total
 
       # Inclusion–exclusion for 3 sets
-      [1 - (miss_a + miss_b + miss_c) +
+      prob = 1 - (miss_a + miss_b + miss_c) +
         (miss_ab + miss_ac + miss_bc) -
-        miss_abc, 0].max
+        miss_abc
+      prob.clamp(0.0, 1.0)
     end
 
-    # Approximation for >3 cards (same as old method)
+    # Approximation for >3 cards
     def approx_combo(target_names, draws)
-      prob_missing = 0.0
-      target_names.each do |name|
-        copies = count_copies([name])
-        miss_prob = hypergeometric(@deck_size - copies, draws).to_f / hypergeometric(@deck_size, draws)
-        prob_missing += miss_prob
+      draws_clamped = clamp_draws(draws)
+      total = hypergeometric(@deck_size, draws_clamped).to_f
+
+      prob_missing = target_names.sum do |name|
+        copies = copies_by_name[name]
+        hypergeometric(@deck_size - copies, draws_clamped).to_f / total
       end
-      [1 - prob_missing, 0].max
+
+      prob = 1 - prob_missing
+      prob.clamp(0.0, 1.0)
     end
 
     # Utility: count how many copies of given cards are in the deck
     def count_copies(names)
-      @deck.main.sum { |card| names.include?(card.name) ? card.count : 0 }
+      unique = names.uniq
+      @deck.main.sum { |card| unique.include?(card.name) ? card.count : 0 }
     end
 
     # Hypergeometric combination helper
@@ -95,9 +110,19 @@ module CwCardUtils
       factorial(n) / (factorial(k) * factorial(n - k))
     end
 
+    def clamp_draws(draws)
+      return 0 if draws.to_i < 0
+      [draws.to_i, @deck_size].min
+    end
+
     def factorial(n)
       return 1 if n.zero?
       (1..n).reduce(1, :*)
     end
+
+    # Only need to calculate this once for the deck passed in.
+    def copies_by_name
+      @copies_by_name ||= @deck.main.each_with_object(Hash.new(0)) { |card, h| h[card.name] += card.count }
+    end
   end
 end

data/lib/cw_card_utils/version.rb

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

data/lib/cw_card_utils.rb

@@ -9,4 +9,17 @@ require_relative "cw_card_utils/deck_comparator"
 
 module CwCardUtils
   class Error < StandardError; end
+
+  # Configuration for the library
+  class << self
+    attr_writer :card_data_source
+
+    def card_data_source
+      @card_data_source ||= ScryfallCmcData.instance
+    end
+
+    def configure
+      yield self if block_given?
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cw_card_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors:
 - Ryan Stenhouse