bitswitch 1.0.1 → 1.0.2

data/lib/bitswitch.rb

@@ -179,14 +179,33 @@ if defined? ActiveRecord::Base
 					raise KellyLSB::BitSwitch::Error, "Missing arguments!" if args.empty?
 					bits = hash.invert
 
-					query = self
+					# Type of condition
+					if args.first.is_a?(String) && ['AND', 'OR'].include?(args.first.upcase)
+						delimiter = args.shift
+					else
+						delimiter = 'AND'
+					end
 
-					# Perform conditions
-					args.each do |slug|
-						query = query.where("POW(2, ?) & `#{self.table_name}`.`#{column}` > 0", bits[slug.to_s])
+					# Empty conditions
+					conditions = Array.new
+
+					# Build conditions
+					if args.first.is_a?(Hash)
+						args.first.each do |slug,tf|
+							bit = bits[slug.to_s]
+							conditions << "POW(2, #{bit}) & `#{self.table_name}`.`#{column}`" + (tf ? ' > 0' : ' <= 0')
+						end
+					else
+						args.each do |slug|
+							bit = bits[slug.to_s]
+							conditions << "POW(2, #{bit}) & `#{self.table_name}`.`#{column}` > 0"
+						end
 					end
 
-					# Return results
+					# Run add query
+					return self.where(conditions.join(" #{delimiter} ")) unless conditions.empty?
+
+					# Return update query
 					return query
 				end
 				

data/lib/bitswitch/version.rb

@@ -1,3 +1,3 @@
 module Bitswitch
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitswitch
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors: