active_record_bitmask 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c616e8677376c68d869fb5f49c9410227e4ff4e591a856c0730dfcc750d8139e
-  data.tar.gz: eedd3a4aeb9df0022cea20110cfd0c0ce3fa2325acc2ae614c6dffeae7bdc9bd
+  metadata.gz: 92ef09e4ac0ca5c2da0db1869dc52776f5d990292e9c921bf02e364f1535925c
+  data.tar.gz: 5e48672686d4d15b10f547a2fccd0c017799dd259bf36f2d1184da9261bce2c8
 SHA512:
-  metadata.gz: 8ba4eb0de8d2896976a54b6cfe4016a8e65cf81e94a27ec68205c426a2c0e513c113d28e57bc678b27c5693a6ced707ab3c8203783c41a06cc6e170fd3bb7fb7
-  data.tar.gz: 53328c78180c6537332d43b1ed58163b96c22b5a893cb9004403a8db0aa2447bd9ce9986386462f338ffb1804f5aa8348777705fb776bf654873ba990198da70
+  metadata.gz: 99696c27cf5fdcfede8e64be3791da418276f6dbd7b1edcb960b5dec585aa14587e82bf686e635d60cbccd0fbc4ab0c88e39150a24504c98e974b07048a55825
+  data.tar.gz: d3dfbe52f15833aada4cbe70559f93c3493511872a1af6f024c1f54d77c8697dab77f396debed19be074014bbe3e077442cfadb2e0a2da414a0126eecf89c07c

data/.travis.yml

@@ -1,9 +1,10 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.5.7
-  - 2.6.5
-  - 2.7.0
+  - 2.5.8
+  - 2.6.6
+  - 2.7.2
+  - 3.0.0
 before_install: gem install bundler
 gemfile:
   - gemfiles/5.0_stable.gemfile
@@ -11,6 +12,20 @@ gemfile:
   - gemfiles/5.2_stable.gemfile
   - gemfiles/6.0_stable.gemfile
   - gemfiles/6.1_stable.gemfile
+matrix:
+  exclude:
+    - rvm: 2.5.8
+      gemfile: gemfiles/6.1_stable.gemfile
+    - rvm: 2.6.6
+      gemfile: gemfiles/6.1_stable.gemfile
+    - rvm: 2.7.2
+      gemfile: gemfiles/6.1_stable.gemfile
+    - rvm: 3.0.0
+      gemfile: gemfiles/5.0_stable.gemfile
+    - rvm: 3.0.0
+      gemfile: gemfiles/5.1_stable.gemfile
+    - rvm: 3.0.0
+      gemfile: gemfiles/5.2_stable.gemfile
 script:
   - bundle exec rspec
   - bundle exec rubocop

data/Appraisals

@@ -20,3 +20,7 @@ end
 appraise '6.1-stable' do
   gem 'activerecord', '~> 6.1.0.rc1'
 end
+
+appraise '7.0-stable' do
+  gem 'activerecord', '7.0.0.alpha2'
+end

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 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/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/gemfiles/7.0_stable.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pry"
+gem "rubocop", "0.86.0"
+gem "appraisal"
+gem "rake"
+gem "rspec"
+gem "sqlite3"
+gem "activerecord", "7.0.0.alpha2"
+
+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/model.rb

@@ -51,15 +51,21 @@ 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
 

data/lib/active_record_bitmask/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_bitmask
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - alpaca-tc
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,7 +24,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-description:
+description: 
 email:
 - alpaca-tc@alpaca.tc
 executables: []
@@ -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
@@ -61,7 +62,7 @@ metadata:
   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/
   bug_tracker_uri: https://github.com/alpaca-tc/active_record_bitmask/issues
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -76,8 +77,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Simple bitmask attribute support for ActiveRecord
 test_files: []