sql_enum 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ba5a5a0695bc9c11496ca90509646d98e2e005e7c89664aba78acb1de45d270
-  data.tar.gz: 1cb90fe77fcc9b7e2d84c0fe9b9b41ddee264de6e488d5de8dbc9462371a8ecd
+  metadata.gz: 2db9bae7e87154948d42ff23710df268a6f942c66aa52b42dd12c78606141c32
+  data.tar.gz: 4ad6e4b93c4ff9bfeaa2b143a96b2b5327c0c2e774320c6e9b2e2c7f569e7155
 SHA512:
-  metadata.gz: 795a28c30fc3fddb87865fc82325243c67a009694c409ffe880dace43c0d601cdcc32b4d9806a9d9c3220616dcc82be9b0e57ca8ccb3bb14c2d6562457c588a5
-  data.tar.gz: 67835417b809b63b7d97deb3531d059f3df63d1450406b0216cb81540a7276c691635126da7afdbf1dcf87fb128f7fe63cc8e196073fac55254e321ca1b66b58
+  metadata.gz: 55105be1538e1f81803acd39b5e202ee0ed685d583fa5c7e99d650edabbe43bf6e13dfdac59a134c5511a00e767a97546e33fd6340f69f0bdc9a0791749bcb12
+  data.tar.gz: f63345f9b4478d15c3138f405c7ab6d0b7952bfa6294761d01db50bf164a231fb74dd8f5f2c86f2cae9f04a348539c02d6f236d991b66e4a30bb37f3736677ec

data/.github/workflows/tests.yml

@@ -7,10 +7,20 @@ on:
 
 jobs:
   rspec:
+    strategy:
+      matrix:
+        rails:
+          - '5.1'
+          - '5.2'
+          - '6.0'
+          - '6.1'
+
     runs-on: ubuntu-latest
 
+    name: RSpec (Rails ${{ matrix.rails }})
+
     steps:
       - uses: actions/checkout@v2
 
       - name: Test
-        run: docker-compose run --rm rspec
+        run: docker-compose run --rm rspec bundle exec appraisal rails-${{ matrix.rails }} rspec

