ulid-rails 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 344d5b35daef598e2fe1116ad9bebea5d24cf9b6c1c2150344f2f1e5b25f0989
-  data.tar.gz: ecf448dea0921bf022a7888d0f2b90f23e27f08b5e103f6aa3669e0f71b0913a
+  metadata.gz: b4ae7aa650be9d57249be6d2a1a3bf77bf26fdb14493533137d7296f07772410
+  data.tar.gz: 521af5d85b5b033b182678cd189ebbbbebf6e4571f2cfe076bcae4fa37800c6d
 SHA512:
-  metadata.gz: 573a3e355e9487ccea553ce0041b831ba10d45d578906022ccbd99a9b672d9859d9cc9f1ae324bab61d68f9c0669609d1bfdfffe870d0a498309be876d6f68c8
-  data.tar.gz: d59ccebd6290359ca5b1e1508275aa16eee8e061455a35cd29ee2439acf07cb777d9ca013b855abaaec0a08087aa2a23d05f43e710b2c313c782ca74e4a0fc82
+  metadata.gz: 7feebaa207e82b83fb213380f14df767216afb69ab8ee91d4ffd68495776d9b8c7f1ee2550f92ac5f7292b5b5c1511dc4a714cfa0671b2a7fe3528a15fb567b8
+  data.tar.gz: 886b465219c7fd77f57dad6c2c6c658149cfa22918ab7505863af86382beafbeb1d4616f02e1d13190fb14ab2044a95c8a9ca55bba6cbd87703c870e00c19284

data/.env

@@ -0,0 +1 @@
+RUBY_VERSION=2.6

data/.github/workflows/lint.yml

@@ -0,0 +1,15 @@
+---
+name: Linting
+on: [push, pull_request]
+jobs:
+  standardrb:
+    env:
+      AR_VERSION: "5.2"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0
+          bundler-cache: true
+      - run: bundle exec standardrb

data/.github/workflows/test.yml

@@ -0,0 +1,17 @@
+---
+name: Tests
+on: [push, pull_request]
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix: 
+        activerecord-version: ["5.2", "6.0", "6.1"]
+        ruby-version: ["2.6", "2.7", "3.0"]
+        exclude:
+          - activerecord-version: "5.2"
+            ruby-version: "3.0"
+    steps:
+      - uses: actions/checkout@v2
+      - name: Test ActiveRecord ${{ matrix.activerecord-version }} and Ruby ${{ matrix.ruby-version }}
+        run: RUBY_VERSION=${{ matrix.ruby-version }} docker-compose run -e AR_VERSION=${{ matrix.activerecord-version }} test

data/.standard.yml

@@ -0,0 +1 @@
+ruby_version: 2.3

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # ulid-rails CHANGELOG
 
+## 0.5
+
+- Ensure ULID order respects timestamp order to millisecond precision.
+- Validation of ULID format when setting value. A wrong format value will trigger a `ULID::Rails::ArgumentError`.
+
+## 0.4
+
+- Support old ruby versions
+- Fix auto_generate #2
+
 ## 0.3
 
 - Support PostgresQL

data/Gemfile

@@ -1,9 +1,9 @@
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in ulid-rails.gemspec
 gemspec
 
-version = ENV['AR_VERSION'] || '6.0'
-eval_gemfile File.expand_path("../gemfiles/#{version}.gemfile", __FILE__)
+version = ENV["AR_VERSION"] || "6.0"
+eval_gemfile File.expand_path("../gemfiles/#{version}.gemfile", __FILE__)

data/Rakefile

@@ -7,4 +7,4 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
-task :default => :test
+task default: :test

data/bin/run_tests

