ulid-rails 0.6.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 286faae595c37c666671a84b8eeeb070497b585dd58cde500e96f8b9939e61e8
-  data.tar.gz: 8463132209c6706611a889e16ddfcf91d24173e88ec47cba9da743df8ccdc12f
+  metadata.gz: ad104e01d6ca64c2430e444ea5d900dcabf387200d177edf90be642bbebe3eaf
+  data.tar.gz: 28dc14190454edd67f047908981940d2741fb6cd7da2b416a4631cd0ea651e8d
 SHA512:
-  metadata.gz: b84e1c464698d32480e5d27a9d91d13565478e5c3aebc2f8e4fd9c58bf07774eee5b65df3dc2cf4326bfcca7790ab2698ebc51d63cba7b82458707e72959b149
-  data.tar.gz: c687adcd8d9b8abee8c85c3bd4ce30dd5393883b7993366ca85c502b748cb668dd150ff5977153b8f90278d36fecbc8f02b07aa3d88a138031f78da0a5376120
+  metadata.gz: f7e03ce00d239548a353a0fb5d1601d8af16303a384fd7c20176065a34a4a3345b8fda3bcc1c18d140858edda8e7544638226037bc2d20c74a1341de3ac62d9d
+  data.tar.gz: 0c7a894e1124d72608f9e493ce7db594780715c1c0e0a69345970d59b093dcf10bc4bc4b1f21f5db9a48bc4862838cb06851485958b19caa4f8085fb1227eacb

data/.github/workflows/test.yml

@@ -6,13 +6,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        activerecord-version: ["5.0", "5.1", "4.2", "5.2", "6.0", "6.1"]
+        activerecord-version: ["5.0", "5.1", "5.2", "6.0", "6.1"]
         ruby-version: ["2.6", "2.7", "3.0"]
         exclude:
-          - activerecord-version: "4.2"
-            ruby-version: "2.7"
-          - activerecord-version: "4.2"
-            ruby-version: "3.0"
           - activerecord-version: "5.0"
             ruby-version: "3.0"
           - activerecord-version: "5.1"

data/CHANGELOG.md

@@ -1,24 +1,32 @@
 # ulid-rails CHANGELOG
 
-## 0.6
+## 1.0.0
 
- - Add support for Rails 4.2, 5.0 and 5.1.
+- Drop support for Rails 4.2.
 
-## 0.5
+### Breaking Changes
+
+- `primary_key` option has been removed. You need to specify `auto_generate: true` to automatically fill your primary key columns.
+
+## 0.6.0
+
+- Add support for Rails 4.2, 5.0 and 5.1.
+
+## 0.5.0
 
 - 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
+## 0.4.0
 
 - Support old ruby versions
 - Fix auto_generate #2
 
-## 0.3
+## 0.3.0
 
 - Support PostgresQL
 
-## 0.2
+## 0.2.0
 
 ### Breaking Changes
 

data/README.md

@@ -1,6 +1,6 @@
 # ULID::Rails
 
