active_record_bitmask 0.0.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c616e8677376c68d869fb5f49c9410227e4ff4e591a856c0730dfcc750d8139e
-  data.tar.gz: eedd3a4aeb9df0022cea20110cfd0c0ce3fa2325acc2ae614c6dffeae7bdc9bd
+  metadata.gz: 624a3dadb88c65c2c87d3c4f3054b8e20d6b32d370df053e1d496ad1081fbb13
+  data.tar.gz: 3fe828937fc5bb799e6e250d8d96248708825262df7ad1e8ee61d80d4d000b04
 SHA512:
-  metadata.gz: 8ba4eb0de8d2896976a54b6cfe4016a8e65cf81e94a27ec68205c426a2c0e513c113d28e57bc678b27c5693a6ced707ab3c8203783c41a06cc6e170fd3bb7fb7
-  data.tar.gz: 53328c78180c6537332d43b1ed58163b96c22b5a893cb9004403a8db0aa2447bd9ce9986386462f338ffb1804f5aa8348777705fb776bf654873ba990198da70
+  metadata.gz: c914453a693e29f98eb756956a33ddc2f2373cce35820863a1827531658a83bc902b5c8344e0561b1db7069f57da4e3500ce323450c7c9eb18e7410601d96817
+  data.tar.gz: 24d72c973b8ed34f8017caa999b132d81a105fb679844054588196e4ae3b9545e93c8ba55de4fe1177df8632460daed6a4d10fe71aca8b100ca4afb638ac1d35

data/.github/workflows/ci.yml

@@ -0,0 +1,54 @@
+name: Ruby
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+
+permissions:
+  contents: read
+
+jobs:
+  rubocop:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['3.1', '3.2']
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run rubocop
+      run: bundle exec rubocop
+
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        gemfile: ['6.0_stable', '6.1_stable', '7.0_stable']
+        ruby-version: ['2.5', '2.6', '2.7', '3.0', '3.1', '3.2']
+        exclude:
+          - ruby-version: '3.2'
+            gemfile: '6.0_stable'
+          - ruby-version: '3.1'
+            gemfile: '6.0_stable'
+          - ruby-version: '2.5'
+            gemfile: '7.0_stable'
+          - ruby-version: '2.6'
+            gemfile: '7.0_stable'
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rspec

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 /gemfiles/*.lock
 /gemfiles/.bundle
+.ruby-version

data/.rubocop.yml

@@ -1,9 +1,19 @@
 AllCops:
+  NewCops: enable
+  SuggestExtensions: false
+  Include:
+    - 'Gemfile'
+    - 'Appraisals'
+    - 'Rakefile'
+    - 'gemfiles/**/*'
+    - 'lib/**/*'
+    - 'spec/**/*'
   Exclude:
     - '.bundle/**/*'
+    - 'vendor/**/*'
     - 'gemfiles/**/*'
     - Gemfile
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.5
   DisplayCopNames: true
 
 Bundler:
@@ -87,3 +97,6 @@ Metrics/PerceivedComplexity:
 Lint/UselessAccessModifier:
   ContextCreatingMethods:
     - concerning
+
+Lint/EmptyBlock:
+  Enabled: false

data/Appraisals

@@ -1,22 +1,13 @@
 # frozen_string_literal: true
 
-appraise '5.0-stable' do
-  gem 'activerecord', '~> 5.0.0'
-  gem 'sqlite3', '~> 1.3.6'
-end
-
-appraise '5.1-stable' do
-  gem 'activerecord', '~> 5.1.0'
-end
-
-appraise '5.2-stable' do
-  gem 'activerecord', '~> 5.2.0'
-end
-
 appraise '6.0-stable' do
   gem 'activerecord', '~> 6.0.0'
 end
 
 appraise '6.1-stable' do
