manasimu 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c10108a002d93f461dfc63c6a64117c114507bb1801ca6b70bd26c597c84303f
-  data.tar.gz: aa970e39f4b26769c1bb7cf26e09bdb5f87cf953b003c88b1f26fa3ec387d663
+  metadata.gz: 7789310be16e9d3b352d2aa77999dbd18b80e90e86270637cc0317bc5941be4a
+  data.tar.gz: 6b85a7a3523e6033aa1efe1d70ef8f7540799a1e72ee4e8ba7f21f0b1d946b14
 SHA512:
-  metadata.gz: ffbcbb854d2e412b83aeb4e337d6d5b8ffab87585df7c1f4c080061f29137e568574fb3463920363d86436d0b9e2ac30f788ed218dc4d671cda5e1a311adfa6f
-  data.tar.gz: 29c05419b9c7097f9413661c79c62b904e9a734b8ebdd35cb8e8ab5229e7edb0512eca3dfc5616f9dd8889e35f8820f2359658ea4910fc8e94ee006ba104e107
+  metadata.gz: 2676d3fd0ba9efc9b1aea58f4dbf9d677da052ed4cd74e31d5e3a47a25db1ab74d5ca1ccab98081556d1d72edff16d5086b43d2579075c0e2684f5b208d80a2b
+  data.tar.gz: f8bb389f4018e8d70f6f810d2475e68635feff41f78b1460f55e3e8e8e8e34414e7182d8b8c38ae3f3cbb6c02010a337c566048cac9e80f2323e5d74422311c6

data/lib/manasimu/data.rb

@@ -66,26 +66,36 @@ class Deck
   end
 
   def self.find_card_types(lines)
-    types = card_types.map do |a| a end
-    types.sort! do |a,b| a.name <=> b.name end
+    ret = []
 
     distinct_types = []
-    types.each do |type|
+    card_types.each do |type|
       next if distinct_types[-1] and distinct_types[-1].name == type.name
-      type.name
       distinct_types << type
     end
 
-    ret = []
-    lines.each do |line|
-      line.chomp!
-      [-1, 4].each do |i|
+
+    [-1, 4].each do |i|
+
+      distinct_types.sort! do |a,b| 
+        if i < 0
+          a.name <=> b.name 
+        elsif a.names[i] and b.names[i]
+          a.names[i] <=> b.names[i]
+        else
+          0
+        end
+      end
+
+      lines.each do |line|
+        line.chomp!
         search_type = distinct_types.bsearch do |type|
-          if i == -1
+          if i < 0
             name = type.name.split(' // ')[0]
-          else
-            next if not type.names[i]
+          elsif type.names[i]
             name = type.names[i].split(' // ')[0]
+          else
+            next
           end
 
           flag = true
@@ -112,7 +122,6 @@ class Deck
           a = search_type.name.split(' // ')[0]
           if line =~ /^#{a}.*$/ and a != 'X'
             ret << search_type
-            break
           end
         end
       end

metadata

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