bitwise_attribute 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a19184eaf7a73f44c929b1aa3cb0794d2d4be1f54a5c15802e1cd1eb0edf1641
-  data.tar.gz: 03edbbb6992ec20733a349a7eefc7b776a4fa91c74e1373222b8949298bbc07f
+  metadata.gz: df49609ab57b88fb77568ae2cdc29ee9851626a67e632170e9a90ebae1bbbfdb
+  data.tar.gz: c5271b2e9ef62d0a6e1e1e55bddc3eaa63274d775065618077fe78299774fcae
 SHA512:
-  metadata.gz: 9159f1439b717c6f4954ed5582d8811d4da7b37b3375ca1cfe4899760d94e5ca189f889180a5465a4b2dc18f7073aed55cfafb852acfce6c93d628088729c784
-  data.tar.gz: 2a2c1f64d74e7184c23d403f48b76566e34db91b2d1e081c70effad74394d4fb7e328c058cdadf6ec4945f4180ce6bedf7c2d2ffcabec69ef2890aee3b28ff10
+  metadata.gz: 64de0ef4cef8fcec575b2c31e04350282c0b5c45c87d2ef87e2a174c13f80cbb2bbafe06e273c189ace9650123b1e4d7f5ff9bd999c1086d2866dbea06bd409f
+  data.tar.gz: bf54560552fdfbf62753044fe65507c405d81240733317e6200cf0417347161aa618cfeddf347d689bdf233917109c5e1d9a51d651c1f32eddd52668a1ea796c

data/.gitignore

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

data/Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    bitwise_attribute (0.3.4)
+    bitwise_attribute (0.3.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activerecord (6.1.3.2)
-      activemodel (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activesupport (6.1.3.2)
+    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 (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -20,16 +20,16 @@ GEM
     ast (2.4.2)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
     docile (1.4.0)
-    ffi (1.15.1-java)
+    ffi (1.15.4-java)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
     minitest (5.14.4)
-    parallel (1.20.1)
-    parser (3.0.1.1)
+    parallel (1.21.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -42,7 +42,7 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.13.0)
     rainbow (3.0.0)
-    rake (13.0.3)
+    rake (13.0.6)
     regexp_parser (2.1.1)
     rexml (3.2.5)
     rspec (3.10.0)
@@ -58,22 +58,21 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.15.0)
+    rubocop (1.22.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.5.0, < 2.0)
+      rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.7.0)
+    rubocop-ast (1.12.0)
       parser (>= 3.0.1.1)
-    rubocop-rake (0.5.1)
-      rubocop
-    rubocop-rspec (2.3.0)
+    rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
+    rubocop-rspec (2.5.0)
+      rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     simplecov (0.21.2)
       docile (~> 1.1)
@@ -86,7 +85,7 @@ GEM
     sqlite3 (1.4.2)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.1.0)
     zeitwerk (2.4.2)
 
 PLATFORMS

data/lib/bitwise_attribute/active_record_methods.rb

@@ -6,12 +6,12 @@ module BitwiseAttribute
       define_singleton_method("with_#{name}") do |*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
@@ -22,10 +22,10 @@ module BitwiseAttribute
 
         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
@@ -34,12 +34,12 @@ module BitwiseAttribute
       define_singleton_method("with_exact_#{name}") do |*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
@@ -50,10 +50,10 @@ module BitwiseAttribute
 
         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

data/lib/bitwise_attribute/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitwise_attribute
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Ricardo Otero
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-29 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord