github-ds 0.5.0 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88208f2b8cc24184dce9a984af467c44d9560196e9832d637ee99aac34082da8
-  data.tar.gz: 70f8c5e30c4b237e33e0d96ff747c4719bcf300f5a67472fe7d347e6779ff0f7
+  metadata.gz: 67fbdfde76841e4bcdc3394cb89a3a153e2f37a40a96f94802fad44044f2930b
+  data.tar.gz: 969a49dd12b5014c55e789af20113430016df5210c9c2cecc2987f7352e00327
 SHA512:
-  metadata.gz: 5afcb251c8dcbb250db23eb758f67a38baa8933fcf6325f2c9a419ae1dcee5455d7571a0eb0cfed0b401134225e482c74cab421b0bd116931996b5b954710c78
-  data.tar.gz: bda6aa58192ec5d29d3a909f1d14d939fcb4b069019c7d617ede8f3e580eceedaddb180cf2c266cf9e8d21e262d7752d3d04d20ecfe1e5491cf75f544a611395
+  metadata.gz: 28dd029a03c1e1d7c37e9780103edadb28f55ae0c99d3397016ecbcbb9e0dc15254a3e1755890c5d1ecc3d9a202263f901b86d9694f06d66e5c44c1b2611e6b6
+  data.tar.gz: 264bbc44d409b3470fcb20eb665cf2620afdd144b22ac0845e13eba94ebb782f198fd654a992b09de6133daaa6141e536b8d7d237b327378cfacb6f63a56e32e

data/.github/workflows/ci.yml

@@ -0,0 +1,36 @@
+name: CI
+
+on:
+  push: {}
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_DATABASE: github_ds_test
+          MYSQL_ROOT_PASSWORD: ""
+        ports:
+          - "3306:3306"
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.7', '3.0']
+        rails-version: ['7.0.0.alpha2', '6.1.0']
+    env:
+      RAILS_VERSION: ${{ matrix.rails-version }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run tests
+      run: bundle exec rake

data/Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 gemspec
 
-DEFAULT_RAILS_VERSION = '6.0.3'
+DEFAULT_RAILS_VERSION = '6.0.3.5'
 ENV['RAILS_VERSION'] ||= DEFAULT_RAILS_VERSION
 
 if ENV['RAILS_VERSION'] == '4.2.10'

data/README.md

@@ -94,6 +94,8 @@ pp kv.mdel(["foo", "bar"])
 # nil
 ```
 
+Note that due to MySQL's default collation, KV keys are case-insensitive.
+
 ### GitHub::SQL
 
 ```ruby
@@ -215,7 +217,7 @@ Nothing currently on our radar other than continued maintenance. Have a big idea
 
 | pic | @mention |
 |---|---|
-| ![@charliesome](https://avatars3.githubusercontent.com/u/179065?s=64) | [@charliesome](https://github.com/charliesome) |
+| ![@haileysome](https://avatars3.githubusercontent.com/u/179065?s=64) | [@haileysome](https://github.com/haileysome) |
 | ![@jnunemaker](https://avatars3.githubusercontent.com/u/235?s=64) | [@jnunemaker](https://github.com/jnunemaker) |
 | ![@miguelff](https://avatars3.githubusercontent.com/u/210307?s=64) | [@miguelff](https://github.com/miguelff) |
 | ![@zerowidth](https://avatars3.githubusercontent.com/u/3999?s=64) | [@zerowidth](https://github.com/zerowidth) |

data/lib/github/ds/version.rb

@@ -1,5 +1,5 @@
 module GitHub
   module DS
-    VERSION = "0.5.0"
+    VERSION = '0.5.3'
   end
 end

data/lib/github/kv.rb

@@ -129,7 +129,8 @@ module GitHub
           SELECT `key`, value FROM #{@table_name} WHERE `key` IN :keys AND (`expires_at` IS NULL OR `expires_at` > :now)
         SQL
 
-        keys.map { |key| kvs[key] }
+        kvs.keys.each { |key| kvs[key.downcase] = kvs[key] }
+        keys.map { |key| kvs[key.downcase] }
       }
     end
 
@@ -328,7 +329,7 @@ module GitHub
             `expires_at`=IF(
               concat('',`value`*1) = `value`,
               IF(
-                :touch,
+                :touch OR (`expires_at` IS NULL OR `expires_at`<:now),
                 :expires,
                 `expires_at`
               ),

data/lib/github/sql.rb

@@ -381,7 +381,7 @@ module GitHub
 
       when DateTime, Time, Date
         enforce_timezone do
-          connection.quote value.to_s(:db)
+          connection.quote value.to_formatted_s(:db)
         end
 
       when true
@@ -402,15 +402,25 @@ module GitHub
 
     # Private: Forces ActiveRecord's default timezone for duration of block.
     def enforce_timezone(&block)
+      on_rails_7 = ActiveRecord.respond_to?(:default_timezone)
       begin
         if @force_timezone
-          zone = ActiveRecord::Base.default_timezone
-          ActiveRecord::Base.default_timezone = @force_timezone
+          if on_rails_7
+            zone = ActiveRecord.default_timezone
+            ActiveRecord.default_timezone = @force_timezone
+          else
+            zone = ActiveRecord::Base.default_timezone
+            ActiveRecord::Base.default_timezone = @force_timezone
+          end
         end
 
         yield if block_given?
       ensure
-        ActiveRecord::Base.default_timezone = zone if @force_timezone
+        if on_rails_7
+          ActiveRecord.default_timezone = zone if @force_timezone
+        else
+          ActiveRecord::Base.default_timezone = zone if @force_timezone
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github-ds
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.3
 platform: ruby
 authors:
 - GitHub Open Source
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-16 00:00:00.000000000 Z
+date: 2023-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -160,8 +160,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A collection of libraries for working with SQL on top of ActiveRecord's connection.

data/.travis.yml

@@ -1,14 +0,0 @@
-language: ruby
-before_install:
-  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
-  - gem install bundler -v '<2'
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-script: bundle exec rake
-env:
-  - RAILS_VERSION=6.0.3.1
-  - RAILS_VERSION=5.2.0
-services:
-  - mysql