active_flag 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f156db5cdf6e7c81eeec5d35fe84a5bf52d3543e1a274eb120ebe5961c3a2aae
-  data.tar.gz: 800c0c276ea269197360587b2b091fbb4208bf1312949eba7fb41568bea6b684
+  metadata.gz: 2410c1b0af6f52df6e74bbbb1dee7f4aa445d7914ec9f63caffc843a4f8453a0
+  data.tar.gz: b4877beab21724bf362fe26fdeb3e3d7d9de532170a46acf638dcad36df15d09
 SHA512:
-  metadata.gz: e0756d76fa4f609f39858f482a3f60cc429446fa8e3781ae157554e9cb5a6eb788663d3a46a32eaf360750083f5b771fdcffdbe4bb96c8166026e1f2e03bf03f
-  data.tar.gz: 4a1a0a5e0ba214b08977d04aa8b1f9ab41ee2a8906f968d05da05da1e35066e7208853405493073ff61cdbcd0972abedd2f3440f4837a0ff6f398b7a0c26ab0e
+  metadata.gz: 84efcd90ecdc82c0e93074902a8bee8f88fb114035a1680808b1f53840e8224388d372872aa3d3d392ad4c36bd0bc5301d48eba21adb5a275b869c5b90d3098f
+  data.tar.gz: 721d7dec4c58f396427bb50dfa4c577bf9aa23bfb871c27f4da8b1d20a9d1aa026e2ec163bdf58927548a4c28ff8f389008fb639d58f8b23f3d3c38c7fb68004

data/.travis.yml

@@ -1,8 +1,11 @@
-sudo: false
 language: ruby
 rvm:
-  - 2.5.3
-before_install: gem install bundler -v 1.13.6
+  - 2.5
+  - 2.6
+  - 2.7
+before_install: gem install bundler -v 1.16.2
 gemfile:
+  - gemfiles/5.0.gemfile
+  - gemfiles/5.1.gemfile
   - gemfiles/5.2.gemfile
   - gemfiles/6.0.gemfile

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2016 Kenn Ejima
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -39,9 +39,13 @@ profile.languages = [:spanish, :japanese]   # Direct assignment that works with
 Profile.languages.maps                      #=> {:english=>1, :spanish=>2, :chinese=>4, :french=>8, :japanese=>16 }
 Profile.languages.humans                    #=> {:english=>"English", :spanish=>"Spanish", :chinese=>"Chinese", :french=>"French", :japanese=>"Japanese"}
 Profile.languages.pairs                     #=> {"English"=>:english, "Spanish"=>:spanish, "Chinese"=>:chinese, "French"=>:french, "Japanese"=>:japanese}
+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
 ```
@@ -54,7 +58,7 @@ gem 'active_flag'
 
 ### Migration
 
-Always set `0` as a default.
+It is recommended to set `0` by default.
 
 ```ruby
 t.integer :languages,                    null: false, default: 0, limit: 8
@@ -66,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
@@ -78,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/gemfiles/5.0.gemfile

@@ -0,0 +1,12 @@
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.0"
+
+group :development, :test do
+  gem "bundler"
+  gem "rake"
+  gem "minitest"
+  gem "sqlite3"
+end
+
+gemspec :path => "../"

data/gemfiles/5.1.gemfile

@@ -0,0 +1,12 @@
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.1"
+
+group :development, :test do
+  gem "bundler"
+  gem "rake"
+  gem "minitest"
+  gem "sqlite3"
+end
+
+gemspec :path => "../"

data/lib/active_flag/definition.rb

@@ -5,14 +5,14 @@ module ActiveFlag
     def initialize(column, keys, klass)
       @column = column
       @keys = keys.freeze
-      @maps = Hash[keys.map.with_index{|key, i| [key, 2**i] }].freeze
+      @maps = Hash[keys.map.with_index{ |key, i| [key, 2**i] }].freeze
       @klass = klass
     end
 
     def humans
       @humans ||= {}
       @humans[I18n.locale] ||= begin
-        @keys.map{|key| [key, human(key)] }.to_h
+        @keys.map { |key| [key, human(key)] }.to_h
       end
     end
 
@@ -34,7 +34,8 @@ module ActiveFlag
 
     def to_i(arg)
       arg = [arg] unless arg.is_a?(Enumerable)
-      arg.map{|s| s && @maps[s.to_s.to_sym] || 0 }.sum
+      arg = arg.uniq
+      arg.map { |s| s && @maps[s.to_s.to_sym] || 0 }.sum
     end
 
     def to_value(instance, integer)
@@ -42,7 +43,7 @@ module ActiveFlag
     end
 
     def to_array(integer)
-      @maps.map{|key, mask| (integer & mask > 0) ? key : nil }.compact
+      @maps.map { |key, mask| (integer & mask > 0) ? key : nil }.compact
     end
 
   private
@@ -58,7 +59,7 @@ module ActiveFlag
       defaults << :"active_flag.#{@column}.#{key}"
       defaults << options.delete(:default) if options[:default]
       defaults << key.to_s.humanize
-      I18n.translate defaults.shift, options.reverse_merge(count: 1, default: defaults)
+      I18n.translate defaults.shift, **options.reverse_merge(count: 1, default: defaults)
     end
   end
 end

data/lib/active_flag/value.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module ActiveFlag
   class Value < Set
     def with(instance, definition)
@@ -8,7 +10,7 @@ module ActiveFlag
     end
 
     def raw
-      @instance.read_attribute(@column)
+      @instance.read_attribute(@column).to_i
     end
 
     def to_human
@@ -29,12 +31,12 @@ module ActiveFlag
 
     def set!(key, options={})
       set(key)
-      @instance.save!(options)
+      @instance.save!(**options)
     end
 
     def unset!(key, options={})
       unset(key)
-      @instance.save!(options)
+      @instance.save!(**options)
     end
 
     def set?(key)

data/lib/active_flag/version.rb

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

data/lib/active_flag.rb

@@ -20,7 +20,7 @@ module ActiveFlag
 
       # Getter
       define_method column do
-        self.class.active_flags[column].to_value(self, read_attribute(column))
+        self.class.active_flags[column].to_value(self, read_attribute(column).to_i)
       end
 
       # Setter
@@ -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.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Kenn Ejima
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2022-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -90,11 +90,14 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - active_flag.gemspec
 - bin/console
 - bin/setup
+- gemfiles/5.0.gemfile
+- gemfiles/5.1.gemfile
 - gemfiles/5.2.gemfile
 - gemfiles/6.0.gemfile
 - lib/active_flag.rb
@@ -105,7 +108,7 @@ files:
 homepage: https://github.com/kenn/active_flag
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -120,8 +123,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Bit array for ActiveRecord
 test_files: []