acts_as_identifier 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5eb6246b99ed8a6b043f1b86f7280676f22107154a2b885b9414058e44d8e11d
-  data.tar.gz: e7ebde2dc53be641c11f26fffefc450568fd2775fe5382e352b16945c7965741
+  metadata.gz: 2e24cb96573ceb1e6439218ab0791c25fca1ff4de0e5320019039a2f1e56e0ce
+  data.tar.gz: 1958d5829d519f497c3c215183f7d071d7e68ccfb66521d2a14db3da0a26e3ba
 SHA512:
-  metadata.gz: 4e88efefec94d938295a34dadb93b29ec350ac7680b997d36499a2f6b2e81c3244dec7142800576752b8b25056e3df1c83c5c237e80546822c1f044136f408e7
-  data.tar.gz: 5a61dcbb7a9f9d114768a82e28cfe68c3a57834cfc93f154f007774b84554bcf68d4df9cbc3cafafa2a068ef0412d69ced5ab0178eb09c0739508a00056a44f6
+  metadata.gz: ed7ff77501adb90ca3b030cda300d974cc92c577863589316a3e4a34f0d14dbf84c2f57e167af13f816ef0ddb9f946b754e3a6d5e3e454f4f42e3ad85180b8d7
+  data.tar.gz: fab6c448257751fd41b08af088f59753d3154ef64bd506604e23881122221bb9338a824bfc0b4f19b697fb2e0762b03d313187dbf56e1d6141db080b87eaf2d7

data/README.md

