manasimu 0.0.4 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66e4795cd04e0cc7c990457ac9c7a55b92e3a2acbe4dff3482f782616bc7cd65
-  data.tar.gz: 892e558ab2356a5643c1f67d5a25567ea9b0cdc6020329587701fe65aae97d0d
+  metadata.gz: aa769c22b5954b3410dec04b773abab6ec9130953b07946ec229528cd38dd7a9
+  data.tar.gz: 0c96dcee60c36629f885e3dbcb0c236c4a699c6bab064a323f7b56968041733f
 SHA512:
-  metadata.gz: c51d8ad73ea770f689bb9eb59bda84ee70a71afe59a05582334c4109d228745edd7035ac34bf988410de769d03b3a5b1279d915a59b45128cfcf4510a7215fec
-  data.tar.gz: f98dd700861130e42c69f36e9211d50700857649cf4cd71b9a4acf4156cd6a9eb08a3ae3c8ec65e17a22eacf170c7246c6c7518ede6166de18452c07727109a3
+  metadata.gz: 00b241f58208db388327de9e23686f41871a3f446dd99d1100589ddc777debc78c9fd551d0edc9ad220c40060fb7f1620e9986445f461a4df50b4afe32f8f171
+  data.tar.gz: e620e1ec3ed3f2b2d5c963aa1a4fd8712c4016ca028e7e0efc13efb1abd4af1de0a88d4300145040a433656cc12e9867b5963fecf54a7008208e88c655f8a25e

data/lib/manasimu/card.rb

@@ -75,7 +75,16 @@ class Card
 end
 
 class CardType
-  attr_accessor :contents
+  attr_accessor :contents, :played, :drawed, :name
+
+  def self.create(card_type, name)
+    ret = card_type.dup
+    ret.contents = card_type.contents
+    ret.played = nil
+    ret.drawed = nil
+    ret.name = name
+    ret
+  end
 
   def initialize(contents)
     return if not contents
@@ -246,22 +255,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|
@@ -293,6 +299,7 @@ class Content
   def to_s
     "[#{@name}] [#{@types}] [#{@color_identity}] [#{@mana_cost}]"
   end
+
 end
 
 class FordFulkersonSingleton

data/lib/manasimu/data.rb

@@ -61,50 +61,16 @@ 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 = Card.new(card_type)
-
+      card_type = @@card_types.find(deck_item[:set], deck_item[:setnum])
+      clone = CardType.create(card_type, deck_item[:name])
+      card_types << clone
+      card = Card.new(clone)
       deck_item[:amount].to_i.times do 
         card_clone = card.dup
         card_clone.id = card_id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manasimu
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.7
 platform: ruby
 authors:
 - so1itaryrove
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-05 00:00:00.000000000 Z
+date: 2022-05-08 00:00:00.000000000 Z
 dependencies: []
 description: mtg arrena mana curve simulator
 email: so1itaryrove@gmail.com
@@ -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