ulid-rails 1.1.1 → 2.0.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5af3537525b91e1c92af1b6ea6bdc8a5a872943a1cb5c8d895f50addb0ae7508
-  data.tar.gz: 0032d5ad04a924b166bbcf10b1fa9d01a5222aa57175fca0b645dd5df05eee70
+  metadata.gz: 4fe6dfad2124c31cc7fbd3b744c8309d3abbd1fe8b3f0f737e87730d48e4a7ad
+  data.tar.gz: 5c94f88160609b46cb584c5e802e1a8fbfc3ae92e75e08277ca50c4f5693d24b
 SHA512:
-  metadata.gz: 3d2855d4fd84b86d85191104aeee9e8574bf3a29bf095c4fec622c611db9c19694db182476d9bd89c2f78f98193c6b8f2fbadf4045fe6240a0d0f0091f30ff19
-  data.tar.gz: 02ebc48788b7d39f5d1684802a2941b10e237d880885c63e311d76493d02f6a5956ba98b54c77c9d54014eec0306ac4df9f91d78324279c621623500bbaf002b
+  metadata.gz: 0f39ff3a403a16b42ea3ee18a82938b266998f936dabe319084d52dedc2a2260761b92ed3273b8b074c0ee95b30979eef30b41abfa8db73ea16b0436652f1b26
+  data.tar.gz: a836d749d63b71b66cc310262db3c3cd529b5378e17c3ef5c265503c695d446fdc954df36f9c74b828ab423620e707138877322db1546b1d6fc3f3e7c4b986aa

data/.github/workflows/test.yml

@@ -15,19 +15,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        activerecord-version: ["5.0", "5.1", "5.2", "6.0", "6.1", "7.0", "7.0.5"]
+        activerecord-version: ["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"}
+        include:
+          - {activerecord-version: "5.2", ruby-version: "2.7"}
     steps:
       - uses: actions/checkout@v3
       - run: docker-compose run test

data/.rubocop.yml

@@ -10,3 +10,4 @@ AllCops:
   NewCops: enable
   Exclude:
     - 'vendor/**/*'
+  TargetRubyVersion: "2.7"

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 2.0.0.pre.1
+
+- Drop support for Rails 5.0 and Rails 5.1.
+- Fix various issues when calling `#where` with non-String values, or multiple ULID values.
+
 ## 1.1.1
 
 - Drop support for ruby 2.6.

data/README.md

@@ -162,13 +162,9 @@ $ docker-compose run -e AR_VERSION=6.1 test
 Or run tests locally, without docker-compose
 
 ```
-$ AR_VERSION=4.2 bundle update && AR_VERSION=4.2 bundle exec rake test
+$ AR_VERSION=6.1 bundle update && AR_VERSION=6.1 bundle exec rake test
 ```
 
-## Known issues
-
-- ActiveRecord 5.0 and 5.1 do not work properly with some data association loading methods. For example, eager loading with limit/offset on a model that has a ulid ID. Refer to test cases that are skiped for AR 5.0 and 5.1.
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/ulid/rails/patch.rb

@@ -8,46 +8,6 @@ module ULID
             as: "FROM_UNIXTIME(CONV(HEX(#{ulid_column_name} >> 80), 16, 10) / 1000.0)"
         end
       end
-
-      module FinderMethods
-        def limited_ids_for(relation)
-          id_rows = super
-          if klass.attribute_types[primary_key].is_a? ULID::Rails::Type
-            id_rows.map do |id|
-              klass.attribute_types[primary_key].deserialize id
-            end
-          else
-            id_rows
-          end
-        end
-      end
-
-      module SchemaStatements
-        def distinct_relation_for_primary_key(relation) # :nodoc:
-          values = columns_for_distinct(
-            visitor.compile(relation.table[relation.primary_key]),
-            relation.order_values
-          )
-
-          limited = relation.reselect(values).distinct!
-          limited_ids = select_rows(limited.arel, "SQL").map(&:last)
-
-          if relation.klass.attribute_types[relation.primary_key].is_a? ULID::Rails::Type
-            limited_ids.map! do |id|
-              relation.klass.attribute_types[relation.primary_key].deserialize id
-            end
-          end
-
-          if limited_ids.empty?
-            relation.none!
-          else
-            relation.where!(relation.primary_key => limited_ids)
-          end
-
-          relation.limit_value = relation.offset_value = nil
-          relation
-        end
-      end
     end
   end
 end

data/lib/ulid/rails/postgresql_type.rb

