manasimu 0.0.27 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f594d88260d5a385a6c371967d6dba160e1078a3b0df93afeb6b260ae24298c
-  data.tar.gz: 3d5ad358c02c73e33802222f9729bd5c457249678eadb85f90420ff6703bb26f
+  metadata.gz: 724aff14f6e57773ecb896037bd4eb379d9fe13ac6870c3fd37b3609682071ab
+  data.tar.gz: 9db295c3c06234a8cd85e008e832d853f40fda0fc9341a0a5e6a8bdd98e0ed55
 SHA512:
-  metadata.gz: 11c10118e360fa088964054f4f3083a6dc493528970083ca0af3b24b5729caeae89becb979d23ac872e99f83c6f7b6ac287b9feff70f8c2d724019865f1ba539
-  data.tar.gz: 187a68ae85b566b9e8e592da86aa9e1338ee030b582211045be954e225ed450d3796fd171379e5862706f233a65b4bf506113d2cbc302d9af079924a97fbae39
+  metadata.gz: f1b976dc510db9c4b20ce8620dceda72b8a0106d275300bb0f0d3b4413cfe862be995794155a0e02a8ac43c2a2815655342e475fe265b418f2dad6732c03f4b7
+  data.tar.gz: 9f7a49c6b350199271151ad8adc8c5d6472def15df5210c7889c123ff849fcd1c47d017b095ae1ac06883e15dbe79ce9bec1a39ee67538d82ce6d6bac287f32c

data/lib/manasimu/card.rb

@@ -128,7 +128,7 @@ class Card
 end
 
 class CardType
-  attr_accessor :contents, :played, :drawed, :name, :can_plays, :mana_sources
+  attr_accessor :contents, :played, :drawed, :name, :can_plays, :mana_sources, :language
 
   def self.create(card_type, name)
     ret = card_type.dup
@@ -192,7 +192,7 @@ class CardType
 
   def mana_source
     @mana_source ||= @contents.map { |c| 
-        c.color_identity ? c.color_identity.split(',') : []
+        c.color_identity ? c.color_identity : []
       }.flatten.uniq
   end
 
@@ -206,7 +206,7 @@ class CardType
 
   def mana_cost
     return @mana_cost if @mana_cost
-    spell = @contents.select {|c| c.types != "Land"}.first
+    spell = @contents.select {|c| not c.types.include? "Land"}.first
     if spell
       @mana_cost = spell.mana_cost
     else
@@ -227,7 +227,7 @@ class CardType
   end
 
   def types
-    @types ||= @contents.map {|c| c.types}
+    @types ||= @contents.map {|c| c.types}.flatten
   end
 
   def color_identity
@@ -235,7 +235,7 @@ class CardType
     @memo_colors ||= []
     @contents.each do |c|
       if c.color_identity
-        c.color_identity.split(",").each do |color|
+        c.color_identity.each do |color|
           @memo_colors << color if not @memo_colors.include? color
         end
       end
@@ -289,7 +289,7 @@ class CardType
             [0,1]
           end
     @is_land = arr.select do |i|
-      @contents[i] and @contents[i].types == "Land"
+      @contents[i] and @contents[i].types.include? "Land"
     end.length > 0
     return @is_land
   end
@@ -476,7 +476,7 @@ class Content
   end
 
   def mana_source?
-    return @types == "Land"
+    return @types.include? "Land"
   end
 
   def to_s

data/lib/manasimu/data.rb

@@ -1,12 +1,33 @@
 class Deck
 
   def self.create(lines)
-    items = Deck.input_to_card_hash(lines)
+    items, only_names = Deck.input_to_card_hash(lines)
+
+    # 名前だけの行を考慮する
+    names = only_names.map do |hash| hash[:name] end
+    types = find_card_types(names)
+
+    if types.length == names.length
+      only_names.each_with_index do |a, i|
+        name = types[i].name
+        if types[i].language == "ja"
+          name = types[i].names[0]
+        end
+        deck_item = {}
+        deck_item[:amount] = only_names[i][:amount]
+        deck_item[:name] = name
+        deck_item[:set] = types[i].set_code
+        deck_item[:setnum] = types[i].number
+        items << deck_item
+      end
+    end
+
     Deck.get_card_details(items)
   end
 
   def self.input_to_card_hash(lines)
     result = []
+    only_names = []
     looking_for_deck_line = false
     for line in lines do
       trimmed = line.chomp
@@ -53,11 +74,15 @@ class Deck
       deck_item = {}
       deck_item[:amount] = $1.strip
       deck_item[:name] = $2.strip
-      deck_item[:set] = $3.strip
-      deck_item[:setnum] = $4.strip
-      result << deck_item
+      if $3
+        deck_item[:set] = $3.strip
+        deck_item[:setnum] = $4.strip
+        result << deck_item
+      else
+        only_names << deck_item
+      end
     end
-    result
+    [result, only_names]
   end
 
   def self.card_types
@@ -206,9 +231,11 @@ class Deck
           if language == en
             a = search_type.name.split(' // ')[0]
             if line =~ /^#{a}.*$/ and a != 'X'
+              search_type.language = 'en'
               ret << search_type
             end
           elsif language == ja
+            search_type.language = 'ja'
             ret << search_type
           else
             # none

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: manasimu
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.30
 platform: ruby
 authors:
 - so1itaryrove