manasimu 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca51865b8677a92f9ab33fb6897506379344a6ba0acb0e0b2958ed20cf99b47d
-  data.tar.gz: 0f5570c68e8263f2d3e50253ecb0be090f29d5a9c648a27d5d3c74f0519ef9e0
+  metadata.gz: 70c28d1658ed8cd6e6f45a92ea6cd50d9b771c5e3bc56d06103da417347facc9
+  data.tar.gz: 9d1bd594f3e33a517538bdd5fb03b67eb642f0d750d4d47755523edefe159384
 SHA512:
-  metadata.gz: 9dc135c25ba5285b0b0adfba4471d80d34fc6fa626603a962b334dfbf3500a457288dcf6fefa82ddc162a4c6da773fdb2f353a264fbf20bc6cc6310805e9abb7
-  data.tar.gz: 2003d9521abf146dbe66ebb2454b446f9627d5394562c5441bde286eb19bac0c1401f25ea5be0020832e9320bcf8933907ce110e3f1d6edd0bf1a033fa5fe12b
+  metadata.gz: '09f8f73fa3be2076e8b43879a84173260d7c37dcef702826632b084c396e1d99ddb06441caf0a03ef65629bc9febe7a5e853f1b3afec815971493633f74beca6'
+  data.tar.gz: e505904201ad78e4611518690b386a70692740bc6934caf0d7beab43bc44dd8020a7207b5950e8e440313da999406db3bf13a410d5bdb970909b1652d9d4f2e6

data/lib/manasimu/card.rb

@@ -246,22 +246,19 @@ end
 
 class CardTypeAggregate
 
-  def find(card_type)
+  def find(set_code, number)
     @memo ||= []
-    return nil if not card_type
-    singleton = @memo.find do |c|
+    @memo.find do |c|
       a = c.contents[0]
-      b = card_type.contents[0]
-      a and b and a.name == b.name
-    end
-    if singleton
-      singleton
-    else
-      @memo << card_type
-      card_type
+      a and a.set_code == set_code and a.number == number
     end
   end
 
+  def add(card_type)
+    @memo ||= []
+    @memo << card_type
+  end
+
   def each
     return if not @memo
     @memo.each do |item|

data/lib/manasimu/data.rb

@@ -61,50 +61,15 @@ class Deck
   end
 
   def self.get_card_details(deck_items)
-    path = File.expand_path( '../../../db/AllPrintings.sqlite', __FILE__ )
-    db = SQLite3::Database.new(path)
-    sql = <<DOC
-    select distinct 
-      name
-     ,number
-     ,colorIdentity
-     ,side
-     ,setCode
-     ,manaCost
-     ,types 
-     ,text
-     ,convertedManaCost
-    from cards 
-    where 
-      number = ? and
-      setCode = ?
-DOC
+    path = File.expand_path( '../../../db/card_type_aggregate', __FILE__ )
+    @@card_types ||= Marshal.load(File.open(path, 'r'))
     cards = []
     card_id = 0
-    card_types = CardTypeAggregate.new
+    card_types = []
     deck_items.each do |deck_item|
-      rows = db.execute(sql, deck_item[:setnum], deck_item[:set])
-      if rows.empty?
-        puts deck_item[:name]
-      end
-
-      card_type = card_types.find(
-        CardType.new(rows.map { |row|
-          {
-            name: row[0],
-            number: row[1],
-            color_identity: row[2],
-            side: row[3],
-            set_code: row[4],
-            mana_cost: row[5],
-            types: row[6],
-            text: row[7],
-            converted_mana_cost: row[8]
-          }
-        })
-      )
+      card_type = @@card_types.find(deck_item[:set], deck_item[:setnum])
+      card_types << card_type
       card = Card.new(card_type)
-
       deck_item[:amount].to_i.times do 
         card_clone = card.dup
         card_clone.id = card_id

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: manasimu
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - so1itaryrove
@@ -16,7 +16,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- db/AllPrintings.sqlite
+- db/card_type_aggregate
 - ext/ford_fulkerson.so
 - lib/manasimu.rb
 - lib/manasimu/card.rb
@@ -45,7 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: mtg arrena mana curve simulator