arql 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92f3117b0baa9b0c54cc683a73251094697b5e2fb8ed7cb329f37b43ad0bbe2e
-  data.tar.gz: 2b839cf6ec293f162faa2f29c7d7421679185c4874f1a4c826d13d4be26350a8
+  metadata.gz: 44604f0630f7b6308b9c53bf90b46bd9138b52fdec169baf46bf4e790adfc82b
+  data.tar.gz: 7efecc0c754d4f16eb31a19756de3d95a06d8d93440e480726d6df574827af13
 SHA512:
-  metadata.gz: c07790dbd1bbff85f9fee6f86346967ecac0e70c0334255eb7041b475a41b7d569a01f40d0d2f8757de34362dcaaff839e31a27d13865f1f40f533ce409388fc
-  data.tar.gz: a82ae15b63a25e22e7a50e6a1a1dc8173dc5881c5c032851fe69e8639dcfc860d734a557f74dfce38868dac2dd86b2f9e2c94b8e487fa17271967b0eb56d6367
+  metadata.gz: d795bedb12d2bf39bbb2b5e394373b545e35a542e00110708915fa57b5ca2248f5ed64ee975283d0a3a23e3e4ed201a560fc3ba78dac4085650d6eef486c7fdf
+  data.tar.gz: 07c6aacfcd46fe3361ebbf977c553c32aad792cb7cd40ebdb9803f0cb76b32ace4bb4326808dd4db2c61be2f6e3e98ec1ee85753ced7e73ee85f8d1f6ffaf10d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arql (0.2.6)
+    arql (0.2.7)
       activerecord (~> 6.0.3)
       activesupport (~> 6.0.3)
       caxlsx (~> 3.0.2)

data/lib/arql/definition.rb

@@ -107,10 +107,15 @@ module Arql
                   end
                 end.tap do |clazz|
                   Object.const_set(const_name, clazz).tap do |const|
-                    const_name.gsub(/[a-z]*/, '').tap do |abbr|
-                      unless Object.const_defined?(abbr)
-                        Object.const_set abbr, const
-                        abbr_const = abbr
+                    const_name.gsub(/[a-z]*/, '').tap do |bare_abbr|
+                      abbr_const = nil
+                      9.times do |idx|
+                        abbr = idx.zero? ? bare_abbr : "#{bare_abbr}#{idx+1}"
+                        unless Object.const_defined?(abbr)
+                          Object.const_set abbr, const
+                          abbr_const = abbr
+                          break
+                        end
                       end
 
                       @@models << {
@@ -161,10 +166,15 @@ module Arql
                 end
               end.tap do |clazz|
                 Object.const_set(const_name, clazz).tap do |const|
-                  const_name.gsub(/[a-z]*/, '').tap do |abbr|
-                    unless Object.const_defined?(abbr)
-                      Object.const_set abbr, const
-                      abbr_const = abbr
+                  const_name.gsub(/[a-z]*/, '').tap do |bare_abbr|
+                    abbr_const = nil
+                    9.times do |idx|
+                      abbr = idx.zero? ? bare_abbr : "#{bare_abbr}#{idx+1}"
+                      unless Object.const_defined?(abbr)
+                        Object.const_set abbr, const
+                        abbr_const = abbr
+                        break
+                      end
                     end
 
                     @@models << {

data/lib/arql/version.rb

@@ -1,3 +1,3 @@
 module Arql
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Liu Xiang