manasimu 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7789310be16e9d3b352d2aa77999dbd18b80e90e86270637cc0317bc5941be4a
-  data.tar.gz: 6b85a7a3523e6033aa1efe1d70ef8f7540799a1e72ee4e8ba7f21f0b1d946b14
+  metadata.gz: f194c1efd40c93772541e4aa6bf1164ff46a836a91887e848944548ed5afabde
+  data.tar.gz: 1716988949899acf5972599c371dd95696748311afd728d1bcd6a9040c2ef901
 SHA512:
-  metadata.gz: 2676d3fd0ba9efc9b1aea58f4dbf9d677da052ed4cd74e31d5e3a47a25db1ab74d5ca1ccab98081556d1d72edff16d5086b43d2579075c0e2684f5b208d80a2b
-  data.tar.gz: f8bb389f4018e8d70f6f810d2475e68635feff41f78b1460f55e3e8e8e8e34414e7182d8b8c38ae3f3cbb6c02010a337c566048cac9e80f2323e5d74422311c6
+  metadata.gz: 14ffb32574c728c83f737d234205e37a85748ba08a68fe952e5a3945a5fb8715ed3791105fa89971f7c874b76de8e9ca8a6168ec7a7d64992f1482adc8ec8f17
+  data.tar.gz: 5e2a6b2740ec5259ab5d60625b6201b05707022735808e75fd1d1d3753ff591db9b9a651401f48b3b91367ebf6baa9c58f0f6448d6ac73bd33a67f381bc13a1b

data/lib/manasimu/data.rb

@@ -75,51 +75,61 @@ class Deck
     end
 
 
-    [-1, 4].each do |i|
+    [-1, 4].each do |j|
 
       distinct_types.sort! do |a,b| 
-        if i < 0
+        if j < 0
           a.name <=> b.name 
-        elsif a.names[i] and b.names[i]
-          a.names[i] <=> b.names[i]
-        else
+        elsif a.names[j] and b.names[j]
+          a.names[j] <=> b.names[j]
+        elsif not a.names[j] and not b.names[j]
           0
+        elsif a.names[j]
+          -1
+        else
+          1
         end
       end
 
       lines.each do |line|
         line.chomp!
         search_type = distinct_types.bsearch do |type|
-          if i < 0
+          if j < 0
             name = type.name.split(' // ')[0]
-          elsif type.names[i]
-            name = type.names[i].split(' // ')[0]
-          else
-            next
+          elsif type.names[j]
+            name = type.names[j].split(' // ')[0]
           end
 
-          flag = true
-          name.chars.each_with_index do |nc,i|
-            if line.length > i
-              lc = line.chars[i]
-              if nc > lc
+          if name
+            flag = true
+            name.chars.each_with_index do |nc,i|
+              if line.length > i
+                lc = line.chars[i]
+                if nc > lc
+                  flag = true
+                  break
+                elsif nc < lc
+                  flag = false
+                  break
+                else
+                  # continue
+                end
+              else
                 flag = true
                 break
-              elsif nc < lc
-                flag = false
-                break
-              else
-                # continue
               end
-            else
-              flag = true
-              break
             end
+            flag
+          else
+            false
           end
-          flag
         end
         if search_type
-          a = search_type.name.split(' // ')[0]
+          if j < 0
+            a = search_type.name.split(' // ')[0]
+          else
+            a = search_type.names[j].split(' // ')[0]
+          end
           if line =~ /^#{a}.*$/ and a != 'X'
             ret << search_type
           end

metadata

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