bitwise_attribute 0.3.1 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f0f237297a8e24d935ba7d8a1e527be90905ce307bb0969f4da05f865ccf620
-  data.tar.gz: a8759597c78d19d75ffac48269501fd8dfe7aa9d382c55324ef36b22557b74e6
+  metadata.gz: df49609ab57b88fb77568ae2cdc29ee9851626a67e632170e9a90ebae1bbbfdb
+  data.tar.gz: c5271b2e9ef62d0a6e1e1e55bddc3eaa63274d775065618077fe78299774fcae
 SHA512:
-  metadata.gz: cb1e364a63825b238ecd8c5c2fc45d52017544039b858cea80b8f2609104f19b90f974bbd2aaeff28b33589b8e1173a8b391ca5396ccc68d4d7f118db1461160
-  data.tar.gz: ebca18a680d5b87ad721f626ad7cf7cbc3bb362d98845fc3d9144c4bdd70b3a2c8e3b5cdd867660e53ffaf4980b7a72a0c0518da9133afb43eb35673e7db0397
+  metadata.gz: 64de0ef4cef8fcec575b2c31e04350282c0b5c45c87d2ef87e2a174c13f80cbb2bbafe06e273c189ace9650123b1e4d7f5ff9bd999c1086d2866dbea06bd409f
+  data.tar.gz: bf54560552fdfbf62753044fe65507c405d81240733317e6200cf0417347161aa618cfeddf347d689bdf233917109c5e1d9a51d651c1f32eddd52668a1ea796c

data/.github/workflows/ci.yml

@@ -0,0 +1,41 @@
+
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: "2.5"
+        bundler-cache: true
+    - name: rubocop version
+      timeout-minutes: 1
+      run: bundle exec rubocop --version
+    - name: rubocop
+      timeout-minutes: 5
+      run: bundle exec rubocop -c .rubocop.yml
+
+  test:
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.5", "2.6", "2.7", "3.0"]
+        experimental: [false]
+        include:
+        - ruby: "truffleruby"
+          experimental: true
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{matrix.ruby}}
+        bundler-cache: true
+    - name: Run tests
+      timeout-minutes: 5
+      run: ${{matrix.env}} bundle exec rspec

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+.DS_Store
 
 # rspec failure tracking
 .rspec_status

data/.rubocop.yml

@@ -1,12 +1,26 @@
-Metrics/AbcSize:
-  Max: 30
+require:
+  - rubocop-rake
+  - rubocop-rspec
+
+AllCops:
+  NewCops: enable
+  TargetRubyVersion: 2.5
+
+RSpec/MultipleMemoizedHelpers:
+  Max: 10
 
 Style/Documentation:
   Enabled: false
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 100
 
+Metrics/CyclomaticComplexity:
+  Max: 15
+
+Metrics/PerceivedComplexity:
+  Max: 15
+
 Metrics/MethodLength:
   Max: 50
 

data/.ruby-version

@@ -1 +1 @@
-2.5.0
+2.7.2

data/Gemfile.lock

@@ -1,91 +1,110 @@
 PATH
   remote: .
   specs:
