ulid-rails 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c37eb5b4b0722d0858a1c08682e89a8285350ab1d151bc90bbb6aaf1c6cff5d
-  data.tar.gz: 9bd6b0bff5eb157b998f04b26b7eb75e3b53d90c4820e2dcbc9ede7c8a1246b8
+  metadata.gz: 344d5b35daef598e2fe1116ad9bebea5d24cf9b6c1c2150344f2f1e5b25f0989
+  data.tar.gz: ecf448dea0921bf022a7888d0f2b90f23e27f08b5e103f6aa3669e0f71b0913a
 SHA512:
-  metadata.gz: ab1f5cf9796884e8845a67bf13a3e6b69f2e3d48c2b21c23ff5d0f1836fdbd6da1850dcb9292be74cad38476f4df3f4cd46306d66d2bdc203c7da50c24861ce2
-  data.tar.gz: f8300abe5bd288884ae1d8a24a12f08e3b6c248c144cc68f564fe567ff7c7fa213ce9a3110a1b5125a9ec9a38220afa139938cb12ce0b779532b613c6390e9a4
+  metadata.gz: 573a3e355e9487ccea553ce0041b831ba10d45d578906022ccbd99a9b672d9859d9cc9f1ae324bab61d68f9c0669609d1bfdfffe870d0a498309be876d6f68c8
+  data.tar.gz: d59ccebd6290359ca5b1e1508275aa16eee8e061455a35cd29ee2439acf07cb777d9ca013b855abaaec0a08087aa2a23d05f43e710b2c313c782ca74e4a0fc82

data/README.md

@@ -27,7 +27,7 @@ Specify `id: false` to `create_table` and add `id` column as 16-byte binary type
 ```ruby
   def change
     create_table :users, id: false do |t|
-      t.binary :id, limit: 16, primary_key: true # MySQL
+      t.binary :id, limit: 16, primary_key: true
       # ...
     end
   end
@@ -63,7 +63,7 @@ end
 
 ### `created_at` virtual column
 
-**MySQL Only (for now)**
+**MySQL 5.7 and higher Only (for now)**
 
 You can define a "virtual column" in MySQL DB that acts same as a physical column.
 Defining the virtual `created_at` is kind of comlicated so this gem provides a helper method for it.

data/bin/run_tests

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 test_with_db() {
   echo "Testing with $1"
   DB=$1 bundle exec rake
@@ -20,4 +22,4 @@ $DIR/wait-for-it.sh mysql80:3306
 test_with_db "mysql80"
 
 $DIR/wait-for-it.sh pg12:5432
-test_with_db "pg12"
+test_with_db "pg12"

data/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.6'
 services:
   test:
     image: ruby:2.6
-    command: sh -c "rm Gemfile.lock && bundle install && bin/run_tests"
+    command: sh -c "rm -f Gemfile.lock && bundle install && bin/run_tests"
     depends_on:
       - mysql56
       - mysql57
@@ -12,7 +12,7 @@ services:
     volumes:
       - bundle:/usr/local/bundle
       - .:/app
-    
+
   mysql56:
     image: mysql:5.6
     environment:
@@ -41,4 +41,4 @@ services:
     healthcheck:
       test: echo "\\l" | psql -U postgre
 volumes:
-  bundle:
+  bundle:

data/lib/ulid/rails.rb

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

data/lib/ulid/rails/type.rb

@@ -18,7 +18,7 @@ module ULID
 
         value = value.to_s if value.is_a?(Data)
         value = value.unpack("H*")[0] if value.encoding == Encoding::ASCII_8BIT
-        value = value[2..] if value.start_with?("\\x")
+        value = value[2..-1] if value.start_with?("\\x")
 
         value.length == 32 ? @formatter.format(value) : super
       end

data/lib/ulid/rails/version.rb

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

data/ulid-rails.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport", ">= 5.0"
   spec.add_dependency "activemodel", ">= 5.0"
   spec.add_dependency "activerecord", ">= 5.0"
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest", "~> 5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ulid-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Kazunori Kajihiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-24 00:00:00.000000000 Z
+date: 2020-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ulid
@@ -84,30 +84,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement