gizzard 0.9.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb2568fde715eb73945c6b19987ea08b3e2c72f34a6e4b5c5ab6dc8758d3f228
-  data.tar.gz: 3522cc6db511d5038947be77b59f6cb91c001df133690455424297ac68bd2b6c
+  metadata.gz: 42863950edb84dc3092ca42f7da68620d1456134586da56c6851c79f27dcafcb
+  data.tar.gz: 4f9646524791d9ce8e7e9ee1ed592a5abfc6c52fb4c6acaeafdb395b3e062c66
 SHA512:
-  metadata.gz: d33ca160e6cf2499cab2eb47d122eb9200c1d255531b76ada7dfd91f79966f3cc0709fbd877bf69ad38c68435294d63d16012ecd341d6888f30b8226fa65cf28
-  data.tar.gz: 55c1901b302755e81bc945337b9dec1f3d1ef92d3faeecd6f967fc679c9dbf30718ca10bd3772782ca03326b42e9823e84ecc576f5cab6d285426c91b5d27f56
+  metadata.gz: ecdadc5cd02c4031feffaba46df94ce4710b23e711fa59c667d029e482fa6d015c7190b6cd624e7a549a714887ae92a3c17648e15f9b99b1e77bf1d44360a815
+  data.tar.gz: f94048a2b9eb625b0075d88822ac9a62e991d3687d155b215d464558dbc4081deba49cc4e723e02dfac243ec24f9e1f39a21ad226d03e3cfb3b88449f067f729

data/README.md

@@ -1,6 +1,7 @@
 # Gizzard
 
-[![Build Status](https://github.com/taka0125/gizzard/workflows/Ruby/badge.svg?branch=main)](https://github.com/taka0125/gizzard/actions)
+[![Build Status](https://github.com/taka0125/gizzard/actions/workflows/main.yml/badge.svg)](https://github.com/taka0125/gizzard/actions/workflows/main.yml)
+[![Gem Version](https://badge.fury.io/rb/gizzard.svg)](https://badge.fury.io/rb/gizzard)
 
 Often use snippet for ActiveRecord.
 

data/lib/gizzard/base.rb

@@ -7,11 +7,7 @@ module Gizzard
         records = Array(records)
         return if records.empty?
 
-        if Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new(7)
-          ActiveRecord::Associations::Preloader.new(records: records, associations: associations, scope: scope).call
-        else
-          ActiveRecord::Associations::Preloader.new.preload(records, associations, scope)
-        end
+        ActiveRecord::Associations::Preloader.new(records: records, associations: associations, scope: scope).call
       end
 
       def delete_all_by_id(batch_size: 1000)

data/lib/gizzard/mysql.rb

@@ -4,20 +4,35 @@ module Gizzard
 
     included do
       include Base
+    end
 
-      scope :filtered_by, -> (column, value) do
+    class_methods do
+      def filtered_by(column, value)
         v = value.respond_to?(:strip) ? value.strip : value
-        v.present? ? where(column => v) : all
+        return where(column => v) if v.present?
+
+        all
       end
 
-      scope :forward_matching_by, -> (column, value) { where("`#{table_name}`.`#{column}` LIKE ?", "#{sanitize_sql_like(value)}%") }
-      scope :backward_matching_by, -> (column, value) { where("`#{table_name}`.`#{column}` LIKE ?", "%#{sanitize_sql_like(value)}") }
-      scope :partial_matching_by, -> (column, value) { where("`#{table_name}`.`#{column}` LIKE ?", "%#{sanitize_sql_like(value)}%") }
-    end
+      def forward_matching_by(column, value, collate: nil)
+        pattern = "#{sanitize_sql_like(value)}%"
+        like_by(column, pattern, collate: collate)
+      end
+
+      def backward_matching_by(column, value, collate: nil)
+        pattern = "%#{sanitize_sql_like(value)}"
+        like_by(column, pattern, collate: collate)
+      end
+
+      def partial_matching_by(column, value, collate: nil)
+        pattern = "%#{sanitize_sql_like(value)}%"
+        like_by(column, pattern, collate: collate)
+      end
 
-    class_methods do
       def order_by_field(column, values)
-        values.present? ? order(Arel.sql("field(`#{table_name}`.`#{column}`, #{values.join(',')})")) : all
+        return in_order_of(column, values) unless values.empty?
+
+        all
       end
 
       def order_by_id_field(ids)
@@ -54,6 +69,15 @@ module Gizzard
 
       private
 
+      def like_by(column, sanitized_pattern, collate: nil)
+        return where(arel_table[column].matches(sanitized_pattern)) if collate.blank?
+
+        where(
+          Arel.sql("`#{arel_table.name}`.`#{arel_table[column].name}` LIKE ? COLLATE #{collate}"),
+          sanitized_pattern
+        )
+      end
+
       def joins_with_index_hint(relation_name, indexes, join_type: :inner_join, hint: :use)
         relation = reflections[relation_name.to_s]
         join_table_name = relation.klass.table_name

data/lib/gizzard/version.rb

@@ -1,3 +1,3 @@
 module Gizzard
-  VERSION = "0.9.1"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: gizzard
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Takahiro Ooishi
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +15,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: ridgepole
   requirement: !ruby/object:Gem::Requirement
@@ -207,9 +206,11 @@ files:
 - lib/gizzard/version.rb
 - sig/gizzard.rbs
 homepage: https://github.com/taka0125/gizzard
-licenses: []
-metadata: {}
-post_install_message: 
+licenses:
+- MIT
+metadata:
+  homepage_uri: https://github.com/taka0125/gizzard
+  source_code_uri: https://github.com/taka0125/gizzard
 rdoc_options: []
 require_paths:
 - lib
@@ -217,15 +218,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Often use snippet for ActiveRecord.
 test_files: []