active_flag 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2138875041460aa14daf08205e785d254a98de7480493ba02384b0e7532e46ec
-  data.tar.gz: 2d73e184d76e622527418ee6f7d631d94af443d0e64af90784d57e924eee7377
+  metadata.gz: 2410c1b0af6f52df6e74bbbb1dee7f4aa445d7914ec9f63caffc843a4f8453a0
+  data.tar.gz: b4877beab21724bf362fe26fdeb3e3d7d9de532170a46acf638dcad36df15d09
 SHA512:
-  metadata.gz: d3df91d0240c5974605780a6a20adfbe251421b85232c12fd422bd222f42e5822cb4896aeb08ea6c9e0103cc451c80d6018a1dd0ef1eec4f43f19fc21b4890fd
-  data.tar.gz: 455b9ed794b025f0c05235f6163053938565c3762f053469a0c9f3855de83918460bced3b28ebfaa56f2ca77fc41f996ed114fe10e7f99b003a484d7f23e0682
+  metadata.gz: 84efcd90ecdc82c0e93074902a8bee8f88fb114035a1680808b1f53840e8224388d372872aa3d3d392ad4c36bd0bc5301d48eba21adb5a275b869c5b90d3098f
+  data.tar.gz: 721d7dec4c58f396427bb50dfa4c577bf9aa23bfb871c27f4da8b1d20a9d1aa026e2ec163bdf58927548a4c28ff8f389008fb639d58f8b23f3d3c38c7fb68004

data/README.md

@@ -43,6 +43,9 @@ Profile.languages.to_array(3)               #=> [:english, :spanish]
 
 # Scope methods
 Profile.where_languages(:french, :spanish)  #=> SELECT * FROM profiles WHERE languages & 10 > 0
+Profile.where_all_languages(:french, :spanish)  #=> SELECT * FROM profiles WHERE languages & 10 = 10
+Profile.where_not_languages(:french, :spanish)  #=> SELECT * FROM profiles WHERE languages & 10 = 0
+Profile.where_not_all_languages(:french, :spanish)  #=> SELECT * FROM profiles WHERE languages & 10 < 10
 Profile.languages.set_all!(:chinese)        #=> UPDATE "profiles" SET languages = COALESCE(languages, 0) | 4
 Profile.languages.unset_all!(:chinese)      #=> UPDATE "profiles" SET languages = COALESCE(languages, 0) & ~4
 ```
@@ -67,7 +70,8 @@ add_column :users, :languages, :integer, null: false, default: 0, limit: 8
 
 ## Query
 
-For a querying purpose, use `where_[column]` scope.
+For a querying purpose, use `where_[column]`, `where_all_[column]`,
+`where_not_[column]` and `where_not_all_[column]` scopes.
 
 ```ruby
 Profile.where_languages(:french)            #=> SELECT * FROM profiles WHERE languages & 8 > 0
@@ -79,12 +83,24 @@ Also takes multiple values.
 Profile.where_languages(:french, :spanish)  #=> SELECT * FROM profiles WHERE languages & 10 > 0
 ```
 
-By default, it searches with `or` operation, so the query above returns profiles that have either French or Spanish.
+By default, it returns profiles that have either French or Spanish.
 
-If you want to change it to `and` operation, you can specify:
+To get profiles that have both French and Spanish, use:
 
 ```ruby
-Profile.where_languages(:french, :spanish, op: :and) #=> SELECT * FROM profiles WHERE languages = 10
+Profile.where_all_languages(:french, :spanish) #=> SELECT * FROM profiles WHERE languages & 10 = 10
+```
+
+To get profiles that do not have either French or Spanish, use:
+
+```ruby
+Profile.where_not_languages(:french, :spanish) #=> SELECT * FROM profiles WHERE languages & 10 = 0
+```
+
+To get profiles that do not have both French and Spanish, use:
+
+```ruby
+Profile.where_not_all_languages(:french, :spanish) #=> SELECT * FROM profiles WHERE languages & 10 < 10
 ```
 
 ## Translation

data/lib/active_flag/version.rb

@@ -1,3 +1,3 @@
 module ActiveFlag
-  VERSION = '1.5.2'
+  VERSION = '1.6.0'
 end

data/lib/active_flag.rb

@@ -35,15 +35,37 @@ module ActiveFlag
 
       # Scopes
       define_singleton_method "where_#{column}" do |*args|
-        options = args.extract_options!
-        integer = active_flags[column].to_i(args)
-        column_name = connection.quote_table_name_for_assignment(table_name, column)
+        options, integer, column_name = send "_where_#{column}", *args
         if options[:op] == :and
+          ActiveSupport::Deprecation.warn('op: :and is deprecated, use where_all instead')
           where("#{column_name} & #{integer} = #{integer}")
         else
           where("#{column_name} & #{integer} > 0")
         end
       end
+
+      define_singleton_method "where_all_#{column}" do |*args|
+        _options, integer, column_name = send "_where_#{column}", *args
+        where("#{column_name} & #{integer} = #{integer}")
+      end
+
+      define_singleton_method "where_not_#{column}" do |*args|
+        _options, integer, column_name = send "_where_#{column}", *args
+        where("#{column_name} & #{integer} = 0")
+      end
+
+      define_singleton_method "where_not_all_#{column}" do |*args|
+        _options, integer, column_name = send "_where_#{column}", *args
+        where("#{column_name} & #{integer} < #{integer}")
+      end
+
+      define_singleton_method "_where_#{column}" do |*args|
+        return [
+          args.extract_options!,
+          active_flags[column].to_i(args),
+          connection.quote_table_name_for_assignment(table_name, column)
+        ]
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_flag
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - Kenn Ejima
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-30 00:00:00.000000000 Z
+date: 2022-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord