active_flag 1.3.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 920b4e8334a939be9b99d1a2cec584337b95392c
-  data.tar.gz: 487d5d96abf070e1d55e0f61b2d8e1b4ea6cb627
+SHA256:
+  metadata.gz: e4a88c02a655b6b16a83ffd290972fb07c8aa9dfa3b3576a3ba8f610b500891a
+  data.tar.gz: 1574b03e53e7d06d5bfba726e893a9ee57216f683fef7b964c119fe439feab42
 SHA512:
-  metadata.gz: 52d1ac341b2cbc1e6f12107603885be37f9e0f71de5a6b1b62a12dc65332dff684a65bd3d4c0ea39fbf931945870e8f1dc7e7eca14e5b7c22f135fe14e4efbc6
-  data.tar.gz: 17e0b5863656d817a284a3e766f97134c178d0db9acb8a6aa66a54830bdbf93101261cfaeaa790bd61c9101542f1eea6edeeab18027baaa8395124c4b1e92cbd
+  metadata.gz: 7d896dd686fc5aef5020c0f1042534c9e8764ae3c7fe1fcc66785a3655bf9b5745e874bbba177f5d5d379bfc5902b8c98344bf2f6d8f7be7ea3784080095fce1
+  data.tar.gz: 4ca09aeaa35f658ce10ce29a760a8c2844c074413d2629b9509056de0263a0771d57997a144caf8de61cb3e7be1125e454bcde24df5a93d20e8ff7267a637139

data/.travis.yml

@@ -1,5 +1,11 @@
-sudo: false
 language: ruby
 rvm:
-  - 2.3.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

@@ -9,6 +9,10 @@ Perfect solution to store multiple boolean values such as preferences, notificat
 * **Single column to group multiple boolean values.** You don't need to have many separate columns. You don't even need a migration when you add a new flag item to the list.
 * **Fast bitwise operations.** `WHERE languages & 3 > 0` is faster than `WHERE (english = true) OR (spanish = true) OR ...`
 
+If you want a simple enum column, take a look at [EnumAccessor](https://github.com/kenn/enum_accessor).
+
+If you need to work with huge bit arrays, take a look at [Bitwise](https://github.com/kenn/bitwise).
+
 ## Usage
 
 ```ruby
@@ -16,6 +20,8 @@ class Profile < ActiveRecord::Base
   flag :languages, [:english, :spanish, :chinese, :french, :japanese]
 end
 
+# {:english=>1, :spanish=>2, :chinese=>4, :french=>8, :japanese=>16 }
+
 # Instance methods
 profile.languages                           #=> #<ActiveFlag::Value: {:english, :japanese}>
 profile.languages.english?                  #=> true
@@ -30,8 +36,12 @@ profile.languages.to_a                      #=> [:english, :spanish]
 profile.languages = [:spanish, :japanese]   # Direct assignment that works with forms
 
 # Class methods
-Profile.where_languages(:french, :spanish)  #=> SELECT * FROM profiles WHERE languages & 10 > 0
 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}
+
+# Scope methods
+Profile.where_languages(:french, :spanish)  #=> SELECT * FROM profiles WHERE languages & 10 > 0
 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
 ```
@@ -44,7 +54,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
@@ -59,7 +69,7 @@ add_column :users, :languages, :integer, null: false, default: 0, limit: 8
 For a querying purpose, use `where_[column]` scope.
 
 ```ruby
-Profile.where_languages(:french)            #=> SELECT * FROM profiles WHERE languages = 8
+Profile.where_languages(:french)            #=> SELECT * FROM profiles WHERE languages & 8 > 0
 ```
 
 Also takes multiple values.
@@ -73,7 +83,7 @@ By default, it searches with `or` operation, so the query above returns profiles
 If you want to change it to `and` operation, you can specify:
 
 ```ruby
-Profile.where_languages(:french, :spanish, op: :and)
+Profile.where_languages(:french, :spanish, op: :and) #=> SELECT * FROM profiles WHERE languages = 10
 ```
 
 ## Translation
@@ -110,10 +120,12 @@ Thanks to the translation support, forms just work as you would expect with the
 
 ```ruby
 # With FormBuilder
+
 = form_for(@profile) do |f|
   = f.collection_check_boxes :languages, Profile.languages.pairs
 
 # With SimpleForm
+
 = simple_form_for(@profile) do |f|
   = f.input :languages, as: :check_boxes, collection: Profile.languages.pairs
 ```

data/active_flag.gemspec

@@ -16,10 +16,10 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'activerecord', '< 6'
+  spec.add_runtime_dependency 'activerecord', '>= 5'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest'

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/gemfiles/5.2.gemfile

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

data/gemfiles/6.0.gemfile

@@ -0,0 +1,12 @@
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6"
+
+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

@@ -8,7 +8,7 @@ module ActiveFlag
     end
 
     def raw
-      @instance.read_attribute(@column)
+      @instance.read_attribute(@column).to_i
     end
 
     def to_human
@@ -29,12 +29,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.3.0'
+  VERSION = '1.5.1'
 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
@@ -41,11 +41,7 @@ module ActiveFlag
         if options[:op] == :and
           where("#{column_name} & #{integer} = #{integer}")
         else
-          if integer & (integer - 1) == 0 # Power of 2, single bit
-            where("#{column_name} = #{integer}")
-          else
-            where("#{column_name} & #{integer} > 0")
-          end
+          where("#{column_name} & #{integer} > 0")
         end
       end
     end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: active_flag
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Kenn Ejima
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2021-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -83,20 +83,23 @@ dependencies:
 description: Bit array for ActiveRecord
 email:
 - kenn.ejima@gmail.com
-executables:
-- console
-- setup
+executables: []
 extensions: []
 extra_rdoc_files: []
 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
 - lib/active_flag/definition.rb
 - lib/active_flag/railtie.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,9 +123,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Bit array for ActiveRecord
 test_files: []