-  gem 'activerecord', '~> 6.1.0.rc1'
+  gem 'activerecord', '~> 6.1.0'
+end
+
+appraise '7.0-stable' do
+  gem 'activerecord', '~> 7.0.0'
 end

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## Next Version
+
+## 1.0.0
+
+* **Breaking Changes** Rails 5.0, 5.1 and 5.2 are no longer supported. #23
+* Changed the version of rails specified in appraisal to stable version. #20
+* Migrate travis.ci to Github Actions #22
+* Support ruby 3.2 #24
+
+## 0.0.6
+
+* Deprecate `#attribute?(*args)` in favor of `#attribute_bitmask?(*args)`. #17
+* Support Rails 7.0.0.alpha1 #18
+
 ## 0.0.5
 
 * Support Rails 6.1.0 #14

data/Gemfile

@@ -4,7 +4,7 @@ gemspec
 
 gem 'pry'
 # Don't update rubocop automatically because sometimes it fails test by breaking changes.
-gem 'rubocop', '0.86.0'
+gem 'rubocop', '1.28.2'
 gem 'appraisal'
 gem 'rake'
 gem 'rspec'

data/README.md

@@ -43,8 +43,8 @@ You can check bitmask
 
 ```ruby
 post = Post.create(roles: [:provider, :guest])
-post.roles?(:provider) #=> false
-post.roles?(:guest, :provider) #=> true
+post.roles_bitmask?(:provider) #=> false
+post.roles_bitmask?(:guest, :provider) #=> true
 ```
 
 You can get the definition of bitmask

data/active_record_bitmask.gemspec

@@ -14,7 +14,9 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Simple bitmask attribute support for ActiveRecord'
   spec.homepage      = 'https://github.com/alpaca-tc/active_record_bitmask'
 
