occams-record 1.10.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13a3f1e39f767ad2eb6948e699d3be39a8018bba1be35260bbdd832c9f83d69f
-  data.tar.gz: 8ef77becb090f5fdea847a707b2a99f5bc796f032632d9bdd4736a92e5a48e8a
+  metadata.gz: 59a1532b7b4de439a549008362dcc631ee79bfbd069c76a322e7df01c7f8d7f9
+  data.tar.gz: 765fe5f325d60a9d9830960be99028aa6215b166d9b2ef13bab84d074e9ede5c
 SHA512:
-  metadata.gz: 3a45f3ca3fb2d3023a200712331b8d31eb9f4fa8b692cfd66434bccdc0eeac94e0dc0bfdcfd63db202a33501b2199eb916f255af59c35101f701db09c8dd53ed
-  data.tar.gz: af48b818be6aa1fd1814db3bf45c80b62d0d65bacb547cfdd5383d0081245c29fe3469f26cdebbc9681b0c0954caccd8d1c87308852f3d4529cd29455edf7f5a
+  metadata.gz: d3a1bebbc0996c1b5b1efe59dfe2b47f14491b8a426eba7bea2e8269693ad7e0ff579c860bcf9031eb7c2ed18f7f4ce525c854d61d8444ed4505fd366fcb6050
+  data.tar.gz: a315b65a3a5c1750a09956ea9330c68b83d10bcd943cb9edf32fe94f47b54b9f9af016abb6f524f7567bd424c74d5cc661b836db6dbeb324e94f7f8222f444a5

data/lib/occams-record/batches/offset_limit/scoped.rb

@@ -13,8 +13,7 @@ module OccamsRecord
         #
         # Returns an Enumerator that yields batches of records, of size "of".
         # NOTE ActiveRecord 5+ provides the 'in_batches' method to do something
-        # similiar, although 4.2 does not. Also it does not respect ORDER BY,
-        # whereas this does.
+        # similiar, but unlike this it doesn't respect ORDER BY.
         #
         # @param batch_size [Integer] batch size
         # @param use_transaction [Boolean] Ensure it runs inside of a database transaction

data/lib/occams-record/binds_converter/named.rb

@@ -1,33 +1,22 @@
 module OccamsRecord
   module BindsConverter
-    # @private
-    WORD = /\w/
-
     #
     # Converts Rails-style named binds (:foo) into native Ruby format (%{foo}).
     #
-    class Named < Abstract
+    class Named
       def initialize(sql)
-        super(sql, ":".freeze)
+        @sql = sql
       end
 
-      protected
-
-      def get_bind
-        old_i = @i
-        @i += 1
-        @start_i = @i
-
-        until @i > @end or @sql[@i] !~ WORD
-          @i += 1
-        end
-
-        if @i > @start_i
-          name = @sql[@start_i..@i - 1]
-          @start_i = @i
-          "%{#{name}}"
-        else
-          @sql[old_i]
+      def to_s
+        @sql.gsub(/([:\\]?):([a-zA-Z]\w*)/) do |match|
+          if $1 == ":".freeze # skip PostgreSQL casts
+            match # return the whole match
+          elsif $1 == "\\".freeze # escaped literal colon
+            match[1..-1] # return match with escaping backslash char removed
+          else
+            "%{#{$2}}"
+          end
         end
       end
     end

data/lib/occams-record/type_caster.rb

@@ -3,8 +3,7 @@ module OccamsRecord
     # @private
     CASTER =
       case ActiveRecord::VERSION::MAJOR
-      when 4 then :type_cast_from_database
-      when 5, 6, 7 then :deserialize
+      when 6, 7 then :deserialize
       else raise "OccamsRecord::TypeCaster::CASTER does yet support this version of ActiveRecord"
       end
 

data/lib/occams-record/version.rb

@@ -3,5 +3,5 @@
 #
 module OccamsRecord
   # @private
-  VERSION = "1.10.0".freeze
+  VERSION = "1.11.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occams-record
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Jordan Hollinger
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.2'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.2'
@@ -84,14 +84,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: The missing high-efficiency query API for ActiveRecord