@@ -9,17 +9,10 @@ test_with_db() {
 
 test_with_db "sqlite3"
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+test_with_db "mysql56"
 
-# Most features should work with MySQL 5.6 but I couldn't properly set it up in test.
-# $DIR/wait-for-it.sh mysql56:3306
-# test_with_db "mysql56"
-
-$DIR/wait-for-it.sh mysql57:3306
 test_with_db "mysql57"
 
-$DIR/wait-for-it.sh mysql80:3306
 test_with_db "mysql80"
 
-$DIR/wait-for-it.sh pg12:5432
 test_with_db "pg12"

data/docker-compose.yml

@@ -1,13 +1,17 @@
 version: '3.6'
 services:
   test:
-    image: ruby:2.6
+    image: "ruby:${RUBY_VERSION}" 
     command: sh -c "rm -f Gemfile.lock && bundle install && bin/run_tests"
     depends_on:
-      - mysql56
-      - mysql57
-      - mysql80
-      - pg12
+      pg12:
+        condition: service_healthy
+      mysql56:
+        condition: service_healthy
+      mysql57:
+        condition: service_healthy
+      mysql80:
+        condition: service_healthy
     working_dir: /app
     volumes:
       - bundle:/usr/local/bundle
@@ -38,7 +42,8 @@ services:
     environment:
       PGDATA: /data
       POSTGRES_DB: db
+      POSTGRES_HOST_AUTH_METHOD: trust
     healthcheck:
-      test: echo "\\l" | psql -U postgre
+      test: echo "\\l" | psql -U postgres
 volumes:
   bundle:

data/gemfiles/5.2.gemfile

@@ -1,6 +1,6 @@
 gem "activesupport", "~> 5.2"
 gem "activemodel", "~> 5.2"
 gem "activerecord", "~> 5.2"
-gem 'sqlite3', '~> 1.3.6'
-gem 'mysql2'
-gem 'pg'
+gem "sqlite3", "~> 1.3.6"
+gem "mysql2"
+gem "pg"

data/gemfiles/6.0.gemfile

@@ -1,6 +1,6 @@
 gem "activesupport", "~> 6.0"
 gem "activemodel", "~> 6.0"
 gem "activerecord", "~> 6.0"
-gem 'sqlite3', '~> 1.4.1'
-gem 'mysql2'
-gem 'pg'
+gem "sqlite3", "~> 1.4.1"
+gem "mysql2"
+gem "pg"

data/gemfiles/6.1.gemfile

@@ -0,0 +1,6 @@
+gem "activesupport", "~> 6.1.0"
+gem "activemodel", "~> 6.1.0"
+gem "activerecord", "~> 6.1.0"
+gem "sqlite3", "~> 1.4.2"
+gem "mysql2"
+gem "pg"

data/lib/ulid/rails/errors.rb

@@ -0,0 +1,5 @@
+module ULID
+  module Rails
+    class ArgumentError < StandardError; end
+  end
+end

data/lib/ulid/rails/formatter.rb

@@ -4,7 +4,7 @@ module ULID
   module Rails
     module Formatter
       def self.format(v)
-        sanitized = v.delete('-').hex
+        sanitized = v.delete("-").hex
         Base32::Crockford.encode(sanitized).rjust(26, "0")
       end
 

data/lib/ulid/rails/patch.rb

@@ -4,8 +4,8 @@ module ULID
       module Migrations
         def virtual_ulid_timestamp(timestamp_column_name, ulid_column_name)
           virtual timestamp_column_name,
-                  type: :datetime,
-                  as: "FROM_UNIXTIME(CONV(HEX(#{ulid_column_name} >> 80), 16, 10) / 1000.0)"
+            type: :datetime,
+            as: "FROM_UNIXTIME(CONV(HEX(#{ulid_column_name} >> 80), 16, 10) / 1000.0)"
         end
       end
     end

data/lib/ulid/rails/type.rb

@@ -1,5 +1,7 @@
 require "active_model/type"
 require "ulid/rails/formatter"
+require "ulid/rails/validator"
+require "ulid/rails/errors"
 
 module ULID
   module Rails
@@ -8,16 +10,21 @@ module ULID
         alias_method :hex, :to_s
       end
 
-      def initialize(formatter = Formatter)
+      def initialize(formatter = Formatter, validator = Validator)
         @formatter = formatter
+        @validator = validator
         super()
       end
 
-      def cast(value)
+      def assert_valid_value(value)
+        raise ArgumentError, "`#{value}` is not a ULID format" unless @validator.is_valid?(value)
+      end
+
+      def deserialize(value)
         return nil if value.nil?
 
         value = value.to_s if value.is_a?(Data)
-        value = value.unpack("H*")[0] if value.encoding == Encoding::ASCII_8BIT
+        value = value.unpack1("H*") if value.encoding == Encoding::ASCII_8BIT
         value = value[2..-1] if value.start_with?("\\x")
 
         value.length == 32 ? @formatter.format(value) : super
@@ -26,13 +33,23 @@ module ULID
       def serialize(value)
         return if value.nil?
 
-        case ActiveRecord::Base.connection_config[:adapter]
+        case adapter
         when "mysql2", "sqlite3"
           Data.new(@formatter.unformat(value))
         when "postgresql"
           Data.new([@formatter.unformat(value)].pack("H*"))
         end
       end
+
+      private
+
+      def adapter
+        if ::ActiveRecord::Base.respond_to?(:connection_db_config)
+          ::ActiveRecord::Base.connection_db_config.configuration_hash[:adapter]
+        else
+          ::ActiveRecord::Base.connection_config[:adapter]
+        end
+      end
     end
   end
 end

data/lib/ulid/rails/validator.rb

@@ -0,0 +1,12 @@
+require "base32/crockford"
+
+module ULID
+  module Rails
+    module Validator
+      def self.is_valid?(v)
+        return true if v.nil?
+        v.length == 26 && Base32::Crockford.valid?(v)
+      end
+    end
+  end
+end

data/lib/ulid/rails/version.rb

@@ -1,5 +1,5 @@
 module ULID
   module Rails
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

data/lib/ulid/rails.rb

@@ -15,7 +15,7 @@ module ULID
       def ulid(column_name, primary_key: false, auto_generate: nil)
         attribute column_name, ULID::Rails::Type.new
 
-        auto_generate = primary_key ? primary_key : auto_generate
+        auto_generate = primary_key || auto_generate
         if auto_generate
           before_create do
             send("#{column_name}=", ULID.generate) if send(column_name).nil?
@@ -25,7 +25,11 @@ module ULID
 
       def ulid_extract_timestamp(ulid_column, timestamp_column = :created_at)
         define_method timestamp_column do
-          at = super() rescue nil
+          at = begin
+            super()
+          rescue
+            nil
+          end
           if !at && (id_val = send(ulid_column))
             Time.zone.at((Base32::Crockford.decode(id_val) >> 80) / 1000.0)
           else

data/ulid-rails.gemspec

@@ -3,22 +3,22 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "ulid/rails/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "ulid-rails"
-  spec.version       = ULID::Rails::VERSION
-  spec.authors       = ["Kazunori Kajihiro"]
-  spec.email         = ["kazunori.kajihiro@gmail.com"]
+  spec.name = "ulid-rails"
+  spec.version = ULID::Rails::VERSION
+  spec.authors = ["Kazunori Kajihiro", "Zendesk"]
+  spec.email = ["kazunori.kajihiro@gmail.com", "ruby-core@zendesk.com"]
 
-  spec.summary       = %q{ULID for rails}
-  spec.description   = %q{ULID for rails}
-  spec.license       = "MIT"
+  spec.summary = "ULID for rails"
+  spec.description = "ULID for rails"
+  spec.license = "MIT"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_dependency "ulid", "~> 1.0"
@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "standard", "~> 1.3.0"
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ulid-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Kazunori Kajihiro
-autorequire: 
+- Zendesk
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ulid
@@ -122,15 +123,33 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 description: ULID for rails
 email:
 - kazunori.kajihiro@gmail.com
+- ruby-core@zendesk.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".env"
+- ".github/workflows/lint.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
+- ".standard.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -139,21 +158,23 @@ files:
 - bin/console
 - bin/run_tests
 - bin/setup
-- bin/wait-for-it.sh
 - docker-compose.yml
 - gemfiles/5.2.gemfile
 - gemfiles/6.0.gemfile
+- gemfiles/6.1.gemfile
 - lib/ulid/rails.rb
+- lib/ulid/rails/errors.rb
 - lib/ulid/rails/formatter.rb
 - lib/ulid/rails/patch.rb
 - lib/ulid/rails/type.rb
+- lib/ulid/rails/validator.rb
 - lib/ulid/rails/version.rb
 - ulid-rails.gemspec
-homepage: 
+homepage:
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -168,9 +189,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.3
+signing_key:
 specification_version: 4
 summary: ULID for rails
 test_files: []

data/.travis.yml

@@ -1,7 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.5.1
-before_install: gem install bundler -v 1.16.4

data/bin/wait-for-it.sh

@@ -1,178 +0,0 @@
-#!/usr/bin/env bash
-#   Use this script to test if a given TCP host/port are available
-
-WAITFORIT_cmdname=${0##*/}
-
-echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
-
-usage()
-{
-    cat << USAGE >&2
-Usage:
-    $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args]
-    -h HOST | --host=HOST       Host or IP under test
-    -p PORT | --port=PORT       TCP port under test
-                                Alternatively, you specify the host and port as host:port
-    -s | --strict               Only execute subcommand if the test succeeds
-    -q | --quiet                Don't output any status messages
-    -t TIMEOUT | --timeout=TIMEOUT
-                                Timeout in seconds, zero for no timeout
-    -- COMMAND ARGS             Execute command with args after the test finishes
-USAGE
-    exit 1
-}
-
-wait_for()
-{
-    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
-        echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
-    else
-        echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout"
-    fi
-    WAITFORIT_start_ts=$(date +%s)
-    while :
-    do
-        if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then
-            nc -z $WAITFORIT_HOST $WAITFORIT_PORT
-            WAITFORIT_result=$?
-        else
-            (echo > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1
-            WAITFORIT_result=$?
-        fi
-        if [[ $WAITFORIT_result -eq 0 ]]; then
-            WAITFORIT_end_ts=$(date +%s)
-            echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds"
-            break
-        fi
-        sleep 1
-    done
-    return $WAITFORIT_result
-}
-
-wait_for_wrapper()
-{
-    # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
-    if [[ $WAITFORIT_QUIET -eq 1 ]]; then
-        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
-    else
-        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
-    fi
-    WAITFORIT_PID=$!
-    trap "kill -INT -$WAITFORIT_PID" INT
-    wait $WAITFORIT_PID
-    WAITFORIT_RESULT=$?
-    if [[ $WAITFORIT_RESULT -ne 0 ]]; then
-        echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
-    fi
-    return $WAITFORIT_RESULT
-}
-
-# process arguments
-while [[ $# -gt 0 ]]
-do
-    case "$1" in
-        *:* )
-        WAITFORIT_hostport=(${1//:/ })
-        WAITFORIT_HOST=${WAITFORIT_hostport[0]}
-        WAITFORIT_PORT=${WAITFORIT_hostport[1]}
-        shift 1
-        ;;
-        --child)
-        WAITFORIT_CHILD=1
-        shift 1
-        ;;
-        -q | --quiet)
-        WAITFORIT_QUIET=1
-        shift 1
-        ;;
-        -s | --strict)
-        WAITFORIT_STRICT=1
-        shift 1
-        ;;
-        -h)
-        WAITFORIT_HOST="$2"
-        if [[ $WAITFORIT_HOST == "" ]]; then break; fi
-        shift 2
-        ;;
-        --host=*)
-        WAITFORIT_HOST="${1#*=}"
-        shift 1
-        ;;
-        -p)
-        WAITFORIT_PORT="$2"
-        if [[ $WAITFORIT_PORT == "" ]]; then break; fi
-        shift 2
-        ;;
-        --port=*)
-        WAITFORIT_PORT="${1#*=}"
-        shift 1
-        ;;
-        -t)
-        WAITFORIT_TIMEOUT="$2"
-        if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi
-        shift 2
-        ;;
-        --timeout=*)
-        WAITFORIT_TIMEOUT="${1#*=}"
-        shift 1
-        ;;
-        --)
-        shift
-        WAITFORIT_CLI=("$@")
-        break
-        ;;
-        --help)
-        usage
-        ;;
-        *)
-        echoerr "Unknown argument: $1"
-        usage
-        ;;
-    esac
-done
-
-if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then
-    echoerr "Error: you need to provide a host and port to test."
-    usage
-fi
-
-WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15}
-WAITFORIT_STRICT=${WAITFORIT_STRICT:-0}
-WAITFORIT_CHILD=${WAITFORIT_CHILD:-0}
-WAITFORIT_QUIET=${WAITFORIT_QUIET:-0}
-
-# check to see if timeout is from busybox?
-WAITFORIT_TIMEOUT_PATH=$(type -p timeout)
-WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH)
-if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then
-        WAITFORIT_ISBUSY=1
-        WAITFORIT_BUSYTIMEFLAG="-t"
-
-else
-        WAITFORIT_ISBUSY=0
-        WAITFORIT_BUSYTIMEFLAG=""
-fi
-
-if [[ $WAITFORIT_CHILD -gt 0 ]]; then
-    wait_for
-    WAITFORIT_RESULT=$?
-    exit $WAITFORIT_RESULT
-else
-    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
-        wait_for_wrapper
-        WAITFORIT_RESULT=$?
-    else
-        wait_for
-        WAITFORIT_RESULT=$?
-    fi
-fi
-
-if [[ $WAITFORIT_CLI != "" ]]; then
-    if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then
-        echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess"
-        exit $WAITFORIT_RESULT
-    fi
-    exec "${WAITFORIT_CLI[@]}"
-else
-    exit $WAITFORIT_RESULT
-fi