-  spec.metadata      = {
+  spec.required_ruby_version = '>= 2.5.0'
+
+  spec.metadata = {
     'homepage_uri' => 'https://github.com/alpaca-tc/active_record_bitmask',
     'changelog_uri' => 'https://github.com/alpaca-tc/active_record_bitmask/blob/master/CHANGELOG.md',
     'source_code_uri' => 'https://github.com/alpaca-tc/active_record_bitmask/',
@@ -26,5 +28,5 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '>= 5.0'
+  spec.add_dependency 'activerecord', '>= 6.0'
 end

data/gemfiles/6.0_stable.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "pry"
-gem "rubocop", "0.86.0"
+gem "rubocop", "1.28.2"
 gem "appraisal"
 gem "rake"
 gem "rspec"

data/gemfiles/6.1_stable.gemfile

@@ -3,11 +3,11 @@
 source "https://rubygems.org"
 
 gem "pry"
-gem "rubocop", "0.86.0"
+gem "rubocop", "1.28.2"
 gem "appraisal"
 gem "rake"
 gem "rspec"
 gem "sqlite3"
-gem "activerecord", "~> 6.1.0.rc1"
+gem "activerecord", "~> 6.1.0"
 
 gemspec path: "../"

data/gemfiles/7.0_stable.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pry"
+gem "rubocop", "1.28.2"
+gem "appraisal"
+gem "rake"
+gem "rspec"
+gem "sqlite3"
+gem "activerecord", "~> 7.0.0"
+
+gemspec path: "../"

data/lib/active_record_bitmask/attribute_methods/query.rb

@@ -1,15 +1,36 @@
 # frozen_string_literal: true
 
+require 'active_record'
+require 'active_support/concern'
+
 module ActiveRecordBitmask
   module AttributeMethods
     module Query
+      extend ActiveSupport::Concern
+
+      included do
+        attribute_method_suffix('_bitmask?')
+      end
+
       private
 
       def bitmask_attribute?(attribute_name)
         self.class.bitmasks.key?(attribute_name.to_sym)
       end
 
-      def attribute?(attribute_name, *values)
+      if ActiveRecord.gem_version < Gem::Version.create('7.0.0.alpha1')
+        # In Rails 7.0.0, calling attribute? with arguments is not working.
+        def attribute?(attribute_name, *values)
+          if bitmask_attribute?(attribute_name) && values.present?
+            ActiveSupport::Deprecation.warn("`#{attribute_name}?(*args)` is deprecated and will be removed in next major version. Call `#{attribute_name}_bitmask?(*args)` instead.")
+            attribute_bitmask?(attribute_name, *values)
+          else
+            super
+          end
+        end
+      end
+
+      def attribute_bitmask?(attribute_name, *values)
         if bitmask_attribute?(attribute_name) && values.present?
           # assert bitmask values
           map = self.class.bitmask_for(attribute_name)
@@ -18,7 +39,7 @@ module ActiveRecordBitmask
 
           (current_value & expected_value) == expected_value
         else
-          super
+          attribute?(attribute_name)
         end
       end
     end

data/lib/active_record_bitmask/bitmask_type.rb

@@ -6,6 +6,7 @@ module ActiveRecordBitmask
     # @param map [ActiveRecordBitmask::Map]
     # @param sub_type [ActiveModel::Type::Value]
     def initialize(_name, map, sub_type)
+      super()
       @map = map
       @sub_type = sub_type
     end

data/lib/active_record_bitmask/model.rb

@@ -51,19 +51,26 @@ module ActiveRecordBitmask
       private
 
       def define_bitmask_attribute(attribute, map)
-        # 2nd arguments is deleted in 6.1.0
-        options = if ActiveRecord.gem_version >= Gem::Version.new('6.1.0.rc1')
-                    []
-                  else
-                    [:bitmask]
-                  end
-
-        decorate_attribute_type(attribute, *options) do |subtype|
-          ActiveRecordBitmask::BitmaskType.new(attribute, map, subtype)
+        if ActiveRecord.gem_version >= Gem::Version.new('7.0.0.alpha1')
+          # Greater than or equal to 7.0.0
+          attribute(attribute) do |subtype|
+            ActiveRecordBitmask::BitmaskType.new(attribute, map, subtype)
+          end
+        elsif ActiveRecord.gem_version >= Gem::Version.new('6.1.0')
+          # Equal to 6.1.0
+          decorate_attribute_type(attribute) do |subtype|
+            ActiveRecordBitmask::BitmaskType.new(attribute, map, subtype)
+          end
+        else
+          # Less than 6.1.0
+          decorate_attribute_type(attribute, :bitmask) do |subtype|
+            ActiveRecordBitmask::BitmaskType.new(attribute, map, subtype)
+          end
         end
       end
 
       # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/PerceivedComplexity
       def define_bitmask_scopes(attribute)
         blank = [0, nil].freeze
 
@@ -121,6 +128,7 @@ module ActiveRecordBitmask
         }
       end
       # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:enable Metrics/PerceivedComplexity
     end
   end
 end

data/lib/active_record_bitmask/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordBitmask
-  VERSION = '0.0.5'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_bitmask
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 1.0.0
 platform: ruby
 authors:
 - alpaca-tc
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2023-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 description:
 email:
 - alpaca-tc@alpaca.tc
@@ -31,10 +31,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -46,6 +46,7 @@ files:
 - gemfiles/5.2_stable.gemfile
 - gemfiles/6.0_stable.gemfile
 - gemfiles/6.1_stable.gemfile
+- gemfiles/7.0_stable.gemfile
 - lib/active_record_bitmask.rb
 - lib/active_record_bitmask/attribute_methods.rb
 - lib/active_record_bitmask/attribute_methods/query.rb
@@ -69,14 +70,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Simple bitmask attribute support for ActiveRecord

data/.travis.yml

@@ -1,16 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.5.7
-  - 2.6.5
-  - 2.7.0
-before_install: gem install bundler
-gemfile:
-  - gemfiles/5.0_stable.gemfile
-  - gemfiles/5.1_stable.gemfile
-  - gemfiles/5.2_stable.gemfile
-  - gemfiles/6.0_stable.gemfile
-  - gemfiles/6.1_stable.gemfile
-script:
-  - bundle exec rspec
-  - bundle exec rubocop