ulid-rails 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f122ca0476d8b8c06f1f4bf08219bdf653d0ba890a3cdb6d9d5d99dfec353424
-  data.tar.gz: 0d1d58ea8a26637db28421610971049cbc9730201c39f9d9444757a65a249a4e
+  metadata.gz: 5af3537525b91e1c92af1b6ea6bdc8a5a872943a1cb5c8d895f50addb0ae7508
+  data.tar.gz: 0032d5ad04a924b166bbcf10b1fa9d01a5222aa57175fca0b645dd5df05eee70
 SHA512:
-  metadata.gz: c37272d98ec13e144f2aa8c704d3db3140bf672cf3f6d7e76931acc7ab008b0a51cc91a51c402a8dbc14d73da3ce31092ace18e99efcf31b9ad4ff4c5fd6cb16
-  data.tar.gz: d7bcabb538e9f4a588b7d28b79459c06e44c9bfaeffdcaf5e563823908cdad5bcf7de3cd9fd2da20b21062415686e40f5df0904b53e38b9ac367084021616a19
+  metadata.gz: 3d2855d4fd84b86d85191104aeee9e8574bf3a29bf095c4fec622c611db9c19694db182476d9bd89c2f78f98193c6b8f2fbadf4045fe6240a0d0f0091f30ff19
+  data.tar.gz: 02ebc48788b7d39f5d1684802a2941b10e237d880885c63e311d76493d02f6a5956ba98b54c77c9d54014eec0306ac4df9f91d78324279c621623500bbaf002b

data/.env

@@ -1 +1 @@
-RUBY_VERSION=2.6
+RUBY_VERSION=2.7

data/.github/workflows/lint.yml

@@ -6,6 +6,7 @@ on:
   push:
     branches:
       - master
+  workflow_dispatch:
 
 jobs:
   standardrb:

data/.github/workflows/test.yml

@@ -6,25 +6,31 @@ on:
   push:
     branches:
       - master
+  workflow_dispatch:
 
 jobs:
   tests:
