active_uxid 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f268252b89f510be74aee33cf4f05c3c7d42ed92
-  data.tar.gz: 41a5e44b636ec6d8c93e9fe6a19228ecde6dc8f0
+  metadata.gz: 9562a3022031637a6274b83a1e2314c06bb15376
+  data.tar.gz: e9393cde490974f5929bd68ba32df0ef2b025dab
 SHA512:
-  metadata.gz: 788be6648a7c161283f8296be871f09e4928990f9543dc90190f9998b068ae32aa897fc318e749165c6dd64282cdcf13751508fd52e54bd8ff4ff0c15482f357
-  data.tar.gz: 1696f6915cb835be739f48c56bdf1a092669707270993438b075dafbbee6b00b50d4cfc6a01cf9ecab67e50d4c36a25d64f2b8b63f7ae6f64cd25469e9b8b180
+  metadata.gz: bedd95ff15abb5b98db5a3539fef901f3584abe6434339e51ca0e8a9ca0a67f169e02bc7895baf0542d41b1b7c7dceff00ae0ab2bfb7a85221d54bb5d674660b
+  data.tar.gz: 8f77b5888cf9f60e887ab4a20374b10a6cad55c5f823c4a253398534dfd0ef334db2d2f02706607a97e60fc3597aa196035eca1c8925b81c52b1b264e13234a3

data/lib/active_uxid.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-%w[version configuration].each do |file_name|
+%w[version configuration base].each do |file_name|
   require "active_uxid/#{file_name}"
 end
 
-%w[base hash ulid].each_with_index do |file_name, i|
-  require "active_uxid/record/#{file_name}" unless i.zero?
+%w[hash ulid].each do |file_name|
+  require "active_uxid/record/#{file_name}"
   require "active_uxid/#{file_name}"
 end
 

data/lib/active_uxid/base.rb

@@ -3,9 +3,17 @@
 module ActiveUxid
   class Base
 
-    ENCODING_CHARS ||= ActiveUxid.configuration.encoding_chars
-    ENCODING_LENGTH = ActiveUxid.configuration.encoding_length
-    ENCODING_SALT ||= ActiveUxid.configuration.encoding_salt
+    def initialize
+      @config = ActiveUxid.configuration
+    end
+
+    %w[encoding_chars encoding_length encoding_salt].each do |setting|
+      define_method(setting) { @config.send(setting) }
+    end
+
+    def encoding_base
+      encoding_chars.length
+    end
 
   end
 end

data/lib/active_uxid/ulid.rb

@@ -1,14 +1,7 @@
 # frozen_string_literal: true
 
 module ActiveUxid
-  class Ulid
-
-    ENCODING_CHARS ||= ActiveUxid.configuration.encoding_chars
-    ENCODING_LENGTH = ActiveUxid.configuration.encoding_length
-
-    def initialize
-      @encoding_length = ActiveUxid.configuration.encoding_length
-    end
+  class Ulid < ActiveUxid::Base
 
     def self.encode
       klass = new
@@ -16,9 +9,9 @@ module ActiveUxid
     end
 
     def uxid_encode
-      (1..@encoding_length).reduce('') do |str, num|
+      (1..encoding_length).reduce('') do |str, num|
         shift = 128 - 5 * num
-        "#{str}#{ENCODING_CHARS[(uxid_octect >> shift) & 0x1f]}"
+        "#{str}#{encoding_chars[(uxid_octect >> shift) & 0x1f]}"
       end
     end
 

data/lib/active_uxid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRegulation
-  VERSION ||= '1.0.10'
+  VERSION ||= '1.0.11'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_uxid
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Juan Gomez