@@ -2,23 +2,24 @@
 
 [![Gem Version](https://badge.fury.io/rb/acts_as_identifier.svg)](https://badge.fury.io/rb/acts_as_identifier)
 
-Automatically generate unique secure random string for one or more columns of ActiveRecord.
+Automatically generate unique fixed-length string for one or more columns of ActiveRecord based on sequence column
 
 ## Usage
 
-> `ActsAsIdentifier` only generate identifier `after_create_commit`
+> `ActsAsIdentifier` only generate identifier `before_commit`
 
 ```ruby
 class Account < ActiveRecord::Base
+  include ActsAsIdentifier
   #
-  # Note: without Rails, should include ActsAsIdentifier
+  # == default options
   #
   # def acts_as_identifier(attr = :identifier,
-  #                            length: 6,
-  #                            prefix: '',
-  #                            id_column: :id,
-  #                            chars: '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.chars,
-  #                            mappings: '3NjncZg82M5fe1PuSABJG9kiRQOqlVa0ybKXYDmtTxCp6Lh7rsIFUWd4vowzHE'.chars)
+  #                             seed: 1,
+  #                           length: 6,
+  #                           prefix: '',
+  #                        id_column: :id,
+  #                            chars: '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
   #
   acts_as_identifier
   # or customize options:
@@ -27,9 +28,9 @@ end
 # => [Account(id: integer, name: string, tenant_id: string, slug: string)]
 
 Account.create
-# => #<Account:0x00007fcdb90830c0 id: 1, name: nil, tenant_id: nil, slug: "s-HuF2Od">
+# => #<Account:0x00007fcdb90830c0 id: 1, name: nil, tenant_id: nil, slug: "s-EPaPaP">
 Account.create
-# => #<Account:0x00007fcdb90830c0 id: 2, name: nil, tenant_id: nil, slug: "s-g3SIB8">
+# => #<Account:0x00007fcdb90830c0 id: 2, name: nil, tenant_id: nil, slug: "s-HSo0u4">
 
 ```
 
@@ -39,6 +40,10 @@ Account.create
 bundle add acts_as_identifier
 ```
 
+## Requirements
+
+Use gem [`Xencoder`](https://github.com/xiaohui-zhangxh/xencoder/) to encode sequence number to fixed-length string.
+
 ## Contributing
 Contribution directions go here.
 
@@ -46,6 +51,4 @@ Contribution directions go here.
 
 ```shell
 bundle exec rspec
-# or test specific range
-EXTRA_TEST=100000,1000000 bundle exec rspec
 ```

data/lib/acts_as_identifier.rb

@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 
-require 'securerandom'
 require 'acts_as_identifier/version'
-require 'acts_as_identifier/xbase_integer'
-require 'acts_as_identifier/encoder'
+require 'xencoder'
 
 module ActsAsIdentifier
-  LoopTooManyTimesError = Class.new(StandardError)
 
   def self.included(base)
     base.extend ClassMethods
@@ -23,25 +20,24 @@ module ActsAsIdentifier
     # @params chars [Array<String>] chars
     # @params mappings [Array<String>] mappings must have the same characters as chars
     def acts_as_identifier(attr = :identifier,
+                           seed: 1,
                            length: 6,
                            prefix: '',
                            id_column: :id,
-                           chars: '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.chars,
-                           mappings: '3NjncZg82M5fe1PuSABJG9kiRQOqlVa0ybKXYDmtTxCp6Lh7rsIFUWd4vowzHE'.chars)
-      raise 'chars must be an array' unless chars.is_a?(Array)
-      raise 'mappings must be an array' unless mappings.is_a?(Array)
-      unless (chars - mappings).empty? && (mappings - chars).empty?
-        raise 'chars and mappings must have the same characters'
-      end
+                           chars: '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
+      define_singleton_method "#{attr}_encoder" do
+        vname = "@#{attr}_encoder"
+        return instance_variable_get(vname) if instance_variable_defined?(vname)
 
-      encoder = Encoder.new(chars: chars, mappings: mappings, length: length)
+        instance_variable_set(vname, Xencoder.new(chars, length: length, seed: seed))
+      end
 
       define_singleton_method "decode_#{attr}" do |str|
-        encoder.decode(str[prefix.length..-1])
+        send("#{attr}_encoder").decode(str[prefix.length..-1])
       end
 
       define_singleton_method "encode_#{attr}" do |num|
-        "#{prefix}#{encoder.encode(num)}"
+        "#{prefix}#{send("#{attr}_encoder").encode(num)}"
       end
 
       before_commit do |record|
@@ -52,5 +48,3 @@ module ActsAsIdentifier
     end
   end
 end
-
-require 'acts_as_identifier/railtie' if defined?(Rails)

data/lib/acts_as_identifier/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActsAsIdentifier
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_identifier
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - xiaohui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-06 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: xencoder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -48,10 +62,7 @@ files:
 - MIT-LICENSE
 - README.md
 - lib/acts_as_identifier.rb
-- lib/acts_as_identifier/encoder.rb
-- lib/acts_as_identifier/railtie.rb
 - lib/acts_as_identifier/version.rb
-- lib/acts_as_identifier/xbase_integer.rb
 homepage: https://github.com/xiaohui-zhangxh/acts_as_identifier
 licenses:
 - MIT

data/lib/acts_as_identifier/encoder.rb

@@ -1,36 +0,0 @@
-module ActsAsIdentifier
-  class Encoder
-    attr_reader :max, :base, :chars, :mappings, :length
-
-    def initialize(chars:, mappings:, length:)
-      @chars = chars.dup
-      @mappings = mappings.dup
-      @length = length
-      @xbase_integer = XbaseInteger.new(chars)
-      @base = @xbase_integer.to_i("#{chars[1]}#{chars[0] * (length - 1)}")
-      @max = @xbase_integer.to_i(chars[-1] * length) - @base
-    end
-
-    def encode(num)
-      str = @xbase_integer.to_x(num + base)
-      (str.length - 1).downto(1).each do |i|
-        idx = @mappings.index(str[i])
-        idx2 = (@mappings.index(str[i - 1]) + idx) % @mappings.size
-        str[i] = @chars.at(idx)
-        str[i - 1] = @chars.at(idx2)
-      end
-      str
-    end
-
-    def decode(str)
-      str = str.dup
-      0.upto(str.length - 2).each do |i|
-        idx = @chars.index(str[i + 1])
-        idx2 = (@chars.index(str[i]) - idx + @chars.size) % @chars.size
-        str[i] = @mappings.at(idx2)
-        str[i + 1] = @mappings.at(idx)
-      end
-      @xbase_integer.to_i(str) - base
-    end
-  end
-end

data/lib/acts_as_identifier/railtie.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module ActsAsIdentifier
-  class Railtie < ::Rails::Railtie
-    initializer 'acts_as_identifier' do
-      ActiveSupport.on_load(:active_record) do
-        include ActsAsIdentifier
-      end
-    end
-  end
-end

data/lib/acts_as_identifier/xbase_integer.rb

@@ -1,23 +0,0 @@
-module ActsAsIdentifier
-  class XbaseInteger
-    attr_reader :chars
-    def initialize(chars)
-      @chars = chars.dup
-    end
-
-    def to_i(str)
-      sum = 0
-      str.chars.reverse.each_with_index do |char, i|
-        sum += chars.index(char) * chars.size**i
-      end
-      sum
-    end
-
-    def to_x(num)
-      str = chars.at(num % chars.size)
-      num /= chars.size
-      str = "#{to_x(num)}#{str}" if num > 0
-      str
-    end
-  end
-end