@@ -0,0 +1,39 @@
+require_relative "type"
+
+module ULID
+  module Rails
+    class PostgresqlType < Type
+      class Data < ULID::Rails::Type::Data
+        def hex
+          hexed = super
+          return nil if hexed.nil?
+          [hexed].pack("H*")
+        end
+
+        alias_method :to_s, :hex
+      end
+
+      # Inspired by active_record/connection_adapters/postgresql/oid/bytea
+      def deserialize(value)
+        case value
+        when nil
+          nil
+        when ULID::Rails::Type::Data
+          super(value.value)
+        else
+          super(PG::Connection.unescape_bytea(value))
+        end
+      end
+
+      private
+
+      def cast_string_to_ulid(value)
+        if value.is_a?(String) && value.length == 34 && value.start_with?("\\x")
+          Data.from_serialized(value[2..])
+        else
+          super(value, data_class: PostgresqlType::Data)
+        end
+      end
+    end
+  end
+end

data/lib/ulid/rails/sqlite_type.rb

@@ -0,0 +1,21 @@
+require_relative "type"
+
+module ULID
+  module Rails
+    class SqliteType < Type
+      class Data < ULID::Rails::Type::Data
+        alias_method :to_s, :hex
+      end
+
+      private
+
+      def cast_string_to_ulid(value)
+        if value.is_a?(String) && value.length == 32
+          Data.from_serialized(value)
+        else
+          super(value, data_class: SqliteType::Data)
+        end
+      end
+    end
+  end
+end

data/lib/ulid/rails/type.rb

@@ -1,68 +1,78 @@
 require "active_model/type"
-require "ulid/rails/formatter"
-require "ulid/rails/validator"
+require "base32/crockford"
 require "ulid/rails/errors"
 
 module ULID
   module Rails
     class Type < ActiveModel::Type::Binary
-      class Data < ActiveModel::Type::Binary::Data
-        alias_method :hex, :to_s
+      def assert_valid_value(value)
+        raise ArgumentError, "`#{value}` is not a ULID format" unless Data.valid_ulid?(value)
       end
 
-      def initialize(formatter = Formatter, validator = Validator)
-        @formatter = formatter
-        @validator = validator
-        super()
+      def cast(value)
+        return nil if value.nil?
+
+        str = value.is_a?(Data) ? value.value : value
+
+        cast_string_to_ulid(str).value
       end
 
-      def assert_valid_value(value)
-        raise ArgumentError, "`#{value}` is not a ULID format" unless @validator.is_valid?(value)
+      def serialize(value)
+        return value if value.is_a?(Data)
+        return Data.null unless value.is_a?(String)
+
+        cast_string_to_ulid(value)
       end
 
       def deserialize(value)
         return nil if value.nil?
 
-        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
+        super
       end
 
-      def serialize(value)
-        return if value.nil?
+      private
+
+      def cast_string_to_ulid(value, data_class: Data)
+        raise ArgumentError if !value.is_a?(String)
 
-        case adapter
-        when "mysql2", "sqlite3"
-          Data.new(@formatter.unformat(value))
-        when "postgresql"
-          Data.new([@formatter.unformat(value)].pack("H*"))
+        if data_class.valid_ulid?(value)
+          data_class.new(value)
+        else
+          data = value.unpack1("H*")
+          data_class.from_serialized(data)
         end
       end
 
-      private
+      class Data < ActiveModel::Type::Binary::Data
+        def self.null
+          new(nil)
+        end
 
-      def adapter
-        if ::ActiveRecord::Base.respond_to?(:connection_db_config)
-          ::ActiveRecord::Base.connection_db_config.configuration_hash[:adapter]
-        else
-          ::ActiveRecord::Base.connection_config[:adapter]
+        def self.from_serialized(data)
+          deserialized = Base32::Crockford.encode(data.hex).rjust(26, "0")
+          new(deserialized)
+        end
+
+        def self.valid_ulid?(str)
+          return true if str.nil?
+
+          str.length == 26 && Base32::Crockford.valid?(str)
+        end
+
+        def initialize(value)
+          @value = nil
+          super if self.class.valid_ulid?(value)
+        end
+
+        attr_reader :value
+
+        def hex
+          return nil if @value.nil?
+
+          hexed = Base32::Crockford.decode(@value).to_s(16).rjust(32, "0")
+          raise ArgumentError if hexed.length > 32
+
+          hexed
         end
       end
     end

data/lib/ulid/rails/version.rb

@@ -1,5 +1,5 @@
 module ULID
   module Rails
-    VERSION = "1.1.1"
+    VERSION = "2.0.0.pre.1"
   end
 end

data/lib/ulid/rails.rb

@@ -5,6 +5,8 @@ require "ulid"
 require "base32/crockford"
 require "ulid/rails/version"
 require "ulid/rails/type"
+require "ulid/rails/postgresql_type"
+require "ulid/rails/sqlite_type"
 require "ulid/rails/patch"
 
 module ULID