+    name: ActiveRecord ${{ matrix.activerecord-version }} / Ruby ${{ matrix.ruby-version }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        activerecord-version: ["5.0", "5.1", "5.2", "6.0", "6.1", "7.0"]
-        ruby-version: ["2.6", "2.7", "3.0", "3.1"]
+        activerecord-version: ["5.0", "5.1", "5.2", "6.0", "6.1", "7.0", "7.0.5"]
+        ruby-version: ["2.7", "3.0", "3.1", "3.2"]
         exclude:
           - {activerecord-version: "5.0", ruby-version: "3.0"}
           - {activerecord-version: "5.0", ruby-version: "3.1"}
+          - {activerecord-version: "5.0", ruby-version: "3.2"}
           - {activerecord-version: "5.1", ruby-version: "3.0"}
           - {activerecord-version: "5.1", ruby-version: "3.1"}
+          - {activerecord-version: "5.1", ruby-version: "3.2"}
           - {activerecord-version: "5.2", ruby-version: "3.0"}
           - {activerecord-version: "5.2", ruby-version: "3.1"}
+          - {activerecord-version: "5.2", ruby-version: "3.2"}
           - {activerecord-version: "6.0", ruby-version: "3.1"}
-          - {activerecord-version: "7.0", ruby-version: "2.6"}
     steps:
       - uses: actions/checkout@v3
-      - 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
+      - run: docker-compose run test
+        env:
+          RUBY_VERSION: ${{ matrix.ruby-version }}
+          AR_VERSION: ${{ matrix.activerecord-version }}

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # ulid-rails CHANGELOG
 
+## Unreleased
+
+## 1.1.1
+
+- Drop support for ruby 2.6.
+- Fix compatibility with ActiveRecord 7.0.5+.
+
 ## 1.1.0
 
 - Fix eager loading with limit/offset on models that have ulid primary key. The fix only applies to ActiveRecord 5.2, 6 and 7 (#38).

data/README.md

@@ -37,6 +37,8 @@ Specify `id: false` to `create_table` and add `id` column as 16-byte binary type
   end
 ```
 
+**MySQL note:** You can also declare the `id` column as `t.column :id, 'binary(16)'` when using MySQL, given that the syntax in the example will generate a SQL that makes the id as `VARBINARY(16)` instead of `BINARY(16)`.
+
 ### Model Changes
 
 Just add the below lines to your models.
@@ -110,7 +112,7 @@ You need to specicfy `type` option
 
 Please note that this library doesn't work properly with `has_and_belongs_to_many` associations.
 
-Our recommendation is to be explicit and instead use the `has_many, through: join_class` association. 
+Our recommendation is to be explicit and instead use the `has_many, through: join_class` association.
 Notice that for it to work properly you must specify the `has_many` to the join class in the main classes of the association,
 and your join class must have `belongs_to` main classes defined as shown in the example below:
 

data/docker-compose.yml

@@ -1,8 +1,10 @@
 version: '3.6'
 services:
   test:
-    image: "ruby:${RUBY_VERSION}" 
+    image: "ruby:${RUBY_VERSION}"
     command: sh -c "rm -f Gemfile.lock && bundle install && bin/run_tests"
+    environment:
+      - AR_VERSION=${AR_VERSION}
     depends_on:
       pg12:
         condition: service_healthy
@@ -23,20 +25,20 @@ services:
       MYSQL_ROOT_PASSWORD: password
     command: --innodb-large-prefix --innodb-file-format=barracuda
     healthcheck:
-      test:  mysql --password=password -e "show databases;"
+      test: mysql --password=password -e "show databases;"
   mysql57:
     image: mysql:5.7
     environment:
       MYSQL_ROOT_PASSWORD: password
     healthcheck:
-      test:  mysql --password=password -e "show databases;"
+      test: mysql --password=password -e "show databases;"
   mysql80:
     image: mysql:8.0
     command: --default-authentication-plugin=mysql_native_password
     environment:
       MYSQL_ROOT_PASSWORD: password
     healthcheck:
-      test:  mysql --password=password -e "show databases;"
+      test: mysql --password=password -e "show databases;"
   pg12:
     image: postgres:12
     environment:

data/gemfiles/7.0.5.gemfile

@@ -0,0 +1,10 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "activesupport", "~> 7.0.5"
+gem "activemodel", "~> 7.0.5"
+gem "activerecord", "~> 7.0.5"
+gem "sqlite3", "~> 1.4"
+gem "mysql2", "~> 0.5"
+gem "pg", "~> 1.1"

data/gemfiles/7.0.gemfile

@@ -2,9 +2,9 @@ source "https://rubygems.org"
 
 gemspec path: ".."
 
-gem "activesupport", "~> 7.0.0"
-gem "activemodel", "~> 7.0.0"
-gem "activerecord", "~> 7.0.0"
+gem "activesupport", "~> 7.0.0", "< 7.0.5"
+gem "activemodel", "~> 7.0.0", "< 7.0.5"
+gem "activerecord", "~> 7.0.0", "< 7.0.5"
 gem "sqlite3", "~> 1.4"
 gem "mysql2", "~> 0.5"
 gem "pg", "~> 1.1"

data/lib/ulid/rails/type.rb

@@ -23,9 +23,24 @@ module ULID
       def deserialize(value)
         return nil if value.nil?
 
-        value = value.to_s if value.is_a?(Data)
-        value = value.unpack1("H*") if value.encoding == Encoding::ASCII_8BIT
-        value = value[2..-1] if value.start_with?("\\x")
+        case adapter
+        when "mysql2"
+          if value.is_a?(Data)
+            value = value.to_s
+          elsif value.is_a?(String)
+            value = value.unpack1("H*")
+          end
+        when "postgresql"
+          if value.is_a?(Data)
+            value = value.to_s
+            value = value.unpack1("H*")
+          end
+          value = value[2..-1] if value.start_with?("\\x")
+        when "sqlite3"
+          if value.is_a?(Data)
+            value = value.to_s
+          end
+        end
 
         value.length == 32 ? @formatter.format(value) : super
       end

data/lib/ulid/rails/version.rb

@@ -1,5 +1,5 @@
 module ULID
   module Rails
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ulid-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Kazunori Kajihiro
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-23 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ulid
@@ -179,6 +179,7 @@ files:
 - gemfiles/5.2.gemfile
 - gemfiles/6.0.gemfile
 - gemfiles/6.1.gemfile
+- gemfiles/7.0.5.gemfile
 - gemfiles/7.0.gemfile
 - lib/ulid/rails.rb
 - lib/ulid/rails/errors.rb
@@ -211,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: ULID for rails