-    bitwise_attribute (0.3.1)
+    bitwise_attribute (0.3.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.1.5)
-      activesupport (= 5.1.5)
-    activerecord (5.1.5)
-      activemodel (= 5.1.5)
-      activesupport (= 5.1.5)
-      arel (~> 8.0)
-    activesupport (5.1.5)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord (6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (8.0.0)
-    ast (2.4.0)
-    byebug (10.0.1)
-    coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    diff-lcs (1.3)
-    docile (1.1.5)
-    i18n (0.9.5)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
+    ffi (1.15.4-java)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    json (2.1.0)
-    method_source (0.9.0)
-    minitest (5.11.3)
-    parallel (1.12.1)
-    parser (2.5.0.5)
-      ast (~> 2.4.0)
-    powerpack (0.1.1)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
+    method_source (1.0.0)
+    minitest (5.14.4)
+    parallel (1.21.0)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry (0.13.1-java)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+      spoon (~> 0.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
     rainbow (3.0.0)
-    rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rake (13.0.6)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    rubocop (0.54.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.22.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    simplecov (0.15.1)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sqlite3 (1.3.13)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.12.0)
+      parser (>= 3.0.1.1)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.5.0)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
+    spoon (0.0.6)
+      ffi
+    sqlite3 (1.4.2)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
-  ruby
+  universal-java-11
+  x86_64-darwin-19
+  x86_64-linux
 
 DEPENDENCIES
   activerecord (>= 3)
   bitwise_attribute!
-  bundler (~> 1.16)
+  bundler
   pry-byebug
-  rake (~> 10.0)
-  rspec (~> 3.0)
-  rubocop (~> 0.54.0)
-  simplecov (~> 0.15.1)
+  rake
+  rspec
+  rubocop
+  rubocop-rake
+  rubocop-rspec
+  simplecov
   sqlite3
 
 BUNDLED WITH
-   1.16.1
+   2.2.16

data/README.md

@@ -1,6 +1,3 @@
-[![Dependency Status](https://gemnasium.com/rikas/bitwise_attribute.svg)](https://gemnasium.com/rikas/bitwise_attribute)
-[![Build Status](https://travis-ci.org/rikas/bitwise_attribute.svg?branch=master)](https://travis-ci.org/rikas/bitwise_attribute)
-
 # BitwiseAttribute
 Manipulation of bitmask attributes in your classes (typically ActiveRecord models). You can have multiple values mapped to the same column — for example when you need a User with multiple roles.
 
@@ -44,7 +41,7 @@ end
 ```ruby
 class User < ActiveRecord::Base
   include BitwiseAttribute
-  
+
   # This line will do all the magic!
   #
   # By default we assume that your column will be called `role_mask`.

data/bitwise_attribute.gemspec

@@ -7,6 +7,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'bitwise_attribute/version'
 
 Gem::Specification.new do |spec|
+  spec.required_ruby_version = '>= 2.5.0'
   spec.name          = 'bitwise_attribute'
   spec.version       = BitwiseAttribute::VERSION
   spec.authors       = ['Ricardo Otero']
@@ -25,11 +26,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib]
 
   spec.add_development_dependency 'activerecord', '>= 3'
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.54.0'
-  spec.add_development_dependency 'simplecov', '~> 0.15.1'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-rake'
+  spec.add_development_dependency 'rubocop-rspec'
+  spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'sqlite3'
 end

data/lib/bitwise_attribute/active_record_methods.rb

@@ -4,56 +4,56 @@ module BitwiseAttribute
   module ActiveRecordMethods
     def define_named_scopes(name, column_name, mapping)
       define_singleton_method("with_#{name}") do |*keys|
-        keys = cleanup_keys(keys)
+        keys = cleanup_keys(keys, mapping)
 
-        return [] unless keys&.any?
+        return none unless keys&.any?
 
-        records = where("#{column_name} & #{mapping[keys.first]} = #{mapping[keys.first]}")
+        records = all
 
-        keys[1..-1].each do |key|
-          records = records.where("#{column_name} & #{mapping[key]} = #{mapping[key]}")
+        keys.each do |key|
+          records = records.where((arel_table[column_name] & mapping[key]).eq(mapping[key]))
         end
 
         records
       end
 
       define_singleton_method("with_any_#{name}") do |*keys|
-        keys = cleanup_keys(keys)
+        keys = cleanup_keys(keys, mapping)
 
         return where.not(column_name => nil) unless keys&.any?
 
-        records = where("#{column_name} & #{mapping[keys.first]} = #{mapping[keys.first]}")
+        records = where('1=0')
 
-        keys[1..-1].each do |key|
-          records = records.or(where("#{column_name} & #{mapping[key]} = #{mapping[key]}"))
+        keys.each do |key|
+          records = records.or(where((arel_table[column_name] & mapping[key]).eq(mapping[key])))
         end
 
         records
       end
 
       define_singleton_method("with_exact_#{name}") do |*keys|
-        keys = cleanup_keys(keys)
+        keys = cleanup_keys(keys, mapping)
 
-        return [] unless keys&.any?
+        return none unless keys&.any?
 
         records = send("with_#{name}", keys)
 
         (mapping.keys - keys).each do |key|
-          records = records.where("#{column_name} & #{mapping[key]} != #{mapping[key]}")
+          records = records.where((arel_table[column_name] & mapping[key]).not_eq(mapping[key]))
         end
 
         records
       end
 
       define_singleton_method("without_#{name}") do |*keys|
-        keys = cleanup_keys(keys)
+        keys = cleanup_keys(keys, mapping)
 
         return where(column_name => nil).or(where(column_name => 0)) unless keys&.any?
 
-        records = where("#{column_name} & #{mapping[keys.first]} != #{mapping[keys.first]}")
+        records = all
 
-        keys[1..-1].each do |key|
-          records = records.where("#{column_name} & #{mapping[key]} != #{mapping[key]}")
+        keys.each do |key|
+          records = records.where((arel_table[column_name] & mapping[key]).not_eq(mapping[key]))
         end
 
         records
@@ -61,17 +61,19 @@ module BitwiseAttribute
 
       # Defines a class method for each key of the mapping, returning records that have *at least*
       # the corresponding value.
-      mapping.keys.each do |key|
+      mapping.each_key do |key|
         define_singleton_method(key) do
           send("with_#{name}", key)
         end
       end
     end
 
-    def cleanup_keys(keys)
+    def cleanup_keys(keys, mapping)
       return [] unless keys
 
-      keys.flatten.map(&:to_sym).uniq
+      clean = keys.flatten.map(&:to_sym).compact.uniq
+
+      clean & mapping.keys # only roles that we know about
     end
   end
 end

data/lib/bitwise_attribute/values_list.rb

@@ -3,10 +3,10 @@
 module BitwiseAttribute
   class ValuesList < Array
     def initialize(field, record, values)
+      super(concat(values))
+
       @field = field
       @record = record
-
-      concat(values)
     end
 
     def <<(value)

data/lib/bitwise_attribute/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BitwiseAttribute
-  VERSION = '0.3.1'
+  VERSION = '0.3.5'
 end

data/lib/bitwise_attribute.rb

@@ -16,7 +16,7 @@ module BitwiseAttribute
   module ClassMethods
     include BitwiseAttribute::ActiveRecordMethods
 
-    def attr_bitwise(name, column_name: nil, values:)
+    def attr_bitwise(name, values:, column_name: nil)
       column_name ||= "#{name.to_s.singularize}_mask"
 
       mapping = build_mapping(values)
@@ -48,7 +48,7 @@ module BitwiseAttribute
       end
 
       # Adds a boolean method for each key (ex: admin?)
-      mapping.keys.each do |key|
+      mapping.each_key do |key|
         define_method("#{key}?") do
           value?(column_name, mapping[key])
         end
@@ -78,11 +78,11 @@ module BitwiseAttribute
   def value_setter(mask_column, values, mapping)
     send("#{mask_column}=", 0)
 
-    values.each do |value|
-      raise(ArgumentError, "Unknown value #{value}!") unless mapping[value]
+    values = values.map(&:to_sym).compact.uniq
 
-      send("#{mask_column}=", send(mask_column) | mapping[value])
-    end
+    values &= mapping.keys
+
+    values.each { |value| send("#{mask_column}=", send(mask_column) | mapping[value]) }
   end
 
   # Return if value is present in mask (raw value)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitwise_attribute
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.5
 platform: ruby
 authors:
 - Ricardo Otero
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -56,58 +56,86 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-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: rubocop-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: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -129,11 +157,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -150,7 +178,7 @@ homepage: https://github.com/rikas/bitwise_attribute
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -158,16 +186,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Bitwise attribute for ruby class and Rails model.
 test_files: []

data/.travis.yml

@@ -1,8 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.5.0
-before_install: gem install bundler -v 1.16.1
-script:
-  - bundle exec rspec --fail-fast
-  - bundle exec rubocop