bitswitch 1.0.2 → 1.0.3

data/lib/bitswitch.rb

@@ -135,94 +135,84 @@ if defined? ActiveRecord::Base
 
 		module ClassMethods
 			def bitswitch(column, hash = {})
+				columne = column.to_s + '='
+				send(:include, Module.new {
+					send(:define_method, column.to_sym) do |*args|
+						val = read_attribute(column)
 
-				KellyLSB::BitSwitch::LocalInstanceMethods.send(:define_method, column.to_sym) do |*args|
-					val = read_attribute(column)
-
-					# If nil make 0
-					val = 0 if val.nil?
-
-					# Make sure the value is an integer
-					raise KellyLSB::BitSwitch::Error, "Column: #{column} is not an integer!" unless val.is_a?(Fixnum)
-
-					# Get the BitSwitch
-					val = val.to_switch hash
+						# If nil make 0
+						val = 0 if val.nil?
 
-					# Return the value of a specific key
-					return val[args.first.to_s] unless args[0].nil?
+						# Make sure the value is an integer
+						raise KellyLSB::BitSwitch::Error, "Column: #{column} is not an integer!" unless val.is_a?(Fixnum)
 
-					# Return the switch
-					return val
-				end
+						# Get the BitSwitch
+						val = val.to_switch hash
 
-				columne = column.to_s + '='
-				KellyLSB::BitSwitch::LocalInstanceMethods.send(:define_method, columne.to_sym) do |input|
-					val = read_attribute(column)
+						# Return the value of a specific key
+						return val[args.first.to_s] unless args[0].nil?
 
-					# If nil make 0
-					val = 0 if val.nil?
+						# Return the switch
+						return val
+					end
 
-					# Make sure the value is an integer
-					raise KellyLSB::BitSwitch::Error, "Column: #{column} is not an integer!" unless val.is_a?(Fixnum)
+					send(:define_method, columne.to_sym) do |input|
+						val = read_attribute(column)
 
-					# Get the BitSwitch
-					val = val.to_switch(hash).to_hash.merge(input).to_switch(hash)
+						# If nil make 0
+						val = 0 if val.nil?
 
-					# Write the updated value
-					update_column(column, val.to_i)
+						# Make sure the value is an integer
+						raise KellyLSB::BitSwitch::Error, "Column: #{column} is not an integer!" unless val.is_a?(Fixnum)
 
-					# Return the switch
-					return self.send(column)
-				end
+						# Get the BitSwitch
+						val = val.to_switch(hash).to_hash.merge(input).to_switch(hash)
 
-				KellyLSB::BitSwitch::SingletonMethods.send(:define_method, column.to_sym) do |*args|
-					raise KellyLSB::BitSwitch::Error, "Missing arguments!" if args.empty?
-					bits = hash.invert
+						# Write the updated value
+						update_column(column, val.to_i)
 
-					# Type of condition
-					if args.first.is_a?(String) && ['AND', 'OR'].include?(args.first.upcase)
-						delimiter = args.shift
-					else
-						delimiter = 'AND'
+						# Return the switch
+						return self.send(column)
 					end
-
-					# 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')
+				})
+
+				send(:extend, Module.new {
+					send(:define_method, column.to_sym) do |*args|
+						raise KellyLSB::BitSwitch::Error, "Missing arguments!" if args.empty?
+						bits = hash.invert
+
+						# Type of condition
+						if args.first.is_a?(String) && ['AND', 'OR'].include?(args.first.upcase)
+							delimiter = args.shift
+						else
+							delimiter = 'AND'
 						end
-					else
-						args.each do |slug|
-							bit = bits[slug.to_s]
-							conditions << "POW(2, #{bit}) & `#{self.table_name}`.`#{column}` > 0"
+
+						# 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
-					end
 
-					# Run add query
-					return self.where(conditions.join(" #{delimiter} ")) unless conditions.empty?
+						# Run add query
+						return self.where(conditions.join(" #{delimiter} ")) unless conditions.empty?
 
-					# Return update query
-					return query
-				end
-				
-				include KellyLSB::BitSwitch::LocalInstanceMethods
-				extend KellyLSB::BitSwitch::SingletonMethods
+						# Return update query
+						return query
+					end
+				})
 			end
 		end
-
-		# This module contains class methods
-		module SingletonMethods
-		end
-
-		module LocalInstanceMethods
-		end
-
-		class Error < StandardError
-		end
 	end
 	end
 

data/lib/bitswitch/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitswitch
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies: []
 description: Have you ever wanted to store multiple true/false values in your database,
   but annoyed with how many fields your tables have, then BitSwitcher is good for