active_uxid 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afa254c4b663a4cb7ca45b05404c33d2c339d259
-  data.tar.gz: ed19e20050e2894efc1730486d43c3c31ae053d1
+  metadata.gz: 7c9e877324685040eaccc2853d70c73ebd63cf4f
+  data.tar.gz: 37746f142994446134fd083d2afa48b1e5801b2c
 SHA512:
-  metadata.gz: 3f7393d7c9d49fc3124a612497115d75f70fa802ce95f7b03bd5f5e5be150a64c3116f215f57e256b4c90123e315da5f4f972ead10b99265199057bc2da9e688
-  data.tar.gz: cd45f3d5d087fef2ad244a4ce588dbf3e7ae77adb6f15dfd8c8657469070b6c67c32613b2f41e3ba4a9baea52df298dfadbc83804edafaa27c9c09a13e5cfe56
+  metadata.gz: 69f643b10dfa00a01bcea7982ec826b29435a126a8fa46881f0a35352334cd6979baf76d6db168b68fba1927f2987b34d6c248895b0c7ba6aa794b07876d8e03
+  data.tar.gz: e583c353c3efb0f1bb3f5102325658e26f98b5a5a2b6ac548f4d8d5448ab9e0db56fb735b2d992ae462fe58069f448afb652bb4b356910c559a5a26e5cf47a36

data/README.md

@@ -35,7 +35,6 @@ Or install it yourself as:
 
 ```ruby
 ActiveUxid::Settings.configure do |config|
-  config.encoder_type = 'ulid'
   config.encoding_chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
   config.encoding_length = 26
   config.encoding_salt = 1369136
@@ -63,9 +62,10 @@ ActiveUxid::Ulid.encode #=> '1mqfg9qa96s8s5f02o1ucf8lcc'
 ```ruby
 class User < ActiveRecord::Base
   # Add a uxid binary attribute to the corresponding table.
-  # This will include the proper UXid format from your settings
 
-  include ActiveUxid::Record
+  include ActiveUxid::Record::Hash
+  # Or
+  include ActiveUxid::Record::Ulid
 end
 
 # Hash UXid's type only

data/lib/active_uxid.rb

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

data/lib/active_uxid/settings.rb

@@ -6,7 +6,6 @@ module ActiveUxid
   class Settings
     extend Dry::Configurable
 
-    setting :encoder_type, 'ulid'
     setting :encoding_chars, '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
     setting :encoding_length, 26
     setting :encoding_salt, 1369136

data/lib/active_uxid/version.rb

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

data/lib/generators/active_uxid/templates/install.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 ActiveUxid::Settings.configure do |config|
-  config.encoder_type = 'ulid'
   config.encoding_chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
   config.encoding_length = 26
   config.encoding_salt = 1369136

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_uxid
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Juan Gomez
@@ -203,7 +203,6 @@ files:
 - lib/active_uxid.rb
 - lib/active_uxid/base.rb
 - lib/active_uxid/hash.rb
-- lib/active_uxid/record.rb
 - lib/active_uxid/record/hash.rb
 - lib/active_uxid/record/ulid.rb
 - lib/active_uxid/settings.rb

data/lib/active_uxid/record.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveUxid
-  module Record
-    extend ActiveSupport::Concern
-  end
-end
-
-# rubocop:disable Metrics/LineLength
-ActiveUxid::Record.include(ActiveUxid::Record::Hash) if ActiveUxid::Settings.config.encoder_type == 'hash'
-ActiveUxid::Record.include(ActiveUxid::Record::Ulid) if ActiveUxid::Settings.config.encoder_type == 'ulid'
-# rubocop:enable Metrics/LineLength