data/.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+gemfiles/*.lock

data/Appraisals

@@ -0,0 +1,15 @@
+appraise "rails-5.1" do
+  gem "rails", "~> 5.1.0"
+end
+
+appraise "rails-5.2" do
+  gem "rails", "~> 5.2.0"
+end
+
+appraise "rails-6.0" do
+  gem "rails", "~> 6.0.0"
+end
+
+appraise "rails-6.1" do
+  gem "rails", "~> 6.1.0"
+end

data/Dockerfile

@@ -1,12 +1,9 @@
-FROM ruby:3.0
-
-# throw errors if Gemfile has been modified since Gemfile.lock
-RUN bundle config --global frozen 1
+FROM ruby:2.7
 
 WORKDIR /usr/src/app
 
-# Bundler caching
-RUN mkdir -p lib/sql_enum
+RUN mkdir -p lib/sql_enum gemfiles
 COPY lib/sql_enum/version.rb  ./lib/sql_enum/
-COPY sql_enum.gemspec Gemfile Gemfile.lock ./
-RUN bundle install
+COPY gemfiles/*.gemfile gemfiles/
+COPY sql_enum.gemspec Gemfile Gemfile.lock Appraisals ./
+RUN bundle install && exec appraisal install

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    sql_enum (0.3.0)
-      activerecord (>= 5.0)
-      activesupport (>= 5.0)
+    sql_enum (0.3.1)
+      activerecord (>= 5.1)
+      activesupport (>= 5.1)
       mysql2
 
 GEM
@@ -20,13 +20,25 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
+    appraisal (2.4.1)
+      bundler
+      rake
+      thor (>= 0.14.0)
     concurrent-ruby (1.1.9)
+    debug (1.3.2)
+      irb (>= 1.3.6)
+      reline (>= 0.2.7)
     diff-lcs (1.3)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
+    io-console (0.5.9)
+    irb (1.3.7)
+      reline (>= 0.2.7)
     minitest (5.14.4)
     mysql2 (0.5.3)
     rake (13.0.3)
+    reline (0.2.7)
+      io-console (~> 0.5)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -40,15 +52,19 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
+    thor (1.1.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     zeitwerk (2.5.1)
 
 PLATFORMS
   ruby
+  x86_64-linux
 
 DEPENDENCIES
+  appraisal
   bundler
+  debug
   rake (~> 13.0)
   rspec (~> 3.0)
   sql_enum!

data/docker-compose.yml

@@ -8,7 +8,7 @@ services:
     depends_on:
       mysql:
         condition: service_healthy
-    command: bundle exec rspec
+    command: bundle exec appraisal rspec
 
   mysql:
     image: mysql:5.7

data/gemfiles/rails_5.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://gem-proxy.chime.com"
+
+gem "rails", "~> 5.1.0"
+
+gemspec path: "../"

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://gem-proxy.chime.com"
+
+gem "rails", "~> 5.2.0"
+
+gemspec path: "../"

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://gem-proxy.chime.com"
+
+gem "rails", "~> 6.0.0"
+
+gemspec path: "../"

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://gem-proxy.chime.com"
+
+gem "rails", "~> 6.1.0"
+
+gemspec path: "../"

data/lib/sql_enum/class_methods.rb

@@ -3,18 +3,41 @@ module SqlEnum
     def sql_enum(column_name, options = {})
       # Query values
       enum_column = EnumColumn.new(table_name, column_name)
-      values = enum_column.values.to_h { |value| [value.to_sym, value.to_s] }
+      values_map = enum_column.values.to_h { |value| [value.to_sym, value.to_s] }
 
       # Check option defaults
       prefix = options.fetch(:_prefix, !!SqlEnum.configuration&.default_prefix)
       suffix = options.fetch(:_suffix, !!SqlEnum.configuration&.default_suffix)
 
       # Define enum using Rails enum
-      enum(column_name => values, _prefix: prefix, _suffix: suffix)
+      enum(column_name => values_map, _prefix: prefix, _suffix: suffix)
 
       # Override reader to return symbols
-      concerning "SqlEnum#{column_name.to_s.camelize}" do
-        define_method(column_name) { super()&.to_sym }
+      type_definition = ->(subtype) { EnumType.new(attr, send(column_name.to_s.pluralize), subtype) }
+      case method(:decorate_attribute_type).arity
+      when 2 # Rails 5.1, 5.2, 6.0
+        decorate_attribute_type(column_name, :enum, &type_definition)
+      else
+        decorate_attribute_type(column_name, &type_definition)
+      end
+
+      prefix_str = format_affix(column_name, prefix, suffix: '_')
+      suffix_str = format_affix(column_name, suffix, prefix: '_')
+
+      # Fix query methods to compare symbols to symbols
+      values_map.each_value do |value|
+        method_name = "#{prefix_str}#{value}#{suffix_str}"
+        define_method("#{method_name}?") { self[column_name] == value.to_sym }
+      end
+    end
+
+    private
+
+    def format_affix(column_name, affix, prefix: '', suffix: '')
+      if affix == true
+        "#{prefix}#{column_name}#{suffix}"
+      elsif affix
+        "#{prefix}#{affix}#{suffix}"
       end
     end
   end

data/lib/sql_enum/enum_column.rb

@@ -21,13 +21,13 @@ module SqlEnum
     end
 
     def schema_values_query
-      <<~EOSQL
-      SELECT column_type
-      FROM information_schema.COLUMNS
-      WHERE TABLE_SCHEMA = '#{database_name}'
-      AND TABLE_NAME = '#{table_name}'
-      AND COLUMN_NAME = '#{column_name}'
-      EOSQL
+      <<~SQL
+        SELECT column_type
+        FROM information_schema.COLUMNS
+        WHERE TABLE_SCHEMA = '#{database_name}'
+        AND TABLE_NAME = '#{table_name}'
+        AND COLUMN_NAME = '#{column_name}'
+      SQL
     end
   end
 end

data/lib/sql_enum/enum_type.rb

@@ -0,0 +1,12 @@
+module SqlEnum
+  # EnumType that always returns a symbol
+  class EnumType < ActiveRecord::Enum::EnumType
+    def cast(arg)
+      super&.to_sym
+    end
+
+    def deserialize(arg)
+      super&.to_sym
+    end
+  end
+end

data/lib/sql_enum/version.rb

@@ -1,3 +1,3 @@
 module SqlEnum
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/sql_enum.rb

@@ -20,5 +20,6 @@ require_relative 'active_record/connection_adapters/mysql/column_methods'
 require_relative 'sql_enum/version'
 require_relative 'sql_enum/configuration'
 require_relative 'sql_enum/enum_column'
+require_relative 'sql_enum/enum_type'
 require_relative 'sql_enum/class_methods'
 require_relative 'sql_enum/active_record'

data/sql_enum.gemspec

@@ -20,11 +20,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport", ">= 5.0"
-  spec.add_dependency "activerecord", ">= 5.0"
+  spec.add_dependency "activesupport", ">= 5.1"
+  spec.add_dependency "activerecord", ">= 5.1"
   spec.add_dependency "mysql2"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "debug"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "appraisal"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql_enum
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Fletcher Fowler
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-28 00:00:00.000000000 Z
+date: 2021-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: debug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - fletch@fzf.me
@@ -106,6 +134,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Appraisals
 - CODE_OF_CONDUCT.md
 - Dockerfile
 - Gemfile
@@ -116,6 +145,10 @@ files:
 - bin/console
 - bin/setup
 - docker-compose.yml
+- gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.1.gemfile
 - lib/active_record/connection_adapters/abstract_mysql.rb
 - lib/active_record/connection_adapters/mysql/column_methods.rb
 - lib/active_record/connection_adapters/mysql2.rb
@@ -125,6 +158,7 @@ files:
 - lib/sql_enum/class_methods.rb
 - lib/sql_enum/configuration.rb
 - lib/sql_enum/enum_column.rb
+- lib/sql_enum/enum_type.rb
 - lib/sql_enum/version.rb
 - sql_enum.gemspec
 homepage: https://github.com/1debit/sql_enum