active_record_bitmask 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83cc7c7817104269769c84be2190c59c2fe2d4501d60844aef239913a1ce1924
-  data.tar.gz: 2e373579a128366eba6ee1403743f9cf6954720b66bebe10982817e7306e78e3
+  metadata.gz: 18a348e5179d4954c4dbdc8cc12c54bd0990bcfd0d9b576491f1b9ba9bb0c9f0
+  data.tar.gz: e7dda179cd25bef3f879510da9c89a2d29d8a22cbbf3187ef1993100e5078341
 SHA512:
-  metadata.gz: 8f3bae3a299ab90f8f709b59f44aa1befdc7b06e949043fec24f74c2923cb5d93b49ed5f6f517c68ef15c31272843f7e9f6f78cb841ddfcfbb0aed7f0f27a401
-  data.tar.gz: 63ff0a8977e527a7be95a6e89e37d6ca09e3b19075dd80f89b39b86c5eeabcdab9afa9e75995bdc74f0523069e27f4f2c8d037a282f0034f489980eeb23767ac
+  metadata.gz: c6ad230632f8ea3a0cc8999daea7cdd7dca048f86360ca4a13a8d4e928b1b726bdc4d7389322cf6aea4471a93d3959897d7245e9db5ce0859fe5fe17f767bf01
+  data.tar.gz: 56cfe27aac0dba743cf84198f0e37c6f9a8868510b698162a56d24cb100079ccc7d9eb8166cd217ab52b2fd33a44bd4dbaf305bb9eb3897a4d1ad2f4849f4851

data/CHANGELOG.md

@@ -0,0 +1,21 @@
+## 0.0.4
+
+* Fixes security alert #9
+
+* Query methods supports string arguments #12
+
+## 0.0.3
+
+* Enumerize ActiveRecordBitmask::Map #4 
+
+* Support old rails #5
+
+* Run RuboCop on CI. #6
+
+## 0.0.2
+
+* Support blank values for checkbox #3
+
+## 0.0.1
+
+* first release.

data/Gemfile

@@ -4,3 +4,7 @@ gemspec
 
 gem 'pry'
 gem 'rubocop'
+gem 'appraisal'
+gem 'rake'
+gem 'rspec'
+gem 'sqlite3'

data/README.md

@@ -24,6 +24,8 @@ Simply declare an existing integer column as a bitmask.
 
 ```ruby
 class Post < ApplicationRecord
+  # bitmask attribute is integer column.
+  # `t.integer :roles, null: false, default: 0`
   bitmask(roles: [:administrator, :provider, :guest])
 end
 ```
@@ -55,15 +57,45 @@ map.values #=> [1, 2, 4]
 
 ### Scopes
 
-#### `with_roles`
+Named scopes are defined when you call `.bitmask(attribute)`.
 
-#### `with_any_roles`
+#### `.with_attribute`
 
-#### `without_roles`
+```ruby
+# all users with roles
+User.with_roles
+
+# all administrators
+User.with_roles(:administrator)
+
+# all users who are both administrator and partner
+User.with_roles(:administrator, :partner)
+```
+
+#### `.with_any_attribute`
+
+```ruby
+# all users who are administrator or partner
+User.with_any_roles(:administrator, :partner)
+```
 
-#### `with_exact_roles`
+#### `.without_attribute`, `.no_attribute`
 
-#### `no_roles`
+```ruby
+# all users without role
+User.without_roles
+User.no_roles
+
+# all users who are not administrator
+User.without_roles(:administrator)
+```
+
+#### `.with_exact_attribute`
+
+```ruby
+# all users who are both administrator and partner and nothing else
+User.with_exact_roles(:administrator, :partner)
+```
 
 ## Development
 

data/active_record_bitmask.gemspec

@@ -14,14 +14,17 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Simple bitmask attribute support for ActiveRecord'
   spec.homepage      = 'https://github.com/alpaca-tc/active_record_bitmask'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  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/',
+    'bug_tracker_uri' => 'https://github.com/alpaca-tc/active_record_bitmask/issues'
+  }
+
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activerecord', '>= 5.0'
-  spec.add_development_dependency 'appraisal'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'sqlite3'
 end

data/gemfiles/5.0_stable.gemfile

@@ -4,7 +4,10 @@ source "https://rubygems.org"
 
 gem "pry"
 gem "rubocop"
-gem "activerecord", "~> 5.0.0"
+gem "appraisal"
+gem "rake"
+gem "rspec"
 gem "sqlite3", "~> 1.3.6"
+gem "activerecord", "~> 5.0.0"
 
 gemspec path: "../"

data/gemfiles/5.1_stable.gemfile

@@ -4,6 +4,10 @@ source "https://rubygems.org"
 
 gem "pry"
 gem "rubocop"
+gem "appraisal"
+gem "rake"
+gem "rspec"
+gem "sqlite3"
 gem "activerecord", "~> 5.1.0"
 
 gemspec path: "../"

data/gemfiles/5.2_stable.gemfile

@@ -4,6 +4,10 @@ source "https://rubygems.org"
 
 gem "pry"
 gem "rubocop"
+gem "appraisal"
+gem "rake"
+gem "rspec"
+gem "sqlite3"
 gem "activerecord", "~> 5.2.0"
 
 gemspec path: "../"

data/gemfiles/6.0_stable.gemfile

@@ -4,6 +4,10 @@ source "https://rubygems.org"
 
 gem "pry"
 gem "rubocop"
+gem "appraisal"
+gem "rake"
+gem "rspec"
+gem "sqlite3"
 gem "activerecord", "~> 6.0.0"
 
 gemspec path: "../"

data/lib/active_record_bitmask/attribute_methods/query.rb

@@ -13,10 +13,10 @@ module ActiveRecordBitmask
         if bitmask_attribute?(attribute_name) && values.present?
           # assert bitmask values
           map = self.class.bitmask_for(attribute_name)
-          map.attributes_to_bitmask(values)
+          expected_value = map.attributes_to_bitmask(values)
+          current_value = map.attributes_to_bitmask(attribute(attribute_name))
 
-          current_value = attribute(attribute_name)
-          values.all? { |value| current_value.include?(value) }
+          (current_value & expected_value) == expected_value
         else
           super
         end

data/lib/active_record_bitmask/model.rb

@@ -56,6 +56,7 @@ module ActiveRecordBitmask
         end
       end
 
+      # rubocop:disable Metrics/CyclomaticComplexity
       def define_bitmask_scopes(attribute)
         blank = [0, nil].freeze
 
@@ -112,6 +113,7 @@ module ActiveRecordBitmask
           where(attribute => blank)
         }
       end
+      # rubocop:enable Metrics/CyclomaticComplexity
     end
   end
 end

data/lib/active_record_bitmask/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_bitmask
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - alpaca-tc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,62 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - alpaca-tc@alpaca.tc
@@ -92,6 +36,7 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -110,7 +55,11 @@ files:
 homepage: https://github.com/alpaca-tc/active_record_bitmask
 licenses:
 - MIT
-metadata: {}
+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/
+  bug_tracker_uri: https://github.com/alpaca-tc/active_record_bitmask/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -126,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Simple bitmask attribute support for ActiveRecord