-This gem makes it possible to use [ULID](https://github.com/ulid/spec) for DB primary keys in a Ruby on Rails app.
+This gem makes it possible to use [ULID](https://github.com/ulid/spec) for DB in a Ruby on Rails app.
 
 
 ## Installation
@@ -41,7 +41,7 @@ Just add the below lines to your models.
 ```ruby
 class MyModel < ApplicationRecord
   include ULID::Rails
-  ulid :id, primary_key: true # The first argument is the ULID column name
+  ulid :id, auto_generate: true # The first argument is the ULID column name
 end
 ```
 
@@ -53,7 +53,7 @@ Since ULID includes milli seconds precision timestamp, you don't need to store `
 ```ruby
 class MyModel < ApplicationRecord
   include ULID::Rails
-  ulid :id, primary_key: true # The first argument is the ULID column name
+  ulid :id, auto_generate: true # The first argument is the ULID column name
 
   # defines `created_at` method which extract timestamp value from id column.
   # This way you don't need physical `created_at` column.
@@ -82,14 +82,13 @@ end
 
 ### Auto-generate ULID
 
-If `primary_key` is `true`, ULID is auto-generated before create by default.
-You can enable or disable auto-generation with `auto_generate` option.
+If `auto_generate` is `true`, ULID is auto-generated before create by default.
+If not specified, the default is `false`.
 
 ```
 class Model < ApplicationRecord
-  ulid :id, primary_key: true # primary key. auto-generate enabled
+  ulid :id, auto_generate: true #  auto-generate enabled
   ulid :foreign_key # auto-generate disabled
-  ulid :ulid, auto_generate: true # non primary, auto-generate enabled
 end
 ```
 

data/lib/ulid/rails/type.rb

@@ -1,21 +1,12 @@
+require "active_model/type"
 require "ulid/rails/formatter"
 require "ulid/rails/validator"
 require "ulid/rails/errors"
-require "ulid/rails/constants"
 
 module ULID
   module Rails
-    case RAILS_VERSION
-    when "4.2"
-      require "active_record/type"
-      Binary = ActiveRecord::Type::Binary
-    else
-      require "active_model/type"
-      Binary = ActiveModel::Type::Binary
-    end
-
-    class Type < Binary
-      class Data < Binary::Data
+    class Type < ActiveModel::Type::Binary
+      class Data < ActiveModel::Type::Binary::Data
         alias_method :hex, :to_s
       end
 
@@ -50,16 +41,6 @@ module ULID
         end
       end
 
-      if RAILS_4_2
-        alias_method :type_cast_for_database, :serialize
-        alias_method :type_cast_from_database, :deserialize
-
-        def type_cast_from_user(value)
-          assert_valid_value(value)
-          super
-        end
-      end
-
       private
 
       def adapter

data/lib/ulid/rails/version.rb

@@ -1,5 +1,5 @@
 module ULID
   module Rails
-    VERSION = "0.6.0"
+    VERSION = "1.0.0"
   end
 end

data/lib/ulid/rails.rb

@@ -1,21 +1,20 @@
 require "active_record"
 require "active_support/concern"
+require "active_model/type"
 require "ulid"
 require "base32/crockford"
 require "ulid/rails/version"
 require "ulid/rails/type"
 require "ulid/rails/patch"
-require "ulid/rails/constants"
 
 module ULID
   module Rails
     extend ActiveSupport::Concern
 
     class_methods do
-      def ulid(column_name, primary_key: false, auto_generate: nil)
+      def ulid(column_name, auto_generate: false)
         attribute column_name, ULID::Rails::Type.new
 
-        auto_generate = primary_key || auto_generate
         if auto_generate
           before_create do
             send("#{column_name}=", ULID.generate) if send(column_name).nil?
@@ -45,11 +44,7 @@ module ULID
       end
     end
 
-    unless RAILS_4_2
-      require "active_model/type"
-      ActiveModel::Type.register(:ulid, ULID::Rails::Type)
-    end
-
+    ActiveModel::Type.register(:ulid, ULID::Rails::Type)
     ActiveRecord::ConnectionAdapters::TableDefinition.send :include, Patch::Migrations
   end
 end

data/ulid-rails.gemspec

@@ -5,13 +5,22 @@ require "ulid/rails/version"
 Gem::Specification.new do |spec|
   spec.name = "ulid-rails"
   spec.version = ULID::Rails::VERSION
+  spec.required_ruby_version = ">= 2.5.0"
   spec.authors = ["Kazunori Kajihiro", "Zendesk"]
   spec.email = ["kazunori.kajihiro@gmail.com", "ruby-core@zendesk.com"]
 
   spec.summary = "ULID for rails"
   spec.description = "ULID for rails"
+  spec.homepage = "https://github.com/k2nr/ulid-rails/"
   spec.license = "MIT"
 
+  spec.metadata = {
+    "changelog_uri" => "https://github.com/k2nr/ulid-rails/blob/master/CHANGELOG.md",
+    "source_code_uri" => "https://github.com/k2nr/ulid-rails/",
+    "bug_tracker_uri" => "https://github.com/k2nr/ulid-rails/issues",
+    "rubygems_mfa_required" => "true"
+  }
+
   # 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
@@ -23,9 +32,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "ulid", "~> 1.0"
   spec.add_dependency "base32-crockford", "~> 0.1"
-  spec.add_dependency "activesupport", ">= 4.2"
-  spec.add_dependency "activemodel", ">= 4.2"
-  spec.add_dependency "activerecord", ">= 4.2"
+  spec.add_dependency "activesupport", ">= 5.0"
+  spec.add_dependency "activemodel", ">= 5.0"
+  spec.add_dependency "activerecord", ">= 5.0"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest", "~> 5.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ulid-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Kazunori Kajihiro
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-11 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ulid
@@ -45,42 +45,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -159,14 +159,12 @@ files:
 - bin/run_tests
 - bin/setup
 - docker-compose.yml
-- gemfiles/4.2.gemfile
 - gemfiles/5.0.gemfile
 - gemfiles/5.1.gemfile
 - gemfiles/5.2.gemfile
 - gemfiles/6.0.gemfile
 - gemfiles/6.1.gemfile
 - lib/ulid/rails.rb
-- lib/ulid/rails/constants.rb
 - lib/ulid/rails/errors.rb
 - lib/ulid/rails/formatter.rb
 - lib/ulid/rails/patch.rb
@@ -174,10 +172,14 @@ files:
 - lib/ulid/rails/validator.rb
 - lib/ulid/rails/version.rb
 - ulid-rails.gemspec
-homepage:
+homepage: https://github.com/k2nr/ulid-rails/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/k2nr/ulid-rails/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/k2nr/ulid-rails/
+  bug_tracker_uri: https://github.com/k2nr/ulid-rails/issues
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -186,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/gemfiles/4.2.gemfile

@@ -1,6 +0,0 @@
-gem "activesupport", "~> 4.2"
-gem "activemodel", "~> 4.2"
-gem "activerecord", "~> 4.2"
-gem "sqlite3", "~> 1.3.6"
-gem "mysql2", ">= 0.3.13", "< 0.6.0"
-gem "pg", "~> 0.15"

data/lib/ulid/rails/constants.rb

@@ -1,6 +0,0 @@
-module ULID
-  module Rails
-    RAILS_VERSION = "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
-    RAILS_4_2 = RAILS_VERSION == "4.2"
-  end
-end