@@ -13,7 +15,7 @@ module ULID
 
     class_methods do
       def ulid(column_name, auto_generate: false)
-        attribute column_name, ULID::Rails::Type.new
+        attribute column_name, :ulid
 
         if auto_generate
           before_create do
@@ -44,15 +46,10 @@ module ULID
       end
     end
 
-    ActiveModel::Type.register(:ulid, ULID::Rails::Type)
-    ActiveRecord::ConnectionAdapters::TableDefinition.send :include, Patch::Migrations
-    case ActiveRecord::VERSION::MAJOR
-    when 5
-      ActiveRecord::FinderMethods.prepend(Patch::FinderMethods) unless ActiveRecord::VERSION::MINOR < 2
-    when 6
-      ActiveRecord::FinderMethods.prepend(Patch::FinderMethods)
-    when 7
-      ActiveRecord::ConnectionAdapters::SchemaStatements.prepend(Patch::SchemaStatements)
-    end
+    ActiveRecord::Type.register(:ulid, ULID::Rails::Type, override: false)
+    ActiveRecord::Type.register(:ulid, ULID::Rails::PostgresqlType, adapter: :postgresql)
+    ActiveRecord::Type.register(:ulid, ULID::Rails::SqliteType, adapter: :sqlite)
+    ActiveRecord::Type.register(:ulid, ULID::Rails::SqliteType, adapter: :sqlite3)
+    ActiveRecord::ConnectionAdapters::TableDefinition.include(Patch::Migrations)
   end
 end

data/ulid-rails.gemspec

@@ -32,10 +32,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "ulid", "~> 1.0"
   spec.add_dependency "base32-crockford", "~> 0.1"
-  spec.add_dependency "activesupport", ">= 5.0"
-  spec.add_dependency "activemodel", ">= 5.0"
-  spec.add_dependency "activerecord", ">= 5.0"
+  spec.add_dependency "activesupport", ">= 5.2"
+  spec.add_dependency "activemodel", ">= 5.2"
+  spec.add_dependency "activerecord", ">= 5.2"
   spec.add_development_dependency "bundler"
+  spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "rubocop-minitest"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ulid-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0.pre.1
 platform: ruby
 authors:
 - Kazunori Kajihiro
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-25 00:00:00.000000000 Z
+date: 2023-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ulid
@@ -45,42 +45,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +95,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -174,8 +188,6 @@ files:
 - bin/run_tests
 - bin/setup
 - docker-compose.yml
-- gemfiles/5.0.gemfile
-- gemfiles/5.1.gemfile
 - gemfiles/5.2.gemfile
 - gemfiles/6.0.gemfile
 - gemfiles/6.1.gemfile
@@ -183,10 +195,10 @@ files:
 - gemfiles/7.0.gemfile
 - lib/ulid/rails.rb
 - lib/ulid/rails/errors.rb
-- lib/ulid/rails/formatter.rb
 - lib/ulid/rails/patch.rb
+- lib/ulid/rails/postgresql_type.rb
+- lib/ulid/rails/sqlite_type.rb
 - lib/ulid/rails/type.rb
-- lib/ulid/rails/validator.rb
 - lib/ulid/rails/version.rb
 - ulid-rails.gemspec
 homepage: https://github.com/k2nr/ulid-rails/
@@ -208,9 +220,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.12
 signing_key:

data/gemfiles/5.0.gemfile

@@ -1,10 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "activesupport", "~> 5.0.0"
-gem "activemodel", "~> 5.0.0"
-gem "activerecord", "~> 5.0.0"
-gem "sqlite3", "~> 1.3.6"
-gem "mysql2", ">= 0.3.18", "< 0.6.0"
-gem "pg", ">= 0.18", "< 2.0"

data/gemfiles/5.1.gemfile

@@ -1,10 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "activesupport", "~> 5.1.0"
-gem "activemodel", "~> 5.1.0"
-gem "activerecord", "~> 5.1.0"
-gem "sqlite3", "~> 1.3", ">= 1.3.6"
-gem "mysql2", ">= 0.3.18", "< 0.6.0"
-gem "pg", ">= 0.18", "< 2.0"

data/lib/ulid/rails/formatter.rb

@@ -1,16 +0,0 @@
-require "base32/crockford"
-
-module ULID
-  module Rails
-    module Formatter
-      def self.format(v)
-        sanitized = v.delete("-").hex
-        Base32::Crockford.encode(sanitized).rjust(26, "0")
-      end
-
-      def self.unformat(v)
-        Base32::Crockford.decode(v).to_s(16).rjust(32, "0")
-      end
-    end
-  end
-end

data/lib/ulid/rails/validator.rb

@@ -1,12 +0,0 @@
-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